ODC-7632: Combine Shipwright model pages

frontend/packages/shipwright-plugin/console-extensions.json

@@ -110,75 +110,87 @@
     }
   },
   {
-    "type": "console.navigation/resource-ns",
+    "type": "console.flag/model",
     "properties": {
-      "perspective": "admin",
-      "section": "builds",
-      "id": "shipwright-builds",
-      "name": "%shipwright-plugin~Shipwright Builds%",
       "model": {
         "group": "shipwright.io",
         "version": "v1alpha1",
-        "kind": "Build"
-      }
-    },
-    "flags": {
-      "required": ["SHIPWRIGHT_BUILD_V1ALPHA1"],
-      "disallowed": ["SHIPWRIGHT_BUILD"]
+        "kind": "BuildStrategy"
+      },
+      "flag": "SHIPWRIGHT_BUILDSTRATEGY_V1ALPHA1"
     }
   },
   {
-    "type": "console.navigation/resource-ns",
+    "type": "console.flag/model",
+    "properties": {
+      "model": {
+        "group": "shipwright.io",
+        "version": "v1beta1",
+        "kind": "BuildStrategy"
+      },
+      "flag": "SHIPWRIGHT_BUILDSTRATEGY"
+    }
+  },
+  {
+    "type": "console.flag/model",
     "properties": {
-      "perspective": "admin",
-      "section": "builds",
-      "id": "shipwright-buildruns",
-      "insertAfter": "shipwright-buildruns",
-      "name": "%shipwright-plugin~Shipwright BuildRuns%",
       "model": {
         "group": "shipwright.io",
         "version": "v1alpha1",
-        "kind": "BuildRun"
-      }
-    },
-    "flags": {
-      "required": ["SHIPWRIGHT_BUILDRUN_V1ALPHA1"],
-      "disallowed": ["SHIPWRIGHT_BUILDRUN"]
+        "kind": "ClusterBuildStrategy"
+      },
+      "flag": "SHIPWRIGHT_CLUSTERBUILDSTRATEGY_V1ALPHA1"
     }
   },
   {
-    "type": "console.navigation/resource-ns",
+    "type": "console.flag/model",
     "properties": {
-      "perspective": "admin",
-      "section": "builds",
-      "id": "shipwright-builds",
-      "name": "%shipwright-plugin~Shipwright Builds%",
       "model": {
         "group": "shipwright.io",
         "version": "v1beta1",
-        "kind": "Build"
-      }
+        "kind": "ClusterBuildStrategy"
+      },
+      "flag": "SHIPWRIGHT_CLUSTERBUILDSTRATEGY"
+    }
+  },
+  {
+    "type": "console.navigation/href",
+    "properties": {
+      "id": "shipwright-tablistpage",
+      "section": "builds",
+      "perspective": "admin",
+      "prefixNamespaced": true,
+      "href": "/shipwright.io",
+      "name": "%shipwright-plugin~Shipwright%"
     },
     "flags": {
       "required": ["SHIPWRIGHT_BUILD"]
     }
   },
   {
-    "type": "console.navigation/resource-ns",
+    "type": "console.navigation/href",
     "properties": {
-      "perspective": "admin",
+      "id": "shipwright-tablistpage-2",
       "section": "builds",
-      "id": "shipwright-buildruns",
-      "insertAfter": "shipwright-buildruns",
-      "name": "%shipwright-plugin~Shipwright BuildRuns%",
-      "model": {
-        "group": "shipwright.io",
-        "version": "v1beta1",
-        "kind": "BuildRun"
-      }
+      "perspective": "admin",
+      "prefixNamespaced": true,
+      "href": "/shipwright.io",
+      "name": "%shipwright-plugin~Shipwright%"
     },
     "flags": {
-      "required": ["SHIPWRIGHT_BUILDRUN"]
+      "required": ["SHIPWRIGHT_BUILD_V1ALPHA1"],
+      "disallowed": ["SHIPWRIGHT_BUILD"]
+    }
+  },
+  {
+    "type": "console.page/route",
+    "properties": {
+      "exact": false,
+      "path": ["/k8s/all-namespaces/shipwright.io", "/k8s/ns/:ns/shipwright.io"],
+      "perspective": "admin",
+      "component": {
+        "$codeRef": "pages.ShipwrightTabListPage"
+      }
     }
   },
   {
@@ -225,6 +237,58 @@
       "component": { "$codeRef": "pages.BuildDetailsPage" }
     }
   },
