Merge remote-tracking branch 'origin/main' into build/test

kubeshop · Oct 30, 2023 · a511c3c · a511c3c
2 parents 1afe686 + 122e2b3
commit a511c3c
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "monokle",
   "version": "2.4.2",
   "author": "Kubeshop",
-  "description": "UI for managing k8s manifests",
+  "description": "Desktop IDE for working with Kubernetes Clusters and YAML configurations",
   "homepage": "./",
   "main": "build/electron/main.js",
   "contributors": [
@@ -283,8 +283,7 @@
       "maintainer": "Kubeshop",
       "vendor": "Kubeshop",
       "executableName": "Monokle",
-      "synopsis": "Your kubernetes best friend!",
-      "description": "A free, open-source tool, to help you navigate kubernetes development. By Kubeshop."
+      "synopsis": "Desktop IDE for Kubernetes"
     },
     "appImage": {
       "artifactName": "${productName}-${os}-${version}-${arch}.${ext}"

diff --git a/src/components/organisms/Dashboard/TableView/TableView.tsx b/src/components/organisms/Dashboard/TableView/TableView.tsx
@@ -56,10 +56,9 @@ const TableView = ({
           columns={columns}
           rowKey="id"
           scroll={{
-            y: tableScrollHeight || height - 212 - (bottomSelection === 'terminal' ? terminalHeight : 0),
+            y: tableScrollHeight || height - 270 - (bottomSelection === 'terminal' ? terminalHeight : 0),
           }}
           rowClassName={(record: ResourceMeta | any) => (record.id === selectedResourceId ? 'selected' : '')}
-          pagination={false}
           sticky
           onRow={(record: ResourceMeta | any) => {
             return {

diff --git a/src/components/organisms/SettingsPane/GlobalSettings/GlobalSettings.tsx b/src/components/organisms/SettingsPane/GlobalSettings/GlobalSettings.tsx
@@ -48,6 +48,18 @@ export const GlobalSettings = () => {
     [_setShouldAppendServerPath]
   );
 
+  const [disableClusterValidation, _setDisableClusterValidation] = useState<boolean>(
+    electronStore.get('appConfig.settings.disableClusterValidation') ?? false
+  );
+
+  const setDisableClusterValidation = useCallback(
+    (value: boolean) => {
+      _setDisableClusterValidation(value);
+      electronStore.set('appConfig.settings.disableClusterValidation', value);
+    },
+    [_setDisableClusterValidation]
+  );
+
   const [isOverridingBinaryPaths, _setIsOverridingBinaryPaths] = useState<boolean>(
     Boolean(electronStore.get('appConfig.binaryPaths')) ?? false
   );
@@ -192,6 +204,9 @@ export const GlobalSettings = () => {
           <Checkbox checked={shouldAppendServerPath} onChange={e => setShouldAppendServerPath(e.target.checked)}>
             Append Server Path to Kubectl Proxy
           </Checkbox>
+          <Checkbox checked={disableClusterValidation} onChange={e => setDisableClusterValidation(e.target.checked)}>
+            Disable validation of cluster resources
+          </Checkbox>
         </S.Div>
 
         <S.Div>

diff --git a/src/redux/validation/validation.listeners.tsx b/src/redux/validation/validation.listeners.tsx
@@ -46,6 +46,7 @@ import {startExecutionTimer} from '@utils/executionTime';
 import {doesSchemaExist} from '@utils/index';
 
 import {ResourceIdentifier, ResourceStorage} from '@shared/models/k8sResource';
+import {electronStore} from '@shared/utils';
 import {isDefined} from '@shared/utils/filter';
 import {isEqual} from '@shared/utils/isEqual';
 import {trackEvent} from '@shared/utils/telemetry';
@@ -88,6 +89,10 @@ const loadListener: AppListenerFn = listen => {
     async effect(_action, {dispatch, delay, signal, cancelActiveListeners}) {
       trackEvent('validation/load_config', {actionType: _action.type});
       if (isAnyOf(setIsInQuickClusterMode)(_action)) {
+        const disableClusterValidation = electronStore.get('appConfig.settings.disableClusterValidation') ?? false;
+        if (disableClusterValidation) {
+          return;
+        }
         if (!_action.payload) {
           return;
         }
@@ -127,6 +132,20 @@ const validateListener: AppListenerFn = listen => {
       restartPreview.rejected
     ),
     async effect(_action, {dispatch, getState, cancelActiveListeners, signal, delay}) {
+      const disableClusterValidation = electronStore.get('appConfig.settings.disableClusterValidation') ?? false;
+
+      if (disableClusterValidation) {
+        if (
+          isAnyOf(
+            loadClusterResources.fulfilled,
+            reloadClusterResources.fulfilled,
+            deleteMultipleClusterResources
+          )(_action)
+        ) {
+          return;
+        }
+      }
+
       const stopExecutionTimer = startExecutionTimer();
       cancelActiveListeners();
 

diff --git a/src/shared/constants/electronStore.ts b/src/shared/constants/electronStore.ts
@@ -117,6 +117,9 @@ export const electronStoreSchema = {
           allowEditInClusterMode: {
             type: 'boolean',
           },
+          disableClusterValidation: {
+            type: 'boolean',
+          },
         },
       },
       recentFolders: {
@@ -325,6 +328,7 @@ export const electronStoreDefaults = {
       createDefaultObjects: false,
       setDefaultPrimitiveValues: true,
       allowEditInClusterMode: true,
+      disableClusterValidation: false,
       enableHelmWithKustomize: true,
     },
     recentFolders: [],