From 89fcbfd12049337e62c782266c70b857597bafc6 Mon Sep 17 00:00:00 2001
From: Pietocha <konrad.pietocha@sap.com>
Date: Tue, 10 Jun 2025 14:10:54 +0200
Subject: [PATCH 01/16] Add initial changes for delete

---
 src/components/KymaModules/KymaModulesList.js |  3 +-
 .../providers/CommunityModuleProvider.js      | 94 +++++++++++++++++--
 2 files changed, 88 insertions(+), 9 deletions(-)

diff --git a/src/components/KymaModules/KymaModulesList.js b/src/components/KymaModules/KymaModulesList.js
index d721b93620..74b056f8b6 100644
--- a/src/components/KymaModules/KymaModulesList.js
+++ b/src/components/KymaModules/KymaModulesList.js
@@ -41,6 +41,7 @@ export default function KymaModulesList({ namespaced }) {
     installedCommunityModules,
     communityModulesLoading,
     setOpenedModuleIndex: setOpenedCommunityModuleIndex,
+    handleResourceDelete: handleCommunityModuleDelete,
   } = useContext(CommunityModuleContext);
 
   const [selectedEntry, setSelectedEntry] = useState(null);
@@ -94,7 +95,7 @@ export default function KymaModulesList({ namespaced }) {
               modulesLoading={communityModulesLoading}
               namespaced={namespaced}
               setOpenedModuleIndex={setOpenedCommunityModuleIndex}
-              handleResourceDelete={handleResourceDelete}
+              handleResourceDelete={handleCommunityModuleDelete}
               customSelectedEntry={selectedEntry}
               setSelectedEntry={setSelectedEntry}
             />
diff --git a/src/components/KymaModules/providers/CommunityModuleProvider.js b/src/components/KymaModules/providers/CommunityModuleProvider.js
index 8caafb4509..8b762feb72 100644
--- a/src/components/KymaModules/providers/CommunityModuleProvider.js
+++ b/src/components/KymaModules/providers/CommunityModuleProvider.js
@@ -1,6 +1,14 @@
 import { createContext, useContext, useEffect, useState } from 'react';
+import { t } from 'i18next';
 import { useGetInstalledModules } from '../hooks';
 import { ModuleTemplatesContext } from './ModuleTemplatesProvider';
+import { createPortal } from 'react-dom';
+import { ModulesDeleteBox } from '../components/ModulesDeleteBox';
+import { checkSelectedModule } from '../support';
+import { Button } from '@ui5/webcomponents-react';
+import { cloneDeep } from 'lodash';
+import { useNotification } from 'shared/contexts/NotificationContext';
+import { useCreateResource } from 'shared/ResourceForm/useCreateResource';
 
 export const CommunityModuleContext = createContext({
   setOpenedModuleIndex: () => {},
@@ -15,16 +23,16 @@ export function CommunityModuleContextProvider({
   children,
   layoutState,
   showDeleteDialog,
+  DeleteMessageBox,
+  handleResourceDelete,
+  setLayoutColumn,
 }) {
-  const [, setOpenedModuleIndex] = useState();
-  const [, setDetailsOpen] = useState(false);
-
-  useEffect(() => {
-    if (layoutState?.layout) {
-      setDetailsOpen(layoutState?.layout !== 'OneColumn');
-    }
-  }, [layoutState]);
+  const [openedModuleIndex, setOpenedModuleIndex] = useState();
+  const [detailsOpen, setDetailsOpen] = useState(false);
+  const [initialUnchangedResource, setInitialUnchangedResource] = useState();
+  const [kymaResourceState, setKymaResourceState] = useState();
 
+  const notification = useNotification();
   const { moduleTemplatesLoading, communityModuleTemplates } = useContext(
     ModuleTemplatesContext,
   );
@@ -33,6 +41,46 @@ export function CommunityModuleContextProvider({
     installed: installedCommunityModules,
     loading: communityModulesLoading,
   } = useGetInstalledModules(communityModuleTemplates, moduleTemplatesLoading);
+  /////////////////////////// TODO: Is it necessary? KymaResource? resourceUrl?
+  const handleModuleUninstall = useCreateResource({
+    singularName: 'Kyma',
+    pluralKind: 'Kymas',
+    resource: kymaResourceState,
+    initialResource: initialUnchangedResource,
+    updateInitialResource: setInitialUnchangedResource,
+    createUrl:
+      ' /apis/operator.kyma-project.io/v1beta2/namespaces/kyma-system/kymas/default',
+    afterCreatedFn: () =>
+      notification.notifySuccess({
+        content: t('kyma-modules.module-uninstall'),
+      }),
+  });
+
+  useEffect(() => {
+    if (layoutState?.layout) {
+      setDetailsOpen(layoutState?.layout !== 'OneColumn');
+    }
+  }, [layoutState]);
+
+  useEffect(() => {
+    /////////////////////////// TODO: Is it proper for KymaResource and KymaResourceState?
+    if (installedCommunityModules?.[openedModuleIndex]?.resource) {
+      setKymaResourceState(
+        installedCommunityModules[openedModuleIndex].resource,
+      );
+      setInitialUnchangedResource(
+        cloneDeep(installedCommunityModules[openedModuleIndex].resource),
+      );
+    }
+  }, [installedCommunityModules, openedModuleIndex]);
+
+  const deleteModuleButton = (
+    <div>
+      <Button onClick={() => handleResourceDelete({})} design="Transparent">
+        {t('common.buttons.delete-module')}
+      </Button>
+    </div>
+  );
 
   return (
     <CommunityModuleContext.Provider
@@ -41,8 +89,38 @@ export function CommunityModuleContextProvider({
         showDeleteDialog: showDeleteDialog,
         installedCommunityModules: installedCommunityModules,
         communityModulesLoading: communityModulesLoading,
+        DeleteMessageBox: DeleteMessageBox,
+        deleteModuleButton: deleteModuleButton,
+        handleResourceDelete: handleResourceDelete,
       }}
     >
+      {createPortal(
+        !communityModulesLoading &&
+          !moduleTemplatesLoading &&
+          showDeleteDialog && (
+            <ModulesDeleteBox
+              DeleteMessageBox={DeleteMessageBox}
+              selectedModules={installedCommunityModules}
+              chosenModuleIndex={
+                openedModuleIndex ??
+                // Find index of the selected module after a refresh or other case after which we have undefined.
+                installedCommunityModules.findIndex(module =>
+                  checkSelectedModule(module, layoutState),
+                )
+              }
+              kymaResource={kymaResourceState}
+              kymaResourceState={kymaResourceState}
+              moduleTemplates={communityModuleTemplates}
+              detailsOpen={detailsOpen}
+              setKymaResourceState={setKymaResourceState}
+              setInitialUnchangedResource={setInitialUnchangedResource}
+              setChosenModuleIndex={setOpenedModuleIndex}
+              handleModuleUninstall={handleModuleUninstall}
+              setLayoutColumn={setLayoutColumn}
+            />
+          ),
+        document.body,
+      )}
       {children}
     </CommunityModuleContext.Provider>
   );

From 29d881fd23516325a737d132ef1bb86bdac3373d Mon Sep 17 00:00:00 2001
From: Pietocha <konrad.pietocha@sap.com>
Date: Wed, 11 Jun 2025 12:42:22 +0200
Subject: [PATCH 02/16] Checking if index is from community

---
 .../components/ModulesDeleteBox.tsx           |  2 +
 .../providers/CommunityModuleProvider.js      | 50 ++++++++++-------
 .../providers/KymaModuleProvider.js           | 55 +++++++++++--------
 3 files changed, 66 insertions(+), 41 deletions(-)

diff --git a/src/components/KymaModules/components/ModulesDeleteBox.tsx b/src/components/KymaModules/components/ModulesDeleteBox.tsx
index da3ab1bef0..97ff0aba0b 100644
--- a/src/components/KymaModules/components/ModulesDeleteBox.tsx
+++ b/src/components/KymaModules/components/ModulesDeleteBox.tsx
@@ -35,6 +35,7 @@ type ModulesListDeleteBoxProps = {
   kymaResource: KymaResourceType;
   kymaResourceState: KymaResourceType;
   detailsOpen: boolean;
+  isCommunity?: boolean;
   setLayoutColumn: SetterOrUpdater<ColumnLayoutState>;
   handleModuleUninstall: () => void;
   setChosenModuleIndex: React.Dispatch<React.SetStateAction<number | null>>;
@@ -50,6 +51,7 @@ export const ModulesDeleteBox = ({
   kymaResource,
   kymaResourceState,
   detailsOpen,
+  isCommunity,
   setLayoutColumn,
   handleModuleUninstall,
   setChosenModuleIndex,
diff --git a/src/components/KymaModules/providers/CommunityModuleProvider.js b/src/components/KymaModules/providers/CommunityModuleProvider.js
index 8b762feb72..a1d020cb44 100644
--- a/src/components/KymaModules/providers/CommunityModuleProvider.js
+++ b/src/components/KymaModules/providers/CommunityModuleProvider.js
@@ -9,6 +9,7 @@ import { Button } from '@ui5/webcomponents-react';
 import { cloneDeep } from 'lodash';
 import { useNotification } from 'shared/contexts/NotificationContext';
 import { useCreateResource } from 'shared/ResourceForm/useCreateResource';
+import { useKymaQuery } from '../kymaModulesQueries';
 
 export const CommunityModuleContext = createContext({
   setOpenedModuleIndex: () => {},
@@ -37,6 +38,12 @@ export function CommunityModuleContextProvider({
     ModuleTemplatesContext,
   );
 
+  const {
+    data: kymaResource,
+    loading: kymaResourceLoading,
+    resourceUrl,
+  } = useKymaQuery();
+
   const {
     installed: installedCommunityModules,
     loading: communityModulesLoading,
@@ -48,8 +55,7 @@ export function CommunityModuleContextProvider({
     resource: kymaResourceState,
     initialResource: initialUnchangedResource,
     updateInitialResource: setInitialUnchangedResource,
-    createUrl:
-      ' /apis/operator.kyma-project.io/v1beta2/namespaces/kyma-system/kymas/default',
+    createUrl: resourceUrl,
     afterCreatedFn: () =>
       notification.notifySuccess({
         content: t('kyma-modules.module-uninstall'),
@@ -63,16 +69,21 @@ export function CommunityModuleContextProvider({
   }, [layoutState]);
 
   useEffect(() => {
-    /////////////////////////// TODO: Is it proper for KymaResource and KymaResourceState?
-    if (installedCommunityModules?.[openedModuleIndex]?.resource) {
-      setKymaResourceState(
-        installedCommunityModules[openedModuleIndex].resource,
-      );
-      setInitialUnchangedResource(
-        cloneDeep(installedCommunityModules[openedModuleIndex].resource),
-      );
+    if (kymaResource) {
+      setKymaResourceState(kymaResource);
+      setInitialUnchangedResource(cloneDeep(kymaResource));
     }
-  }, [installedCommunityModules, openedModuleIndex]);
+  }, [kymaResource]);
+
+  const getOpenedModuleIndex = (moduleIndex, activeModules) => {
+    const index =
+      moduleIndex ??
+      // Find index of the selected module after a refresh or other case after which we have undefined.
+      activeModules.findIndex(module =>
+        checkSelectedModule(module, layoutState),
+      );
+    return index > -1 ? index : undefined;
+  };
 
   const deleteModuleButton = (
     <div>
@@ -95,19 +106,19 @@ export function CommunityModuleContextProvider({
       }}
     >
       {createPortal(
-        !communityModulesLoading &&
+        getOpenedModuleIndex(openedModuleIndex, installedCommunityModules) !=
+          undefined &&
+          !communityModulesLoading &&
+          !kymaResourceLoading &&
           !moduleTemplatesLoading &&
           showDeleteDialog && (
             <ModulesDeleteBox
               DeleteMessageBox={DeleteMessageBox}
               selectedModules={installedCommunityModules}
-              chosenModuleIndex={
-                openedModuleIndex ??
-                // Find index of the selected module after a refresh or other case after which we have undefined.
-                installedCommunityModules.findIndex(module =>
-                  checkSelectedModule(module, layoutState),
-                )
-              }
+              chosenModuleIndex={getOpenedModuleIndex(
+                openedModuleIndex,
+                installedCommunityModules,
+              )}
               kymaResource={kymaResourceState}
               kymaResourceState={kymaResourceState}
               moduleTemplates={communityModuleTemplates}
@@ -117,6 +128,7 @@ export function CommunityModuleContextProvider({
               setChosenModuleIndex={setOpenedModuleIndex}
               handleModuleUninstall={handleModuleUninstall}
               setLayoutColumn={setLayoutColumn}
+              isCommunity={true}
             />
           ),
         document.body,
diff --git a/src/components/KymaModules/providers/KymaModuleProvider.js b/src/components/KymaModules/providers/KymaModuleProvider.js
index 47d5fde683..f687877e45 100644
--- a/src/components/KymaModules/providers/KymaModuleProvider.js
+++ b/src/components/KymaModules/providers/KymaModuleProvider.js
@@ -81,6 +81,16 @@ export function KymaModuleContextProvider({
     ModuleTemplatesContext,
   );
 
+  const getOpenedModuleIndex = (moduleIndex, activeModules) => {
+    const index =
+      moduleIndex ??
+      // Find index of the selected module after a refresh or other case after which we have undefined.
+      activeModules.findIndex(module =>
+        checkSelectedModule(module, layoutState),
+      );
+    return index > -1 ? index : undefined;
+  };
+
   const deleteModuleButton = (
     <div>
       <Button onClick={() => handleResourceDelete({})} design="Transparent">
@@ -108,28 +118,29 @@ export function KymaModuleContextProvider({
       }}
     >
       {createPortal(
-        !kymaResourceLoading && !moduleTemplatesLoading && showDeleteDialog && (
-          <ModulesDeleteBox
-            DeleteMessageBox={DeleteMessageBox}
-            selectedModules={activeKymaModules}
-            chosenModuleIndex={
-              openedModuleIndex ??
-              // Find index of the selected module after a refresh or other case after which we have undefined.
-              activeKymaModules.findIndex(module =>
-                checkSelectedModule(module, layoutState),
-              )
-            }
-            kymaResource={kymaResource}
-            kymaResourceState={kymaResourceState}
-            moduleTemplates={kymaModuleTemplates}
-            detailsOpen={detailsOpen}
-            setKymaResourceState={setKymaResourceState}
-            setInitialUnchangedResource={setInitialUnchangedResource}
-            setChosenModuleIndex={setOpenedModuleIndex}
-            handleModuleUninstall={handleModuleUninstall}
-            setLayoutColumn={setLayoutColumn}
-          />
-        ),
+        getOpenedModuleIndex(openedModuleIndex, activeKymaModules) !=
+          undefined &&
+          !kymaResourceLoading &&
+          !moduleTemplatesLoading &&
+          showDeleteDialog && (
+            <ModulesDeleteBox
+              DeleteMessageBox={DeleteMessageBox}
+              selectedModules={activeKymaModules}
+              chosenModuleIndex={getOpenedModuleIndex(
+                openedModuleIndex,
+                activeKymaModules,
+              )}
+              kymaResource={kymaResource}
+              kymaResourceState={kymaResourceState}
+              moduleTemplates={kymaModuleTemplates}
+              detailsOpen={detailsOpen}
+              setKymaResourceState={setKymaResourceState}
+              setInitialUnchangedResource={setInitialUnchangedResource}
+              setChosenModuleIndex={setOpenedModuleIndex}
+              handleModuleUninstall={handleModuleUninstall}
+              setLayoutColumn={setLayoutColumn}
+            />
+          ),
         document.body,
       )}
       {children}

From 3a71c8c68c93f4fe19d7de91a6ab62a3d8e38ab5 Mon Sep 17 00:00:00 2001
From: Pietocha <konrad.pietocha@sap.com>
Date: Wed, 11 Jun 2025 15:16:36 +0200
Subject: [PATCH 03/16] Checking if is it community module in DeleteBox

---
 .../components/ModulesDeleteBox.tsx           | 25 +++++++++--------
 .../providers/CommunityModuleProvider.js      | 28 +++++++------------
 src/shared/hooks/BackendAPI/useGet.js         |  2 +-
 3 files changed, 25 insertions(+), 30 deletions(-)

diff --git a/src/components/KymaModules/components/ModulesDeleteBox.tsx b/src/components/KymaModules/components/ModulesDeleteBox.tsx
index 97ff0aba0b..08b0853254 100644
--- a/src/components/KymaModules/components/ModulesDeleteBox.tsx
+++ b/src/components/KymaModules/components/ModulesDeleteBox.tsx
@@ -32,8 +32,8 @@ type ModulesListDeleteBoxProps = {
   moduleTemplates: ModuleTemplateListType;
   selectedModules: { name: string }[];
   chosenModuleIndex: number | null;
-  kymaResource: KymaResourceType;
-  kymaResourceState: KymaResourceType;
+  kymaResource?: KymaResourceType;
+  kymaResourceState?: KymaResourceType;
   detailsOpen: boolean;
   isCommunity?: boolean;
   setLayoutColumn: SetterOrUpdater<ColumnLayoutState>;
@@ -238,15 +238,18 @@ export const ModulesDeleteBox = ({
         if (chosenModuleIndex != null) {
           selectedModules.splice(chosenModuleIndex, 1);
         }
-        setKymaResourceState({
-          ...kymaResource,
-          spec: {
-            ...kymaResource.spec,
-            modules: selectedModules,
-          },
-        });
-        handleModuleUninstall();
-        setInitialUnchangedResource(cloneDeep(kymaResourceState));
+        if (!isCommunity && kymaResource) {
+          setKymaResourceState({
+            ...kymaResource,
+            spec: {
+              ...kymaResource.spec,
+              modules: selectedModules,
+            },
+          });
+          handleModuleUninstall();
+          setInitialUnchangedResource(cloneDeep(kymaResourceState));
+        }
+
         if (detailsOpen) {
           setLayoutColumn({
             layout: 'OneColumn',
diff --git a/src/components/KymaModules/providers/CommunityModuleProvider.js b/src/components/KymaModules/providers/CommunityModuleProvider.js
index a1d020cb44..42d35401cf 100644
--- a/src/components/KymaModules/providers/CommunityModuleProvider.js
+++ b/src/components/KymaModules/providers/CommunityModuleProvider.js
@@ -6,10 +6,8 @@ import { createPortal } from 'react-dom';
 import { ModulesDeleteBox } from '../components/ModulesDeleteBox';
 import { checkSelectedModule } from '../support';
 import { Button } from '@ui5/webcomponents-react';
-import { cloneDeep } from 'lodash';
 import { useNotification } from 'shared/contexts/NotificationContext';
 import { useCreateResource } from 'shared/ResourceForm/useCreateResource';
-import { useKymaQuery } from '../kymaModulesQueries';
 
 export const CommunityModuleContext = createContext({
   setOpenedModuleIndex: () => {},
@@ -30,6 +28,7 @@ export function CommunityModuleContextProvider({
 }) {
   const [openedModuleIndex, setOpenedModuleIndex] = useState();
   const [detailsOpen, setDetailsOpen] = useState(false);
+  // TODO: Is this two needed in community modules?:
   const [initialUnchangedResource, setInitialUnchangedResource] = useState();
   const [kymaResourceState, setKymaResourceState] = useState();
 
@@ -38,12 +37,6 @@ export function CommunityModuleContextProvider({
     ModuleTemplatesContext,
   );
 
-  const {
-    data: kymaResource,
-    loading: kymaResourceLoading,
-    resourceUrl,
-  } = useKymaQuery();
-
   const {
     installed: installedCommunityModules,
     loading: communityModulesLoading,
@@ -55,7 +48,9 @@ export function CommunityModuleContextProvider({
     resource: kymaResourceState,
     initialResource: initialUnchangedResource,
     updateInitialResource: setInitialUnchangedResource,
-    createUrl: resourceUrl,
+    // TODO: resourceUrl
+    createUrl:
+      '/apis/operator.kyma-project.io/v1beta2/namespaces/kyma-system/kymas/default',
     afterCreatedFn: () =>
       notification.notifySuccess({
         content: t('kyma-modules.module-uninstall'),
@@ -68,12 +63,12 @@ export function CommunityModuleContextProvider({
     }
   }, [layoutState]);
 
-  useEffect(() => {
-    if (kymaResource) {
-      setKymaResourceState(kymaResource);
-      setInitialUnchangedResource(cloneDeep(kymaResource));
-    }
-  }, [kymaResource]);
+  // useEffect(() => {
+  //   if (installedCommunityModules?.length) {
+  //     setKymaResourceState(installedCommunityModules);
+  //     setInitialUnchangedResource(cloneDeep(installedCommunityModules));
+  //   }
+  // }, [installedCommunityModules]);
 
   const getOpenedModuleIndex = (moduleIndex, activeModules) => {
     const index =
@@ -109,7 +104,6 @@ export function CommunityModuleContextProvider({
         getOpenedModuleIndex(openedModuleIndex, installedCommunityModules) !=
           undefined &&
           !communityModulesLoading &&
-          !kymaResourceLoading &&
           !moduleTemplatesLoading &&
           showDeleteDialog && (
             <ModulesDeleteBox
@@ -119,8 +113,6 @@ export function CommunityModuleContextProvider({
                 openedModuleIndex,
                 installedCommunityModules,
               )}
-              kymaResource={kymaResourceState}
-              kymaResourceState={kymaResourceState}
               moduleTemplates={communityModuleTemplates}
               detailsOpen={detailsOpen}
               setKymaResourceState={setKymaResourceState}
diff --git a/src/shared/hooks/BackendAPI/useGet.js b/src/shared/hooks/BackendAPI/useGet.js
index 9badb89c6c..443345e30c 100644
--- a/src/shared/hooks/BackendAPI/useGet.js
+++ b/src/shared/hooks/BackendAPI/useGet.js
@@ -367,6 +367,6 @@ export const useGetScope = () => {
     });
     const openApiSpec = await response.json();
 
-    return openApiSpec.resources.find(r => r.kind === kind).namespaced;
+    return openApiSpec.resources.find(r => r.kind === kind)?.namespaced;
   };
 };

From 3fa5e6b4bf72420370029bc975d389712006bcb8 Mon Sep 17 00:00:00 2001
From: Pietocha <konrad.pietocha@sap.com>
Date: Thu, 12 Jun 2025 22:52:29 +0200
Subject: [PATCH 04/16] Add additional checking while deleting for community

---
 .../components/ModulesDeleteBox.tsx           |  4 ++-
 .../providers/CommunityModuleProvider.js      | 35 ++++---------------
 2 files changed, 9 insertions(+), 30 deletions(-)

diff --git a/src/components/KymaModules/components/ModulesDeleteBox.tsx b/src/components/KymaModules/components/ModulesDeleteBox.tsx
index 08b0853254..18528f3efe 100644
--- a/src/components/KymaModules/components/ModulesDeleteBox.tsx
+++ b/src/components/KymaModules/components/ModulesDeleteBox.tsx
@@ -246,7 +246,9 @@ export const ModulesDeleteBox = ({
               modules: selectedModules,
             },
           });
-          handleModuleUninstall();
+        }
+        handleModuleUninstall();
+        if (!isCommunity) {
           setInitialUnchangedResource(cloneDeep(kymaResourceState));
         }
 
diff --git a/src/components/KymaModules/providers/CommunityModuleProvider.js b/src/components/KymaModules/providers/CommunityModuleProvider.js
index 42d35401cf..31a7193c66 100644
--- a/src/components/KymaModules/providers/CommunityModuleProvider.js
+++ b/src/components/KymaModules/providers/CommunityModuleProvider.js
@@ -7,7 +7,6 @@ import { ModulesDeleteBox } from '../components/ModulesDeleteBox';
 import { checkSelectedModule } from '../support';
 import { Button } from '@ui5/webcomponents-react';
 import { useNotification } from 'shared/contexts/NotificationContext';
-import { useCreateResource } from 'shared/ResourceForm/useCreateResource';
 
 export const CommunityModuleContext = createContext({
   setOpenedModuleIndex: () => {},
@@ -28,34 +27,21 @@ export function CommunityModuleContextProvider({
 }) {
   const [openedModuleIndex, setOpenedModuleIndex] = useState();
   const [detailsOpen, setDetailsOpen] = useState(false);
-  // TODO: Is this two needed in community modules?:
-  const [initialUnchangedResource, setInitialUnchangedResource] = useState();
-  const [kymaResourceState, setKymaResourceState] = useState();
 
   const notification = useNotification();
   const { moduleTemplatesLoading, communityModuleTemplates } = useContext(
     ModuleTemplatesContext,
   );
-
   const {
     installed: installedCommunityModules,
     loading: communityModulesLoading,
   } = useGetInstalledModules(communityModuleTemplates, moduleTemplatesLoading);
-  /////////////////////////// TODO: Is it necessary? KymaResource? resourceUrl?
-  const handleModuleUninstall = useCreateResource({
-    singularName: 'Kyma',
-    pluralKind: 'Kymas',
-    resource: kymaResourceState,
-    initialResource: initialUnchangedResource,
-    updateInitialResource: setInitialUnchangedResource,
-    // TODO: resourceUrl
-    createUrl:
-      '/apis/operator.kyma-project.io/v1beta2/namespaces/kyma-system/kymas/default',
-    afterCreatedFn: () =>
-      notification.notifySuccess({
-        content: t('kyma-modules.module-uninstall'),
-      }),
-  });
+
+  const handleModuleUninstall = () =>
+    // TODO: Add logic to handle module uninstallation.
+    notification.notifySuccess({
+      content: t('kyma-modules.module-uninstall'),
+    });
 
   useEffect(() => {
     if (layoutState?.layout) {
@@ -63,13 +49,6 @@ export function CommunityModuleContextProvider({
     }
   }, [layoutState]);
 
-  // useEffect(() => {
-  //   if (installedCommunityModules?.length) {
-  //     setKymaResourceState(installedCommunityModules);
-  //     setInitialUnchangedResource(cloneDeep(installedCommunityModules));
-  //   }
-  // }, [installedCommunityModules]);
-
   const getOpenedModuleIndex = (moduleIndex, activeModules) => {
     const index =
       moduleIndex ??
@@ -115,8 +94,6 @@ export function CommunityModuleContextProvider({
               )}
               moduleTemplates={communityModuleTemplates}
               detailsOpen={detailsOpen}
-              setKymaResourceState={setKymaResourceState}
-              setInitialUnchangedResource={setInitialUnchangedResource}
               setChosenModuleIndex={setOpenedModuleIndex}
               handleModuleUninstall={handleModuleUninstall}
               setLayoutColumn={setLayoutColumn}

From 321ac933e473a44f41ebe4750e1e801442469145 Mon Sep 17 00:00:00 2001
From: Pietocha <konrad.pietocha@sap.com>
Date: Fri, 13 Jun 2025 08:36:51 +0200
Subject: [PATCH 05/16] Add useful comments

---
 src/components/KymaModules/providers/CommunityModuleProvider.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/KymaModules/providers/CommunityModuleProvider.js b/src/components/KymaModules/providers/CommunityModuleProvider.js
index 31a7193c66..e83a86c7b1 100644
--- a/src/components/KymaModules/providers/CommunityModuleProvider.js
+++ b/src/components/KymaModules/providers/CommunityModuleProvider.js
@@ -38,7 +38,7 @@ export function CommunityModuleContextProvider({
   } = useGetInstalledModules(communityModuleTemplates, moduleTemplatesLoading);
 
   const handleModuleUninstall = () =>
-    // TODO: Add logic to handle module uninstallation.
+    // TODO: Add logic to handle module uninstallation if it's needed for community case.
     notification.notifySuccess({
       content: t('kyma-modules.module-uninstall'),
     });

From 05ca7e592f903fdf3df95e1b26fb94d2a92293f0 Mon Sep 17 00:00:00 2001
From: Pietocha <konrad.pietocha@sap.com>
Date: Mon, 16 Jun 2025 16:06:35 +0200
Subject: [PATCH 06/16] Add backend for fetching yaml

---
 backend/companion/communityRouter.js          | 21 +++++++
 backend/index.js                              |  3 +
 .../components/ModulesDeleteBox.tsx           | 21 ++++++-
 .../KymaModules/deleteModulesHelpers.tsx      | 61 +++++++++++++++++++
 .../providers/CommunityModuleProvider.js      | 13 +---
 .../providers/KymaModuleProvider.js           |  4 +-
 6 files changed, 107 insertions(+), 16 deletions(-)
 create mode 100644 backend/companion/communityRouter.js

diff --git a/backend/companion/communityRouter.js b/backend/companion/communityRouter.js
new file mode 100644
index 0000000000..007c812297
--- /dev/null
+++ b/backend/companion/communityRouter.js
@@ -0,0 +1,21 @@
+import express from 'express';
+import cors from 'cors';
+
+const router = express.Router();
+router.use(express.json());
+router.use(cors());
+
+async function handleGetCommunityResource(req, res) {
+  const { link } = JSON.parse(req.body.toString());
+  try {
+    const response = await fetch(link);
+    const data = await response.text();
+    res.json(data);
+  } catch (error) {
+    res.status(500).json(`Failed to fetch community resource. ${error}`);
+  }
+}
+
+router.post('/resource', handleGetCommunityResource);
+
+export default router;
diff --git a/backend/index.js b/backend/index.js
index 5f6c600e2f..b98328bf1e 100644
--- a/backend/index.js
+++ b/backend/index.js
@@ -3,6 +3,7 @@ import { handleTracking } from './tracking.js';
 import jsyaml from 'js-yaml';
 import { proxyHandler, proxyRateLimiter } from './proxy.js';
 import companionRouter from './companion/companionRouter';
+import communityRouter from './companion/communityRouter';
 //import { requestLogger } from './utils/other'; //uncomment this to log the outgoing traffic
 
 const express = require('express');
@@ -94,12 +95,14 @@ if (isDocker) {
   // yup, order matters here
   serveMonaco(app);
   app.use('/backend/ai-chat', companionRouter);
+  app.use('/backend/community', communityRouter);
   app.use('/backend', handleRequest);
   serveStaticApp(app, '/', '/core-ui');
 } else {
   // Running in prod mode
   handleTracking(app);
   app.use('/backend/ai-chat', companionRouter);
+  app.use('/backend/community', communityRouter);
   app.use('/backend', handleRequest);
 }
 
diff --git a/src/components/KymaModules/components/ModulesDeleteBox.tsx b/src/components/KymaModules/components/ModulesDeleteBox.tsx
index 18528f3efe..08b38b78dd 100644
--- a/src/components/KymaModules/components/ModulesDeleteBox.tsx
+++ b/src/components/KymaModules/components/ModulesDeleteBox.tsx
@@ -14,6 +14,7 @@ import {
   fetchResourceCounts,
   generateAssociatedResourcesUrls,
   getAssociatedResources,
+  getCommunityResources,
   getCRResource,
   handleItemClick,
 } from '../deleteModulesHelpers';
@@ -26,6 +27,7 @@ import { cloneDeep } from 'lodash';
 import { KymaResourceType, ModuleTemplateListType } from '../support';
 import { SetterOrUpdater } from 'recoil';
 import { ColumnLayoutState } from 'state/columnLayoutAtom';
+import { usePost } from 'shared/hooks/BackendAPI/usePost';
 
 type ModulesListDeleteBoxProps = {
   DeleteMessageBox: React.FC<any>;
@@ -64,10 +66,12 @@ export const ModulesDeleteBox = ({
   const { clusterUrl, namespaceUrl } = useUrl();
   const deleteResourceMutation = useDelete();
   const fetchFn = useSingleGet();
+  const post = usePost();
 
   const [resourceCounts, setResourceCounts] = useState<Record<string, any>>({});
   const [forceDeleteUrls, setForceDeleteUrls] = useState<string[]>([]);
   const [crUrls, setCrUrls] = useState<string[]>([]);
+  const [communityUrls, setCommunityUrls] = useState<string[]>([]);
   const [allowForceDelete, setAllowForceDelete] = useState(false);
   const [associatedResourceLeft, setAssociatedResourceLeft] = useState(false);
 
@@ -112,6 +116,19 @@ export const ModulesDeleteBox = ({
         navigate,
       );
 
+      if (isCommunity) {
+        const communityResources = await getCommunityResources(
+          chosenModuleIndex,
+          selectedModules,
+          kymaResource,
+          moduleTemplates,
+          post,
+        );
+        console.log('TEST-communityResources:', communityResources.flat());
+        // TODO: Get Community Urls.
+        // setCommunityUrls(communityUrl);
+      }
+
       setResourceCounts(counts);
       setForceDeleteUrls(urls);
       setCrUrls(Array.isArray(crUrl) ? crUrl : [crUrl]);
@@ -246,9 +263,7 @@ export const ModulesDeleteBox = ({
               modules: selectedModules,
             },
           });
-        }
-        handleModuleUninstall();
-        if (!isCommunity) {
+          handleModuleUninstall();
           setInitialUnchangedResource(cloneDeep(kymaResourceState));
         }
 
diff --git a/src/components/KymaModules/deleteModulesHelpers.tsx b/src/components/KymaModules/deleteModulesHelpers.tsx
index 425bedcf83..110f180cc8 100644
--- a/src/components/KymaModules/deleteModulesHelpers.tsx
+++ b/src/components/KymaModules/deleteModulesHelpers.tsx
@@ -4,6 +4,8 @@ import {
   findModuleTemplate,
   ModuleTemplateListType,
 } from './support';
+import jsyaml from 'js-yaml';
+import { PostFn } from 'shared/hooks/BackendAPI/usePost';
 
 interface Counts {
   [key: string]: number;
@@ -72,6 +74,41 @@ export const getCRResource = (
   return resource ? [resource] : [];
 };
 
+export const getCommunityResources = async (
+  chosenModuleIndex: number | null,
+  selectedModules: any,
+  kymaResource: any,
+  moduleTemplates: ModuleTemplateListType,
+  post: PostFn,
+) => {
+  if (chosenModuleIndex == null) {
+    return [];
+  }
+  const selectedModule = selectedModules[chosenModuleIndex];
+  const moduleChannel = selectedModule?.channel || kymaResource?.spec?.channel;
+  const moduleVersion =
+    selectedModule?.version ||
+    findModuleStatus(kymaResource, selectedModule?.name)?.version;
+
+  const module = findModuleTemplate(
+    moduleTemplates,
+    selectedModule?.name,
+    moduleChannel,
+    moduleVersion,
+  );
+
+  const resources = (module?.spec as any)?.resources;
+  if (resources?.length) {
+    const test = resources.map(async (res: any) => {
+      if (res.link) {
+        return await postForCommunityResources(post, res.link);
+      }
+    });
+    return await Promise.all(test);
+  }
+  return [];
+};
+
 export const handleItemClick = async (
   kind: string,
   group: string,
@@ -235,3 +272,27 @@ export const deleteCrResources = async (
     return 'Error while deleting Custom Resource';
   }
 };
+
+export default async function postForCommunityResources(
+  post: PostFn,
+  link: string,
+) {
+  if (!link) {
+    console.error('No link provided for community resource');
+    return false;
+  }
+
+  try {
+    const response = await post('/community/resource', { link });
+
+    if (response && typeof response === 'string') {
+      return jsyaml.loadAll(response);
+    }
+
+    console.error('Invalid response format:', response);
+    return false;
+  } catch (error) {
+    console.error('Error fetching data:', error);
+    return false;
+  }
+}
diff --git a/src/components/KymaModules/providers/CommunityModuleProvider.js b/src/components/KymaModules/providers/CommunityModuleProvider.js
index e83a86c7b1..249fabd987 100644
--- a/src/components/KymaModules/providers/CommunityModuleProvider.js
+++ b/src/components/KymaModules/providers/CommunityModuleProvider.js
@@ -6,7 +6,6 @@ import { createPortal } from 'react-dom';
 import { ModulesDeleteBox } from '../components/ModulesDeleteBox';
 import { checkSelectedModule } from '../support';
 import { Button } from '@ui5/webcomponents-react';
-import { useNotification } from 'shared/contexts/NotificationContext';
 
 export const CommunityModuleContext = createContext({
   setOpenedModuleIndex: () => {},
@@ -28,7 +27,6 @@ export function CommunityModuleContextProvider({
   const [openedModuleIndex, setOpenedModuleIndex] = useState();
   const [detailsOpen, setDetailsOpen] = useState(false);
 
-  const notification = useNotification();
   const { moduleTemplatesLoading, communityModuleTemplates } = useContext(
     ModuleTemplatesContext,
   );
@@ -37,12 +35,6 @@ export function CommunityModuleContextProvider({
     loading: communityModulesLoading,
   } = useGetInstalledModules(communityModuleTemplates, moduleTemplatesLoading);
 
-  const handleModuleUninstall = () =>
-    // TODO: Add logic to handle module uninstallation if it's needed for community case.
-    notification.notifySuccess({
-      content: t('kyma-modules.module-uninstall'),
-    });
-
   useEffect(() => {
     if (layoutState?.layout) {
       setDetailsOpen(layoutState?.layout !== 'OneColumn');
@@ -53,7 +45,7 @@ export function CommunityModuleContextProvider({
     const index =
       moduleIndex ??
       // Find index of the selected module after a refresh or other case after which we have undefined.
-      activeModules.findIndex(module =>
+      activeModules?.findIndex(module =>
         checkSelectedModule(module, layoutState),
       );
     return index > -1 ? index : undefined;
@@ -80,7 +72,7 @@ export function CommunityModuleContextProvider({
       }}
     >
       {createPortal(
-        getOpenedModuleIndex(openedModuleIndex, installedCommunityModules) !=
+        getOpenedModuleIndex(openedModuleIndex, installedCommunityModules) !==
           undefined &&
           !communityModulesLoading &&
           !moduleTemplatesLoading &&
@@ -95,7 +87,6 @@ export function CommunityModuleContextProvider({
               moduleTemplates={communityModuleTemplates}
               detailsOpen={detailsOpen}
               setChosenModuleIndex={setOpenedModuleIndex}
-              handleModuleUninstall={handleModuleUninstall}
               setLayoutColumn={setLayoutColumn}
               isCommunity={true}
             />
diff --git a/src/components/KymaModules/providers/KymaModuleProvider.js b/src/components/KymaModules/providers/KymaModuleProvider.js
index f687877e45..5080a36152 100644
--- a/src/components/KymaModules/providers/KymaModuleProvider.js
+++ b/src/components/KymaModules/providers/KymaModuleProvider.js
@@ -85,7 +85,7 @@ export function KymaModuleContextProvider({
     const index =
       moduleIndex ??
       // Find index of the selected module after a refresh or other case after which we have undefined.
-      activeModules.findIndex(module =>
+      activeModules?.findIndex(module =>
         checkSelectedModule(module, layoutState),
       );
     return index > -1 ? index : undefined;
@@ -118,7 +118,7 @@ export function KymaModuleContextProvider({
       }}
     >
       {createPortal(
-        getOpenedModuleIndex(openedModuleIndex, activeKymaModules) !=
+        getOpenedModuleIndex(openedModuleIndex, activeKymaModules) !==
           undefined &&
           !kymaResourceLoading &&
           !moduleTemplatesLoading &&

From 6bfe2e9b82a98e85befc090eac3535d365d5c4dc Mon Sep 17 00:00:00 2001
From: Pietocha <konrad.pietocha@sap.com>
Date: Tue, 17 Jun 2025 11:40:24 +0200
Subject: [PATCH 07/16] Add creating urls and delting resources

---
 .../KymaModules/components/ModulesDeleteBox.tsx  | 15 +++++++++++----
 .../KymaModules/deleteModulesHelpers.tsx         | 16 +++++++++-------
 src/shared/components/GenericList/GenericList.js |  2 +-
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/src/components/KymaModules/components/ModulesDeleteBox.tsx b/src/components/KymaModules/components/ModulesDeleteBox.tsx
index 08b38b78dd..555a217ccb 100644
--- a/src/components/KymaModules/components/ModulesDeleteBox.tsx
+++ b/src/components/KymaModules/components/ModulesDeleteBox.tsx
@@ -24,7 +24,11 @@ import { useUrl } from 'hooks/useUrl';
 import pluralize from 'pluralize';
 import { useDelete } from 'shared/hooks/BackendAPI/useMutation';
 import { cloneDeep } from 'lodash';
-import { KymaResourceType, ModuleTemplateListType } from '../support';
+import {
+  getResourcePath,
+  KymaResourceType,
+  ModuleTemplateListType,
+} from '../support';
 import { SetterOrUpdater } from 'recoil';
 import { ColumnLayoutState } from 'state/columnLayoutAtom';
 import { usePost } from 'shared/hooks/BackendAPI/usePost';
@@ -124,9 +128,9 @@ export const ModulesDeleteBox = ({
           moduleTemplates,
           post,
         );
-        console.log('TEST-communityResources:', communityResources.flat());
-        // TODO: Get Community Urls.
-        // setCommunityUrls(communityUrl);
+
+        const communityUrl = communityResources.map(cr => getResourcePath(cr));
+        setCommunityUrls(communityUrl);
       }
 
       setResourceCounts(counts);
@@ -278,6 +282,9 @@ export const ModulesDeleteBox = ({
         if (allowForceDelete && forceDeleteUrls.length > 0) {
           deleteCrResources(deleteResourceMutation, crUrls);
         }
+        if (isCommunity && allowForceDelete && communityUrls?.length > 0) {
+          deleteCrResources(deleteResourceMutation, communityUrls);
+        }
       }}
     />
   );
diff --git a/src/components/KymaModules/deleteModulesHelpers.tsx b/src/components/KymaModules/deleteModulesHelpers.tsx
index 110f180cc8..2de173eef8 100644
--- a/src/components/KymaModules/deleteModulesHelpers.tsx
+++ b/src/components/KymaModules/deleteModulesHelpers.tsx
@@ -99,12 +99,14 @@ export const getCommunityResources = async (
 
   const resources = (module?.spec as any)?.resources;
   if (resources?.length) {
-    const test = resources.map(async (res: any) => {
-      if (res.link) {
-        return await postForCommunityResources(post, res.link);
-      }
-    });
-    return await Promise.all(test);
+    const yamlRes = await Promise.all(
+      resources.map(async (res: any) => {
+        if (res.link) {
+          return await postForCommunityResources(post, res.link);
+        }
+      }),
+    );
+    return yamlRes.flat();
   }
   return [];
 };
@@ -289,7 +291,7 @@ export default async function postForCommunityResources(
       return jsyaml.loadAll(response);
     }
 
-    console.error('Invalid response format:', response);
+    console.error('Empty or invalid response format:', response);
     return false;
   } catch (error) {
     console.error('Error fetching data:', error);
diff --git a/src/shared/components/GenericList/GenericList.js b/src/shared/components/GenericList/GenericList.js
index b257e31a5d..bfb54da59a 100644
--- a/src/shared/components/GenericList/GenericList.js
+++ b/src/shared/components/GenericList/GenericList.js
@@ -297,7 +297,7 @@ export const GenericList = ({
             isModuleSelected
           }
           index={index}
-          key={e.metadata?.uid || e.name || e.metadata?.name || index}
+          key={`${e.metadata?.uid || e.name || e.metadata?.name}-${index}`}
           entry={e}
           actions={actions}
           rowRenderer={rowRenderer}

From 93e1aa37b889d8b1a99464d1dfbce6b788e2ebcf Mon Sep 17 00:00:00 2001
From: Pietocha <konrad.pietocha@sap.com>
Date: Tue, 17 Jun 2025 12:05:48 +0200
Subject: [PATCH 08/16] Check link

---
 backend/companion/communityRouter.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/backend/companion/communityRouter.js b/backend/companion/communityRouter.js
index 007c812297..1e6c1dbdac 100644
--- a/backend/companion/communityRouter.js
+++ b/backend/companion/communityRouter.js
@@ -7,6 +7,13 @@ router.use(cors());
 
 async function handleGetCommunityResource(req, res) {
   const { link } = JSON.parse(req.body.toString());
+
+  // Only allow URLs that start with https.
+  const allowedDomain = /^https:\/\//;
+  if (!allowedDomain.test(link)) {
+    return res.status(400).json('Invalid or untrusted link provided.');
+  }
+
   try {
     const response = await fetch(link);
     const data = await response.text();

From 4159694747e3140d38e80f96e5f662be19d2717d Mon Sep 17 00:00:00 2001
From: Pietocha <konrad.pietocha@sap.com>
Date: Tue, 17 Jun 2025 14:09:51 +0200
Subject: [PATCH 09/16] Move community enpoint to modules

---
 backend/index.js                                      |  6 +++---
 backend/{companion => modules}/communityRouter.js     |  9 +++++----
 .../KymaModules/components/ModulesDeleteBox.tsx       |  2 +-
 src/components/KymaModules/deleteModulesHelpers.tsx   | 11 ++++-------
 4 files changed, 13 insertions(+), 15 deletions(-)
 rename backend/{companion => modules}/communityRouter.js (74%)

diff --git a/backend/index.js b/backend/index.js
index b98328bf1e..f1984b8394 100644
--- a/backend/index.js
+++ b/backend/index.js
@@ -3,7 +3,7 @@ import { handleTracking } from './tracking.js';
 import jsyaml from 'js-yaml';
 import { proxyHandler, proxyRateLimiter } from './proxy.js';
 import companionRouter from './companion/companionRouter';
-import communityRouter from './companion/communityRouter';
+import communityRouter from './modules/communityRouter';
 //import { requestLogger } from './utils/other'; //uncomment this to log the outgoing traffic
 
 const express = require('express');
@@ -95,14 +95,14 @@ if (isDocker) {
   // yup, order matters here
   serveMonaco(app);
   app.use('/backend/ai-chat', companionRouter);
-  app.use('/backend/community', communityRouter);
+  app.use('/backend/modules', communityRouter);
   app.use('/backend', handleRequest);
   serveStaticApp(app, '/', '/core-ui');
 } else {
   // Running in prod mode
   handleTracking(app);
   app.use('/backend/ai-chat', companionRouter);
-  app.use('/backend/community', communityRouter);
+  app.use('/backend/modules', communityRouter);
   app.use('/backend', handleRequest);
 }
 
diff --git a/backend/companion/communityRouter.js b/backend/modules/communityRouter.js
similarity index 74%
rename from backend/companion/communityRouter.js
rename to backend/modules/communityRouter.js
index 1e6c1dbdac..ce61b30ca6 100644
--- a/backend/companion/communityRouter.js
+++ b/backend/modules/communityRouter.js
@@ -1,5 +1,6 @@
 import express from 'express';
 import cors from 'cors';
+import jsyaml from 'js-yaml';
 
 const router = express.Router();
 router.use(express.json());
@@ -9,20 +10,20 @@ async function handleGetCommunityResource(req, res) {
   const { link } = JSON.parse(req.body.toString());
 
   // Only allow URLs that start with https.
-  const allowedDomain = /^https:\/\//;
-  if (!allowedDomain.test(link)) {
+  const allowedLink = /^https:\/\//;
+  if (!allowedLink.test(link)) {
     return res.status(400).json('Invalid or untrusted link provided.');
   }
 
   try {
     const response = await fetch(link);
     const data = await response.text();
-    res.json(data);
+    res.json(jsyaml.loadAll(data));
   } catch (error) {
     res.status(500).json(`Failed to fetch community resource. ${error}`);
   }
 }
 
-router.post('/resource', handleGetCommunityResource);
+router.post('/community-resource', handleGetCommunityResource);
 
 export default router;
diff --git a/src/components/KymaModules/components/ModulesDeleteBox.tsx b/src/components/KymaModules/components/ModulesDeleteBox.tsx
index 555a217ccb..6001f31643 100644
--- a/src/components/KymaModules/components/ModulesDeleteBox.tsx
+++ b/src/components/KymaModules/components/ModulesDeleteBox.tsx
@@ -128,8 +128,8 @@ export const ModulesDeleteBox = ({
           moduleTemplates,
           post,
         );
-
         const communityUrl = communityResources.map(cr => getResourcePath(cr));
+        console.log('TEST-COMMUNITY-URL', communityUrl);
         setCommunityUrls(communityUrl);
       }
 
diff --git a/src/components/KymaModules/deleteModulesHelpers.tsx b/src/components/KymaModules/deleteModulesHelpers.tsx
index 2de173eef8..295b318b3f 100644
--- a/src/components/KymaModules/deleteModulesHelpers.tsx
+++ b/src/components/KymaModules/deleteModulesHelpers.tsx
@@ -4,7 +4,6 @@ import {
   findModuleTemplate,
   ModuleTemplateListType,
 } from './support';
-import jsyaml from 'js-yaml';
 import { PostFn } from 'shared/hooks/BackendAPI/usePost';
 
 interface Counts {
@@ -285,13 +284,11 @@ export default async function postForCommunityResources(
   }
 
   try {
-    const response = await post('/community/resource', { link });
-
-    if (response && typeof response === 'string') {
-      return jsyaml.loadAll(response);
+    const response = await post('/modules/community-resource', { link });
+    if (response?.length) {
+      return response;
     }
-
-    console.error('Empty or invalid response format:', response);
+    console.error('Empty or invalid response:', response);
     return false;
   } catch (error) {
     console.error('Error fetching data:', error);

From 0e8c8eb142ff6a2e20fdbbf8b5b228a31610f688 Mon Sep 17 00:00:00 2001
From: Pietocha <konrad.pietocha@sap.com>
Date: Tue, 17 Jun 2025 20:47:09 +0200
Subject: [PATCH 10/16] Make separate functions for delete

---
 .../components/ModulesDeleteBox.tsx           | 93 ++++++++++++-------
 1 file changed, 59 insertions(+), 34 deletions(-)

diff --git a/src/components/KymaModules/components/ModulesDeleteBox.tsx b/src/components/KymaModules/components/ModulesDeleteBox.tsx
index 6001f31643..c5703fb041 100644
--- a/src/components/KymaModules/components/ModulesDeleteBox.tsx
+++ b/src/components/KymaModules/components/ModulesDeleteBox.tsx
@@ -75,7 +75,9 @@ export const ModulesDeleteBox = ({
   const [resourceCounts, setResourceCounts] = useState<Record<string, any>>({});
   const [forceDeleteUrls, setForceDeleteUrls] = useState<string[]>([]);
   const [crUrls, setCrUrls] = useState<string[]>([]);
-  const [communityUrls, setCommunityUrls] = useState<string[]>([]);
+  const [communityResourcesUrls, setCommunityResourcesUrls] = useState<
+    string[]
+  >([]);
   const [allowForceDelete, setAllowForceDelete] = useState(false);
   const [associatedResourceLeft, setAssociatedResourceLeft] = useState(false);
 
@@ -128,9 +130,8 @@ export const ModulesDeleteBox = ({
           moduleTemplates,
           post,
         );
-        const communityUrl = communityResources.map(cr => getResourcePath(cr));
-        console.log('TEST-COMMUNITY-URL', communityUrl);
-        setCommunityUrls(communityUrl);
+        const communityUrls = communityResources.map(cr => getResourcePath(cr));
+        setCommunityResourcesUrls(communityUrls);
       }
 
       setResourceCounts(counts);
@@ -153,6 +154,57 @@ export const ModulesDeleteBox = ({
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [resourceCounts, associatedResources]);
 
+  const deleteAllResources = () => {
+    if (allowForceDelete && forceDeleteUrls.length > 0) {
+      deleteAssociatedResources(deleteResourceMutation, forceDeleteUrls);
+    }
+    if (chosenModuleIndex != null) {
+      selectedModules.splice(chosenModuleIndex, 1);
+    }
+    if (!isCommunity && kymaResource) {
+      setKymaResourceState({
+        ...kymaResource,
+        spec: {
+          ...kymaResource.spec,
+          modules: selectedModules,
+        },
+      });
+      handleModuleUninstall();
+      setInitialUnchangedResource(cloneDeep(kymaResourceState));
+    }
+
+    if (detailsOpen) {
+      setLayoutColumn({
+        layout: 'OneColumn',
+        startColumn: null,
+        midColumn: null,
+        endColumn: null,
+      });
+    }
+    if (allowForceDelete && forceDeleteUrls.length > 0) {
+      deleteCrResources(deleteResourceMutation, crUrls);
+    }
+  };
+
+  const deleteCommunityResources = async () => {
+    if (allowForceDelete && forceDeleteUrls.length > 0) {
+      // Delete associated resources.
+      await deleteAssociatedResources(deleteResourceMutation, forceDeleteUrls);
+      // Delete spec.data.
+      await deleteCrResources(deleteResourceMutation, crUrls);
+      // Delete community resources.
+      deleteCrResources(deleteResourceMutation, communityResourcesUrls);
+    }
+    if (detailsOpen) {
+      setLayoutColumn({
+        layout: 'OneColumn',
+        startColumn: null,
+        midColumn: null,
+        endColumn: null,
+      });
+    }
+  };
+
   return (
     <DeleteMessageBox
       disableDeleteButton={associatedResourceLeft ? !allowForceDelete : false}
@@ -253,37 +305,10 @@ export const ModulesDeleteBox = ({
           : ''
       }
       deleteFn={() => {
-        if (allowForceDelete && forceDeleteUrls.length > 0) {
-          deleteAssociatedResources(deleteResourceMutation, forceDeleteUrls);
-        }
-        if (chosenModuleIndex != null) {
-          selectedModules.splice(chosenModuleIndex, 1);
-        }
         if (!isCommunity && kymaResource) {
-          setKymaResourceState({
-            ...kymaResource,
-            spec: {
-              ...kymaResource.spec,
-              modules: selectedModules,
-            },
-          });
-          handleModuleUninstall();
-          setInitialUnchangedResource(cloneDeep(kymaResourceState));
-        }
-
-        if (detailsOpen) {
-          setLayoutColumn({
-            layout: 'OneColumn',
-            startColumn: null,
-            midColumn: null,
-            endColumn: null,
-          });
-        }
-        if (allowForceDelete && forceDeleteUrls.length > 0) {
-          deleteCrResources(deleteResourceMutation, crUrls);
-        }
-        if (isCommunity && allowForceDelete && communityUrls?.length > 0) {
-          deleteCrResources(deleteResourceMutation, communityUrls);
+          deleteAllResources();
+        } else if (isCommunity) {
+          deleteCommunityResources();
         }
       }}
     />

From bb7cc822b006117e7038598a9ec3cc4708b54e76 Mon Sep 17 00:00:00 2001
From: Pietocha <konrad.pietocha@sap.com>
Date: Wed, 18 Jun 2025 15:10:30 +0200
Subject: [PATCH 11/16] Check if url is safe

---
 backend/modules/communityRouter.js            | 21 ++++++++---
 .../components/ModulesDeleteBox.tsx           | 36 ++++++++++---------
 .../KymaModules/deleteModulesHelpers.tsx      | 36 ++++++++++++++++---
 3 files changed, 68 insertions(+), 25 deletions(-)

diff --git a/backend/modules/communityRouter.js b/backend/modules/communityRouter.js
index ce61b30ca6..5ed294eaf3 100644
--- a/backend/modules/communityRouter.js
+++ b/backend/modules/communityRouter.js
@@ -9,10 +9,23 @@ router.use(cors());
 async function handleGetCommunityResource(req, res) {
   const { link } = JSON.parse(req.body.toString());
 
-  // Only allow URLs that start with https.
-  const allowedLink = /^https:\/\//;
-  if (!allowedLink.test(link)) {
-    return res.status(400).json('Invalid or untrusted link provided.');
+  // Validate that link is a string and a valid HTTPS URL, and restrict to allowed domains.
+  if (typeof link !== 'string') {
+    return res.status(400).json('Link must be a string.');
+  }
+
+  try {
+    const url = new URL(link);
+    // Only allow HTTPS protocol and restrict to specific trusted domains.
+    const allowedDomains = ['github.com'];
+    if (
+      url.protocol !== 'https:' ||
+      !allowedDomains.some(domain => url.hostname.endsWith(domain))
+    ) {
+      return res.status(400).json('Invalid or untrusted link provided.');
+    }
+  } catch (e) {
+    return res.status(400).json('Invalid URL format.');
   }
 
   try {
diff --git a/src/components/KymaModules/components/ModulesDeleteBox.tsx b/src/components/KymaModules/components/ModulesDeleteBox.tsx
index c5703fb041..3302932f85 100644
--- a/src/components/KymaModules/components/ModulesDeleteBox.tsx
+++ b/src/components/KymaModules/components/ModulesDeleteBox.tsx
@@ -14,6 +14,7 @@ import {
   fetchResourceCounts,
   generateAssociatedResourcesUrls,
   getAssociatedResources,
+  getCommunityResourceUrls,
   getCommunityResources,
   getCRResource,
   handleItemClick,
@@ -24,11 +25,7 @@ import { useUrl } from 'hooks/useUrl';
 import pluralize from 'pluralize';
 import { useDelete } from 'shared/hooks/BackendAPI/useMutation';
 import { cloneDeep } from 'lodash';
-import {
-  getResourcePath,
-  KymaResourceType,
-  ModuleTemplateListType,
-} from '../support';
+import { KymaResourceType, ModuleTemplateListType } from '../support';
 import { SetterOrUpdater } from 'recoil';
 import { ColumnLayoutState } from 'state/columnLayoutAtom';
 import { usePost } from 'shared/hooks/BackendAPI/usePost';
@@ -111,16 +108,19 @@ export const ModulesDeleteBox = ({
         selectedModules,
         kymaResource,
         moduleTemplates,
+        isCommunity,
       );
 
-      const crUrl = await generateAssociatedResourcesUrls(
-        crUResources,
-        fetchFn,
-        clusterUrl,
-        getScope,
-        namespaceUrl,
-        navigate,
-      );
+      const crUrl = isCommunity
+        ? getCommunityResourceUrls(crUResources)
+        : await generateAssociatedResourcesUrls(
+            crUResources,
+            fetchFn,
+            clusterUrl,
+            getScope,
+            namespaceUrl,
+            navigate,
+          );
 
       if (isCommunity) {
         const communityResources = await getCommunityResources(
@@ -130,7 +130,7 @@ export const ModulesDeleteBox = ({
           moduleTemplates,
           post,
         );
-        const communityUrls = communityResources.map(cr => getResourcePath(cr));
+        const communityUrls = getCommunityResourceUrls(communityResources);
         setCommunityResourcesUrls(communityUrls);
       }
 
@@ -187,13 +187,17 @@ export const ModulesDeleteBox = ({
   };
 
   const deleteCommunityResources = async () => {
-    if (allowForceDelete && forceDeleteUrls.length > 0) {
+    if (allowForceDelete && forceDeleteUrls.length) {
       // Delete associated resources.
       await deleteAssociatedResources(deleteResourceMutation, forceDeleteUrls);
+    }
+    if (allowForceDelete && crUrls?.length) {
       // Delete spec.data.
       await deleteCrResources(deleteResourceMutation, crUrls);
+    }
+    if (allowForceDelete && communityResourcesUrls?.length) {
       // Delete community resources.
-      deleteCrResources(deleteResourceMutation, communityResourcesUrls);
+      await deleteCrResources(deleteResourceMutation, communityResourcesUrls);
     }
     if (detailsOpen) {
       setLayoutColumn({
diff --git a/src/components/KymaModules/deleteModulesHelpers.tsx b/src/components/KymaModules/deleteModulesHelpers.tsx
index 295b318b3f..55eaff1af1 100644
--- a/src/components/KymaModules/deleteModulesHelpers.tsx
+++ b/src/components/KymaModules/deleteModulesHelpers.tsx
@@ -45,6 +45,7 @@ export const getCRResource = (
   selectedModules: any,
   kymaResource: any,
   moduleTemplates: ModuleTemplateListType,
+  isCommunity: boolean = false,
 ) => {
   if (chosenModuleIndex == null) {
     return [];
@@ -64,11 +65,13 @@ export const getCRResource = (
 
   let resource: Resource | null = null;
   if (module?.spec?.data) {
-    resource = {
-      group: module.spec.data.apiVersion.split('/')[0],
-      version: module.spec.data.apiVersion.split('/')[1],
-      kind: module.spec.data.kind,
-    };
+    resource = isCommunity
+      ? module?.spec?.data
+      : {
+          group: module.spec.data.apiVersion.split('/')[0],
+          version: module.spec.data.apiVersion.split('/')[1],
+          kind: module.spec.data.kind,
+        };
   }
   return resource ? [resource] : [];
 };
@@ -295,3 +298,26 @@ export default async function postForCommunityResources(
     return false;
   }
 }
+
+export const getCommunityResourceUrls = (resources: any) => {
+  if (!resources?.length) return [];
+
+  return resources.map((resource: any) => {
+    if (!resource) return '';
+
+    const apiVersion =
+      resource?.apiVersion || `${resource?.group}/${resource?.version}`;
+    const resourceName = resource?.metadata?.name || resource?.name;
+    const resourceNamespace =
+      resource?.metadata?.namespace || resource?.namespace;
+    const api = apiVersion === 'v1' ? 'api' : 'apis';
+
+    return resourceNamespace
+      ? `/${api}/${apiVersion}/namespaces/${resourceNamespace}/${pluralize(
+          resource.kind,
+        ).toLowerCase()}/${resourceName}`
+      : `/${api}/${apiVersion}/${pluralize(
+          resource.kind || '',
+        ).toLowerCase()}/${resourceName}`;
+  });
+};

From 90fa74ced7e929886626527e3f36dbc71be0233b Mon Sep 17 00:00:00 2001
From: Pietocha <konrad.pietocha@sap.com>
Date: Mon, 23 Jun 2025 08:25:47 +0200
Subject: [PATCH 12/16] Show catched error

---
 backend/modules/communityRouter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/modules/communityRouter.js b/backend/modules/communityRouter.js
index 5ed294eaf3..8a19b39354 100644
--- a/backend/modules/communityRouter.js
+++ b/backend/modules/communityRouter.js
@@ -25,7 +25,7 @@ async function handleGetCommunityResource(req, res) {
       return res.status(400).json('Invalid or untrusted link provided.');
     }
   } catch (e) {
-    return res.status(400).json('Invalid URL format.');
+    return res.status(400).json('Invalid URL format.', e);
   }
 
   try {

From e1d79360af0874fa137e4b33efbff17f5d5e6f0c Mon Sep 17 00:00:00 2001
From: Pietocha <konrad.pietocha@sap.com>
Date: Mon, 23 Jun 2025 08:38:55 +0200
Subject: [PATCH 13/16] Code correction added

---
 backend/modules/communityRouter.js | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/backend/modules/communityRouter.js b/backend/modules/communityRouter.js
index 8a19b39354..04183946b7 100644
--- a/backend/modules/communityRouter.js
+++ b/backend/modules/communityRouter.js
@@ -23,15 +23,11 @@ async function handleGetCommunityResource(req, res) {
       !allowedDomains.some(domain => url.hostname.endsWith(domain))
     ) {
       return res.status(400).json('Invalid or untrusted link provided.');
+    } else {
+      const response = await fetch(link);
+      const data = await response.text();
+      res.json(jsyaml.loadAll(data));
     }
-  } catch (e) {
-    return res.status(400).json('Invalid URL format.', e);
-  }
-
-  try {
-    const response = await fetch(link);
-    const data = await response.text();
-    res.json(jsyaml.loadAll(data));
   } catch (error) {
     res.status(500).json(`Failed to fetch community resource. ${error}`);
   }

From 48d30db2a5790b7a9b13e0ee0f13c6a7ca8d3670 Mon Sep 17 00:00:00 2001
From: Pietocha <konrad.pietocha@sap.com>
Date: Mon, 23 Jun 2025 12:14:57 +0200
Subject: [PATCH 14/16] Test deleting

---
 .../KymaModules/components/ModulesDeleteBox.tsx          | 9 ++++++++-
 .../KymaModules/providers/CommunityModuleProvider.js     | 3 +++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/components/KymaModules/components/ModulesDeleteBox.tsx b/src/components/KymaModules/components/ModulesDeleteBox.tsx
index 3302932f85..50ca18c550 100644
--- a/src/components/KymaModules/components/ModulesDeleteBox.tsx
+++ b/src/components/KymaModules/components/ModulesDeleteBox.tsx
@@ -35,7 +35,7 @@ type ModulesListDeleteBoxProps = {
   moduleTemplates: ModuleTemplateListType;
   selectedModules: { name: string }[];
   chosenModuleIndex: number | null;
-  kymaResource?: KymaResourceType;
+  kymaResource: KymaResourceType;
   kymaResourceState?: KymaResourceType;
   detailsOpen: boolean;
   isCommunity?: boolean;
@@ -187,6 +187,13 @@ export const ModulesDeleteBox = ({
   };
 
   const deleteCommunityResources = async () => {
+    // TODO: Something wrong with these URLs? After deleting the module is still visible in the list.
+    console.log(
+      'TEST-Delete-URLs:',
+      forceDeleteUrls,
+      crUrls,
+      communityResourcesUrls,
+    );
     if (allowForceDelete && forceDeleteUrls.length) {
       // Delete associated resources.
       await deleteAssociatedResources(deleteResourceMutation, forceDeleteUrls);
diff --git a/src/components/KymaModules/providers/CommunityModuleProvider.js b/src/components/KymaModules/providers/CommunityModuleProvider.js
index 249fabd987..c2033c4ca6 100644
--- a/src/components/KymaModules/providers/CommunityModuleProvider.js
+++ b/src/components/KymaModules/providers/CommunityModuleProvider.js
@@ -6,6 +6,7 @@ import { createPortal } from 'react-dom';
 import { ModulesDeleteBox } from '../components/ModulesDeleteBox';
 import { checkSelectedModule } from '../support';
 import { Button } from '@ui5/webcomponents-react';
+import { KymaModuleContext } from './KymaModuleProvider';
 
 export const CommunityModuleContext = createContext({
   setOpenedModuleIndex: () => {},
@@ -27,6 +28,7 @@ export function CommunityModuleContextProvider({
   const [openedModuleIndex, setOpenedModuleIndex] = useState();
   const [detailsOpen, setDetailsOpen] = useState(false);
 
+  const { kymaResource } = useContext(KymaModuleContext);
   const { moduleTemplatesLoading, communityModuleTemplates } = useContext(
     ModuleTemplatesContext,
   );
@@ -78,6 +80,7 @@ export function CommunityModuleContextProvider({
           !moduleTemplatesLoading &&
           showDeleteDialog && (
             <ModulesDeleteBox
+              kymaResource={kymaResource}
               DeleteMessageBox={DeleteMessageBox}
               selectedModules={installedCommunityModules}
               chosenModuleIndex={getOpenedModuleIndex(

From 2c1736d0e271dcf593758332b1d2fcdf7cd5d944 Mon Sep 17 00:00:00 2001
From: Pietocha <konrad.pietocha@sap.com>
Date: Mon, 23 Jun 2025 13:02:50 +0200
Subject: [PATCH 15/16] Remove unusuful import from test

---
 .../integration/tests/accessibility/test-acc-extensions.spec.js  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/integration/tests/accessibility/test-acc-extensions.spec.js b/tests/integration/tests/accessibility/test-acc-extensions.spec.js
index f5670bdbc8..5d6c5fe3fe 100644
--- a/tests/integration/tests/accessibility/test-acc-extensions.spec.js
+++ b/tests/integration/tests/accessibility/test-acc-extensions.spec.js
@@ -1,6 +1,5 @@
 /// <reference types="cypress" />
 
-import { search } from 'core-js/fn/symbol';
 import jsyaml from 'js-yaml';
 
 context('Accessibility test Extensions view', () => {

From e58e7e9800331bdf79bca33529a01e13334e6c7f Mon Sep 17 00:00:00 2001
From: Pietocha <konrad.pietocha@sap.com>
Date: Tue, 24 Jun 2025 20:55:37 +0200
Subject: [PATCH 16/16] Remove console.log

---
 src/components/KymaModules/components/ModulesDeleteBox.tsx | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/components/KymaModules/components/ModulesDeleteBox.tsx b/src/components/KymaModules/components/ModulesDeleteBox.tsx
index 50ca18c550..f40241d7fd 100644
--- a/src/components/KymaModules/components/ModulesDeleteBox.tsx
+++ b/src/components/KymaModules/components/ModulesDeleteBox.tsx
@@ -187,13 +187,6 @@ export const ModulesDeleteBox = ({
   };
 
   const deleteCommunityResources = async () => {
-    // TODO: Something wrong with these URLs? After deleting the module is still visible in the list.
-    console.log(
-      'TEST-Delete-URLs:',
-      forceDeleteUrls,
-      crUrls,
-      communityResourcesUrls,
-    );
     if (allowForceDelete && forceDeleteUrls.length) {
       // Delete associated resources.
       await deleteAssociatedResources(deleteResourceMutation, forceDeleteUrls);