From 5367ac4da6cfe5cddc298d7d2691d1d369946235 Mon Sep 17 00:00:00 2001
From: volar <stanislav.volar@petitpress.sk>
Date: Wed, 4 Dec 2024 22:21:31 +0100
Subject: [PATCH] cached users moved to common admin

---
 src/components/CachedDamUserChip.vue          | 12 ++++++--
 .../asset/components/AssetCreateButton.vue    |  6 ++--
 .../coreDam/asset/detail/AssetDetailView.vue  |  5 ++--
 .../components/AssetListSidebarMetadata.vue   | 11 +++++--
 .../list/components/AssetTableRowItem.vue     | 14 ++++++---
 .../list/composables/assetListActions.ts      |  4 +--
 .../extSystem/composables/extSystemActions.ts |  5 ++--
 .../coreDam/user/composables/cachedUsers.ts   | 30 -------------------
 8 files changed, 36 insertions(+), 51 deletions(-)
 delete mode 100644 src/views/coreDam/user/composables/cachedUsers.ts

diff --git a/src/components/CachedDamUserChip.vue b/src/components/CachedDamUserChip.vue
index 64c8306f..ab916a5a 100644
--- a/src/components/CachedDamUserChip.vue
+++ b/src/components/CachedDamUserChip.vue
@@ -2,8 +2,14 @@
 import { computed, shallowRef, watch } from 'vue'
 import { ROUTE } from '@/router/routes'
 import { useRouter } from 'vue-router'
