Draft Release v2.X.X

.eslintrc

@@ -46,7 +46,8 @@
     "mockWindowLocation": "readonly",
     "shallowHook": "readonly",
     "shallowHookComponent": "readonly",
-    "shallowHookWrapper": "readonly"
+    "shallowHookWrapper": "readonly",
+    "skipIt": "readonly"
   },
   "rules": {
     "arrow-parens": [
@@ -74,6 +75,10 @@
     "import/no-named-as-default": 0,
     "import/no-named-as-default-member": 0,
     "jest/no-done-callback": 0,
+    "jest/no-standalone-expect": [
+      2,
+      { "additionalTestBlockFunctions": ["skipIt"] }
+    ],
     "jest/prefer-to-have-length": 0,
     "jsdoc/check-tag-names": [
       2,

.github/workflows/pull_request.yml

@@ -41,7 +41,7 @@ jobs:
             }
       - name: Code coverage
         if: ${{ success() }}
-        uses: codecov/codecov-action@v2.1.0
+        uses: codecov/codecov-action@v3.1.0
       - name: Confirm beta integration
         if: ${{ success() }}
         uses: actions/github-script@v6

config/build.plugins.js

@@ -6,11 +6,6 @@ const fedModulePlugin = require('@redhat-cloud-services/frontend-components-conf
 const { setupWebpackDotenvFilesForEnv } = require('./build.dotenv');
 const { dependencies } = require('../package.json');
 
-const setHtmlPlugin = () => ({
-  title: process.env.REACT_APP_UI_DISPLAY_NAME,
-  template: join(process.env._BUILD_STATIC_DIR, 'index.html')
-});
-
 const setReplacePlugin = () => [
   {
     pattern: /%([A-Z_]+)%/g,
@@ -62,6 +57,5 @@ const setCommonPlugins = () => {
 
 module.exports = {
   setCommonPlugins,
-  setHtmlPlugin,
   setReplacePlugin
 };

config/jest.setupTests.js

@@ -17,6 +17,17 @@ setupDotenvFilesForEnv({ env: process.env.NODE_ENV });
  */
 configure({ adapter: new Adapter() });
 
+/**
+ * Conditionally skip "it" test statements.
+ * Ex:
+ *   skipIt(true)('should do a thing...', () => { ... });
+ *
+ * @param {*|boolean} value Any truthy value, typically used with environment variables
+ *
+ * @returns {*|jest.It}
+ */
+global.skipIt = value => (value && it?.skip) || it;
+
 /**
  * Emulate for component checks
  */

config/webpack.dev.config.js

@@ -1,5 +1,5 @@
 const config = require('@redhat-cloud-services/frontend-components-config');
-const { setHtmlPlugin, setReplacePlugin, setCommonPlugins } = require('./build.plugins');
+const { setReplacePlugin, setCommonPlugins } = require('./build.plugins');
 const { setupDotenvFilesForEnv } = require('./build.dotenv');
 const { setDevRoutes } = require('./spandx.config');
 
@@ -16,7 +16,6 @@ const { config: webpackConfig, plugins } = config({
   routes: setDevRoutes(),
   standalone: true,
   useProxy: false,
-  htmlPlugin: setHtmlPlugin(),
   replacePlugin: setReplacePlugin()
 });
 

config/webpack.prod.config.js

@@ -1,6 +1,6 @@
 const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer');
 const config = require('@redhat-cloud-services/frontend-components-config');
-const { setHtmlPlugin, setReplacePlugin, setCommonPlugins } = require('./build.plugins');
+const { setReplacePlugin, setCommonPlugins } = require('./build.plugins');
 const { setupDotenvFilesForEnv } = require('./build.dotenv');
 
 const {
@@ -12,7 +12,6 @@ const {
 const { config: webpackConfig, plugins } = config({
   rootFolder: _BUILD_RELATIVE_DIRNAME,
   deployment: (/beta/.test(BETA_PREFIX) && 'beta/apps') || 'apps',
-  htmlPlugin: setHtmlPlugin(),
   replacePlugin: setReplacePlugin()
 });
 

config/webpack.proxy.config.js

@@ -1,5 +1,5 @@
 const config = require('@redhat-cloud-services/frontend-components-config');
-const { setHtmlPlugin, setReplacePlugin, setCommonPlugins } = require('./build.plugins');
+const { setReplacePlugin, setCommonPlugins } = require('./build.plugins');
 const { setupDotenvFilesForEnv } = require('./build.dotenv');
 const { setProxyRoutes } = require('./spandx.config');
 
@@ -28,7 +28,6 @@ const { config: webpackConfig, plugins } = config({
   routes: setProxyRoutes({ DEV_PORT, BETA_PREFIX }),
   standalone: false,
   useProxy: true,
-  htmlPlugin: setHtmlPlugin(),
   replacePlugin: setReplacePlugin()
 });
 

deploy/build_deploy.sh

@@ -0,0 +1,36 @@
+#!/bin/bash
+
+# --------------------------------------------
+# Export vars for helper scripts to use
+# --------------------------------------------
+# name of app-sre "application" folder this component lives in; needs to match for quay
+export COMPONENT="rhsm"
+# IMAGE should match the quay repo set by app.yaml in app-interface
+export IMAGE="quay.io/cloudservices/curiosity-frontend"
+export APP_NAME=`node -e 'console.log(require("./package.json").insights.appname)'`
+export APP_ROOT=$(pwd)
+export NODE_BUILD_VERSION=`node -e 'console.log(require("./package.json").engines.node.match(/(\d+)\.\d+\.\d+/)[1])'`
+COMMON_BUILDER=https://raw.githubusercontent.com/RedHatInsights/insights-frontend-builder-common/master
+
+# --------------------------------------------
+# Options that must be configured by app owner
+# --------------------------------------------
+IQE_PLUGINS="curiosity"
+IQE_MARKER_EXPRESSION="smoke"
+IQE_FILTER_EXPRESSION=""
+
+set -exv
+# source is preferred to | bash -s in this case to avoid a subshell
+source <(curl -sSL $COMMON_BUILDER/src/frontend-build.sh)
+BUILD_RESULTS=$?
+
+# Stubbed out for now
+mkdir -p $WORKSPACE/artifacts
+cat << EOF > $WORKSPACE/artifacts/junit-dummy.xml
+<testsuite tests="1">
+    <testcase classname="dummy" name="dummytest"/>
+</testsuite>
+EOF
+
+# teardown_docker
+exit $BUILD_RESULTS

deploy/frontend.yaml

@@ -0,0 +1,82 @@
+apiVersion: v1
+kind: Template
+metadata:
+  name: rhsm-frontend
+objects:
+  - apiVersion: cloud.redhat.com/v1alpha1
+    kind: Frontend
+    metadata:
+      # this must match appList value in frontend-configs/deploy/deploy.yaml
+      name: subscriptions
+    spec:
+      envName: ${ENV_NAME}
+      title: rhsm
+      deploymentRepo: https://github.com/RedHatInsights/curiosity-frontend
+      API:
+        versions:
+          - v1
+      frontend:
+        paths:
+          - /apps/subscriptions
+      image: ${IMAGE}:${IMAGE_TAG}
+      navItems:
+        # use *-navigation.json in cloud-services-config for reference
+        - title: "Subscriptions"
+          expandable: true
+          routes:
+            - appId: "subscriptions"
+              title: "All RHEL"
+              href: "/insights/subscriptions/rhel"
+              product: "Subscription Watch"
+            - appId: "subscriptions"
+              title: "ARM"
+              href: "/insights/subscriptions/rhel-arm"
+              product: "Subscription Watch"
+            - appId: "subscriptions"
+              title: "IBM Power"
+              href: "/insights/subscriptions/rhel-ibmpower"
+              product: "Subscription Watch"
+            - appId: "subscriptions"
+              title: "IBM Z systems"
+              href: "/insights/subscriptions/rhel-ibmz"
+              product: "Subscription Watch"
+            - appId: "subscriptions"
+              title: "X86"
+              href: "/insights/subscriptions/rhel-x86"
+              product: "Subscription Watch"
+            - appId: "subscriptions"
+              title: "OpenShift Subscriptions"
+              href: "/openshift/subscriptions/openshift-container"
+              product: "Subscription Watch"
+            - appId: "subscriptions"
+              title: "Dedicated (On-Demand)"
+              href: "/openshift/subscriptions/openshift-dedicated"
+              product: "Subscription Watch"
+            - appId: "subscriptions"
+              title: "Streams for Apache Kafka"
+              href: "/application-services/subscriptions/streams"
+              product: "Subscription Watch"
+      module:
+        # this should match chrome/fed-modules.json in cloud-services-config
+        manifestLocation: "/apps/subscriptions/fed-mods.json"
+        modules:
+          - id: "application-services-subscriptions"
+            module: "./RootApp"
+            routes:
+              - pathname: "/application-services/subscriptions"
+          - id: "insights-subscriptions"
+            module: "./RootApp"
+            routes:
+              - pathname: "/insights/subscriptions"
+          - id: "openshift-subscriptions"
+            module: "./RootApp"
+            routes:
+              - pathname: "/openshift/subscriptions"
+
+parameters:
+  - name: ENV_NAME
+    required: true
+  - name: IMAGE_TAG
+    required: true
+  - name: IMAGE
+    value: quay.io/cloudservices/rhsm-frontend

deploy/pr_check.sh

@@ -0,0 +1,36 @@
+#!/bin/bash
+
+# --------------------------------------------
+# Export vars for helper scripts to use
+# --------------------------------------------
+# name of app-sre "application" folder this component lives in; needs to match for quay
+export COMPONENT="rhsm"
+# IMAGE should match the quay repo set by app.yaml in app-interface
+export IMAGE="quay.io/cloudservices/curiosity-frontend"
+export WORKSPACE=${WORKSPACE:-$APP_ROOT} # if running in jenkins, use the build's workspace
+export APP_ROOT=$(pwd)
+export NODE_BUILD_VERSION=`node -e 'console.log(require("./package.json").engines.node.match(/(\d+)\.\d+\.\d+/)[1])'`
+COMMON_BUILDER=https://raw.githubusercontent.com/RedHatInsights/insights-frontend-builder-common/master
+
+# --------------------------------------------
+# Options that must be configured by app owner
+# --------------------------------------------
+IQE_PLUGINS="curiosity"
+IQE_MARKER_EXPRESSION="smoke"
+IQE_FILTER_EXPRESSION=""
+
+set -exv
+# source is preferred to | bash -s in this case to avoid a subshell
+source <(curl -sSL $COMMON_BUILDER/src/frontend-build.sh)
+BUILD_RESULTS=$?
+
+# Stubbed out for now
+mkdir -p $WORKSPACE/artifacts
+cat << EOF > $WORKSPACE/artifacts/junit-dummy.xml
+<testsuite tests="1">
+    <testcase classname="dummy" name="dummytest"/>
+</testsuite>
+EOF
+
+# teardown_docker
+exit $BUILD_RESULTS