update according to common admin

src/model/coreDam/factory/AssetLicenceGroupFactory.ts

@@ -1,10 +1,9 @@
 import { SYSTEM_CORE_DAM } from '@/model/systems'
-import { dateTimeNow } from '@anzusystems/common-admin'
+import { type DamAssetLicenceGroup, dateTimeNow } from '@anzusystems/common-admin'
 import { ENTITY } from '@/services/api/coreDam/assetLicenceGroupApi'
-import type { AssetLicenceGroup } from '@/types/coreDam/AssetLicenceGroup'
 
 export function useAssetLicenceGroupFactory() {
- const createDefault = (): AssetLicenceGroup => {
+ const createDefault = (): DamAssetLicenceGroup => {
  return {
  id: 0,
  name: '',

src/model/coreDam/factory/UserFactory.ts

@@ -21,6 +21,7 @@ export function useUserFactory() {
  permissionGroups: [],
  permissions: {},
  resolvedPermissions: {},
+ licenceGroups: [],
  assetLicences: [],
  enabled: true,
  createdAt: dateTimeNow(),
@@ -43,6 +44,7 @@ export function useUserFactory() {
  adminToExtSystems: user.adminToExtSystems,
  userToExtSystems: [],
  assetLicences: user.assetLicences,
+ licenceGroups: user.licenceGroups,
  allowedAssetExternalProviders: user.allowedAssetExternalProviders,
  allowedDistributionServices: user.allowedDistributionServices,
  }

src/model/coreDam/filter/AssetLicenceGroupFilter.ts

@@ -14,17 +14,3 @@ const filter = reactive({
 export function useAssetLicenceGroupListFilter() {
  return filter
 }
-
-export function useAssetLicenceGroupFilter() {
- return reactive({
- name: {
- ...makeFilter({ name: 'name', variant: 'startsWith' }),
- },
- extSystem: {
- ...makeFilter({ name: 'extSystem', default: null }),
- },
- extId: {
- ...makeFilter({ name: 'extId', default: null }),
- },
- })
-}

src/services/api/coreDam/assetLicenceGroupApi.ts

@@ -2,46 +2,20 @@ import { damClient } from '@/services/api/clients/damClient'
 import { SYSTEM_CORE_DAM } from '@/model/systems'
 import {
  apiCreateOne,
- apiFetchByIds, apiFetchList,
  apiFetchOne,
  apiUpdateOne,
- type FilterBag,
- type IntegerId, type Pagination
+ type DamAssetLicenceGroup,
+ type IntegerId,
 } from '@anzusystems/common-admin'
-import type { AssetLicenceGroup } from '@/types/coreDam/AssetLicenceGroup'
-import type { AxiosInstance } from 'axios'
 
 const END_POINT = '/adm/v1/asset-licence-group'
 export const ENTITY = 'assetLicenceGroup'
 
-export const fetchAssetLicenceGroupListByIds = (client: () => AxiosInstance, ids: IntegerId[]) =>
- apiFetchByIds<AssetLicenceGroup[]>(
- client,
- ids,
- END_POINT,
- {},
- SYSTEM_CORE_DAM,
- ENTITY,
- {},
- true
- )
+export const createAssetLicenceGroup = (data: DamAssetLicenceGroup) =>
+ apiCreateOne<DamAssetLicenceGroup>(damClient, data, END_POINT, {}, SYSTEM_CORE_DAM, ENTITY)
 
-export const fetchAssetLicenceGroupList = (client: () => AxiosInstance, pagination: Pagination, filterBag: FilterBag) =>
- apiFetchList<AssetLicenceGroup[]>(
- client,
- END_POINT,
- {},
- pagination,
- filterBag,
- SYSTEM_CORE_DAM,
- ENTITY
- )
-
-export const createAssetLicenceGroup = (data: AssetLicenceGroup) =>
- apiCreateOne<AssetLicenceGroup>(damClient, data, END_POINT, {}, SYSTEM_CORE_DAM, ENTITY)
-
-export const updateAssetLicenceGroup = (id: IntegerId, data: AssetLicenceGroup) =>
- apiUpdateOne<AssetLicenceGroup>(damClient, data, END_POINT + '/:id', { id }, SYSTEM_CORE_DAM, ENTITY)
+export const updateAssetLicenceGroup = (id: IntegerId, data: DamAssetLicenceGroup) =>
+ apiUpdateOne<DamAssetLicenceGroup>(damClient, data, END_POINT + '/:id', { id }, SYSTEM_CORE_DAM, ENTITY)
 
 export const fetchAssetLicenceGroup = (id: IntegerId) =>
- apiFetchOne<AssetLicenceGroup>(damClient, END_POINT + '/:id', { id }, SYSTEM_CORE_DAM, ENTITY)
+ apiFetchOne<DamAssetLicenceGroup>(damClient, END_POINT + '/:id', { id }, SYSTEM_CORE_DAM, ENTITY)

src/stores/coreDam/assetLicenceGroupStore.ts

@@ -1,12 +1,12 @@
 import { acceptHMRUpdate, defineStore } from 'pinia'
 import { useAssetLicenceGroupFactory } from '@/model/coreDam/factory/AssetLicenceGroupFactory'
-import type { AssetLicenceGroup } from '@/types/coreDam/AssetLicenceGroup'
 import { ref } from 'vue'
+import type { DamAssetLicenceGroup } from '@anzusystems/common-admin'
 
 export const useAssetLicenceGroupOneStore = defineStore('assetLicenceGroupOneStore', () => {
  const { createDefault } = useAssetLicenceGroupFactory()
 
- const assetLicenceGroup = ref<AssetLicenceGroup>(createDefault())
+ const assetLicenceGroup = ref<DamAssetLicenceGroup>(createDefault())
 
  function reset() {
  assetLicenceGroup.value = createDefault()

src/stores/coreDam/userStore.ts

@@ -1,15 +1,14 @@
-import type { DamUser, DamUserUpdateDto } from '@anzusystems/common-admin'
+import type { DamAssetLicenceGroup, DamUser, DamUserUpdateDto } from '@anzusystems/common-admin'
 import { useUserFactory } from '@/model/coreDam/factory/UserFactory'
 import { acceptHMRUpdate, defineStore } from 'pinia'
 import { ref } from 'vue'
-import type { AssetLicenceGroup } from '@/types/coreDam/AssetLicenceGroup'
 
 export const useUserOneStore = defineStore('damUserOneStore', () => {
  const { createDefault, createDefaultForUpdate } = useUserFactory()
 
  const user = ref<DamUser>(createDefault())
  const userUpdate = ref<DamUserUpdateDto>(createDefaultForUpdate(createDefault()))
- const userAssetLicenceGroups = ref<AssetLicenceGroup[]>([])
+ const userAssetLicenceGroups = ref<DamAssetLicenceGroup[]>([])
 
  function setUser(userNew: DamUser) {
  user.value = userNew

src/views/coreDam/asset/components/ImagePreview.vue

@@ -13,7 +13,7 @@ import { computed, ref, watch } from 'vue'
 import placeholder16x9 from '@/assets/image/placeholder16x9.jpg'
 import { fetchImageFile } from '@/services/api/coreDam/imageApi'
 import { useI18n } from 'vue-i18n'
-import { useCurrentAssetLicence, useCurrentExtSystem } from '@/composables/system/currentExtSystem'
+import { useCurrentAssetLicence } from '@/composables/system/currentExtSystem'
 
 const props = withDefaults(
  defineProps<{
@@ -47,7 +47,6 @@ const fetchImage = async (id: DocId) => {
 }
 
 const { currentAssetLicenceId } = useCurrentAssetLicence()
-const { currentExtSystemId } = useCurrentExtSystem()
 
 const imagePreviewModel = computed({
  get() {
@@ -179,13 +178,7 @@ watch(
  {{ t('system.imagePreview.actions.unassign') }}
  </VBtn>
  <AAssetSelect
- :select-config="[
- {
- title: 'Default',
- licence: currentAssetLicenceId,
- extSystem: currentExtSystemId,
- },
- ]"
+ :select-licences="[currentAssetLicenceId]"
  :min-count="1"
  :max-count="1"
  :asset-type="AssetTypeValue.Image"

src/views/coreDam/assetLicenceGroup/components/AssetLicenceGroupCreateButton.vue

@@ -5,15 +5,16 @@ import {
  ACreateDialog,
  AFormTextField,
  ARow,
- ASystemEntityScope, DamAssetLicenceRemoteAutocomplete,
- DamExtSystemRemoteAutocomplete
+ ASystemEntityScope,
+ type DamAssetLicenceGroup,
+ DamAssetLicenceRemoteAutocomplete,
+ DamExtSystemRemoteAutocomplete,
 } from '@anzusystems/common-admin'
 import { SYSTEM_CORE_DAM } from '@/model/systems'
 import { useAssetLicenceGroupFactory } from '@/model/coreDam/factory/AssetLicenceGroupFactory'
 import { useAssetLicenceGroupValidation } from '@/views/coreDam/assetLicenceGroup/composables/assetLicenceGroupValidation'
 import { createAssetLicenceGroup, ENTITY } from '@/services/api/coreDam/assetLicenceGroupApi'
 import { damClient } from '@/services/api/clients/damClient'
-import type { AssetLicenceGroup } from '@/types/coreDam/AssetLicenceGroup'
 
 withDefaults(
  defineProps<{
@@ -26,11 +27,11 @@ withDefaults(
  }
 )
 const emit = defineEmits<{
- (e: 'onSuccess', data: AssetLicenceGroup): void
+ (e: 'onSuccess', data: DamAssetLicenceGroup): void
 }>()
 
 const { createDefault } = useAssetLicenceGroupFactory()
-const assetLicenceGroup = ref<AssetLicenceGroup>(createDefault())
+const assetLicenceGroup = ref<DamAssetLicenceGroup>(createDefault())
 const dialog = ref(false)
 
 const { v$ } = useAssetLicenceGroupValidation(assetLicenceGroup)

src/views/coreDam/assetLicenceGroup/components/AssetLicenceGroupDatatable.vue

@@ -8,7 +8,7 @@ import {
  ATableCopyIdButton,
  ATableDetailButton,
  ATableEditButton,
- createDatatableColumnsConfig,
+ createDatatableColumnsConfig, type DamAssetLicenceGroup,
  type DatatableOrderingOption,
  useAcl,
  useFilterHelpers,
@@ -22,10 +22,9 @@ import AssetLicenceGroupFilter from '@/views/coreDam/assetLicenceGroup/component
 import { useAssetLicenceGroupListFilter } from '@/model/coreDam/filter/AssetLicenceGroupFilter'
 import CachedExtSystemChip from '@/views/coreDam/extSystem/components/CachedExtSystemChip.vue'
 import { ACL, type AclValue } from '@/types/Permission'
-import type { AssetLicenceGroup } from '@/types/coreDam/AssetLicenceGroup'
 import CachedAssetLicenceChip from '@/views/coreDam/assetLicence/components/CachedAssetLicenceChip.vue'
 
-type DatatableItem = AssetLicenceGroup
+type DatatableItem = DamAssetLicenceGroup
 
 const router = useRouter()
 const filter = useAssetLicenceGroupListFilter()

src/views/coreDam/assetLicenceGroup/composables/assetLicenceGroupActions.ts

@@ -1,22 +1,15 @@
 import { ref } from 'vue'
-import type { FilterBag, IntegerId, Pagination, ValueObjectOption } from '@anzusystems/common-admin'
-import { useAlerts } from '@anzusystems/common-admin'
+import type { DamAssetLicenceGroup, FilterBag, Pagination } from '@anzusystems/common-admin'
+import { fetchDamAssetLicenceGroupList, useAlerts } from '@anzusystems/common-admin'
 import { useAssetLicenceGroupOneStore } from '@/stores/coreDam/assetLicenceGroupStore'
 import { storeToRefs } from 'pinia'
-import {
- fetchAssetLicenceGroup,
- fetchAssetLicenceGroupList,
- fetchAssetLicenceGroupListByIds,
- updateAssetLicenceGroup,
-} from '@/services/api/coreDam/assetLicenceGroupApi'
+import { fetchAssetLicenceGroup, updateAssetLicenceGroup } from '@/services/api/coreDam/assetLicenceGroupApi'
 import useVuelidate from '@vuelidate/core'
 import { useRouter } from 'vue-router'
 import { ROUTE } from '@/router/routes'
-import type { AssetLicenceGroup } from '@/types/coreDam/AssetLicenceGroup'
 import { useCachedAssetLicences } from '@/views/coreDam/assetLicence/composables/cachedAssetLicences'
 import { useCachedExtSystems } from '@/views/coreDam/extSystem/composables/cachedExtSystems'
 import { damClient } from '@/services/api/clients/damClient'
-import type { AxiosInstance } from 'axios'
 
 const { showValidationError, showRecordWas, showErrorsDefault } = useAlerts()
 
@@ -27,14 +20,14 @@ const saveButtonLoading = ref(false)
 const saveAndCloseButtonLoading = ref(false)
 
 export const useAssetLicenceGroupListActions = () => {
- const listItems = ref<AssetLicenceGroup[]>([])
+ const listItems = ref<DamAssetLicenceGroup[]>([])
  const { addToCachedAssetLicences, fetchCachedAssetLicences } = useCachedAssetLicences()
  const { addToCachedExtSystems, fetchCachedExtSystems } = useCachedExtSystems()
 
  const fetchList = async (pagination: Pagination, filterBag: FilterBag) => {
  listLoading.value = true
  try {
- const res = await fetchAssetLicenceGroupList(damClient, pagination, filterBag)
+ const res = await fetchDamAssetLicenceGroupList(damClient, pagination, filterBag)
  res.forEach((item) => {
  addToCachedAssetLicences(item.licences)
  addToCachedExtSystems(item.extSystem)
@@ -137,24 +130,3 @@ export const useAssetLicenceGroupEditActions = () => {
  }
 }
 
-export const useAssetLicenceGroupSelectActions = (client: () => AxiosInstance) => {
- const mapToValueObjectOption = (assetLicenceGroups: AssetLicenceGroup[]): ValueObjectOption<IntegerId>[] => {
- return assetLicenceGroups.map((assetLicence: AssetLicenceGroup) => ({
- title: assetLicence.name,
- value: assetLicence.id,
- }))
- }
-
- const fetchItems = async (pagination: Pagination, filterBag: FilterBag) => {
- return mapToValueObjectOption(await fetchAssetLicenceGroupList(client, pagination, filterBag))
- }
-
- const fetchItemsByIds = async (ids: number[]) => {
- return mapToValueObjectOption(await fetchAssetLicenceGroupListByIds(client, ids))
- }
-
- return {
- fetchItems,
- fetchItemsByIds,
- }
-}

src/views/coreDam/assetLicenceGroup/composables/assetLicenceGroupValidation.ts

@@ -1,10 +1,9 @@
 import type { Ref } from 'vue'
 import { computed } from 'vue'
 import useVuelidate from '@vuelidate/core'
-import { useValidate } from '@anzusystems/common-admin'
-import type { AssetLicenceGroup } from '@/types/coreDam/AssetLicenceGroup'
+import { type DamAssetLicenceGroup, useValidate } from '@anzusystems/common-admin'
 
-export function useAssetLicenceGroupValidation(assetLicenceGroup: Ref<AssetLicenceGroup>) {
+export function useAssetLicenceGroupValidation(assetLicenceGroup: Ref<DamAssetLicenceGroup>) {
  const { required, minLength, minValue } = useValidate()
 
  const rules = computed(() => ({