refactor: Modules view

src/components/Extensibility/helpers/jsonataWrapper.ts

@@ -66,12 +66,12 @@ export function jsonataWrapper(expression: string) {
   );
 
   exp.registerFunction('getModuleState', resource => {
-    const { data: status } = useModuleStatus(resource);
+    const { data: status } = useModuleStatus(resource?.resource);
     return status?.state || 'Unknown';
   });
 
   exp.registerFunction('getModuleDescription', resource => {
-    const { data: status } = useModuleStatus(resource);
+    const { data: status } = useModuleStatus(resource?.resource);
     return status?.description;
   });
 

src/components/KymaModules/KymaModulesAddModule.js

@@ -11,6 +11,7 @@ import {
 } from './kymaModulesQueries';
 
 import './KymaModulesAddModule.scss';
+import { findStatus } from './support';
 
 export default function KymaModulesAddModule({
   resourceName,
@@ -188,38 +189,6 @@ export default function KymaModulesAddModule({
     setSelectedModules(newSelectedModules);
   };
 
-  const setChannel = (module, channel, index) => {
-    const modulesToUpdate = [...selectedModules];
-    if (
-      selectedModules.find(
-        selectedModule => selectedModule.name === module.name,
-      )
-    ) {
-      if (channel === 'predefined') {
-        delete modulesToUpdate[index].channel;
-      } else modulesToUpdate[index].channel = channel;
-    } else {
-      modulesToUpdate.push({
-        name: module.name,
-      });
-      if (channel !== 'predefined')
-        modulesToUpdate[modulesToUpdate?.length - 1].channel = channel;
-    }
-    setSelectedModules(modulesToUpdate);
-  };
-
-  const findStatus = moduleName => {
-    return kymaResource?.status?.modules?.find(
-      module => moduleName === module.name,
-    );
-  };
-
-  const findSpec = moduleName => {
-    return kymaResource?.spec.modules?.find(
-      module => moduleName === module.name,
-    );
-  };
-
   const checkIfSelectedModuleIsBeta = moduleName => {
     return selectedModules.some(({ name, channel }) => {
       if (moduleName && name !== moduleName) {
@@ -241,7 +210,7 @@ export default function KymaModulesAddModule({
       ?.find(mod => mod.name === moduleName)
       ?.channels.some(
         ({ channel: ch, isBeta }) =>
-          ch === findStatus(moduleName)?.channel ||
+          ch === findStatus(kymaResource, moduleName)?.channel ||
           (kymaResource.spec.channel && isBeta),
       );
   };
@@ -262,9 +231,8 @@ export default function KymaModulesAddModule({
           key={module.name}
           isChecked={isChecked}
           setCheckbox={setCheckbox}
-          setChannel={setChannel}
-          findStatus={findStatus}
-          findSpec={findSpec}
+          selectedModules={selectedModules}
+          setSelectedModules={setSelectedModules}
           checkIfStatusModuleIsBeta={checkIfStatusModuleIsBeta}
         />
       );