Merge pull request #1447 from kubeshop/olelensmar/fix/compile-fixes

kubeshop · Mar 9, 2022 · 7a97411 · 7a97411
2 parents f067531 + fcdf9ac
commit 7a97411
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 32 deletions.
diff --git a/src/components/organisms/ActionsPane/ActionsPane.tsx b/src/components/organisms/ActionsPane/ActionsPane.tsx
@@ -283,7 +283,7 @@ const ActionsPane: React.FC<IProps> = props => {
       });
       setIsApplyModalVisible(false);
     },
-    [dispatch, fileMap, kubeConfigContext, kubeConfigPath, projectConfig, previewType, resourceMap, selectedResource]
+    [dispatch, fileMap, kubeConfigContext, projectConfig, previewType, resourceMap, selectedResource]
   );
 
   const onClickApplyHelmChart = useCallback(
@@ -548,32 +548,32 @@ const ActionsPane: React.FC<IProps> = props => {
               ) : null}
             </TabPane>
 
-          {schemaForSelectedPath ||
-          (selectedResource && (isKustomization || resourceKindHandler?.formEditorOptions?.editorSchema)) ? (
-            <TabPane key="form" tab={<TabHeader icon={<ContainerOutlined />}>Form</TabHeader>}>
-              {isFolderLoading || previewLoader.isLoading ? (
-                <S.Skeleton active />
-              ) : activeTabKey === 'form' ? (
-                selectedPath && schemaForSelectedPath && !selectedResource ? (
-                  <FormEditor
-                    formSchema={extractFormSchema(schemaForSelectedPath)}
-                    formUiSchema={getUiSchemaForPath(selectedPath)}
-                  />
-                ) : isKustomization && selectedResource ? (
-                  <FormEditor
-                    formSchema={extractFormSchema(
-                      getResourceSchema(selectedResource, String(k8sVersion), String(userDataDir))
-                    )}
-                  />
-                ) : resourceKindHandler?.formEditorOptions ? (
-                  <FormEditor
-                    formSchema={resourceKindHandler.formEditorOptions.editorSchema}
-                    formUiSchema={resourceKindHandler.formEditorOptions.editorUiSchema}
-                  />
-                ) : null
-              ) : null}
-            </TabPane>
-          ) : null}
+            {schemaForSelectedPath ||
+            (selectedResource && (isKustomization || resourceKindHandler?.formEditorOptions?.editorSchema)) ? (
+              <TabPane key="form" tab={<TabHeader icon={<ContainerOutlined />}>Form</TabHeader>}>
+                {isFolderLoading || previewLoader.isLoading ? (
+                  <S.Skeleton active />
+                ) : activeTabKey === 'form' ? (
+                  selectedPath && schemaForSelectedPath && !selectedResource ? (
+                    <FormEditor
+                      formSchema={extractFormSchema(schemaForSelectedPath)}
+                      formUiSchema={getUiSchemaForPath(selectedPath)}
+                    />
+                  ) : isKustomization && selectedResource ? (
+                    <FormEditor
+                      formSchema={extractFormSchema(
+                        getResourceSchema(selectedResource, String(k8sVersion), String(userDataDir))
+                      )}
+                    />
+                  ) : resourceKindHandler?.formEditorOptions ? (
+                    <FormEditor
+                      formSchema={resourceKindHandler.formEditorOptions.editorSchema}
+                      formUiSchema={resourceKindHandler.formEditorOptions.editorUiSchema}
+                    />
+                  ) : null
+                ) : null}
+              </TabPane>
+            ) : null}
 
             {selectedResource && resourceKindHandler && !isKustomization && (
               <TabPane key="metadataForm" tab={<TabHeader icon={<ContainerOutlined />}>Metadata</TabHeader>}>

diff --git a/src/redux/thunks/applyMultipleResources.ts b/src/redux/thunks/applyMultipleResources.ts
@@ -10,12 +10,11 @@ import {AppDispatch} from '@models/appdispatch';
 import {K8sResource} from '@models/k8sresource';
 
 import {setAlert} from '@redux/reducers/alert';
+import {doesTextStartWithYamlDocumentDelimiter} from '@redux/services/resource';
 import {applyYamlToCluster} from '@redux/thunks/applyYaml';
 import {removeNamespaceFromCluster} from '@redux/thunks/utils';
 
-import {doesTextStartWithYamlDocumentDelimiter} from './resource';
-
-const applyMultipleResources = (
+const applyMultipleResources = async (
   config: AppConfig,
   resourcesToApply: K8sResource[],
   dispatch: AppDispatch,

diff --git a/src/redux/thunks/previewHelmValuesFile.ts b/src/redux/thunks/previewHelmValuesFile.ts
@@ -33,8 +33,6 @@ export const previewHelmValuesFile = createAsyncThunk<
   const state = thunkAPI.getState().main;
   const projectConfig = currentConfigSelector(thunkAPI.getState());
   const kubeconfig = projectConfig.kubeConfig?.path;
-  const k8sVersion = projectConfig.k8sVersion;
-  const userDataDir = configState.userDataDir;
   const currentContext = projectConfig.kubeConfig?.currentContext;
   const valuesFile = state.helmValuesMap[valuesFileId];