Selaa lähdekoodia

Merge pull request #1221 from porter-dev/por-58-launch-page-crash

[POR-58] Frontend crashes on (cluster dashboard) -> (applications) -> (launch template)
jusrhee 4 vuotta sitten
vanhempi
sitoutus
81c33c1e7a
2 muutettua tiedostoa jossa 8 lisäystä ja 11 poistoa
  1. 7 8
      dashboard/src/main/home/launch/Launch.tsx
  2. 1 3
      dashboard/src/shared/routing.tsx

+ 7 - 8
dashboard/src/main/home/launch/Launch.tsx

@@ -126,10 +126,10 @@ class Templates extends Component<PropsType, StateType> {
           return;
         }
         // If its not web worker or job it means is an addon, and for now it's not supported
-        if (!["web", "worker", "job"].includes(release?.chart?.metadata?.name)) {
-          this.context.setCurrentError(
-            "Addons don't support cloning yet!"
-          );
+        if (
+          !["web", "worker", "job"].includes(release?.chart?.metadata?.name)
+        ) {
+          this.context.setCurrentError("Addons don't support cloning yet!");
           this.props.history.push("/dashboard");
           return;
         }
@@ -162,13 +162,13 @@ class Templates extends Component<PropsType, StateType> {
   }
 
   isTryingToClone = () => {
-    const queryParams = getQueryParams({ location });
+    const queryParams = getQueryParams(this.props);
     return queryParams.has("shouldClone");
   };
 
   areCloneQueryParamsValid = () => {
     const qp = getQueryParams(this.props);
-
+    
     const requiredParams = [
       "release_namespace",
       "release_template_version",
@@ -195,8 +195,7 @@ class Templates extends Component<PropsType, StateType> {
 
     return api.getChart<ChartTypeWithExtendedConfig>(
       "<token>",
-      {
-      },
+      {},
       {
         id: this.context.currentProject.id,
         name: queryParams.get("release_name"),

+ 1 - 3
dashboard/src/shared/routing.tsx

@@ -59,9 +59,7 @@ export const pushFiltered = (
 
 export const getQueryParams = (props: any) => {
   const searchParams = props.location.search;
-  if (searchParams) {
-    return new URLSearchParams(searchParams);
-  }
+  return new URLSearchParams(searchParams);
 };
 
 export const getQueryParam = (props: any, paramName: string) => {