jusrhee před 4 roky
rodič
revize
6f66e6e4ca

+ 3 - 3
dashboard/src/components/porter-form/PorterForm.tsx

@@ -110,7 +110,7 @@ const PorterForm: React.FC<Props> = (props) => {
         })
         })
       )
       )
       .concat(props.rightTabOptions || []);
       .concat(props.rightTabOptions || []);
-    return options.filter(x => !!x);
+    return options.filter((x) => !!x);
   };
   };
 
 
   const showSaveButton = (): boolean => {
   const showSaveButton = (): boolean => {
@@ -135,12 +135,12 @@ const PorterForm: React.FC<Props> = (props) => {
 
 
   const renderTab = (): JSX.Element => {
   const renderTab = (): JSX.Element => {
     if (!formData) {
     if (!formData) {
-      console.log("hm fuck")
+      console.log("hm fuck");
       return props.renderTabContents(currentTab);
       return props.renderTabContents(currentTab);
     }
     }
 
 
     const tab = formData.tabs?.filter((tab) => tab.name == currentTab)[0];
     const tab = formData.tabs?.filter((tab) => tab.name == currentTab)[0];
-    console.log("currentTab", currentTab)
+    console.log("currentTab", currentTab);
     console.log("tab", tab);
     console.log("tab", tab);
 
 
     // Handle external tab
     // Handle external tab

+ 3 - 1
dashboard/src/components/porter-form/PorterFormWrapper.tsx

@@ -50,7 +50,9 @@ const PorterFormWrapper: React.FunctionComponent<PropsType> = ({
     } else if (formData?.tabs?.length > 0) {
     } else if (formData?.tabs?.length > 0) {
       let includedTabs = formData.tabs;
       let includedTabs = formData.tabs;
       if (isLaunch) {
       if (isLaunch) {
-        includedTabs = formData.tabs.filter((tab: any) => !tab?.settings?.omitFromLaunch);
+        includedTabs = formData.tabs.filter(
+          (tab: any) => !tab?.settings?.omitFromLaunch
+        );
       }
       }
       return includedTabs[0].name;
       return includedTabs[0].name;
     } else if (rightTabOptions?.length > 0) {
     } else if (rightTabOptions?.length > 0) {

+ 2 - 2
dashboard/src/components/porter-form/types.ts

@@ -147,7 +147,7 @@ export interface Tab {
   sections: Section[];
   sections: Section[];
   settings?: {
   settings?: {
     omitFromLaunch?: boolean;
     omitFromLaunch?: boolean;
-  }
+  };
 }
 }
 
 
 export interface PorterFormData {
 export interface PorterFormData {
@@ -201,7 +201,7 @@ export interface PorterFormState {
   };
   };
   validation: {
   validation: {
     [key: string]: PorterFormFieldValidationState;
     [key: string]: PorterFormFieldValidationState;
-  }
+  };
   variables: PorterFormVariableList;
   variables: PorterFormVariableList;
 }
 }
 
 

+ 11 - 13
dashboard/src/main/home/Home.tsx

@@ -485,9 +485,9 @@ class Home extends Component<PropsType, StateType> {
   };
   };
 
 
   render() {
   render() {
-    let { 
-      currentModal, 
-      setCurrentModal, 
+    let {
+      currentModal,
+      setCurrentModal,
       currentProject,
       currentProject,
       currentOverlay,
       currentOverlay,
       setCurrentOverlay,
       setCurrentOverlay,
@@ -578,16 +578,14 @@ class Home extends Component<PropsType, StateType> {
           </Modal>
           </Modal>
         )}
         )}
 
 
-        {
-          currentOverlay && (
-            <ConfirmOverlay
-              show={true}
-              message={currentOverlay.message}
-              onYes={currentOverlay.onYes}
-              onNo={currentOverlay.onNo}
-            />
-          )
-        }
+        {currentOverlay && (
+          <ConfirmOverlay
+            show={true}
+            message={currentOverlay.message}
+            onYes={currentOverlay.onYes}
+            onNo={currentOverlay.onNo}
+          />
+        )}
 
 
         {this.renderSidebar()}
         {this.renderSidebar()}
 
 

+ 24 - 24
dashboard/src/main/home/cluster-dashboard/env-groups/ExpandedEnvGroup.tsx

@@ -392,30 +392,30 @@ class ExpandedEnvGroup extends Component<PropsType, StateType> {
             </LastDeployed>
             </LastDeployed>
           </InfoWrapper>
           </InfoWrapper>
 
 
-          {
-            this.state.deleting ? (
-              <>
-                <LineBreak />
-                <Placeholder>
-                  <TextWrap>
-                    <Header>
-                      <Spinner src={loading} /> Deleting "{this.state.envGroup.name}"
-                    </Header>
-                    You will be automatically redirected after deletion is complete.
-                  </TextWrap>
-                </Placeholder>
-              </>
-            ) : (
-              <TabRegion
-                currentTab={this.state.currentTab}
-                setCurrentTab={(x: string) => this.setState({ currentTab: x })}
-                options={this.state.tabOptions}
-                color={null}
-              >
-                {this.renderTabContents()}
-              </TabRegion>
-            )
-          }
+          {this.state.deleting ? (
+            <>
+              <LineBreak />
+              <Placeholder>
+                <TextWrap>
+                  <Header>
+                    <Spinner src={loading} /> Deleting "
+                    {this.state.envGroup.name}"
+                  </Header>
+                  You will be automatically redirected after deletion is
+                  complete.
+                </TextWrap>
+              </Placeholder>
+            </>
+          ) : (
+            <TabRegion
+              currentTab={this.state.currentTab}
+              setCurrentTab={(x: string) => this.setState({ currentTab: x })}
+              options={this.state.tabOptions}
+              color={null}
+            >
+              {this.renderTabContents()}
+            </TabRegion>
+          )}
         </StyledExpandedChart>
         </StyledExpandedChart>
       </>
       </>
     );
     );

+ 60 - 61
dashboard/src/main/home/cluster-dashboard/expanded-chart/ExpandedChart.tsx

@@ -89,9 +89,9 @@ const ExpandedChart: React.FC<Props> = (props) => {
     closeWebsocket,
     closeWebsocket,
   } = useWebsockets();
   } = useWebsockets();
 
 
-  const { 
-    currentCluster, 
-    currentProject, 
+  const {
+    currentCluster,
+    currentProject,
     setCurrentError,
     setCurrentError,
     setCurrentOverlay,
     setCurrentOverlay,
   } = useContext(Context);
   } = useContext(Context);
@@ -468,7 +468,7 @@ const ExpandedChart: React.FC<Props> = (props) => {
         (tab: any) => !liveTabs.includes(tab.value)
         (tab: any) => !liveTabs.includes(tab.value)
       );
       );
     }
     }
