Skip to content

Commit 407d80c

Browse files
WANZARGENWANZARGEN
committed
Merge commit '4f20d587e134060942852f45b13ae53095573393' into feature-project-landing
Signed-off-by: Wanjin Noh <[email protected]>
2 parents 13b7025 + 4f20d58 commit 407d80c

File tree

447 files changed

+1514
-32740
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

447 files changed

+1514
-32740
lines changed

‎apps/web/src/common/modules/custom-table/custom-field-modal/CustomFieldModalForDynamicLayout.vue

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ import { useProxyValue } from '@/common/composables/proxy-state';
2121
import { TAGS_OPTIONS, TAGS_PREFIX } from '@/common/modules/custom-table/custom-field-modal/config';
2222
import ColumnItemForDynamicLayout from '@/common/modules/custom-table/custom-field-modal/modules/ColumnItemForDynamicLayout.vue';
2323
24-
import { convertAgentModeOptions } from '@/services/asset-inventory-v1/helpers/agent-mode-helper';
25-
import { getServiceAccountTableSchema, updateCustomTableSchema } from '@/services/asset-inventory-v1/helpers/dynamic-ui-schema-generator';
24+
import { convertAgentModeOptions } from '@/services/asset-inventory/helpers/agent-mode-helper';
25+
import { getServiceAccountTableSchema, updateCustomTableSchema } from '@/services/asset-inventory/helpers/dynamic-ui-schema-generator';
2626
import type {
2727
GetSchemaParams,
2828
ResourceType,
29-
} from '@/services/asset-inventory-v1/helpers/dynamic-ui-schema-generator/type';
29+
} from '@/services/asset-inventory/helpers/dynamic-ui-schema-generator/type';
3030
3131
const SelectCloudServiceTagColumns = () => import('@/common/modules/custom-table/custom-field-modal/modules/SelectCloudServiceTagColumns.vue');
3232
const SelectTagColumns = () => import('@/common/modules/custom-table/custom-field-modal/modules/SelectTagColumns.vue');

‎apps/web/src/common/modules/navigations/top-bar/modules/top-bar-search/helper.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { QueryHelper } from '@cloudforet/core-lib/query';
55
import { SEARCH_TAB } from '@/common/modules/navigations/top-bar/modules/top-bar-search/config';
66
import type { SearchTab } from '@/common/modules/navigations/top-bar/modules/top-bar-search/type';
77

8-
import { ASSET_INVENTORY_ROUTE_V1 } from '@/services/asset-inventory-v1/routes/route-constant';
8+
import { ASSET_INVENTORY_ROUTE } from '@/services/asset-inventory/routes/route-constant';
99
import { DASHBOARDS_ROUTE } from '@/services/dashboards/routes/route-constant';
1010
import { PROJECT_ROUTE_V1 } from '@/services/project/v1/routes/route-constant';
1111

