Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions src/components/Extensibility/helpers/jsonataWrapper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import { doesUserHavePermission } from 'state/navigation/filters/permissions';
import { permissionSetsSelector } from 'state/permissionSetsSelector';
import { jwtDecode } from 'jwt-decode';
import { AuthDataState, authDataState } from 'state/authDataAtom';
import { useModuleStatus } from '../../KymaModules/support';

/*
Turns jsonata expressions like
Expand Down Expand Up @@ -65,16 +64,6 @@ export function jsonataWrapper(expression: string) {
},
);

exp.registerFunction('getModuleState', resource => {
const { data: status } = useModuleStatus(resource?.resource);
return status?.state || 'Unknown';
});

exp.registerFunction('getModuleDescription', resource => {
const { data: status } = useModuleStatus(resource?.resource);
return status?.description;
});

exp.registerFunction('compareStrings', (first, second) => {
return first?.localeCompare(second) ?? 1;
});
Expand Down
2 changes: 1 addition & 1 deletion src/components/KymaModules/KymaModulesAddModule.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { MessageStrip } from '@ui5/webcomponents-react';
import { useTranslation } from 'react-i18next';
import { ResourceForm } from 'shared/ResourceForm';
import { Spinner } from 'shared/components/Spinner/Spinner';
import ModulesCard from './ModulesCard';
import ModulesCard from 'components/KymaModules/components/ModulesCard';
import { cloneDeep } from 'lodash';
import {
useModulesReleaseQuery,
Expand Down
6 changes: 3 additions & 3 deletions src/components/KymaModules/KymaModulesEdit.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ import './KymaModulesCreate.scss';
import { Spinner } from 'shared/components/Spinner/Spinner';
import { isFormOpenState } from 'state/formOpenAtom';
import { isResourceEditedState } from 'state/resourceEditedAtom';
import { ManagedWarnings } from './ManagedWarnings';
import { ChannelWarning } from './ChannelWarning';
import { UnmanagedModuleInfo } from './UnmanagedModuleInfo';
import { ManagedWarnings } from 'components/KymaModules/components/ManagedWarnings';
import { ChannelWarning } from 'components/KymaModules/components/ChannelWarning';
import { UnmanagedModuleInfo } from 'components/KymaModules/components/UnmanagedModuleInfo';
import {
useModulesReleaseQuery,
useModuleTemplatesQuery,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,21 @@ import {
Card,
CheckBox,
Label,
ListItemStandard,
Option,
Panel,
Select,
ListItemStandard,
Text,
Title,
} from '@ui5/webcomponents-react';
import { ExternalLink } from 'shared/components/ExternalLink/ExternalLink';
import { useTranslation } from 'react-i18next';
import { useEffect, useState } from 'react';
import { findSpec, findStatus, setChannel } from './support';
import {
findSpec,
findStatus,
setChannel,
} from 'components/KymaModules/support';

async function isImageAvailable(url) {
try {
Expand All @@ -22,6 +26,7 @@ async function isImageAvailable(url) {
return false;
}
}

async function getImageSrc(module) {
const defaultImage = '/assets/sap-logo.svg';
const iconLink = module.icon.link;
Expand Down Expand Up @@ -51,6 +56,7 @@ export default function ModulesCard({
const src = await getImageSrc(module);
setImageSrc(src);
}

checkImage();
}, [module]);

Expand Down
Loading