+  {
+    "type": "console.page/resource/details",
+    "properties": {
+      "model": {
+        "group": "shipwright.io",
+        "version": "v1alpha1",
+        "kind": "BuildStrategy"
+      },
+      "component": {
+        "$codeRef": "pages.BuildStrategyDetailsPage"
+      }
+    }
+  },
+  {
+    "type": "console.page/resource/details",
+    "properties": {
+      "model": {
+        "group": "shipwright.io",
+        "version": "v1beta1",
+        "kind": "BuildStrategy"
+      },
+      "component": {
+        "$codeRef": "pages.BuildStrategyDetailsPage"
+      }
+    }
+  },
+  {
+    "type": "console.page/resource/details",
+    "properties": {
+      "model": {
+        "group": "shipwright.io",
+        "version": "v1alpha1",
+        "kind": "ClusterBuildStrategy"
+      },
+      "component": {
+        "$codeRef": "pages.ClusterBuildStrategyDetailsPage"
+      }
+    }
+  },
+  {
+    "type": "console.page/resource/details",
+    "properties": {
+      "model": {
+        "group": "shipwright.io",
+        "version": "v1beta1",
+        "kind": "ClusterBuildStrategy"
+      },
+      "component": {
+        "$codeRef": "pages.ClusterBuildStrategyDetailsPage"
+      }
+    }
+  },
   {
     "type": "console.page/resource/list",
     "properties": {

frontend/packages/shipwright-plugin/integration-tests/features/e2e/shipwright-ci.feature

@@ -6,7 +6,6 @@ Feature: Shipwright build details page
             Given user has installed Shipwright Operator
               And user is at developer perspective
               And user has created or selected namespace "aut-shipwright-build-details"
-              And user is at Add page
               And user has created shipwright builds
 
         @smoke
@@ -17,11 +16,14 @@ Feature: Shipwright build details page
 
 
         @smoke
-        Scenario: Shipwright build page in admin perspective: SWB-01-TC02
+        Scenario: Shipwright page in admin perspective: SWB-01-TC02
              When user switches to Administrative perspective
               And user clicks on Builds navigation in Administrative perspective
-             Then user will see "Shipwright Builds" tab
-             Then user will see "Shipwright BuildRuns" tab
+              And user clicks on "Shipwright" tab in the Administrator perspective
+             Then user will see "Builds" horizontal link tab
+              And user will see "BuildRuns" horizontal link tab
+              And user will see "BuildStrategies" horizontal link tab
+              And user will see "ClusterBuildStrategies" horizontal link tab
 
 
         @regression
@@ -42,15 +44,15 @@ Feature: Shipwright build details page
         @regression
         Scenario: Filter in Shipwright build runs page: SWB-01-TC05
             Given user is at Shipwright Builds details page for build "buildpack-nodejs-build-heroku"
-             When user clicks on "BuildRuns" tab
+             When user clicks on "BuildRuns" tab in the Developer perspective
               And user clicks on Filter
              Then user will see "Pending", "Running", "Succeeded", "Failed" and "Unknown" options
 
 
         @regression
         Scenario: Shipwright build runs details page: SWB-01-TC06
             Given user is at Shipwright Builds details page for build "buildpack-nodejs-build-heroku"
-             When user clicks on "BuildRuns" tab
+             When user clicks on "BuildRuns" tab in the Developer perspective
               And user clicks on build run "buildpack-nodejs-build-heroku-1"
              Then user will see "BuildRun details" section
               And user will see "Conditions" section
@@ -60,7 +62,7 @@ Feature: Shipwright build details page
         @regression
         Scenario: Event tab in build details page: SWB-01-TC07
             Given user is at Shipwright Builds details page for build "buildpack-nodejs-build-heroku"
-             When user clicks on "BuildRuns" tab
+             When user clicks on "BuildRuns" tab in the Developer perspective
               And user clicks on build run "buildpack-nodejs-build-heroku-1"
               And user clicks on Event tab
              Then user will see events steaming

frontend/packages/shipwright-plugin/integration-tests/features/shipwright-table.feature

@@ -13,7 +13,7 @@ Feature: Shipwright builds table view
         @smoke
         Scenario: Shipwright Builds Table should contain all the required headers: SWB-03-TC01
             Given user is at Builds page
-             When user clicks on "Shipwright Builds" tab
+             When user clicks on "Shipwright Builds" tab in the Developer perspective
              Then user will see "Name"
               And user will see "Output"
               And user will see "Last run"

frontend/packages/shipwright-plugin/integration-tests/support/step-definitions/builds/shipwright-build-detail-page.ts

@@ -48,10 +48,14 @@ Then('user will see {string}, {string} and {string} in Filter list', (el1, el2,
   cy.get(buildPO.filterList).should('contain', el1).and('contain', el2).and('contain', el3);
 });
 
-When('user clicks on {string} tab', (tab: string) => {
+When('user clicks on {string} tab in the Developer perspective', (tab: string) => {
   cy.byLegacyTestID(`horizontal-link-${tab}`).should('be.visible').click();
 });
 
+When('user clicks on {string} tab in the Administrator perspective', (tab: string) => {
+  cy.byTestID(`nav`).contains(tab).should('be.visible').click();
+});
+
 When('user clicks on Event tab', () => {
   cy.get(buildPO.eventTab).should('be.visible').click();
 });
@@ -96,6 +100,14 @@ When(
   },
 );
 
+Then('user will see {string} horizontal link tab', (tab: string) => {
+  cy.get(`[data-test-id='horizontal-link-${tab}']`).should('be.visible');
+});
+
+When('user clicks on {string} horizontal link tab', (tab: string) => {
+  cy.get(`[data-test-id='horizontal-link-${tab}']`).should('be.visible').click();
+});
+
 When('user clicks on build run {string}', (buildRun: string) => {
   cy.byLegacyTestID(`${buildRun}`).click();
 });

frontend/packages/shipwright-plugin/locales/en/shipwright-plugin.json

@@ -3,8 +3,7 @@
   "Builds": "Builds",
   "BuildRun": "BuildRun",
   "BuildRuns": "BuildRuns",
-  "Shipwright Builds": "Shipwright Builds",
-  "Shipwright BuildRuns": "Shipwright BuildRuns",
+  "Shipwright": "Shipwright",
   "Start": "Start",
   "Start last run": "Start last run",
   "Rerun": "Rerun",
@@ -60,9 +59,9 @@
   "{{count}} second_other": "{{count}} seconds",
   "{{sec}}s": "{{sec}}s",
   "Started": "Started",
+  "BuildStrategy": "BuildStrategy",
   "ClusterBuildStrategy": "ClusterBuildStrategy",
   "ClusterBuildStrategies": "ClusterBuildStrategies",
-  "BuildStrategy": "BuildStrategy",
   "BuildStrategies": "BuildStrategies",
   "Buildah": "Buildah",
   "Source-to-Image": "Source-to-Image"

frontend/packages/shipwright-plugin/src/components/build-details/BuildDetailsPage.tsx

@@ -7,6 +7,7 @@ import {
   ActionMenuVariant,
   ActionServiceProvider,
 } from '@console/shared/src/components/actions';
+import { useShipwrightBreadcrumbsFor } from '../../utils';
 import BuildDetailsTab from './BuildDetailsTab';
 import BuildEventsTab from './BuildEventsTab';
 import BuildRunsTab from './BuildRunsTab';
@@ -38,7 +39,14 @@ const BuildDetailsPage: React.FC<DetailsPageProps> = (props) => {
     navFactory.events(BuildEventsTab),
   ];
 
-  return <DetailsPage {...props} customActionMenu={customActionMenu} pages={pages} />;
+  return (
+    <DetailsPage
+      {...props}
+      customActionMenu={customActionMenu}
+      pages={pages}
+      breadcrumbsFor={useShipwrightBreadcrumbsFor}
+    />
+  );
 };
 
 export default BuildDetailsPage;

frontend/packages/shipwright-plugin/src/components/build-list/BuildListPage.tsx

@@ -1,11 +1,10 @@
 import * as React from 'react';
 import { useTranslation } from 'react-i18next';
-import { useFlag } from '@console/dynamic-plugin-sdk/src/lib-core';
 import { ListPage, ListPageProps } from '@console/internal/components/factory';
 import { RowFilter } from '@console/internal/components/filter-toolbar';
 import { referenceForModel } from '@console/internal/module/k8s';
-import { BuildModel, BuildModelV1Alpha1 } from '../../models';
 import { Build } from '../../types';
+import { useBuildModel } from '../../utils';
 import { getBuildRunStatus } from '../buildrun-status/BuildRunStatus';
 import { BuildTable } from './BuildTable';
 
@@ -43,14 +42,12 @@ const BuildListPage: React.FC<BuildListPageProps> = (props) => {
     },
   ];
 
+  const buildModel = useBuildModel();
+
   return (
     <ListPage
       title={t('shipwright-plugin~Builds')}
-      kind={
-        useFlag('SHIPWRIGHT_BUILD')
-          ? referenceForModel(BuildModel)
-          : referenceForModel(BuildModelV1Alpha1)
-      }
+      kind={referenceForModel(buildModel)}
       ListComponent={BuildTable}
       rowFilters={filters}
       canCreate

frontend/packages/shipwright-plugin/src/components/buildrun-details/BuildRunDetailsPage.tsx

@@ -7,6 +7,7 @@ import {
   ActionMenuVariant,
   ActionServiceProvider,
 } from '@console/shared/src/components/actions';
+import { useShipwrightBreadcrumbsFor } from '../../utils';
 import { getBuildRunStatus } from '../buildrun-status/BuildRunStatus';
 import BuildRunDetailsTab from './BuildRunDetailsTab';
 import BuildRunEventsTab from './BuildRunEventsTab';
@@ -40,6 +41,7 @@ const BuildRunDetailsPage: React.FC<DetailsPageProps> = (props) => {
       getResourceStatus={getBuildRunStatus}
       customActionMenu={customActionMenu}
       pages={pages}
+      breadcrumbsFor={useShipwrightBreadcrumbsFor}
     />
   );
 };