Merge pull request #4649 from project-koku/release_prod-ros.89523

Deployment commit for prod-ros

Author: dlabrecq

.github/workflows/tag_release.yml

@@ -4,13 +4,16 @@ on:
     branches:
       - prod-hccm
       - prod-ros
+env:
+  BRANCH: ${{ github.base_ref }}
+
 jobs:
   tag_release:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5
         with:
-          ref: ${{ github.head_ref || github.ref_name }}
+          ref: ${{ env.BRANCH }}
       - run: |
           git fetch --prune --unshallow
       - name: Tag this release
@@ -32,6 +35,6 @@ jobs:
           TAG="r.$DATE.$MINOR_VERSION"
           git config --local user.email "[email protected]"
           git config --local user.name "Cost Management Release Action"
-          git log $(git tag --list | tail -1)..prod-stable | git tag -a $TAG -F -
+          git log $(git tag --list | tail -1)..${{ env.BRANCH }} | git tag -a $TAG -F -
           git push origin $TAG
         shell: bash

.tekton/koku-ui-hccm-pull-request.yaml

@@ -8,7 +8,7 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/cancel-in-progress: "true"
     pipelinesascode.tekton.dev/max-keep-runs: "3"
-    pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch in ["main", "prod-hccm"]
+    pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch in ["stage-hccm", "prod-hccm"]
   creationTimestamp: null
   labels:
     appstudio.openshift.io/application: koku-ui-hccm

.tekton/koku-ui-hccm-push.yaml

@@ -7,7 +7,7 @@ metadata:
     build.appstudio.redhat.com/target_branch: '{{target_branch}}'
     pipelinesascode.tekton.dev/cancel-in-progress: "false"
     pipelinesascode.tekton.dev/max-keep-runs: "3"
-    pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch in ["main", "prod-hccm"]
+    pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch in ["stage-hccm", "prod-hccm"]
   creationTimestamp: null
   labels:
     appstudio.openshift.io/application: koku-ui-hccm

apps/koku-ui-hccm/README.md

@@ -62,9 +62,9 @@ Note that this approach currently supports the Insights stage and prod environme
 npm start
 ```
 
-Follow the prompts that follow.
+Follow the prompts below.
 
-* Which platform environment you want to use `stage`
+* Which platform environment you want to use? `stage`
 
 2. Open the following URL
 ```

apps/koku-ui-hccm/RELEASE.md

@@ -2,32 +2,81 @@
 
 This doc describes how to release Koku UI to each staging environment. Note that this should be done in order for testing purposes.
 
-## Release script
+## Release branches
 
-The release script creates a PR with a unique SHA, used for a namespace \`ref\` in the app-interface repo. The script also ensures that code is always pulled from the correct branches. For example, we always:
+The release script creates a koku-ui PR with a unique SHA, used for a namespace \`ref\` in app-interface. The script also ensures that code is always pulled from the correct branches. For example, we always:
 
-1. Pull from master when pushing to prod-hccm
+1. Pull from master when pushing to stage-hccm
+2. Pull from stage-hccm when pushing to prod-hccm
 
 Note: Pushing to master automatically deploys to the stage.
 
 Please allow the PR to build successfully and merge before running the script again.
 
+### Release to stage-hccm
+
+```
+sh ../../scripts/release-branch.sh -s
+```
+
 ### Release to prod-hccm
 
 ```
-sh scripts/release-branch.sh -p
+sh ../../scripts/release-branch.sh -p
 ```
 
-## Deployment
+### Wrapper for all release and deployment functionality
+
+```
+node ../../scripts/release-all.js
+```
 
-After all PRs have been merged, update the \`koku-ui-hccm\` resource in https://gitlab.cee.redhat.com/service/app-interface/-/blob/master/data/services/insights/hccm/deploy-clowder.yml
+Follow the prompts below.
+
+* Which app do you want to release? `koku-ui-hccm`
+* Which Chrome environment you want to release? `stage`
+* Do you want to release to app-interface? `N`
+
+## Deployments for app-interface
+
+The release script will update app-interface with the latest SHA refs from the koku-ui branches above. The script also ensures that SHA refs are always pulled from the correct branches. For example, we always:
+
+1. Pull from stage-hccm when updating the stage deployment in app-interface
+2. Pull from prod-hccm when updating the prod deployment in app-interface
+
+### Release to app-interface
+
+```
+sh ../../scripts/release-app-interface.sh -<p|s>
+```
+
+### Wrapper for all release and deployment functionality
+
+```
+node ../../scripts/release-all.js
+```
+
+Follow the prompts below.
+
+* Which app do you want to release? `koku-ui-hccm`
+* Which Chrome environment you want to release? `stage`
+* Do you want to release to app-interface? `Y`
+
+### Manual deployment
+
+After all koku-ui PRs have been merged, update the \`koku-ui-hccm\` resource in https://gitlab.cee.redhat.com/service/app-interface/-/blob/master/data/services/insights/hccm/deploy-clowder.yml
 
 Use the latest commit of each branch to update namespaces \`ref\` in the app-interface repo. Don't use a merge commit, SHAs must be unique when images are created for each branch.
 
 ```
 - name: koku-ui-hccm
   ...
