fix: fix inventory model location

Signed-off-by: sulmo <[email protected]>

apps/web/src/lib/access-control/page-permission-helper.ts

@@ -1,5 +1,6 @@
 
-import type { RoleType } from '@/schema/inventory/cloud-service-report/model';
+
+import type { RoleType } from '@/schema/identity/role/type';
 
 import type {
     PagePermissionMap,
@@ -20,6 +21,7 @@ import type { LNBItem, LNBMenu } from '@/common/modules/navigations/lnb/type';
 
 
 
+
 export const getDefaultPagePermissionList = (isDomainOwner: boolean, roleType?: RoleType): PagePermissionTuple[] => {
     if (isDomainOwner) return DOMAIN_OWNER_DEFAULT_PERMISSIONS;
     if (roleType === 'SYSTEM') return SYSTEM_USER_DEFAULT_PERMISSIONS;

apps/web/src/schema/identity/policy/model.ts

@@ -0,0 +1,25 @@
+import type { Tags, TimeStamp } from '@/schema/_common/model';
+
+export interface PolicyModel {
+    created_at: TimeStamp;
+    domain_id: string;
+    name: string;
+    permissions: Array<string>;
+    policy_id: string;
+    repository_info?: RepositoryInfoDataModel;
+    tags: Tags;
+    policy_type?: string;
+    project_id?: string;
+    labels?: any;
+    state?: PolicyState;
+    updated_at?: TimeStamp;
+}
+
+interface RepositoryInfoDataModel {
+    repository_id: string;
+    name: string;
+    repository_type: string;
+    endpoint: string;
+}
+
+type PolicyState = 'ENABLED' | 'DISABLED';

apps/web/src/schema/identity/role-binding/model.ts

@@ -1,7 +1,7 @@
 import type { TimeStamp } from '@/schema/_common/model';
 import type { ProjectGroupModel } from '@/schema/identity/project-group/model';
 import type { ProjectModel } from '@/schema/identity/project/model';
-import type { RoleModel } from '@/schema/inventory/cloud-service-report/model';
+import type { RoleModel } from '@/schema/identity/role/model';
 
 export interface RoleBindingModel {
     created_at: TimeStamp;

apps/web/src/schema/identity/role/model.ts

@@ -0,0 +1,17 @@
+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 { RawPagePermission } from '@/lib/access-control/config';
+
+export interface RoleModel {
+    created_at: TimeStamp;
+    deleted_at?: TimeStamp;
+    domain_id: string;
+    name: string;
+    policies?: Policy[];
+    page_permissions: RawPagePermission[];
+    role_id: string;
+    role_type: RoleType;
+    tags?: Tags; // [ description: string ]
+}

apps/web/src/schema/identity/role/type.ts

@@ -0,0 +1,3 @@
+import type { ROLE_TYPE } from '@/schema/identity/role/constant';
+
+export type RoleType = typeof ROLE_TYPE[keyof typeof ROLE_TYPE];

apps/web/src/schema/identity/user-group/model.ts

@@ -1,24 +0,0 @@
-import type { Tags, TimeStamp } from '@/schema/_common/model';
-
-export interface PolicyModel {
-    created_at: TimeStamp;
-    domain_id: string;
-    name: string;
-    permissions: Array<string>;
-    policy_id: string;
-    repository_info?: RepositoryInfoDataModel;
-    tags: Tags;
-    policy_type?: string;
-    project_id?: string;
-    labels?: any;
-    state?: PolicyState;
-    updated_at?: TimeStamp;
-}
-
-interface RepositoryInfoDataModel {
-    repository_id: string;
-    name: string;
-    repository_type: string;
-    endpoint: string;
-}
-type PolicyState = 'ENABLED' | 'DISABLED';

apps/web/src/schema/inventory/cloud-service-report/model.ts

@@ -1,23 +1,3 @@
-import type { Tags, TimeStamp } from '@/schema/_common/model';
-import type { ROLE_TYPE } from '@/schema/identity/role/constant';
-
-import type { RawPagePermission } from '@/lib/access-control/config';
-
-
-export type RoleType = typeof ROLE_TYPE[keyof typeof ROLE_TYPE];
-
-export interface RoleModel {
-    created_at: TimeStamp;
-    deleted_at?: TimeStamp;
-    domain_id: string;
-    name: string;
-    policies?: Policy[];
-    page_permissions: RawPagePermission[];
-    role_id: string;
-    role_type: RoleType;
-    tags?: Tags; // [ description: string ]
-}
-
 export interface Policy {
     policy_id: string;
     policy_type: string;

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;

apps/web/src/services/administration/components/PolicyListDataTable.vue

@@ -87,7 +87,7 @@ import type { ToolboxOptions } from '@cloudforet/core-lib/component-util/toolbox
 import { ApiQueryHelper } from '@cloudforet/core-lib/space-connector/helper';
 
 import { SpaceRouter } from '@/router';
-import type { PolicyModel } from '@/schema/identity/user-group/model';
+import type { PolicyModel } from '@/schema/identity/policy/model';
 import type { Policy } from '@/schema/inventory/cloud-service-report/model';
 import { store } from '@/store';
 

apps/web/src/services/administration/components/RoleManagementTabDetail.vue

@@ -92,8 +92,8 @@ import type { DataTableField } from '@spaceone/design-system/types/data-display/
 import { iso8601Formatter } from '@cloudforet/core-lib';
 import { SpaceConnector } from '@cloudforet/core-lib/space-connector';
 
-import type { PolicyModel } from '@/schema/identity/user-group/model';
-import type { RoleModel } from '@/schema/inventory/cloud-service-report/model';
+import type { PolicyModel } from '@/schema/identity/policy/model';
+import type { RoleModel } from '@/schema/identity/role/model';
 import { store } from '@/store';
 import { i18n } from '@/translations';
 

apps/web/src/services/administration/components/RoleUpdateForm.vue

@@ -44,7 +44,9 @@ import {
 
 import { PHeading } from '@spaceone/design-system';
 
-import type { Policy, RoleModel, RoleType } from '@/schema/inventory/cloud-service-report/model';
+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 { i18n } from '@/translations';
 
 import type { RawPagePermission } from '@/lib/access-control/config';

apps/web/src/services/administration/components/RoleUpdatePageAccessForm.vue

@@ -46,7 +46,7 @@ import { PPaneLayout, PHeading } from '@spaceone/design-system';
 import { find, isEqual } from 'lodash';
 
 import { ROLE_TYPE } from '@/schema/identity/role/constant';
-import type { RoleType } from '@/schema/inventory/cloud-service-report/model';
+import type { RoleType } from '@/schema/identity/role/type';
 
 import type { RawPagePermission } from '@/lib/access-control/config';
 import { PAGE_PERMISSION_TYPE } from '@/lib/access-control/config';
@@ -60,6 +60,7 @@ import type { PageAccessMenuItem } from '@/services/administration/types/page-ac
 
 
 
+
 const getIndividualPagePermissions = (menuItem: PageAccessMenuItem): RawPagePermission[] => {
     if (menuItem.id === 'all') return [];
 

apps/web/src/services/administration/components/RoleUpdatePageBaseInformation.vue

@@ -67,7 +67,7 @@ import {
 } from '@spaceone/design-system';
 
 import { ROLE_TYPE } from '@/schema/identity/role/constant';
-import type { RoleType } from '@/schema/inventory/cloud-service-report/model';
+import type { RoleType } from '@/schema/identity/role/type';
 import { i18n } from '@/translations';
 
 import { useFormValidator } from '@/common/composables/form-validator';
@@ -76,6 +76,7 @@ import type { BaseInfoFormData } from '@/services/administration/components/Role
 import { ROLE_TYPE_BADGE_OPTION } from '@/services/administration/constants/role-constant';
 
 
+
 interface RoleTypeForm {label: string; key: string; description: TranslateResult}
 
 export default {

apps/web/src/services/administration/helpers/policy-helper.ts

@@ -2,7 +2,7 @@ import { iso8601Formatter } from '@cloudforet/core-lib';
 import type { KeyDataType, ValueHandler, ValueItem } from '@cloudforet/core-lib/component-util/query-search/type';
 
 import type { TimeStamp } from '@/schema/_common/model';
-import type { PolicyModel } from '@/schema/identity/user-group/model';
+import type { PolicyModel } from '@/schema/identity/policy/model';
 
 import { POLICY_TYPE } from '@/services/administration/constants/policy-constant';
 import type { PolicyType } from '@/services/administration/types/policy-type';

apps/web/src/services/administration/pages/RoleCreatePage.vue

@@ -34,7 +34,7 @@ import { PHeading, PButton } from '@spaceone/design-system';
 import { SpaceConnector } from '@cloudforet/core-lib/space-connector';
 
 import { SpaceRouter } from '@/router';
-import type { RoleModel } from '@/schema/inventory/cloud-service-report/model';
+import type { RoleModel } from '@/schema/identity/role/model';
 import { i18n } from '@/translations';
 
 import { showSuccessMessage } from '@/lib/helper/notice-alert-helper';

apps/web/src/services/administration/pages/RoleUpdatePage.vue

@@ -35,7 +35,7 @@ import { PHeading, PButton } from '@spaceone/design-system';
 import { SpaceConnector } from '@cloudforet/core-lib/space-connector';
 
 import { SpaceRouter } from '@/router';
-import type { RoleModel } from '@/schema/inventory/cloud-service-report/model';
+import type { RoleModel } from '@/schema/identity/role/model';
 import { i18n } from '@/translations';
 
 import { showSuccessMessage } from '@/lib/helper/notice-alert-helper';

apps/web/src/services/administration/store/policy-page-store.ts

@@ -5,7 +5,7 @@ import { SpaceConnector } from '@cloudforet/core-lib/space-connector';
 
 
 import type { ListResponse } from '@/schema/_common/model';
-import type { PolicyModel } from '@/schema/identity/user-group/model';
+import type { PolicyModel } from '@/schema/identity/policy/model';
 
 import ErrorHandler from '@/common/composables/error/errorHandler';
 

apps/web/src/store/modules/user/getters.ts

@@ -1,6 +1,6 @@
 import type { Getter } from 'vuex';
 
-import type { RoleType } from '@/schema/inventory/cloud-service-report/model';
+import type { RoleType } from '@/schema/identity/role/type';
 
 import { languages } from '@/store/modules/user/config';
 
@@ -14,6 +14,7 @@ import {
 
 import type { UserState } from './type';
 
+
 export const isDomainOwner = (state: UserState): boolean => state.userType === 'DOMAIN_OWNER';
 export const languageLabel = (state: UserState): string => languages[state.language as string] || state.language;
 export const roleNames = (state: UserState): Array<string> => {