fix: Do not display Global account and Subaccount id if not present (kyma-project#4357)

* fix: do not display global account and subaccount id if not present

* refactor: simplify cluster values rendering conditions

* fix: global account id and subaccount id undefined error

* fix: fix typing errors in tests

* test: fix click timeout error

Author: awoloszyn22

src/components/Clusters/views/ClusterOverview/ClusterDetails.jsx

@@ -11,7 +11,6 @@ import { DynamicPageComponent } from 'shared/components/DynamicPageComponent/Dyn
 import ResourceDetailsCard from 'shared/components/ResourceDetails/ResourceDetailsCard';
 import ClusterModulesCard from './ClusterModulesCard';
 import { ClusterStorageType } from '../ClusterStorageType';
-import { EMPTY_TEXT_PLACEHOLDER } from 'shared/constants';
 import { CommunityModuleContextProvider } from 'components/Modules/community/providers/CommunityModuleProvider';
 import { ModuleTemplatesContextProvider } from 'components/Modules/providers/ModuleTemplatesProvider';
 import { useGetEnvironmentParameters } from './useGetEnvironmentParameters';
@@ -85,21 +84,19 @@ export default function ClusterDetails({ currentCluster }) {
                 </Text>
               </DynamicPageComponent.Column>
               <GardenerProvider />
-              {kymaResourceLabels && (
-                <>
-                  <DynamicPageComponent.Column
-                    title={t('clusters.overview.global-account-id')}
-                  >
-                    {kymaResourceLabels['kyma-project.io/global-account-id'] ??
-                      EMPTY_TEXT_PLACEHOLDER}
-                  </DynamicPageComponent.Column>
-                  <DynamicPageComponent.Column
-                    title={t('clusters.overview.subaccount-id')}
-                  >
-                    {kymaResourceLabels['kyma-project.io/subaccount-id'] ??
-                      EMPTY_TEXT_PLACEHOLDER}
-                  </DynamicPageComponent.Column>
-                </>
+              {!!kymaResourceLabels?.['kyma-project.io/global-account-id'] && (
+                <DynamicPageComponent.Column
+                  title={t('clusters.overview.global-account-id')}
+                >
+                  {kymaResourceLabels['kyma-project.io/global-account-id']}
+                </DynamicPageComponent.Column>
+              )}
+              {!!kymaResourceLabels?.['kyma-project.io/subaccount-id'] && (
+                <DynamicPageComponent.Column
+                  title={t('clusters.overview.subaccount-id')}
+                >
+                  {kymaResourceLabels['kyma-project.io/subaccount-id']}
+                </DynamicPageComponent.Column>
               )}
               {!environmentParametersLoading && !!natGatewayIps && (
                 <DynamicPageComponent.Column

tests/integration/tests/kyma-cluster/test-kyma-modules.spec.js

@@ -20,11 +20,14 @@ context('Test Kyma Modules views', () => {
   });
 
   it('Check if edit is empty', () => {
-    cy.wait(500);
+    cy.wait(1000);
+
     cy.inspectTab('Edit');
 
     cy.contains('No modules installed').should('be.visible');
 
+    cy.wait(1000);
+
     cy.inspectTab('View');
   });
 

tests/integration/tests/namespace/test-reduced-permissions--configuration.spec.js

@@ -95,7 +95,9 @@ context('Test reduced permissions 2', () => {
       .contains('Namespaces')
       .click();
 
-    cy.wait(500).typeInSearch('kube-public');
+    cy.wait(1000);
+
+    cy.typeInSearch('kube-public');
 
     cy.clickListLink('kube-public');