@@ -15,7 +15,7 @@ export const topBarSearchReferenceRouter = (type: Exclude<SearchTab, 'service'>,
1515
switch (type) {
1616
case SEARCH_TAB.SERVICE_ACCOUNT:
1717
return {
18-
name: ASSET_INVENTORY_ROUTE_V1.SERVICE_ACCOUNT.DETAIL._NAME,
18+
name: ASSET_INVENTORY_ROUTE.SERVICE_ACCOUNT.DETAIL._NAME,
1919
params: { serviceAccountId: resourceId, workspaceId },
2020
};
2121
case SEARCH_TAB.PROJECT:
@@ -31,7 +31,7 @@ export const topBarSearchReferenceRouter = (type: Exclude<SearchTab, 'service'>,
3131
case SEARCH_TAB.CLOUD_SERVICE:
3232
if (!options.name || !options.group || !options.provider) throw new Error('provider and group are required for cloudService type');
3333
return {
34-
name: ASSET_INVENTORY_ROUTE_V1.CLOUD_SERVICE.DETAIL._NAME,
34+
name: ASSET_INVENTORY_ROUTE.CLOUD_SERVICE.DETAIL._NAME,
3535
params: {
3636
name: options.name,
3737
workspaceId,

‎apps/web/src/common/modules/navigations/top-bar/modules/top-bar-toolset/modules/top-bar-favorite/modules/TopBarFavoriteContextMenu.vue

+3-3
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ import type { FavoriteItem, FavoriteType } from '@/common/modules/favorites/favo
4949
import { useGnbStore } from '@/common/modules/navigations/stores/gnb-store';
5050
import TopBarSuggestionList from '@/common/modules/navigations/top-bar/modules/TopBarSuggestionList.vue';
5151
52-
import { ASSET_INVENTORY_ROUTE_V1 } from '@/services/asset-inventory-v1/routes/route-constant';
52+
import { ASSET_INVENTORY_ROUTE } from '@/services/asset-inventory/routes/route-constant';
5353
import { COST_EXPLORER_ROUTE } from '@/services/cost-explorer/routes/route-constant';
5454
import { useDashboardQuery } from '@/services/dashboards/composables/use-dashboard-query';
5555
import { DASHBOARDS_ROUTE } from '@/services/dashboards/routes/route-constant';
@@ -277,7 +277,7 @@ const handleSelect = (item: FavoriteMenuItem) => {
277277
router.push(referenceRouter(itemName, { resource_type: 'identity.ProjectGroup' })).catch(() => {});
278278
} else if (item.itemType === FAVORITE_TYPE.METRIC) {
279279
router.push({
280-
name: ASSET_INVENTORY_ROUTE_V1.METRIC_EXPLORER.DETAIL._NAME,
280+
name: ASSET_INVENTORY_ROUTE.METRIC_EXPLORER.DETAIL._NAME,
281281
params: {
282282
metricId: item.name || '',
283283
},
@@ -286,7 +286,7 @@ const handleSelect = (item: FavoriteMenuItem) => {
286286
const metricId = storeState.metricExamples.find((example) => example.example_id === item.name)?.metric_id;
287287
if (!metricId) return;
288288
router.push({
289-
name: ASSET_INVENTORY_ROUTE_V1.METRIC_EXPLORER.DETAIL.EXAMPLE._NAME,
289+
name: ASSET_INVENTORY_ROUTE.METRIC_EXPLORER.DETAIL.EXAMPLE._NAME,
290290
params: {
291291
metricId,
292292
metricExampleId: item.name || '',

‎apps/web/src/common/modules/tags/tags-panel/TagsPanel.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import type { Tag } from '@/common/modules/tags/type';
2323
2424
import type {
2525
CloudServiceTagTableItem,
26-
} from '@/services/asset-inventory-v1/types/cloud-service-detail-tag-type';
26+
} from '@/services/asset-inventory/types/cloud-service-detail-tag-type';
2727
2828
const props = withDefaults(defineProps<{
2929
resourceKey: string;

‎apps/web/src/common/modules/widgets/DailyUpdates.vue

+4-4
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,8 @@ import WidgetLayout from '@/common/components/layouts/WidgetLayout.vue';
164164
import ErrorHandler from '@/common/composables/error/errorHandler';
165165
import { useGrantScopeGuard } from '@/common/composables/grant-scope-guard';
166166
167-
import { ASSET_INVENTORY_ROUTE_V1 } from '@/services/asset-inventory-v1/routes/route-constant';
168-
import type { CloudServiceDetailPageUrlQuery } from '@/services/asset-inventory-v1/types/cloud-service-page-type';
167+
import { ASSET_INVENTORY_ROUTE } from '@/services/asset-inventory/routes/route-constant';
168+
import type { CloudServiceDetailPageUrlQuery } from '@/services/asset-inventory/types/cloud-service-page-type';
169169
170170
171171
interface CloudServiceData {
@@ -269,7 +269,7 @@ export default {
269269
createdCount: d.created_count,
270270
deletedCount: d.deleted_count,
271271
createdHref: {
272-
name: ASSET_INVENTORY_ROUTE_V1.CLOUD_SERVICE.DETAIL._NAME,
272+
name: ASSET_INVENTORY_ROUTE.CLOUD_SERVICE.DETAIL._NAME,
273273
params: {
274274
provider: d.provider,
275275
group: d.cloud_service_group,
@@ -283,7 +283,7 @@ export default {
283283
},
284284
},
285285
deletedHref: {
286-
name: ASSET_INVENTORY_ROUTE_V1.CLOUD_SERVICE.DETAIL._NAME,
286+
name: ASSET_INVENTORY_ROUTE.CLOUD_SERVICE.DETAIL._NAME,
287287
params: {
288288
provider: d.provider,
289289
group: d.cloud_service_group,

‎apps/web/src/common/modules/widgets/_components/WidgetFormDataTableCardAddForm.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ import {
3737
} from '@/common/modules/widgets/_constants/data-table-constant';
3838
import type { DataTableQueryFilter } from '@/common/modules/widgets/types/widget-model';
3939
40-
import { PROJECT_GROUP_LABEL_INFO } from '@/services/asset-inventory-v1/constants/asset-analysis-constant';
40+
import { PROJECT_GROUP_LABEL_INFO } from '@/services/asset-inventory/constants/asset-analysis-constant';
4141
import { GROUP_BY_ITEM_MAP } from '@/services/cost-explorer/constants/cost-explorer-constant';
4242
4343
const TAGS_DATA_KEY = 'tags';

‎apps/web/src/common/modules/widgets/_components/WidgetFormDataTableCardFilters.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ import { useWidgetGenerateStore } from '@/common/modules/widgets/_store/widget-g
4949
import type { DataTableQueryFilterForDropdown } from '@/common/modules/widgets/types/widget-data-table-type';
5050
import type { DataTableSourceType, DataTableQueryFilter } from '@/common/modules/widgets/types/widget-model';
5151
52-
import { PROJECT_GROUP_LABEL_INFO } from '@/services/asset-inventory-v1/constants/asset-analysis-constant';
52+
import { PROJECT_GROUP_LABEL_INFO } from '@/services/asset-inventory/constants/asset-analysis-constant';
5353
import { GROUP_BY } from '@/services/cost-explorer/constants/cost-explorer-constant';
5454
5555

‎apps/web/src/common/modules/widgets/_components/WidgetFormOverlayPreviewTable.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import type { DataInfo } from '@/common/modules/widgets/types/widget-model';
3636
3737
import { gray, white } from '@/styles/colors';
3838
39-
import { SIZE_UNITS } from '@/services/asset-inventory-v1/constants/asset-analysis-constant';
39+
import { SIZE_UNITS } from '@/services/asset-inventory/constants/asset-analysis-constant';
4040
import { GRANULARITY } from '@/services/cost-explorer/constants/cost-explorer-constant';
4141
import type { Granularity } from '@/services/cost-explorer/types/cost-explorer-query-type';
4242
import { useDashboardDetailQuery } from '@/services/dashboards/composables/use-dashboard-detail-query';

‎apps/web/src/common/modules/widgets/_composables/use-widget-frame.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ import type {
3030
} from '@/common/modules/widgets/types/widget-display-type';
3131
import type { FullDataLink, WidgetFrameProps } from '@/common/modules/widgets/types/widget-frame-type';
3232

33-
import { ADMIN_ASSET_INVENTORY_ROUTE_V1 } from '@/services/asset-inventory-v1/routes/admin/route-constant';
34-
import { ASSET_INVENTORY_ROUTE_V1 } from '@/services/asset-inventory-v1/routes/route-constant';
35-
import type { MetricFilter } from '@/services/asset-inventory-v1/types/asset-analysis-type';
33+
import { ADMIN_ASSET_INVENTORY_ROUTE } from '@/services/asset-inventory/routes/admin/route-constant';
34+
import { ASSET_INVENTORY_ROUTE } from '@/services/asset-inventory/routes/route-constant';
35+
import type { MetricFilter } from '@/services/asset-inventory/types/asset-analysis-type';
3636
import { UNIFIED_COST_KEY } from '@/services/cost-explorer/constants/cost-explorer-constant';
3737
import { DYNAMIC_COST_QUERY_SET_PARAMS } from '@/services/cost-explorer/constants/managed-cost-analysis-query-sets';
3838
import { ADMIN_COST_EXPLORER_ROUTE } from '@/services/cost-explorer/routes/admin/route-constant';
@@ -136,7 +136,7 @@ const getFullDataLocation = (
136136
const _metricId = dataTable?.options?.[DATA_SOURCE_DOMAIN.ASSET]?.metric_id;
137137
if (_metricId) {
138138
return {
139-
name: isAdminMode ? ADMIN_ASSET_INVENTORY_ROUTE_V1.METRIC_EXPLORER.DETAIL._NAME : ASSET_INVENTORY_ROUTE_V1.METRIC_EXPLORER.DETAIL._NAME,
139+
name: isAdminMode ? ADMIN_ASSET_INVENTORY_ROUTE.METRIC_EXPLORER.DETAIL._NAME : ASSET_INVENTORY_ROUTE.METRIC_EXPLORER.DETAIL._NAME,
140140
params: {
141141
workspaceId: isAdminMode ? undefined : workspaceId,
142142
metricId: _metricId,

‎apps/web/src/common/modules/widgets/_helpers/widget-helper.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { DATE_FIELD } from '@/common/modules/widgets/_constants/widget-constant'
66
import { NUMBER_FORMAT } from '@/common/modules/widgets/_constants/widget-field-constant';
77
import type { NumberFormatInfo } from '@/common/modules/widgets/_widget-fields/number-format/type';
88

9-
import { SIZE_UNITS } from '@/services/asset-inventory-v1/constants/asset-analysis-constant';
9+
import { SIZE_UNITS } from '@/services/asset-inventory/constants/asset-analysis-constant';
1010

1111

1212
export const sortWidgetTableFields = (fields: string[]): string[] => {

‎apps/web/src/common/pages/AlertPublicDetailPage.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ import { red } from '@/styles/colors';
2525
import {
2626
ALERT_SEVERITY_COLORS,
2727
ALERT_SEVERITY_LABELS,
28-
} from '@/services/alert-manager-v1/constants/alert-constant';
29-
import { ALERT_MANAGER_ROUTE } from '@/services/alert-manager/routes/route-constant';
28+
} from '@/services/alert-manager/v1/constants/alert-constant';
29+
import { ALERT_MANAGER_ROUTE } from '@/services/alert-manager/v2/routes/route-constant';
3030
import { AUTH_ROUTE } from '@/services/auth/routes/route-constant';
3131
3232
const router = useRouter();

‎apps/web/src/lib/helper/router-recent-helper.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { MENU_INFO_MAP } from '@/lib/menu/menu-info';
77
import type { RecentType } from '@/common/modules/navigations/type';
88
import { RECENT_TYPE } from '@/common/modules/navigations/type';
99

10-
import { ASSET_INVENTORY_ROUTE_V1 } from '@/services/asset-inventory-v1/routes/route-constant';
10+
import { ASSET_INVENTORY_ROUTE } from '@/services/asset-inventory/routes/route-constant';
1111
import { MANAGED_COST_QUERY_SET_ID_LIST } from '@/services/cost-explorer/constants/managed-cost-analysis-query-sets';
1212
import { COST_EXPLORER_ROUTE } from '@/services/cost-explorer/routes/route-constant';
1313
import { DASHBOARDS_ROUTE } from '@/services/dashboards/routes/route-constant';
@@ -31,7 +31,7 @@ export const getRecentConfig = (to: Route): RecentConfig | undefined => {
3131
}
3232

3333
/* ClOUD SERVICE */
34-
if (to.name === ASSET_INVENTORY_ROUTE_V1.CLOUD_SERVICE.DETAIL._NAME) {
34+
if (to.name === ASSET_INVENTORY_ROUTE.CLOUD_SERVICE.DETAIL._NAME) {
3535
const provider = to?.params?.provider;
3636
const group = to?.params?.group;
3737
const name = to?.params?.name;
@@ -40,7 +40,7 @@ export const getRecentConfig = (to: Route): RecentConfig | undefined => {
4040
}
4141

4242
/* SECURITY */
43-
if (to.name === ASSET_INVENTORY_ROUTE_V1.SECURITY.DETAIL._NAME) {
43+
if (to.name === ASSET_INVENTORY_ROUTE.SECURITY.DETAIL._NAME) {
4444
const provider = to?.params?.provider;
4545
const group = to?.params?.group;
4646
const name = to?.params?.name;
@@ -63,7 +63,7 @@ export const getRecentConfig = (to: Route): RecentConfig | undefined => {
6363
return { itemType: RECENT_TYPE.PROJECT, workspaceId, itemId: projectId };
6464
}
6565

66-
if (to.name === ASSET_INVENTORY_ROUTE_V1.SERVICE_ACCOUNT.DETAIL._NAME) {
66+
if (to.name === ASSET_INVENTORY_ROUTE.SERVICE_ACCOUNT.DETAIL._NAME) {
6767
const serviceAccountId = to?.params?.serviceAccountId;
6868
const isTrustedAccount = serviceAccountId.startsWith('ta');
6969
if (!serviceAccountId) return undefined;
@@ -80,7 +80,7 @@ export const getRecentConfig = (to: Route): RecentConfig | undefined => {
8080
return { itemType: RECENT_TYPE.COST_ANALYSIS, workspaceId, itemId: costQuerySetId };
8181
}
8282

83-
if (to.name === ASSET_INVENTORY_ROUTE_V1.METRIC_EXPLORER.DETAIL._NAME) {
83+
if (to.name === ASSET_INVENTORY_ROUTE.METRIC_EXPLORER.DETAIL._NAME) {
8484
const metricId = to?.params?.metricId;
8585
if (!metricId) return undefined;
8686
return { itemType: RECENT_TYPE.METRIC_EXPLORER, workspaceId, itemId: metricId };

‎apps/web/src/lib/menu/menu-architecture.ts

+2
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,8 @@ export const ADMIN_MENU_LIST_FOR_ALERT_MANAGER_V2: Menu[] = [
217217
id: MENU_ID.ASSET_INVENTORY,
218218
subMenuList: [
219219
{ id: MENU_ID.CLOUD_SERVICE },
220+
{ id: MENU_ID.SERVER },
221+
{ id: MENU_ID.SECURITY },
220222
{ id: MENU_ID.METRIC_EXPLORER },
221223
{ id: MENU_ID.COLLECTOR },
222224
{ id: MENU_ID.SERVICE_ACCOUNT },

‎apps/web/src/lib/menu/menu-info.ts

+10-10
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ import type { MenuId, MenuInfo } from '@/lib/menu/config';
22
import { MENU_ID } from '@/lib/menu/config';
33

44
import { ADMIN_ADVANCED_ROUTE } from '@/services/advanced/routes/admin/route-constant';
5-
import { ALERT_MANAGER_ROUTE_V1 } from '@/services/alert-manager-v1/routes/route-constant';
6-
import { ALERT_MANAGER_ROUTE } from '@/services/alert-manager/routes/route-constant';
7-
import { ASSET_INVENTORY_ROUTE_V1 } from '@/services/asset-inventory-v1/routes/route-constant';
5+
import { ALERT_MANAGER_ROUTE_V1 } from '@/services/alert-manager/v1/routes/route-constant';
6+
import { ALERT_MANAGER_ROUTE } from '@/services/alert-manager/v2/routes/route-constant';
7+
import { ASSET_INVENTORY_ROUTE } from '@/services/asset-inventory/routes/route-constant';
88
import { ADMIN_COST_EXPLORER_ROUTE } from '@/services/cost-explorer/routes/admin/route-constant';
99
import { COST_EXPLORER_ROUTE } from '@/services/cost-explorer/routes/route-constant';
1010
import { DASHBOARDS_ROUTE } from '@/services/dashboards/routes/route-constant';
@@ -39,43 +39,43 @@ export const MENU_INFO_MAP: Record<MenuId, MenuInfo> = Object.freeze({
3939
},
4040
[MENU_ID.ASSET_INVENTORY]: {
4141
menuId: MENU_ID.ASSET_INVENTORY,
42-
routeName: ASSET_INVENTORY_ROUTE_V1._NAME,
42+
routeName: ASSET_INVENTORY_ROUTE._NAME,
4343
translationId: 'MENU.ASSET_INVENTORY',
4444
icon: 'ic_service_asset-inventory',
4545
},
4646
[MENU_ID.CLOUD_SERVICE]: {
4747
menuId: MENU_ID.CLOUD_SERVICE,
48-
routeName: ASSET_INVENTORY_ROUTE_V1.CLOUD_SERVICE._NAME,
48+
routeName: ASSET_INVENTORY_ROUTE.CLOUD_SERVICE._NAME,
4949
translationId: 'MENU.ASSET_INVENTORY_CLOUD_SERVICE',
5050
icon: 'ic_service_cloud-service',
5151
},
5252
[MENU_ID.SERVER]: {
5353
menuId: MENU_ID.SERVER,
54-
routeName: ASSET_INVENTORY_ROUTE_V1.SERVER._NAME,
54+
routeName: ASSET_INVENTORY_ROUTE.SERVER._NAME,
5555
translationId: 'MENU.ASSET_INVENTORY_SERVER',
5656
icon: 'ic_service_server',
5757
},
5858
[MENU_ID.SECURITY]: {
5959
menuId: MENU_ID.SECURITY,
60-
routeName: ASSET_INVENTORY_ROUTE_V1.SECURITY._NAME,
60+
routeName: ASSET_INVENTORY_ROUTE.SECURITY._NAME,
6161
translationId: 'MENU.ASSET_INVENTORY_SECURITY',
6262
icon: 'ic_service_security',
6363
},
6464
[MENU_ID.METRIC_EXPLORER]: {
6565
menuId: MENU_ID.METRIC_EXPLORER,
66-
routeName: ASSET_INVENTORY_ROUTE_V1.METRIC_EXPLORER._NAME,
66+
routeName: ASSET_INVENTORY_ROUTE.METRIC_EXPLORER._NAME,
6767
translationId: 'MENU.ASSET_INVENTORY_METRIC_EXPLORER',
6868
icon: 'ic_service_metric-explorer',
6969
},
7070
[MENU_ID.COLLECTOR]: {
7171
menuId: MENU_ID.COLLECTOR,
72-
routeName: ASSET_INVENTORY_ROUTE_V1.COLLECTOR._NAME,
72+
routeName: ASSET_INVENTORY_ROUTE.COLLECTOR._NAME,
7373
translationId: 'MENU.ASSET_INVENTORY_COLLECTOR',
7474
icon: 'ic_service_collector',
7575
},
7676
[MENU_ID.SERVICE_ACCOUNT]: {
7777
menuId: MENU_ID.SERVICE_ACCOUNT,
78-
routeName: ASSET_INVENTORY_ROUTE_V1.SERVICE_ACCOUNT._NAME,
78+
routeName: ASSET_INVENTORY_ROUTE.SERVICE_ACCOUNT._NAME,
7979
translationId: 'MENU.ASSET_INVENTORY_SERVICE_ACCOUNT',
8080
icon: 'ic_service_service-account',
8181
},

‎apps/web/src/lib/reference/referenceRouter.ts

+8-8
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import { QueryHelper } from '@cloudforet/core-lib/query';
77

88
import type { Reference, ResourceType } from '@/lib/reference/type';
99

10-
import { ADMIN_ASSET_INVENTORY_ROUTE_V1 } from '@/services/asset-inventory-v1/routes/admin/route-constant';
11-
import { ASSET_INVENTORY_ROUTE_V1 } from '@/services/asset-inventory-v1/routes/route-constant';
10+
import { ADMIN_ASSET_INVENTORY_ROUTE } from '@/services/asset-inventory/routes/admin/route-constant';
11+
import { ASSET_INVENTORY_ROUTE } from '@/services/asset-inventory/routes/route-constant';
1212
import { PROJECT_ROUTE_V1 } from '@/services/project/v1/routes/route-constant';
1313

1414
interface LinkFormatter {
@@ -103,7 +103,7 @@ type RouterMap = Record<ResourceType, { name: string; formatter: LinkFormatter}>
103103
const routerMap = (isAdminMode?: boolean): RouterMap => ({
104104
'inventory.Server':
105105
{
106-
name: ASSET_INVENTORY_ROUTE_V1.SERVER._NAME,
106+
name: ASSET_INVENTORY_ROUTE.SERVER._NAME,
107107
formatter: serverLinkFormatter,
108108
},
109109
'identity.Project':
@@ -118,27 +118,27 @@ const routerMap = (isAdminMode?: boolean): RouterMap => ({
118118
},
119119
'inventory.Collector':
120120
{
121-
name: isAdminMode ? ADMIN_ASSET_INVENTORY_ROUTE_V1.COLLECTOR._NAME : ASSET_INVENTORY_ROUTE_V1.COLLECTOR._NAME,
121+
name: isAdminMode ? ADMIN_ASSET_INVENTORY_ROUTE.COLLECTOR._NAME : ASSET_INVENTORY_ROUTE.COLLECTOR._NAME,
122122
formatter: collectorLinkFormatter,
123123
},
124124
'identity.ServiceAccount':
125125
{
126-
name: isAdminMode ? ADMIN_ASSET_INVENTORY_ROUTE_V1.SERVICE_ACCOUNT.DETAIL._NAME : ASSET_INVENTORY_ROUTE_V1.SERVICE_ACCOUNT.DETAIL._NAME,
126+
name: isAdminMode ? ADMIN_ASSET_INVENTORY_ROUTE.SERVICE_ACCOUNT.DETAIL._NAME : ASSET_INVENTORY_ROUTE.SERVICE_ACCOUNT.DETAIL._NAME,
127127
formatter: serviceAccountLinkFormatter,
128128
},
129129
'identity.TrustedAccount':
130130
{
131-
name: isAdminMode ? ADMIN_ASSET_INVENTORY_ROUTE_V1.SERVICE_ACCOUNT.DETAIL._NAME : ASSET_INVENTORY_ROUTE_V1.SERVICE_ACCOUNT.DETAIL._NAME,
131+
name: isAdminMode ? ADMIN_ASSET_INVENTORY_ROUTE.SERVICE_ACCOUNT.DETAIL._NAME : ASSET_INVENTORY_ROUTE.SERVICE_ACCOUNT.DETAIL._NAME,
132132
formatter: serviceAccountLinkFormatter,
133133
},
134134
'inventory.CloudService':
135135
{
136-
name: isAdminMode ? ADMIN_ASSET_INVENTORY_ROUTE_V1.CLOUD_SERVICE.SEARCH._NAME : ASSET_INVENTORY_ROUTE_V1.CLOUD_SERVICE.SEARCH._NAME,
136+
name: isAdminMode ? ADMIN_ASSET_INVENTORY_ROUTE.CLOUD_SERVICE.SEARCH._NAME : ASSET_INVENTORY_ROUTE.CLOUD_SERVICE.SEARCH._NAME,
137137
formatter: cloudServiceLinkFormatter,
138138
},
139139
'inventory.CloudServiceType':
140140
{
141-
name: isAdminMode ? ADMIN_ASSET_INVENTORY_ROUTE_V1.CLOUD_SERVICE.TYPE_SEARCH._NAME : ASSET_INVENTORY_ROUTE_V1.CLOUD_SERVICE.TYPE_SEARCH._NAME,
141+
name: isAdminMode ? ADMIN_ASSET_INVENTORY_ROUTE.CLOUD_SERVICE.TYPE_SEARCH._NAME : ASSET_INVENTORY_ROUTE.CLOUD_SERVICE.TYPE_SEARCH._NAME,
142142
formatter: cloudServiceTypeLinkFormatter,
143143
},
144144
});

0 commit comments

Comments
 (0)