-    
+
     setLeftTabOptions(leftTabOptions);
     setLeftTabOptions(leftTabOptions);
     setRightTabOptions(rightTabOptions);
     setRightTabOptions(rightTabOptions);
   };
   };
@@ -693,66 +693,65 @@ const ExpandedChart: React.FC<Props> = (props) => {
             </LastDeployed>
             </LastDeployed>
           </InfoWrapper>
           </InfoWrapper>
         </HeaderWrapper>
         </HeaderWrapper>
-        {
-          deleting ? (
-            <>
-              <LineBreak />
-              <Placeholder>
-                <TextWrap>
-                  <Header>
-                    <Spinner src={loadingSrc} /> Deleting "{currentChart.name}"
-                  </Header>
-                  You will be automatically redirected after deletion is complete.
-                </TextWrap>
-              </Placeholder>
-            </>
-          ) : (
-            <>
-              <RevisionSection
-                showRevisions={showRevisions}
-                toggleShowRevisions={() => {
-                  setShowRevisions(!showRevisions);
+        {deleting ? (
+          <>
+            <LineBreak />
+            <Placeholder>
+              <TextWrap>
+                <Header>
+                  <Spinner src={loadingSrc} /> Deleting "{currentChart.name}"
+                </Header>
+                You will be automatically redirected after deletion is complete.
+              </TextWrap>
+            </Placeholder>
+          </>
+        ) : (
+          <>
+            <RevisionSection
+              showRevisions={showRevisions}
+              toggleShowRevisions={() => {
+                setShowRevisions(!showRevisions);
+              }}
+              chart={currentChart}
+              refreshChart={() => getChartData(currentChart)}
+              setRevision={setRevision}
+              forceRefreshRevisions={forceRefreshRevisions}
+              refreshRevisionsOff={() => setForceRefreshRevisions(false)}
+              status={chartStatus}
+              shouldUpdate={
+                currentChart.latest_version &&
+                currentChart.latest_version !==
+                  currentChart.chart.metadata.version
+              }
+              latestVersion={currentChart.latest_version}
+              upgradeVersion={handleUpgradeVersion}
+            />
+            <BodyWrapper>
+              <PorterFormWrapper
+                formData={currentChart.form}
+                valuesToOverride={{
+                  namespace: props.namespace,
+                  clusterId: currentCluster.id,
                 }}
                 }}
-                chart={currentChart}
-                refreshChart={() => getChartData(currentChart)}
-                setRevision={setRevision}
-                forceRefreshRevisions={forceRefreshRevisions}
-                refreshRevisionsOff={() => setForceRefreshRevisions(false)}
-                status={chartStatus}
-                shouldUpdate={
-                  currentChart.latest_version &&
-                  currentChart.latest_version !== currentChart.chart.metadata.version
+                renderTabContents={renderTabContents}
+                isReadOnly={
+                  imageIsPlaceholder ||
+                  !isAuthorized("application", "", ["get", "update"])
+                }
+                onSubmit={onSubmit}
+                rightTabOptions={rightTabOptions}
+                leftTabOptions={leftTabOptions}
+                color={isPreview ? "#f5cb42" : null}
+                addendum={
+                  <TabButton onClick={toggleDevOpsMode} devOpsMode={devOpsMode}>
+                    <i className="material-icons">offline_bolt</i> DevOps Mode
+                  </TabButton>
                 }
                 }
-                latestVersion={currentChart.latest_version}
-                upgradeVersion={handleUpgradeVersion}
+                saveValuesStatus={saveValuesStatus}
               />
               />
-              <BodyWrapper>
-                <PorterFormWrapper
-                  formData={currentChart.form}
-                  valuesToOverride={{
-                    namespace: props.namespace,
-                    clusterId: currentCluster.id,
-                  }}
-                  renderTabContents={renderTabContents}
-                  isReadOnly={
-                    imageIsPlaceholder ||
-                    !isAuthorized("application", "", ["get", "update"])
-                  }
-                  onSubmit={onSubmit}
-                  rightTabOptions={rightTabOptions}
-                  leftTabOptions={leftTabOptions}
-                  color={isPreview ? "#f5cb42" : null}
-                  addendum={
-                    <TabButton onClick={toggleDevOpsMode} devOpsMode={devOpsMode}>
-                      <i className="material-icons">offline_bolt</i> DevOps Mode
-                    </TabButton>
-                  }
-                  saveValuesStatus={saveValuesStatus}
-                />
-              </BodyWrapper>
-            </>
-          )
-        }
+            </BodyWrapper>
+          </>
+        )}
       </StyledExpandedChart>
       </StyledExpandedChart>
     </>
     </>
   );
   );

