From 91dc8a7fbcfc9b789fb8b8d270b6f392f83c6f80 Mon Sep 17 00:00:00 2001 From: Yongtae Park Date: Thu, 23 Nov 2023 18:10:22 +0900 Subject: [PATCH] fix: remove type mis-usage Signed-off-by: samuel.park --- apps/web/src/schema/identity/role/model.ts | 3 +-- apps/web/src/schema/identity/role/type.ts | 5 +++++ apps/web/src/schema/inventory/cloud-service-report/model.ts | 5 +---- apps/web/src/schema/inventory/job-task/model.ts | 2 +- .../administration/components/PolicyListDataTable.vue | 2 +- .../services/administration/components/RoleUpdateForm.vue | 3 +-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/apps/web/src/schema/identity/role/model.ts b/apps/web/src/schema/identity/role/model.ts index 82bae8e76e..27143048f3 100644 --- a/apps/web/src/schema/identity/role/model.ts +++ b/apps/web/src/schema/identity/role/model.ts @@ -1,6 +1,5 @@ import type { Tags, TimeStamp } from '@/schema/_common/model'; -import type { RoleType } from '@/schema/identity/role/type'; -import type { Policy } from '@/schema/inventory/cloud-service-report/model'; +import type { RoleType, Policy } from '@/schema/identity/role/type'; import type { RawPagePermission } from '@/lib/access-control/config'; diff --git a/apps/web/src/schema/identity/role/type.ts b/apps/web/src/schema/identity/role/type.ts index a75ae97c24..696271d884 100644 --- a/apps/web/src/schema/identity/role/type.ts +++ b/apps/web/src/schema/identity/role/type.ts @@ -1,3 +1,8 @@ import type { ROLE_TYPE } from '@/schema/identity/role/constant'; export type RoleType = typeof ROLE_TYPE[keyof typeof ROLE_TYPE]; + +export interface Policy { + policy_id: string; + policy_type: string; +} diff --git a/apps/web/src/schema/inventory/cloud-service-report/model.ts b/apps/web/src/schema/inventory/cloud-service-report/model.ts index 2a378570e2..8b13789179 100644 --- a/apps/web/src/schema/inventory/cloud-service-report/model.ts +++ b/apps/web/src/schema/inventory/cloud-service-report/model.ts @@ -1,4 +1 @@ -export interface Policy { - policy_id: string; - policy_type: string; -} + diff --git a/apps/web/src/schema/inventory/job-task/model.ts b/apps/web/src/schema/inventory/job-task/model.ts index fb14a12d54..e7ad381722 100644 --- a/apps/web/src/schema/inventory/job-task/model.ts +++ b/apps/web/src/schema/inventory/job-task/model.ts @@ -2,7 +2,7 @@ import type { JobTaskError } from '@/services/asset-inventory/types/collector-hi export interface JobTaskModel { job_task_id: string; -status: string; + status: string; create_count: number; updated_count: number; failure_count: number; diff --git a/apps/web/src/services/administration/components/PolicyListDataTable.vue b/apps/web/src/services/administration/components/PolicyListDataTable.vue index c192aece03..2fa39cf6e5 100644 --- a/apps/web/src/services/administration/components/PolicyListDataTable.vue +++ b/apps/web/src/services/administration/components/PolicyListDataTable.vue @@ -88,7 +88,7 @@ import { ApiQueryHelper } from '@cloudforet/core-lib/space-connector/helper'; import { SpaceRouter } from '@/router'; import type { PolicyModel } from '@/schema/identity/policy/model'; -import type { Policy } from '@/schema/inventory/cloud-service-report/model'; +import type { Policy } from '@/schema/identity/role/type'; import { store } from '@/store'; import { replaceUrlQuery } from '@/lib/router-query-string'; diff --git a/apps/web/src/services/administration/components/RoleUpdateForm.vue b/apps/web/src/services/administration/components/RoleUpdateForm.vue index 99e6e1fb81..e7ecead356 100644 --- a/apps/web/src/services/administration/components/RoleUpdateForm.vue +++ b/apps/web/src/services/administration/components/RoleUpdateForm.vue @@ -45,8 +45,7 @@ import { import { PHeading } from '@spaceone/design-system'; import type { RoleModel } from '@/schema/identity/role/model'; -import type { RoleType } from '@/schema/identity/role/type'; -import type { Policy } from '@/schema/inventory/cloud-service-report/model'; +import type { RoleType, Policy } from '@/schema/identity/role/type'; import { i18n } from '@/translations'; import type { RawPagePermission } from '@/lib/access-control/config';