diff --git a/src/model/coreDam/factory/DistributionCategoryFactory.ts b/src/model/coreDam/factory/DistributionCategoryFactory.ts index c5a0a907..f874fa5d 100644 --- a/src/model/coreDam/factory/DistributionCategoryFactory.ts +++ b/src/model/coreDam/factory/DistributionCategoryFactory.ts @@ -1,8 +1,7 @@ import { SYSTEM_CORE_DAM } from '@/model/systems' -import { dateTimeNow } from '@anzusystems/common-admin' +import { DamAssetType, dateTimeNow } from '@anzusystems/common-admin' import { ENTITY } from '@/services/api/coreDam/distributionCategoryApi' import type { DistributionCategory } from '@/types/coreDam/DistributionCategory' -import { DamAssetType } from '@anzusystems/common-admin' export function useDistributionCategoryFactory() { const createDefault = (extSystemId: number, type?: DamAssetType): DistributionCategory => { diff --git a/src/model/coreDam/factory/DistributionCategorySelectFactory.ts b/src/model/coreDam/factory/DistributionCategorySelectFactory.ts index ef18ebd0..2d081063 100644 --- a/src/model/coreDam/factory/DistributionCategorySelectFactory.ts +++ b/src/model/coreDam/factory/DistributionCategorySelectFactory.ts @@ -1,8 +1,7 @@ import { SYSTEM_CORE_DAM } from '@/model/systems' -import { dateTimeNow } from '@anzusystems/common-admin' +import { DamAssetType, dateTimeNow } from '@anzusystems/common-admin' import { ENTITY } from '@/services/api/coreDam/distributionCategorySelectApi' import type { DistributionCategorySelect } from '@/types/coreDam/DistributionCategorySelect' -import { DamAssetType } from '@anzusystems/common-admin' export function useDistributionCategorySelectFactory() { const createDefault = (extSystemId: number): DistributionCategorySelect => { diff --git a/src/model/coreDam/filter/AssetFilter.ts b/src/model/coreDam/filter/AssetFilter.ts index 2b4fe374..5036b885 100644 --- a/src/model/coreDam/filter/AssetFilter.ts +++ b/src/model/coreDam/filter/AssetFilter.ts @@ -1,8 +1,7 @@ import { reactive } from 'vue' -import { makeFilterHelper } from '@anzusystems/common-admin' +import { DamAssetStatus, makeFilterHelper } from '@anzusystems/common-admin' import { SYSTEM_CORE_DAM } from '@/model/systems' import { ENTITY } from '@/services/api/coreDam/assetApi' -import { DamAssetStatus } from '@anzusystems/common-admin' const makeFilter = makeFilterHelper(SYSTEM_CORE_DAM, ENTITY) diff --git a/src/model/coreDam/filter/DistributionCategoryFilter.ts b/src/model/coreDam/filter/DistributionCategoryFilter.ts index d5315965..08fa01a1 100644 --- a/src/model/coreDam/filter/DistributionCategoryFilter.ts +++ b/src/model/coreDam/filter/DistributionCategoryFilter.ts @@ -1,9 +1,8 @@ import type { Filter } from '@anzusystems/common-admin' -import { makeFilterHelper, type MakeFilterOptions } from '@anzusystems/common-admin' +import { DamAssetType, makeFilterHelper, type MakeFilterOptions } from '@anzusystems/common-admin' import { reactive } from 'vue' import { SYSTEM_CORE_DAM } from '@/model/systems' import { ENTITY } from '@/services/api/coreDam/distributionCategoryApi' -import { DamAssetType } from '@anzusystems/common-admin' const makeFilter: (options: Partial>) => Filter = makeFilterHelper(SYSTEM_CORE_DAM, ENTITY) diff --git a/src/model/coreDam/filter/DistributionCategorySelectFilter.ts b/src/model/coreDam/filter/DistributionCategorySelectFilter.ts index 2f2985dd..93c4c6b1 100644 --- a/src/model/coreDam/filter/DistributionCategorySelectFilter.ts +++ b/src/model/coreDam/filter/DistributionCategorySelectFilter.ts @@ -1,9 +1,8 @@ import type { Filter } from '@anzusystems/common-admin' -import { makeFilterHelper, type MakeFilterOptions } from '@anzusystems/common-admin' +import { DamAssetType, makeFilterHelper, type MakeFilterOptions } from '@anzusystems/common-admin' import { reactive } from 'vue' import { SYSTEM_CORE_DAM } from '@/model/systems' import { ENTITY } from '@/services/api/coreDam/distributionCategorySelectApi' -import { DamAssetType } from '@anzusystems/common-admin' const makeFilter: (options: Partial>) => Filter = makeFilterHelper(SYSTEM_CORE_DAM, ENTITY) diff --git a/src/types/coreDam/Distribution.ts b/src/types/coreDam/Distribution.ts index 2fc0c06d..7b2059b1 100644 --- a/src/types/coreDam/Distribution.ts +++ b/src/types/coreDam/Distribution.ts @@ -1,5 +1,9 @@ -import type { DamDistributionServiceName, DamDistributionStatus } from '@anzusystems/common-admin' -import type { DatetimeUTCNullable, DocId } from '@anzusystems/common-admin' +import type { + DamDistributionServiceName, + DamDistributionStatus, + DatetimeUTCNullable, + DocId, +} from '@anzusystems/common-admin' import { isDefined } from '@anzusystems/common-admin' import type { DistributionYoutubePrivacy } from '@/model/coreDam/valueObject/DistributionYoutubePrivacy' import type { DistributionFailReason } from '@/model/coreDam/valueObject/DistributionFailReason' diff --git a/src/types/coreDam/DistributionCategory.ts b/src/types/coreDam/DistributionCategory.ts index 074f864b..ee33a0a8 100644 --- a/src/types/coreDam/DistributionCategory.ts +++ b/src/types/coreDam/DistributionCategory.ts @@ -1,5 +1,10 @@ -import type { AnzuUserAndTimeTrackingAware, DocId, IntegerId, ResourceNameSystemAware } from '@anzusystems/common-admin' -import type { DamAssetType } from '@anzusystems/common-admin' +import type { + AnzuUserAndTimeTrackingAware, + DamAssetType, + DocId, + IntegerId, + ResourceNameSystemAware, +} from '@anzusystems/common-admin' import type { DistributionCategoryOption } from '@/types/coreDam/DistributionCategoryOption' export interface DistributionCategory extends AnzuUserAndTimeTrackingAware, ResourceNameSystemAware { diff --git a/src/types/coreDam/DistributionCategorySelect.ts b/src/types/coreDam/DistributionCategorySelect.ts index 502254c5..0891f32b 100644 --- a/src/types/coreDam/DistributionCategorySelect.ts +++ b/src/types/coreDam/DistributionCategorySelect.ts @@ -1,7 +1,12 @@ -import type { AnzuUserAndTimeTrackingAware, DocId, IntegerId, ResourceNameSystemAware } from '@anzusystems/common-admin' +import type { + AnzuUserAndTimeTrackingAware, + DamAssetType, + DamDistributionServiceName, + DocId, + IntegerId, + ResourceNameSystemAware, +} from '@anzusystems/common-admin' import type { DistributionCategoryOption } from '@/types/coreDam/DistributionCategoryOption' -import type { DamAssetType } from '@anzusystems/common-admin' -import type { DamDistributionServiceName } from '@anzusystems/common-admin' export interface DistributionCategorySelect extends AnzuUserAndTimeTrackingAware, ResourceNameSystemAware { id: DocId diff --git a/src/views/common/permission/components/PermissionEditor.vue b/src/views/common/permission/components/PermissionEditor.vue index f1a4f094..f7e15d2d 100644 --- a/src/views/common/permission/components/PermissionEditor.vue +++ b/src/views/common/permission/components/PermissionEditor.vue @@ -126,9 +126,7 @@ const { t } = useI18n() > {{ translatePermission('actions', permissionAction) }} -
- {{ permissionSubject }}_{{ permissionAction }} -
+
{{ permissionSubject }}_{{ permissionAction }}
getGrantOriginOption(props.grantOrigin) ({{ grantOriginOption.title }}) + >({{ grantOriginOption.title }}) diff --git a/src/views/coreDam/asset/components/AssetImage.vue b/src/views/coreDam/asset/components/AssetImage.vue index e8623705..78596ed5 100644 --- a/src/views/coreDam/asset/components/AssetImage.vue +++ b/src/views/coreDam/asset/components/AssetImage.vue @@ -1,10 +1,8 @@ diff --git a/src/views/coreDam/asset/detail/components/distribution/DistributionListItemJw.vue b/src/views/coreDam/asset/detail/components/distribution/DistributionListItemJw.vue index 25f5a7de..04c00ab1 100644 --- a/src/views/coreDam/asset/detail/components/distribution/DistributionListItemJw.vue +++ b/src/views/coreDam/asset/detail/components/distribution/DistributionListItemJw.vue @@ -1,12 +1,11 @@