Skip to content

Commit 7636c3c

Browse files
authored
refactor: Tide the directories of modules (#3649)
* remove unused jsnonatan functions * move components to components * fix imports * fix imports
1 parent 6ae191a commit 7636c3c

File tree

7 files changed

+12
-17
lines changed

7 files changed

+12
-17
lines changed

src/components/Extensibility/helpers/jsonataWrapper.ts

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import { doesUserHavePermission } from 'state/navigation/filters/permissions';
66
import { permissionSetsSelector } from 'state/permissionSetsSelector';
77
import { jwtDecode } from 'jwt-decode';
88
import { AuthDataState, authDataState } from 'state/authDataAtom';
9-
import { useModuleStatus } from '../../KymaModules/support';
109

1110
/*
1211
Turns jsonata expressions like
@@ -65,16 +64,6 @@ export function jsonataWrapper(expression: string) {
6564
},
6665
);
6766

68-
exp.registerFunction('getModuleState', resource => {
69-
const { data: status } = useModuleStatus(resource?.resource);
70-
return status?.state || 'Unknown';
71-
});
72-
73-
exp.registerFunction('getModuleDescription', resource => {
74-
const { data: status } = useModuleStatus(resource?.resource);
75-
return status?.description;
76-
});
77-
7867
exp.registerFunction('compareStrings', (first, second) => {
7968
return first?.localeCompare(second) ?? 1;
8069
});

src/components/KymaModules/KymaModulesAddModule.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { MessageStrip } from '@ui5/webcomponents-react';
33
import { useTranslation } from 'react-i18next';
44
import { ResourceForm } from 'shared/ResourceForm';
55
import { Spinner } from 'shared/components/Spinner/Spinner';
6-
import ModulesCard from './ModulesCard';
6+
import ModulesCard from 'components/KymaModules/components/ModulesCard';
77
import { cloneDeep } from 'lodash';
88
import {
99
useModulesReleaseQuery,

src/components/KymaModules/KymaModulesEdit.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ import './KymaModulesCreate.scss';
2828
import { Spinner } from 'shared/components/Spinner/Spinner';
2929
import { isFormOpenState } from 'state/formOpenAtom';
3030
import { isResourceEditedState } from 'state/resourceEditedAtom';
31-
import { ManagedWarnings } from './ManagedWarnings';
32-
import { ChannelWarning } from './ChannelWarning';
33-
import { UnmanagedModuleInfo } from './UnmanagedModuleInfo';
31+
import { ManagedWarnings } from 'components/KymaModules/components/ManagedWarnings';
32+
import { ChannelWarning } from 'components/KymaModules/components/ChannelWarning';
33+
import { UnmanagedModuleInfo } from 'components/KymaModules/components/UnmanagedModuleInfo';
3434
import {
3535
useModulesReleaseQuery,
3636
useModuleTemplatesQuery,
File renamed without changes.
File renamed without changes.

src/components/KymaModules/ModulesCard.js renamed to src/components/KymaModules/components/ModulesCard.js

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,21 @@ import {
22
Card,
33
CheckBox,
44
Label,
5+
ListItemStandard,
56
Option,
67
Panel,
78
Select,
8-
ListItemStandard,
99
Text,
1010
Title,
1111
} from '@ui5/webcomponents-react';
1212
import { ExternalLink } from 'shared/components/ExternalLink/ExternalLink';
1313
import { useTranslation } from 'react-i18next';
1414
import { useEffect, useState } from 'react';
15-
import { findSpec, findStatus, setChannel } from './support';
15+
import {
16+
findSpec,
17+
findStatus,
18+
setChannel,
19+
} from 'components/KymaModules/support';
1620

1721
async function isImageAvailable(url) {
1822
try {
@@ -22,6 +26,7 @@ async function isImageAvailable(url) {
2226
return false;
2327
}
2428
}
29+
2530
async function getImageSrc(module) {
2631
const defaultImage = '/assets/sap-logo.svg';
2732
const iconLink = module.icon.link;
@@ -51,6 +56,7 @@ export default function ModulesCard({
5156
const src = await getImageSrc(module);
5257
setImageSrc(src);
5358
}
59+
5460
checkImage();
5561
}, [module]);
5662

src/components/KymaModules/UnmanagedModuleInfo.tsx renamed to src/components/KymaModules/components/UnmanagedModuleInfo.tsx

File renamed without changes.

0 commit comments

Comments
 (0)