fix: Proper data for Joule suggestions (#3934)

KonradPietocha · web-flow · commit ff55adb14659 · 2025-05-27T11:36:26.000+02:00
* Raw resource type name added to column layout state

* Add and pass raw resource type name property

* Clear and corrections

* Lint correction
diff --git a/src/components/App/ExtensibilityRoutes.js b/src/components/App/ExtensibilityRoutes.js
@@ -41,6 +41,7 @@ const ColumnWrapper = ({ resourceType, extension, urlPath }) => {
       layoutState?.showCreate?.resource ||
       layoutState?.showEdit?.resource ||
       null,
+    rawResourceTypeName: extension?.general?.resource?.kind,
   });
 
   const overrides = { resourceType: urlPath };
diff --git a/src/components/BusolaExtensions/BusolaExtensionCreate.js b/src/components/BusolaExtensions/BusolaExtensionCreate.js
@@ -64,11 +64,13 @@ export default function BusolaExtensionCreate({
               startColumn: {
                 resourceName: null,
                 resourceType: 'Extensions',
+                rawResourceTypeName: 'ConfigMap',
                 namespaceId: 'kube-public',
               },
               midColumn: {
-                resourceName: crd.metadata.name,
+                resourceName: crd?.metadata?.name,
                 resourceType: 'Extensions',
+                rawResourceTypeName: 'ConfigMap',
                 namespaceId: 'kube-public',
               },
               endColumn: null,
diff --git a/src/components/Clusters/views/ClusterOverview/ClusterOverview.js b/src/components/Clusters/views/ClusterOverview/ClusterOverview.js
@@ -46,6 +46,7 @@ export function ClusterOverview() {
       layout: 'OneColumn',
       startColumn: {
         resourceType: 'Cluster',
+        rawResourceTypeName: 'Cluster',
       },
       midColumn: null,
       endColumn: null,
diff --git a/src/components/KymaCompanion/components/Chat/CodePanel/CodePanel.tsx b/src/components/KymaCompanion/components/Chat/CodePanel/CodePanel.tsx
@@ -130,6 +130,7 @@ export default function CodePanel({
         type === 'Update'
           ? {
               resourceType: resType,
+              rawResourceTypeName: resType,
               namespaceId: namespace,
               resourceName: resName,
               apiGroup: null,
diff --git a/src/components/KymaCompanion/hooks/usePromptSuggestions.ts b/src/components/KymaCompanion/hooks/usePromptSuggestions.ts
@@ -22,7 +22,9 @@ const getResourceFromColumnnLayout = (
     columnLayout?.startColumn;
   return {
     namespace: column?.namespaceId ?? '',
-    resourceType: prettifyNameSingular(column?.resourceType ?? ''),
+    resourceType:
+      prettifyNameSingular(column?.rawResourceTypeName ?? '') ||
+      prettifyNameSingular(column?.resourceType ?? ''),
     groupVersion: column?.apiGroup
       ? `${column?.apiGroup}/${column?.apiVersion}`
       : column?.apiVersion ?? '',
diff --git a/src/components/KymaModules/components/ModulesList.tsx b/src/components/KymaModules/components/ModulesList.tsx
@@ -81,6 +81,7 @@ export const ModulesList = ({
     setLayoutColumn({
       startColumn: {
         resourceType: 'kymas',
+        rawResourceTypeName: 'Kyma',
         namespaceId: 'kyma-system',
         apiGroup: 'operator.kyma-project.io',
         apiVersion: 'v1beta2',
@@ -90,6 +91,7 @@ export const ModulesList = ({
       layout: 'TwoColumnsMidExpanded',
       showCreate: {
         resourceType: 'kymas',
+        rawResourceTypeName: 'Kyma',
         resourceUrl: resourceUrl,
       } as ShowCreate,
     });
@@ -159,6 +161,8 @@ export const ModulesList = ({
       resourceType: pluralize(
         findModuleStatus(kymaResource, resource.name)?.resource?.kind || '',
       ),
+      rawResourceTypeName: findModuleStatus(kymaResource, resource.name)
+        ?.resource?.kind,
       namespaceId:
         findModuleStatus(kymaResource, resource.name)?.resource?.metadata
           ?.namespace || '',
@@ -249,11 +253,13 @@ export const ModulesList = ({
     const { group, version } = extractApiGroupVersion(
       moduleStatus?.resource?.apiVersion,
     );
+
     setLayoutColumn({
       startColumn: {
         resourceType: hasExtension
           ? pluralize(moduleStatus?.resource?.kind || '').toLowerCase()
           : moduleCrd?.metadata?.name,
+        rawResourceTypeName: moduleStatus?.resource?.kind,
         namespaceId: moduleStatus?.resource?.metadata.namespace || '',
         apiGroup: group,
         apiVersion: version,
@@ -262,6 +268,7 @@ export const ModulesList = ({
         resourceType: hasExtension
           ? pluralize(moduleStatus?.resource?.kind || '').toLowerCase()
           : moduleCrd?.metadata?.name,
+        rawResourceTypeName: moduleStatus?.resource?.kind,
         resourceName: moduleStatus?.resource?.metadata?.name,
         namespaceId: moduleStatus?.resource?.metadata.namespace || '',
         apiGroup: group,
diff --git a/src/resources/CustomResourceDefinitions/CRCreate.js b/src/resources/CustomResourceDefinitions/CRCreate.js
@@ -98,6 +98,7 @@ function CRCreateForm({
           endColumn: {
             resourceName: cr.metadata.name,
             resourceType: crdName,
+            rawResourceTypeName: crd.spec.names.kind,
             namespaceId: cr.metadata.namespace,
           },
         });
diff --git a/src/resources/LimitRanges/LimitRangesList.js b/src/resources/LimitRanges/LimitRangesList.js
@@ -26,6 +26,7 @@ export function LimitRangesList(props) {
     setLayoutColumn({
       startColumn: {
         resourceType: 'LimitRange',
+        rawResourceTypeName: 'LimitRange',
         namespaceId: props.namespace,
         apiGroup: '',
         apiVersion: 'v1',
@@ -34,6 +35,7 @@ export function LimitRangesList(props) {
       endColumn: null,
       showCreate: {
         resourceType: props.resourceType,
+        rawResourceTypeName: props.resourceType,
         namespaceId: props.namespace,
         resourceUrl: props.resourceUrl,
       },
diff --git a/src/resources/Namespaces/NamespaceCreate.js b/src/resources/Namespaces/NamespaceCreate.js
@@ -130,6 +130,7 @@ export default function NamespaceCreate({
       showEdit: prevState.showEdit,
       startColumn: {
         resourceType: 'Namespace',
+        rawResourceTypeName: 'Namespace',
         resourceName: namespace.metadata?.name,
         apiGroup: '',
         apiVersion: 'v1',
diff --git a/src/resources/ResourceQuotas/ResourceQuotasList.tsx b/src/resources/ResourceQuotas/ResourceQuotasList.tsx
@@ -48,6 +48,7 @@ export function ResourceQuotasList(props: any) {
       startColumn: {
         resourceName: null,
         resourceType: 'ResourceQuota',
+        rawResourceTypeName: 'ResourceQuota',
         namespaceId: props.namespace,
         apiGroup: '',
         apiVersion: 'v1',
@@ -56,6 +57,7 @@ export function ResourceQuotasList(props: any) {
       endColumn: null,
       showCreate: {
         resourceType: props.resourceType,
+        rawResourceTypeName: props.resourceType,
         namespaceId: props.namespace,
         resourceUrl: props.resourceUrl,
       },
diff --git a/src/resources/createResourceRoutes.js b/src/resources/createResourceRoutes.js
@@ -60,6 +60,7 @@ const ColumnWrapper = ({ list, details, create, ...props }) => {
       layoutState?.showCreate?.resource ||
       layoutState?.showEdit?.resource ||
       null,
+    rawResourceTypeName: props.resourceType,
   });
 
   const defaultColumn =
diff --git a/src/resources/other/BusolaExtensions.routes.js b/src/resources/other/BusolaExtensions.routes.js
@@ -41,6 +41,7 @@ const ColumnWrapper = ({ defaultColumn = 'list' }) => {
       layoutState?.showCreate?.resource ||
       layoutState?.showEdit?.resource ||
       null,
+    rawResourceTypeName: 'ConfigMap',
   });
 
   const elementCreateProps = usePrepareCreateProps({
diff --git a/src/resources/other/CustomResources.routes.js b/src/resources/other/CustomResources.routes.js
@@ -47,6 +47,7 @@ export const ColumnWrapper = () => {
       layoutState?.showCreate?.resource ||
       layoutState?.showEdit?.resource ||
       null,
+    rawResourceTypeName: 'CustomResourceDefinition',
   });
   const defaultColumn = crName ? 'details' : 'list';
 
diff --git a/src/resources/other/helmReleases.routes.js b/src/resources/other/helmReleases.routes.js
@@ -28,6 +28,7 @@ const ColumnWrapper = ({ defaultColumn = 'list' }) => {
       layoutState?.showCreate?.resource ||
       layoutState?.showEdit?.resource ||
       null,
+    rawResourceTypeName: 'HelmReleases',
   });
 
   let startColumnComponent = null;
diff --git a/src/resources/other/kymaModules.routes.js b/src/resources/other/kymaModules.routes.js
@@ -47,6 +47,7 @@ const ColumnWraper = ({
       layoutState?.showCreate?.resource ||
       layoutState?.showEdit?.resource ||
       null,
+    rawResourceTypeName: 'Kyma',
   });
 
   let startColumnComponent = null;
diff --git a/src/shared/ResourceForm/useCreateResource.js b/src/shared/ResourceForm/useCreateResource.js
@@ -85,6 +85,7 @@ export function useCreateResource({
                 midColumn: {
                   resourceName: resource.metadata.name,
                   resourceType: resource.kind,
+                  rawResourceTypeName: resource.kind,
                   namespaceId: resource.metadata.namespace,
                   apiGroup: group,
                   apiVersion: version,
@@ -99,6 +100,7 @@ export function useCreateResource({
                 endColumn: {
                   resourceName: resource.metadata.name,
                   resourceType: resource.kind,
+                  rawResourceTypeName: resource.kind,
                   namespaceId: resource.metadata.namespace,
                 },
               },
diff --git a/src/shared/components/GenericList/GenericList.js b/src/shared/components/GenericList/GenericList.js
@@ -369,6 +369,7 @@ export const GenericList = ({
                   selectedEntry?.metadata?.name ??
                   e.target.children[0].innerText,
                 resourceType: resourceType,
+                rawResourceTypeName: resourceType,
                 namespaceId: selectedEntry?.metadata?.namespace,
                 apiGroup: group,
                 apiVersion: version,
diff --git a/src/shared/components/ResourcesList/ResourcesList.js b/src/shared/components/ResourcesList/ResourcesList.js
@@ -349,6 +349,7 @@ export function ResourceListRenderer({
             endColumn: null,
             showCreate: {
               resourceType: resourceType,
+              rawResourceTypeName: resourceType,
               namespaceId: namespace,
               resource: activeResource,
             },
@@ -449,6 +450,7 @@ export function ResourceListRenderer({
             endColumn: null,
             showCreate: {
               resourceType: layoutState?.midColumn.resourceName,
+              rawResourceTypeName: layoutState?.midColumn.resourceName,
               namespaceId: namespace,
             },
             showEdit: null,
diff --git a/src/shared/hooks/usePrepareLayout.js b/src/shared/hooks/usePrepareLayout.js
@@ -91,6 +91,7 @@ export function usePrepareLayoutColumns({
   crName,
   resource,
   isModule,
+  rawResourceTypeName,
 }) {
   const setLayoutColumn = useSetRecoilState(columnLayoutState);
   const setIsFormOpen = useSetRecoilState(isFormOpenState);
@@ -103,12 +104,12 @@ export function usePrepareLayoutColumns({
 
   const newLayoutState = useMemo(() => {
     const isAllNamespaces = namespaceId === '-all-';
-
     if (isModule) {
       return {
         layout: layout || 'OneColumn',
         startColumn: {
           resourceType: 'kymas',
+          rawResourceTypeName: 'Kyma',
           namespaceId: 'kyma-system',
           apiGroup: 'operator.kyma-project.io',
           apiVersion: 'v1beta2',
@@ -145,6 +146,7 @@ export function usePrepareLayoutColumns({
           resourceName:
             resourceType === 'Namespaces' ? resourceName : undefined,
           resourceType,
+          rawResourceTypeName,
           namespaceId,
           apiGroup,
           apiVersion,
@@ -154,6 +156,7 @@ export function usePrepareLayoutColumns({
         showEdit: showEdit
           ? {
               resourceType,
+              rawResourceTypeName,
               namespaceId,
               apiGroup,
               apiVersion,
@@ -170,6 +173,7 @@ export function usePrepareLayoutColumns({
         layout: layout,
         startColumn: {
           resourceType,
+          rawResourceTypeName,
           namespaceId,
           apiGroup,
           apiVersion,
@@ -178,6 +182,7 @@ export function usePrepareLayoutColumns({
           ? {
               resourceName,
               resourceType,
+              rawResourceTypeName,
               namespaceId,
               apiGroup,
               apiVersion,
@@ -187,18 +192,25 @@ export function usePrepareLayoutColumns({
           ? {
               resourceName: crName,
               resourceType: resourceName,
+              rawResourceTypeName: resourceName ?? rawResourceTypeName,
               namespaceId,
               apiGroup,
               apiVersion,
             }
           : null,
         showCreate: showCreate
-          ? { resourceType: resourceName, namespaceId, resource }
+          ? {
+              resourceType: resourceName,
+              rawResourceTypeName: resourceName,
+              namespaceId,
+              resource,
+            }
           : null,
         showEdit: showEdit
           ? {
               resourceName: crName,
               resourceType: resourceName,
+              rawResourceTypeName: resourceName ?? rawResourceTypeName,
               namespaceId,
               apiGroup,
               apiVersion,
@@ -212,6 +224,7 @@ export function usePrepareLayoutColumns({
       layout: layout,
       startColumn: {
         resourceType,
+        rawResourceTypeName,
         namespaceId,
         apiGroup,
         apiVersion,
@@ -221,16 +234,30 @@ export function usePrepareLayoutColumns({
           ? {
               resourceName,
               resourceType,
+              rawResourceTypeName,
               namespaceId,
               apiGroup,
               apiVersion,
             }
           : null,
       endColumn: null,
-      showCreate: showCreate ? { resourceType, namespaceId, resource } : null,
+      showCreate: showCreate
+        ? {
+            resourceType,
+            rawResourceTypeName,
+            namespaceId,
+            resource,
+          }
+        : null,
       showEdit: showEdit
         ? editColumn === 'startColumn'
-          ? { resourceType, namespaceId, apiGroup, apiVersion }
+          ? {
+              resourceType,
+              rawResourceTypeName,
+              namespaceId,
+              apiGroup,
+              apiVersion,
+            }
           : {
               resourceName,
               resourceType,
@@ -255,6 +282,7 @@ export function usePrepareLayoutColumns({
     crName,
     resource,
     isModule,
+    rawResourceTypeName,
   ]);
 
   useEffect(() => {
diff --git a/src/sidebar/NavItem.tsx b/src/sidebar/NavItem.tsx
@@ -72,6 +72,7 @@ export function NavItem({ node, subItem = false }: NavItemProps) {
           setLayoutColumn({
             startColumn: {
               resourceType: node?.resourceTypeCased,
+              rawResourceTypeName: node?.resourceTypeCased,
               resourceName: null,
               namespaceId: namespaceId,
               apiGroup: node?.apiGroup,
diff --git a/src/sidebar/SidebarNavigation.tsx b/src/sidebar/SidebarNavigation.tsx
@@ -63,6 +63,7 @@ export function SidebarNavigation() {
     setLayoutColumn({
       startColumn: {
         resourceType: 'Cluster',
+        rawResourceTypeName: 'Cluster',
         resourceName: null,
         namespaceId: null,
         apiGroup: null,
@@ -128,6 +129,8 @@ export function SidebarNavigation() {
                         startColumn: {
                           resourceType:
                             prevState.startColumn?.resourceType ?? null,
+                          rawResourceTypeName:
+                            prevState.startColumn?.resourceType ?? null,
                           resourceName:
                             prevState.startColumn?.resourceName ?? null,
                           apiGroup: prevState.startColumn?.apiGroup ?? null,
diff --git a/src/state/columnLayoutAtom.ts b/src/state/columnLayoutAtom.ts
@@ -3,12 +3,14 @@ import { atom, RecoilState } from 'recoil';
 export type ColumnState = {
   resourceName: null | string;
   resourceType: null | string;
+  rawResourceTypeName?: null | string;
   namespaceId: null | string;
   apiGroup: null | string;
   apiVersion: null | string;
 };
 export type ShowCreate = {
   resourceType: null | string;
+  rawResourceTypeName?: null | string;
   namespaceId: null | string;
   resource?: null | object;
   resourceUrl?: null | string;