+ 5 - 1
dashboard/src/main/home/cluster-dashboard/expanded-chart/ExpandedChartWrapper.tsx

@@ -93,7 +93,11 @@ class ExpandedChartWrapper extends Component<PropsType, StateType> {
     let { baseRoute, namespace } = match.params as any;
     let { baseRoute, namespace } = match.params as any;
     let { loading, currentChart } = this.state;
     let { loading, currentChart } = this.state;
     if (loading) {
     if (loading) {
-      return <LoadingWrapper><Loading /></LoadingWrapper>;
+      return (
+        <LoadingWrapper>
+          <Loading />
+        </LoadingWrapper>
+      );
     } else if (currentChart && baseRoute === "jobs") {
     } else if (currentChart && baseRoute === "jobs") {
       return (
       return (
         <ExpandedJobChart
         <ExpandedJobChart

+ 41 - 42
dashboard/src/main/home/cluster-dashboard/expanded-chart/ExpandedJobChart.tsx

@@ -587,48 +587,47 @@ class ExpandedJobChart extends Component<PropsType, StateType> {
             </InfoWrapper>
             </InfoWrapper>
           </HeaderWrapper>
           </HeaderWrapper>
 
 
-          {
-            this.state.deleting ? (
-              <>
-                <LineBreak />
-                <Placeholder>
-                  <TextWrap>
-                    <Header>
-                      <Spinner src={loading} /> Deleting "{currentChart.name}"
-                    </Header>
-                    You will be automatically redirected after deletion is complete.
-                  </TextWrap>
-                </Placeholder>
-              </>
-            ) : (
-              <BodyWrapper>
-                {(this.state.leftTabOptions?.length > 0 ||
-                  this.state.formData.tabs?.length > 0 ||
-                  this.state.rightTabOptions?.length > 0) && (
-                  <PorterFormWrapper
-                    formData={this.state.formData}
-                    valuesToOverride={{
-                      namespace: chart.namespace,
-                      clusterId: this.props.currentCluster.id,
-                    }}
-                    renderTabContents={this.renderTabContents}
-                    isReadOnly={
-                      this.state.imageIsPlaceholder ||
-                      !this.props.isAuthorized("job", "", ["get", "update"])
-                    }
-                    onSubmit={(formValues) => {
-                      console.log(formValues)
-                      this.handleSaveValues(formValues, false)
-                    }}
-                    leftTabOptions={this.state.leftTabOptions}
-                    rightTabOptions={this.state.rightTabOptions}
-                    saveValuesStatus={this.state.saveValuesStatus}
-                    saveButtonText="Save Config"
-                  />
-                )}
-              </BodyWrapper>
-            )
-          }
+          {this.state.deleting ? (
+            <>
+              <LineBreak />
+              <Placeholder>
+                <TextWrap>
+                  <Header>
+                    <Spinner src={loading} /> Deleting "{currentChart.name}"
+                  </Header>
+                  You will be automatically redirected after deletion is
+                  complete.
+                </TextWrap>
+              </Placeholder>
+            </>
+          ) : (
+            <BodyWrapper>
+              {(this.state.leftTabOptions?.length > 0 ||
+                this.state.formData.tabs?.length > 0 ||
+                this.state.rightTabOptions?.length > 0) && (
+                <PorterFormWrapper
+                  formData={this.state.formData}
+                  valuesToOverride={{
+                    namespace: chart.namespace,
+                    clusterId: this.props.currentCluster.id,
+                  }}
+                  renderTabContents={this.renderTabContents}
+                  isReadOnly={
+                    this.state.imageIsPlaceholder ||
+                    !this.props.isAuthorized("job", "", ["get", "update"])
+                  }
+                  onSubmit={(formValues) => {
+                    console.log(formValues);
+                    this.handleSaveValues(formValues, false);
+                  }}
+                  leftTabOptions={this.state.leftTabOptions}
+                  rightTabOptions={this.state.rightTabOptions}
+                  saveValuesStatus={this.state.saveValuesStatus}
+                  saveButtonText="Save Config"
+                />
+              )}
+            </BodyWrapper>
+          )}
         </StyledExpandedChart>
         </StyledExpandedChart>
       </>
       </>
     );
     );

+ 3 - 3
dashboard/src/shared/Context.tsx

@@ -26,9 +26,9 @@ export interface GlobalContextType {
   currentModalData: any;
   currentModalData: any;
   setCurrentModal: (currentModal: string, currentModalData?: any) => void;
   setCurrentModal: (currentModal: string, currentModalData?: any) => void;
   currentOverlay: {
   currentOverlay: {
-    message: string,
-    onYes: any,
-    onNo: any,
+    message: string;
+    onYes: any;
+    onNo: any;
   };
   };
   setCurrentOverlay: (x: any) => void;
   setCurrentOverlay: (x: any) => void;
   currentError: string | null;
   currentError: string | null;

+ 3 - 3
dashboard/src/shared/types.tsx

@@ -267,9 +267,9 @@ export interface ContextProps {
   currentModalData: any;
   currentModalData: any;
   setCurrentModal: (currentModal: string, currentModalData?: any) => void;
   setCurrentModal: (currentModal: string, currentModalData?: any) => void;
   currentOverlay: {
   currentOverlay: {
-    message: string,
-    onYes: any,
-    onNo: any,
+    message: string;
+    onYes: any;
+    onNo: any;
   };
   };
   setCurrentOverlay: (x: any) => void;
   setCurrentOverlay: (x: any) => void;
   currentError?: string;
   currentError?: string;