-import { COMMON_CONFIG, type IntegerId, isNull, isUndefined, AAnzuUserAvatar } from '@anzusystems/common-admin'
-import { useCachedUsers } from '@/views/coreDam/user/composables/cachedUsers'
+import {
+  AAnzuUserAvatar,
+  COMMON_CONFIG,
+  type IntegerId,
+  isNull,
+  isUndefined,
+  useDamCachedUsers,
+} from '@anzusystems/common-admin'
 import type { UserMinimal } from '@/types/coreDam/User'
 
 const props = withDefaults(
@@ -17,7 +23,7 @@ const router = useRouter()
 const cached = shallowRef<undefined | UserMinimal>(undefined)
 const loaded = shallowRef<boolean>(false)
 
-const { getCachedUser } = useCachedUsers()
+const { getCachedUser } = useDamCachedUsers()
 
 const item = computed(() => {
   return getCachedUser(props.id)
diff --git a/src/views/coreDam/asset/components/AssetCreateButton.vue b/src/views/coreDam/asset/components/AssetCreateButton.vue
index 37207f4c..3b3522a5 100644
--- a/src/views/coreDam/asset/components/AssetCreateButton.vue
+++ b/src/views/coreDam/asset/components/AssetCreateButton.vue
@@ -1,12 +1,13 @@
 <script lang="ts" setup>
 import { ref } from 'vue'
-import type { AssetDetailItemDto } from '@anzusystems/common-admin'
 import {
   ADialogToolbar,
   AFormValueObjectOptionsSelect,
   ARow,
+  type AssetDetailItemDto,
   ASystemEntityScope,
   useAlerts,
+  useDamCachedUsers,
 } from '@anzusystems/common-admin'
 import { SYSTEM_CORE_DAM } from '@/model/systems'
 import { ENTITY } from '@/services/api/coreDam/authorApi'
@@ -16,7 +17,6 @@ import { useI18n } from 'vue-i18n'
 import { createAsset } from '@/services/api/coreDam/assetApi'
 import { useAssetDetailStore } from '@/stores/coreDam/assetDetailStore'
 import { useCurrentAssetLicence } from '@/composables/system/currentExtSystem'
-import { useCachedUsers } from '@/views/coreDam/user/composables/cachedUsers'
 import type { AssetCreateDto } from '@/types/coreDam/Asset'
 
 const emit = defineEmits<{
@@ -26,7 +26,7 @@ const emit = defineEmits<{
 const { t } = useI18n()
 const { currentAssetLicenceId } = useCurrentAssetLicence()
 const assetDetailStore = useAssetDetailStore()
-const { addToCachedUsers, fetchCachedUsers } = useCachedUsers()
+const { addToCachedUsers, fetchCachedUsers } = useDamCachedUsers()
 
 const { createCreateDto } = useAssetFactory()
 const asset = ref<AssetCreateDto>(createCreateDto())
diff --git a/src/views/coreDam/asset/detail/AssetDetailView.vue b/src/views/coreDam/asset/detail/AssetDetailView.vue
index 5203893f..b3b70ced 100644
--- a/src/views/coreDam/asset/detail/AssetDetailView.vue
+++ b/src/views/coreDam/asset/detail/AssetDetailView.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { useRoute, useRouter } from 'vue-router'
 import { nextTick, onMounted, ref } from 'vue'
-import { type DocId, isDocId, isString, useAlerts, useTheme } from '@anzusystems/common-admin'
+import { type DocId, isDocId, isString, useAlerts, useDamCachedUsers, useTheme } from '@anzusystems/common-admin'
 import { useAssetDetailStore } from '@/stores/coreDam/assetDetailStore'
 import { storeToRefs } from 'pinia'
 import AssetImageRoiSelect from '@/views/coreDam/asset/detail/components/AssetImageRoiSelect.vue'
@@ -13,7 +13,6 @@ import { useI18n } from 'vue-i18n'
 import { useAssetListStore } from '@/stores/coreDam/assetListStore'
 import { ROUTE } from '@/router/routes'
 import { useAssetDetailActions } from '@/views/coreDam/asset/detail/composables/assetDetailActions'
-import { useCachedUsers } from '@/views/coreDam/user/composables/cachedUsers'
 
 defineEmits<{
   (e: 'mainRouteChanged'): void
@@ -28,7 +27,7 @@ const assetListStore = useAssetListStore()
 const { asset } = storeToRefs(assetDetailStore)
 const { toolbarColor } = useTheme()
 const { activeTab } = useAssetDetailTab()
-const { fetchCachedUsers, addToCachedUsers } = useCachedUsers()
+const { fetchCachedUsers, addToCachedUsers } = useDamCachedUsers()
 const {
   toggleSidebar,
   sidebar,
diff --git a/src/views/coreDam/asset/list/components/AssetListSidebarMetadata.vue b/src/views/coreDam/asset/list/components/AssetListSidebarMetadata.vue
index bde6684f..341f3713 100644
--- a/src/views/coreDam/asset/list/components/AssetListSidebarMetadata.vue
+++ b/src/views/coreDam/asset/list/components/AssetListSidebarMetadata.vue
@@ -2,7 +2,13 @@
 import { computed, ref, watch } from 'vue'
 import { useAssetDetailActions } from '@/views/coreDam/asset/detail/composables/assetDetailActions'
 import { updateAssetMetadata } from '@/services/api/coreDam/assetApi'
-import { browserHistoryReplaceUrlByRouter, DamAssetStatus, isNull, useAlerts } from '@anzusystems/common-admin'
+import {
+  browserHistoryReplaceUrlByRouter,
+  DamAssetStatus,
+  isNull,
+  useAlerts,
+  useDamCachedUsers,
+} from '@anzusystems/common-admin'
 import { useAssetDetailStore } from '@/stores/coreDam/assetDetailStore'
 import { useI18n } from 'vue-i18n'
 import AssetMetadata from '@/views/coreDam/asset/components/AssetMetadata.vue'
@@ -12,7 +18,6 @@ import { AssetMetadataValidationScopeSymbol } from '@/components/validationScope
 import { useMainWrapper } from '@/composables/wrappers/useMainWrapper'
 import { ROUTE } from '@/router/routes'
 import { useRouter } from 'vue-router'
-import { useCachedUsers } from '@/views/coreDam/user/composables/cachedUsers'
 import { ACL } from '@/composables/auth/auth'
 
 const emit = defineEmits<{
@@ -28,7 +33,7 @@ const { t } = useI18n()
 
 const { asset, loader, metadataUnTouch, metadataAreTouched, mainFileSingleUse } = useAssetDetailActions()
 
-const { fetchCachedUsers, addToCachedUsers } = useCachedUsers()
+const { fetchCachedUsers, addToCachedUsers } = useDamCachedUsers()
 
 const assetDetailStore = useAssetDetailStore()
 
diff --git a/src/views/coreDam/asset/list/components/AssetTableRowItem.vue b/src/views/coreDam/asset/list/components/AssetTableRowItem.vue
index 580862b4..5c888ce2 100644
--- a/src/views/coreDam/asset/list/components/AssetTableRowItem.vue
+++ b/src/views/coreDam/asset/list/components/AssetTableRowItem.vue
@@ -1,13 +1,19 @@
 <script lang="ts" setup>
 import type { AssetListItem } from '@/stores/coreDam/assetListStore'
 import AssetImage from '@/views/coreDam/asset/components/AssetImage.vue'
-import type { DocId } from '@anzusystems/common-admin'
-import { AChipNoLink, ADatetime, ATableCopyIdButton, ATableEditButton, prettyBytes } from '@anzusystems/common-admin'
+import {
+  AChipNoLink,
+  ADatetime,
+  ATableCopyIdButton,
+  ATableEditButton,
+  type DocId,
+  prettyBytes,
+  useDamCachedUsers,
+} from '@anzusystems/common-admin'
 import { useI18n } from 'vue-i18n'
 import CachedDamUserChip from '@/components/CachedDamUserChip.vue'
 import { useAssetItemActions } from '@/views/coreDam/asset/list/composables/assetItemActions'
 import AssetImageMetaIcons from '@/views/coreDam/asset/components/AssetImageMetaIcons.vue'
-import { useCachedUsers } from '@/views/coreDam/user/composables/cachedUsers'
 import { onMounted } from 'vue'
 import CachedPodcastChip from '@/views/coreDam/podcast/components/CachedPodcastChip.vue'
 import { useCachedPodcasts } from '@/views/coreDam/podcast/composables/cachedPodcasts'
@@ -36,7 +42,7 @@ const { t } = useI18n()
 const IMAGE_HEIGHT = 72
 const IMAGE_WIDTH = 128
 
-const { fetchCachedUsers, addToCachedUsers } = useCachedUsers()
+const { fetchCachedUsers, addToCachedUsers } = useDamCachedUsers()
 
 // eslint-disable-next-line vue/no-setup-props-reactivity-loss
 const { asset, assetType, assetStatus, tableImageProperties } = useAssetItemActions(props.item)
diff --git a/src/views/coreDam/asset/list/composables/assetListActions.ts b/src/views/coreDam/asset/list/composables/assetListActions.ts
index 400c3672..d556b804 100644
--- a/src/views/coreDam/asset/list/composables/assetListActions.ts
+++ b/src/views/coreDam/asset/list/composables/assetListActions.ts
@@ -8,7 +8,6 @@ import { useAssetDetailStore } from '@/stores/coreDam/assetDetailStore'
 import { useAssetListStore } from '@/stores/coreDam/assetListStore'
 import { useUploadQueuesStore } from '@/stores/coreDam/uploadQueuesStore'
 import { keyboardEventTargetIsAnyFormElement } from '@/utils/event'
-import { useCachedUsers } from '@/views/coreDam/user/composables/cachedUsers'
 import type { AssetSearchListItemDto, DamAssetTypeType, DocId } from '@anzusystems/common-admin'
 import {
   arrayItemToggle,
@@ -16,6 +15,7 @@ import {
   DamAssetType,
   isNull,
   useAlerts,
+  useDamCachedUsers,
   useFilterHelpers,
   usePagination,
 } from '@anzusystems/common-admin'
@@ -43,7 +43,7 @@ export function useAssetListActions(sidebarRight: Ref<boolean> | null = null) {
   const { list, loader, activeItemIndex } = storeToRefs(assetListStore)
   const { resetFilter } = useFilterHelpers()
   const { currentAssetLicenceId } = useCurrentAssetLicence()
-  const { fetchCachedUsers, addToCachedUsers } = useCachedUsers()
+  const { fetchCachedUsers, addToCachedUsers } = useDamCachedUsers()
   const { maxSelectedItems } = useBetaTestFeatures()
   const showMetaIcons = ref(true)
 
diff --git a/src/views/coreDam/extSystem/composables/extSystemActions.ts b/src/views/coreDam/extSystem/composables/extSystemActions.ts
index fb7a7167..fc92d9e8 100644
--- a/src/views/coreDam/extSystem/composables/extSystemActions.ts
+++ b/src/views/coreDam/extSystem/composables/extSystemActions.ts
@@ -1,18 +1,17 @@
 import { ref } from 'vue'
 import type { DamExtSystem, FilterBag, Pagination } from '@anzusystems/common-admin'
-import { fetchDamExtSystemList, useAlerts } from '@anzusystems/common-admin'
+import { fetchDamExtSystemList, useAlerts, useDamCachedUsers } from '@anzusystems/common-admin'
 import { fetchExtSystem, updateExtSystem } from '@/services/api/coreDam/extSystemApi'
 import { storeToRefs } from 'pinia'
 import { useExtSystemOneStore } from '@/stores/coreDam/extSystemStore'
 import useVuelidate from '@vuelidate/core'
 import { useRouter } from 'vue-router'
 import { ROUTE } from '@/router/routes'
-import { useCachedUsers } from '@/views/coreDam/user/composables/cachedUsers'
 import { damClient } from '@/services/api/clients/damClient'
 
 const { showValidationError, showRecordWas, showErrorsDefault } = useAlerts()
 
-const { fetchCachedUsers, addToCachedUsers } = useCachedUsers()
+const { fetchCachedUsers, addToCachedUsers } = useDamCachedUsers()
 
 const datatableHiddenColumns = ref<Array<string>>(['id'])
 const listLoading = ref(false)
diff --git a/src/views/coreDam/user/composables/cachedUsers.ts b/src/views/coreDam/user/composables/cachedUsers.ts
deleted file mode 100644
index 8fdd2fe8..00000000
--- a/src/views/coreDam/user/composables/cachedUsers.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import type { UserMinimal } from '@/types/coreDam/User'
-import type { DamUser, IntegerId } from '@anzusystems/common-admin'
-import { defineCached, fetchDamUserListByIds } from '@anzusystems/common-admin'
-import { damClient } from '@/services/api/clients/damClient'
-
-const mapFullToMinimal = (source: DamUser): UserMinimal => {
-  return { id: source.id, email: source.email, avatar: source.avatar, person: source.person }
-}
-
-const mapIdToMinimal = (id: IntegerId): UserMinimal => {
-  return { id: id, email: '', person: { firstName: '', lastName: '', fullName: '' }, avatar: { color: '', text: '' } }
-}
-
-const { cache, fetch, add, addManual, has, get, isLoaded } = defineCached<IntegerId, DamUser, UserMinimal>(
-  mapFullToMinimal,
-  mapIdToMinimal,
-  (ids: IntegerId[]) => fetchDamUserListByIds(damClient, ids)
-)
-
-export const useCachedUsers = () => {
-  return {
-    addManualToCachedUsers: addManual,
-    addToCachedUsers: add,
-    fetchCachedUsers: fetch,
-    cachedUsers: cache,
-    hasCachedUser: has,
-    getCachedUser: get,
-    isLoadedCachedUser: isLoaded,
-  }
-}