-    # Prod Stable Deployment
+    # Stage Deployment
+  - namespace:
+      $ref: /services/insights/frontend-operator/namespaces/stage-frontends.yml
+    ref: 68ce48592f5222029f27f6fb708698013d2f0a58 // Replace with latest SHA for stage-hccm branch
+    ...
+    # Prod Deployment
   - namespace:
       $ref: /services/insights/frontend-operator/namespaces/prod-frontends.yml
     ref: c7f6c75fd1e895afbc05a2a6d26835fa16a0edfa // Replace with latest SHA for prod-hccm branch

apps/koku-ui-hccm/package.json

@@ -24,6 +24,10 @@
     "lint:ts:fix": "eslint src --fix",
     "patch:hosts": "fec patch-etc-hosts",
     "postinstall": "ts-patch install && rm -rf .cache",
+    "release:stage": "sh ../../scripts/release-branch.sh -s",
+    "release:prod": "sh ../../scripts/release-branch.sh -p",
+    "release:app-interface:stage": "sh ../../scripts/release-app-interface.sh -s",
+    "release:app-interface:prod": "sh ../../scripts/release-app-interface.sh -p",
     "start": "fec dev",
     "start:csb": "CLOUD_SERVICES_BACKEND_PORT=8000 npm start",
     "start:csb:ros": "FEC_STATIC_PORT=8003 npm run start:csb",

apps/koku-ui-hccm/src/routes/settings/costModels/costModel/sourceTable.tsx

@@ -86,7 +86,7 @@ class SourceTableBase extends React.Component<SourceTableProps, SourceTableState
         <Table
           onDeleteText={intl.formatMessage(messages.costModelsSourceDelete)}
           onDelete={item => {
-            this.setState({ dialogSource: item[0] });
+            this.setState({ dialogSource: item?.[0] });
             setDialogOpen({ name: 'deleteSource', isOpen: true });
           }}
           onAdd={() => setDialogOpen({ name: 'addSource', isOpen: true })}

apps/koku-ui-hccm/src/routes/settings/costModels/costModel/table.tsx

@@ -25,32 +25,21 @@ interface TableBaseProps extends WrappedComponentProps {
   current: CostModel;
 }
 
-interface PaginationQuery {
-  page: number;
-  perPage: number;
-}
-
 interface TableBaseState {
   query: { name: string[] };
   currentFilter: string;
   filter: string;
-  pagination: PaginationQuery;
 }
 
 class TableBase extends React.Component<TableBaseProps, TableBaseState> {
   protected defaultState: TableBaseState = {
     query: { name: [] },
     currentFilter: '',
     filter: '',
-    pagination: { page: 1, perPage: 10 },
   };
   public state: TableBaseState = { ...this.defaultState };
 
   public render() {
-    const {
-      pagination: { page, perPage },
-    } = this.state;
-
     const { current, intl, isWritePermission, onAdd, rows } = this.props;
 
     const filteredRows = rows
@@ -61,7 +50,6 @@ class TableBase extends React.Component<TableBaseProps, TableBaseState> {
         return this.state.query.name.every(fName => uuid.includes(fName));
       })
       .map(uuid => [uuid]);
-    const res = filteredRows.slice((page - 1) * perPage, page * perPage);
 
     // Note: Removed pagination props because the /cost-models/{cost_model_uuid}/ API does not support pagination
     // See https://issues.redhat.com/browse/COST-2097
@@ -79,12 +67,10 @@ class TableBase extends React.Component<TableBaseProps, TableBaseState> {
           filter={{
             onClearAll: () =>
               this.setState({
-                pagination: { ...this.state.pagination, page: 1 },
                 query: { name: [] },
               }),
             onRemove: (_category, chip) => {
               this.setState({
-                pagination: { ...this.state.pagination, page: 1 },
                 query: removeMultiValueQuery(this.state.query)('name', chip),
               });
             },
@@ -102,17 +88,16 @@ class TableBase extends React.Component<TableBaseProps, TableBaseState> {
                 query: addMultiValueQuery(this.state.query)('name', this.state.currentFilter),
                 currentFilter: '',
                 filter: this.state.currentFilter,
-                pagination: { ...this.state.pagination, page: 1 },
               });
             },
             value: this.state.currentFilter,
             placeholder: intl.formatMessage(messages.costModelsFilterPlaceholder),
           }}
         />
-        {res.length > 0 && (
+        {filteredRows.length > 0 && (
           <SourcesTable
             showDeleteDialog={(rowId: number) => {
-              this.props.onDelete(res[rowId]);
+              this.props.onDelete(filteredRows[rowId]);
             }}
             showOperatorVersion={getSourceType(current.source_type) === 'OCP'}
           />

apps/koku-ui-onprem/package.json

@@ -9,6 +9,7 @@
   "private": true,
   "scripts": {
     "build": "NODE_ENV=production npm run ts-node ../../node_modules/.bin/webpack --mode=production",
+    "clean": "rimraf dist",
     "start": "npm run ts-node ../../node_modules/.bin/webpack serve --mode=development --color --progress",
     "lint": "npm-run-all lint:*",
     "lint:ts": "eslint src",

apps/koku-ui-ros/README.md

@@ -64,7 +64,7 @@ npm start
 
 Follow the prompts that follow.
 
-* Which platform environment you want to use `stage`
+* Which platform environment you want to use? `stage`
 
 2. Open the following URL
 ```