Change routes of operators to be consistent (#1626)

vmware-tanzu · Apr 2, 2020 · 7165fa4 · 7165fa4
1 parent 96fab2a
commit 7165fa4
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 18 deletions.
diff --git a/dashboard/src/components/AppList/CustomResourceListItem.tsx b/dashboard/src/components/AppList/CustomResourceListItem.tsx
@@ -29,7 +29,7 @@ class CustomResourceListItem extends React.Component<ICustomResourceListItemProp
     return (
       <InfoCard
         key={resource.metadata.name}
-        link={`/operators-instances/ns/${resource.metadata.namespace}/${csv.metadata.name}/${crd.name}/${resource.metadata.name}`}
+        link={`/ns/${resource.metadata.namespace}/operators-instances/${csv.metadata.name}/${crd.name}/${resource.metadata.name}`}
         title={resource.metadata.name}
         icon={icon}
         info={`${resource.kind} v${csv.spec.version || "-"}`}

diff --git a/dashboard/src/components/Catalog/CatalogItem.test.tsx b/dashboard/src/components/Catalog/CatalogItem.test.tsx
@@ -97,7 +97,7 @@ context("when the item is a catalog", () => {
   it("has the proper link", () => {
     const wrapper = shallow(<CatalogItem item={catalogItem} />);
     expect(wrapper.find(InfoCard).prop("link")).toEqual(
-      "/operators-instances/ns/kubeapps/new/foo-cluster/foo1",
+      "/ns/kubeapps/operators-instances/new/foo-cluster/foo1",
     );
   });
 });
diff --git a/dashboard/src/components/Catalog/CatalogItem.tsx b/dashboard/src/components/Catalog/CatalogItem.tsx
@@ -54,7 +54,7 @@ const CatalogItem: React.SFC<ICatalogItemProps> = props => {
     // Cosmetic change, remove the version from the csv name
     const csvName = csv?.split(".v")[0];
     tag1 = <span>{csvName}</span>;
-    link = `/operators-instances/ns/${namespace}/new/${csv}/${id}`;
+    link = `/ns/${namespace}/operators-instances/new/${csv}/${id}`;
     subIcon = operatorIcon;
   }
   const descriptionC = (

diff --git a/dashboard/src/components/Header/Header.test.tsx b/dashboard/src/components/Header/Header.test.tsx
@@ -74,7 +74,7 @@ describe("settings", () => {
     const expectedItems = [
       { children: "App Repositories", to: "/config/ns/default/repos" },
       { children: "Service Brokers", to: "/config/brokers" },
-      { children: "Operators", to: "/operators/ns/default" },
+      { children: "Operators", to: "/ns/default/operators" },
     ];
     items.forEach((item, index) => {
       expect(item.children).toBe(expectedItems[index].children);

diff --git a/dashboard/src/components/Header/Header.tsx b/dashboard/src/components/Header/Header.tsx
@@ -151,7 +151,7 @@ class Header extends React.Component<IHeaderProps, IHeaderState> {
                       </li>
                       {this.props.featureFlags.operators && (
                         <li role="none">
-                          <NavLink to={`/operators/ns/${namespace.current}`}>Operators</NavLink>
+                          <NavLink to={`/ns/${namespace.current}/operators`}>Operators</NavLink>
                         </li>
                       )}
                     </ul>

diff --git a/dashboard/src/components/OperatorInstanceForm/OperatorInstanceForm.tsx b/dashboard/src/components/OperatorInstanceForm/OperatorInstanceForm.tsx
@@ -117,7 +117,7 @@ class DeploymentFormBody extends React.Component<
     const created = await createResource(namespace, resource.apiVersion, resourceType, resource);
     if (created) {
       push(
-        `/operators-instances/ns/${namespace}/${csv.metadata.name}/${crd.name}/${resource.metadata.name}`,
+        `/ns/${namespace}/operators-instances/${csv.metadata.name}/${crd.name}/${resource.metadata.name}`,
       );
     }
   };

diff --git a/dashboard/src/components/OperatorInstanceUpdateForm/OperatorInstanceUpdateForm.tsx b/dashboard/src/components/OperatorInstanceUpdateForm/OperatorInstanceUpdateForm.tsx
@@ -98,7 +98,7 @@ class DeploymentFormBody extends React.Component<
       resource,
     );
     if (created) {
-      push(`/operators-instances/ns/${namespace}/${csvName}/${crdName}/${resourceName}`);
+      push(`/ns/${namespace}/operators-instances/${csvName}/${crdName}/${resourceName}`);
     }
   };
 }

diff --git a/dashboard/src/components/OperatorList/__snapshots__/OperatorList.test.tsx.snap b/dashboard/src/components/OperatorList/__snapshots__/OperatorList.test.tsx.snap
@@ -66,7 +66,7 @@ exports[`render the operator list with installed operators 1`] = `
           icon="api/v1/namespaces/default/operator/foo/logo"
           info="v1.0.0"
           key="foo"
-          link="/operators/ns/default/foo"
+          link="/ns/default/operators/foo"
           tag1Content="security"
           tag2Content="kubeapps"
           title="foo"
@@ -115,7 +115,7 @@ exports[`render the operator list without installed operators 1`] = `
           icon="api/v1/namespaces/default/operator/foo/logo"
           info="v1.0.0"
           key="foo"
-          link="/operators/ns/default/foo"
+          link="/ns/default/operators/foo"
           tag1Content="security"
           tag2Content="kubeapps"
           title="foo"

diff --git a/dashboard/src/components/OperatorView/OperatorHeader.tsx b/dashboard/src/components/OperatorView/OperatorHeader.tsx
@@ -33,7 +33,7 @@ class OperatorHeader extends React.Component<IOperatorHeaderProps> {
               <h5 className="subtitle margin-b-normal">
                 {/* TODO(andresmgot): Filter by provider */}
                 <span>{version} - Provided by </span>
-                <Link to={`/operators/ns/${namespace}`}>{provider}</Link>
+                <Link to={`/ns/${namespace}/operators`}>{provider}</Link>
               </h5>
               <h5 className="subtitle margin-b-reset">{description}</h5>
             </div>

diff --git a/dashboard/src/components/OperatorView/__snapshots__/OperatorHeader.test.tsx.snap b/dashboard/src/components/OperatorView/__snapshots__/OperatorHeader.test.tsx.snap
@@ -36,7 +36,7 @@ exports[`renders the header 1`] = `
              - Provided by 
           </span>
           <Link
-            to="/operators/ns/kubeapps"
+            to="/ns/kubeapps/operators"
           >
             Kubeapps
           </Link>

diff --git a/dashboard/src/containers/RoutesContainer/Routes.tsx b/dashboard/src/containers/RoutesContainer/Routes.tsx
@@ -67,11 +67,11 @@ class Routes extends React.Component<IRoutesProps> {
     if (this.props.featureFlags.operators) {
       // Add routes related to operators
       Object.assign(privateRoutes, {
-        "/operators/ns/:namespace": OperatorsListContainer,
-        "/operators/ns/:namespace/:operator": OperatorViewContainer,
-        "/operators-instances/ns/:namespace/new/:csv/:crd": OperatorInstanceCreateContainer,
-        "/operators-instances/ns/:namespace/:csv/:crd/:instanceName": OperatorInstanceViewContainer,
-        "/operators-instances/ns/:namespace/:csv/:crd/update/:instanceName": OperatorInstanceUpdateContainer,
+        "/ns/:namespace/operators": OperatorsListContainer,
+        "/ns/:namespace/operators/:operator": OperatorViewContainer,
+        "/ns/:namespace/operators-instances/new/:csv/:crd": OperatorInstanceCreateContainer,
+        "/ns/:namespace/operators-instances/:csv/:crd/:instanceName": OperatorInstanceViewContainer,
+        "/ns/:namespace/operators-instances/:csv/:crd/:instanceName/update": OperatorInstanceUpdateContainer,
       });
     }
     return (

diff --git a/dashboard/src/shared/url.ts b/dashboard/src/shared/url.ts
@@ -8,11 +8,11 @@ export const app = {
       `/charts/${cv.relationships.chart.data.repo.name}/${cv.relationships.chart.data.name}/versions/${cv.attributes.version}`,
   },
   operators: {
-    view: (namespace: string, name: string) => `/operators/ns/${namespace}/${name}`,
+    view: (namespace: string, name: string) => `/ns/${namespace}/operators/${name}`,
   },
   operatorInstances: {
     update: (namespace: string, csvName: string, crdName: string, instanceName: string) =>
-      `/operators-instances/ns/${namespace}/${csvName}/${crdName}/update/${instanceName}`,
+      `/ns/${namespace}/operators-instances/${csvName}/${crdName}/${instanceName}/update`,
   },
 };