Skip to content

Commit dee77c3

Browse files
sandrodw3brianchandotcom
sandrodw3
authored and
brianchandotcom
committed
LPD-91502 Reorganize dashboard components
1 parent 52a12d5 commit dee77c3

22 files changed

Lines changed: 48 additions & 39 deletions

‎modules/apps/site/site-cms-site-initializer/src/main/resources/META-INF/resources/js/main_view/dashboard/Dashboards.tsx‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ import {ClayTooltipProvider} from '@clayui/tooltip';
88
import React from 'react';
99

1010
import Breadcrumb from '../../common/components/Breadcrumb';
11-
import {InventoryContextProvider} from './InventoryContext';
12-
import InventoryDashboard from './components/InventoryDashboard';
11+
import InventoryDashboard from './inventory/InventoryDashboard';
1312

1413
import '../../../css/dashboard/Dashboard.scss';
1514

@@ -39,17 +38,15 @@ const Dashboards: React.FC<IDashboards> = ({
3938
/>
4039

4140
<ClayTooltipProvider>
42-
<InventoryContextProvider value={{constants}}>
43-
<ClayLayout.Container className="px-4" fluid>
44-
{freeTier ? (
45-
<EnterpriseOnlyPlaceholder
46-
learnResources={learnResources}
47-
/>
48-
) : (
49-
<InventoryDashboard />
50-
)}
51-
</ClayLayout.Container>
52-
</InventoryContextProvider>
41+
<ClayLayout.Container className="px-4" fluid>
42+
{freeTier ? (
43+
<EnterpriseOnlyPlaceholder
44+
learnResources={learnResources}
45+
/>
46+
) : (
47+
<InventoryDashboard constants={constants} />
48+
)}
49+
</ClayLayout.Container>
5350
</ClayTooltipProvider>
5451
</>
5552
);

modules/apps/site/site-cms-site-initializer/src/main/resources/META-INF/resources/js/main_view/dashboard/components/PickerTrigger.tsx renamed to modules/apps/site/site-cms-site-initializer/src/main/resources/META-INF/resources/js/main_view/dashboard/common/PickerTrigger.tsx

File renamed without changes.

modules/apps/site/site-cms-site-initializer/src/main/resources/META-INF/resources/js/main_view/dashboard/components/SpacesDropdown.tsx renamed to modules/apps/site/site-cms-site-initializer/src/main/resources/META-INF/resources/js/main_view/dashboard/common/SpacesDropdown.tsx

File renamed without changes.

modules/apps/site/site-cms-site-initializer/src/main/resources/META-INF/resources/js/main_view/dashboard/InventoryContext.tsx renamed to modules/apps/site/site-cms-site-initializer/src/main/resources/META-INF/resources/js/main_view/dashboard/inventory/InventoryContext.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import React, {createContext, useCallback, useReducer} from 'react';
77

8-
import {initialSpace} from './components/SpacesDropdown';
8+
import {initialSpace} from '../common/SpacesDropdown';
99

1010
type Item = {
1111
externalReferenceCode?: string;

modules/apps/site/site-cms-site-initializer/src/main/resources/META-INF/resources/js/main_view/dashboard/components/InventoryDashboard.tsx renamed to modules/apps/site/site-cms-site-initializer/src/main/resources/META-INF/resources/js/main_view/dashboard/inventory/InventoryDashboard.tsx

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,28 @@
66
import ClayLayout from '@clayui/layout';
77
import React, {useContext} from 'react';
88

9-
import {InventoryContext} from '../InventoryContext';
10-
import {ContentCard} from './ContentCard';
11-
import {ExpiredAssetsCard} from './ExpiredAssetsCard';
12-
import {FilesCard} from './FilesCard';
13-
import {InventoryAnalysisCard} from './InventoryAnalysisCard';
14-
import {LanguagesDropdown} from './LanguagesDropdown';
15-
import {SectionHeader} from './SectionHeader';
16-
import {SpacesDropdown} from './SpacesDropdown';
9+
import {SpacesDropdown} from '../common/SpacesDropdown';
10+
import {InventoryContext, InventoryContextProvider} from './InventoryContext';
11+
import {ContentCard} from './components/ContentCard';
12+
import {ExpiredAssetsCard} from './components/ExpiredAssetsCard';
13+
import {FilesCard} from './components/FilesCard';
14+
import {InventoryAnalysisCard} from './components/InventoryAnalysisCard';
15+
import {LanguagesDropdown} from './components/LanguagesDropdown';
16+
import {SectionHeader} from './components/SectionHeader';
1717

18-
export default function InventoryDashboard() {
18+
export default function InventoryDashboard({
19+
constants,
20+
}: {
21+
constants: {[key: string]: string};
22+
}) {
23+
return (
24+
<InventoryContextProvider value={{constants}}>
25+
<InventoryDashboardContent />
26+
</InventoryContextProvider>
27+
);
28+
}
29+
30+
function InventoryDashboardContent() {
1931
const {
2032
changeSpace,
2133
filters: {space},

modules/apps/site/site-cms-site-initializer/src/main/resources/META-INF/resources/js/main_view/dashboard/components/AllCategoriesDropdown.tsx renamed to modules/apps/site/site-cms-site-initializer/src/main/resources/META-INF/resources/js/main_view/dashboard/inventory/components/AllCategoriesDropdown.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import {buildQueryString} from '@liferay/analytics-reports-js-components-web';
77
import React, {useContext, useState} from 'react';
88

9-
import ApiHelper from '../../../common/services/ApiHelper';
9+
import ApiHelper from '../../../../common/services/ApiHelper';
1010
import {InventoryContext} from '../InventoryContext';
1111
import {FilterDropdown} from './FilterDropdown';
1212
import {

modules/apps/site/site-cms-site-initializer/src/main/resources/META-INF/resources/js/main_view/dashboard/components/AllStructureTypesDropdown.tsx renamed to modules/apps/site/site-cms-site-initializer/src/main/resources/META-INF/resources/js/main_view/dashboard/inventory/components/AllStructureTypesDropdown.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ import {Option, Picker} from '@clayui/core';
77
import {buildQueryString} from '@liferay/analytics-reports-js-components-web';
88
import React, {useContext, useEffect, useState} from 'react';
99

10-
import ApiHelper from '../../../common/services/ApiHelper';
11-
import getLocalizedValue from '../../../common/utils/getLocalizedValue';
10+
import ApiHelper from '../../../../common/services/ApiHelper';
11+
import getLocalizedValue from '../../../../common/utils/getLocalizedValue';
12+
import PickerTrigger from '../../common/PickerTrigger';
1213
import {InventoryContext} from '../InventoryContext';
1314
import {Item} from './FilterDropdown';
1415
import {IAllFiltersDropdown, initialFilters} from './InventoryAnalysisCard';
15-
import PickerTrigger from './PickerTrigger';
1616

1717
const AllStructureTypesDropdown: React.FC<IAllFiltersDropdown> = ({
1818
className,

modules/apps/site/site-cms-site-initializer/src/main/resources/META-INF/resources/js/main_view/dashboard/components/AllTagsDropdown.tsx renamed to modules/apps/site/site-cms-site-initializer/src/main/resources/META-INF/resources/js/main_view/dashboard/inventory/components/AllTagsDropdown.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
import {Option, Picker} from '@clayui/core';
77
import React, {useContext, useEffect, useMemo, useState} from 'react';
88

9-
import TagService from '../../../common/services/TagService';
9+
import TagService from '../../../../common/services/TagService';
10+
import PickerTrigger from '../../common/PickerTrigger';
1011
import {InventoryContext} from '../InventoryContext';
1112
import {Item} from './FilterDropdown';
1213
import {
1314
IAllFiltersDropdown,
1415
filterBySpaces,
1516
initialFilters,
1617
} from './InventoryAnalysisCard';
17-
import PickerTrigger from './PickerTrigger';
1818

1919
type Keyword = {assetLibraries: {id: number}[]; id: string; name: string};
2020

modules/apps/site/site-cms-site-initializer/src/main/resources/META-INF/resources/js/main_view/dashboard/components/AllVocabulariesDropdown.tsx renamed to modules/apps/site/site-cms-site-initializer/src/main/resources/META-INF/resources/js/main_view/dashboard/inventory/components/AllVocabulariesDropdown.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
import {Option, Picker} from '@clayui/core';
77
import React, {useContext, useEffect, useMemo, useState} from 'react';
88

9-
import VocabularyService from '../../../common/services/VocabularyService';
9+
import VocabularyService from '../../../../common/services/VocabularyService';
10+
import PickerTrigger from '../../common/PickerTrigger';
1011
import {InventoryContext} from '../InventoryContext';
1112
import {Item} from './FilterDropdown';
1213
import {
1314
IAllFiltersDropdown,
1415
filterBySpaces,
1516
initialFilters,
1617
} from './InventoryAnalysisCard';
17-
import PickerTrigger from './PickerTrigger';
1818

1919
type Vocabulary = {assetLibraries: {id: number}[]; id: string; name: string};
2020

modules/apps/site/site-cms-site-initializer/src/main/resources/META-INF/resources/js/main_view/dashboard/components/BaseCard.tsx renamed to modules/apps/site/site-cms-site-initializer/src/main/resources/META-INF/resources/js/main_view/dashboard/inventory/components/BaseCard.tsx

File renamed without changes.

0 commit comments

Comments
 (0)