Przeglądaj źródła

image selector loading fix

jusrhee 5 lat temu
rodzic
commit
05aab0f3ce

+ 6 - 3
dashboard/src/components/image-selector/ImageSelector.tsx

@@ -28,7 +28,7 @@ type StateType = {
 export default class ImageSelector extends Component<PropsType, StateType> {
   state = {
     isExpanded: this.props.forceExpanded,
-    loading: false,
+    loading: true,
     error: false,
     images: [] as ImageType[],
     clickedImage: null as ImageType | null,
@@ -57,14 +57,17 @@ export default class ImageSelector extends Component<PropsType, StateType> {
                     source: img.name
                   }
                 })
-                this.setState({images: [...images, ...newImg]}, () => {
+                this.setState({
+                  images: [...images, ...newImg],
+                  loading: false,
+                  error: false,
+                }, () => {
                   nextController()
                 })
               }
             });    
           })
         });
-        this.setState({loading: false, error: false });
       }
     });
   }

+ 1 - 1
dashboard/src/main/Main.tsx

@@ -26,7 +26,7 @@ export default class Main extends Component<PropsType, StateType> {
   state = {
     loading: true,
     isLoggedIn : false,
-    initialized: (localStorage.getItem("init") == 'true')
+    initialized: localStorage.getItem("init") === 'true'
   }
 
   componentDidMount() {

+ 8 - 4
dashboard/src/main/home/cluster-dashboard/expanded-chart/ExpandedChart.tsx

@@ -53,7 +53,7 @@ export default class ExpandedChart extends Component<PropsType, StateType> {
     components: [] as ResourceType[],
     podSelectors: [] as string[],
     revisionPreview: null as (ChartType | null),
-    devOpsMode: false,
+    devOpsMode: localStorage.getItem('devOpsMode') === 'true',
     tabOptions: [] as ChoiceType[],
     tabContents: [] as any,
     checkTabExists: false,
@@ -146,7 +146,7 @@ export default class ExpandedChart extends Component<PropsType, StateType> {
     // Append universal tabs
     tabOptions.push(
       { label: 'Status', value: 'status' },
-      { label: 'Deploy', value: 'deploy' },
+      //{ label: 'Deploy', value: 'deploy' },
       { label: 'Settings', value: 'settings' },
     );
 
@@ -254,7 +254,9 @@ export default class ExpandedChart extends Component<PropsType, StateType> {
       tabOptions.pop();
       tabOptions.pop();
       tabOptions.pop();
-      this.setState({ devOpsMode: false, checkTabExists: true, tabOptions });
+      this.setState({ devOpsMode: false, checkTabExists: true, tabOptions }, () => {
+        localStorage.setItem('devOpsMode', 'false')
+      });
     } else {
       let { tabOptions } = this.state;
       tabOptions.push(
@@ -262,7 +264,9 @@ export default class ExpandedChart extends Component<PropsType, StateType> {
         { label: 'Manifests', value: 'list' },
         { label: 'Raw Values', value: 'values' }
       );
-      this.setState({ devOpsMode: true, tabOptions, checkTabExists: false });
+      this.setState({ devOpsMode: true, tabOptions, checkTabExists: false }, () => {
+        localStorage.setItem('devOpsMode', 'true');
+      });
     }
   }
 

+ 1 - 1
dashboard/src/main/home/cluster-dashboard/expanded-chart/status/Logs.tsx

@@ -106,5 +106,5 @@ const Message = styled.div`
   align-items: center;
   justify-content: center;
   color: #ffffff44;
-  font-size: 14px;
+  font-size: 13px;
 `;

+ 1 - 1
dashboard/src/main/home/dashboard/Dashboard.tsx

@@ -50,7 +50,7 @@ export default class Dashboard extends Component<PropsType, StateType> {
 
           <Placeholder>
             🚀 Pipelines coming soon.
-        </Placeholder>
+          </Placeholder>
         </div>
       );
     }