Merge branch 'main' of https://github.com/kyma-project/busola into post-conversations

Author: chriskari

.github/scripts/install-kyma.sh

@@ -16,8 +16,9 @@ fi
 
 # Create if not exist
 kubectl get ns kyma-system || kubectl create ns kyma-system
+kubectl get ns kcp-system || kubectl create ns kcp-system
 
-./bin/kyma alpha deploy
+# ./bin/kyma alpha deploy
 
 echo "Apply and enable keda module"
 kubectl apply -f https://github.com/kyma-project/keda-manager/releases/latest/download/keda-manager.yaml
@@ -47,6 +48,8 @@ kubectl apply -f https://github.com/kyma-project/telemetry-manager/releases/late
 kubectl apply -f https://github.com/kyma-project/telemetry-manager/releases/latest/download/telemetry-default-cr.yaml -n kyma-system
 
 echo "Apply modules fixtures"
+kubectl apply -f tests/integration/fixtures/module-templates-crd.yaml
+kubectl apply -f tests/integration/fixtures/test-crd-kyma.yaml
 kubectl apply -f tests/integration/fixtures/modules
 
 echo "Apply gardener resources"

src/components/KymaModules/KymaModulesEdit.js

@@ -285,7 +285,6 @@ export default function KymaModulesEdit({ resource, ...props }) {
             text={t('kyma-modules.managed')}
             checked={findModuleSpec(kymaResource, module.name)?.managed}
             onChange={event => {
-              console.log(event);
               setManaged(event.target.checked, index);
             }}
           />

src/components/KymaModules/KymaModulesList.js

@@ -222,6 +222,12 @@ export default function KymaModulesList({
         resource?.version,
       );
 
+      const moduleDocs =
+        currentModuleTemplate?.spec?.info?.documentation ||
+        currentModuleTemplate?.metadata?.annotations[
+          'operator.kyma-project.io/doc-url'
+        ];
+
       const currentModuleReleaseMeta = findModuleReleaseMeta(resource.name);
 
       const isChannelOverriden =
@@ -254,7 +260,8 @@ export default function KymaModulesList({
         <>
           {moduleStatus?.channel
             ? moduleStatus?.channel
-            : kymaResource?.spec?.modules?.[moduleIndex]?.channel}
+            : kymaResource?.spec?.modules?.[moduleIndex]?.channel ||
+              kymaResource?.spec?.channel}
           {isChannelOverriden ? (
             <Tag
               hideStateIcon
@@ -281,17 +288,13 @@ export default function KymaModulesList({
           {moduleStatus?.state || 'Unknown'}
         </StatusBadge>,
         // Documentation
-        <ExternalLink
-          url={
-            currentModuleTemplate?.spec?.info
-              ? currentModuleTemplate.spec.info.documentation
-              : currentModuleTemplate?.metadata?.annotations[
-                  'operator.kyma-project.io/doc-url'
-                ]
-          }
-        >
-          {t('common.headers.link')}
-        </ExternalLink>,
+        moduleDocs ? (
+          <ExternalLink url={moduleDocs}>
+            {t('common.headers.link')}
+          </ExternalLink>
+        ) : (
+          EMPTY_TEXT_PLACEHOLDER
+        ),
       ];
     };
 
@@ -495,6 +498,19 @@ export default function KymaModulesList({
       return false;
     };
 
+    function getEntries(statusModules = [], specModules = []) {
+      specModules.forEach(specItem => {
+        const exists = statusModules.some(
+          statusItem => statusItem.name === specItem.name,
+        );
+
+        if (!exists) {
+          statusModules.push({ name: specItem.name });
+        }
+      });
+      return statusModules;
+    }
+
     return (
       <React.Fragment key="modules-list">
         {!detailsOpen &&
@@ -588,7 +604,10 @@ export default function KymaModulesList({
           customColumnLayout={customColumnLayout}
           enableColumnLayout
           hasDetailsView
-          entries={resource?.status?.modules}
+          entries={getEntries(
+            resource?.status?.modules,
+            resource?.spec?.modules,
+          )}
           headerRenderer={headerRenderer}
           rowRenderer={rowRenderer}
           noHideFields={['Name', '', 'Namespace']}

src/shared/components/GenericList/GenericList.js

@@ -124,11 +124,13 @@ export const GenericList = ({
   const [searchQuery, setSearchQuery] = useState('');
 
   useEffect(() => {
-    if (pagination) {
-      // move back when the last item from the last page is deleted
-      const pagesCount = Math.ceil(entries.length / pagination.itemsPerPage);
-      if (currentPage > pagesCount && pagesCount > 0) {
-        setCurrentPage(pagesCount);
+    if (entries.length > 0) {
+      if (pagination) {
+        // move back when the last item from the last page is deleted
+        const pagesCount = Math.ceil(entries.length / pagination.itemsPerPage);
+        if (currentPage > pagesCount && pagesCount > 0) {
+          setCurrentPage(pagesCount);
+        }
       }
     }
     setFilteredEntries(