Draft release 1.0.0, Sync Test to Stage

package.json

@@ -33,11 +33,12 @@
       "!src/index.js",
       "!src/setupTests.js",
       "!src/components/app.js",
-      "!src/helpers/index.js",
+      "!src/common/index.js",
       "!src/redux/index.js",
       "!src/redux/store.js",
       "!src/redux/middleware/**",
       "!src/redux/actions/index.js",
+      "!src/redux/common/index.js",
       "!src/redux/reducers/index.js",
       "!src/redux/selectors/index.js"
     ],
@@ -48,7 +49,18 @@
   "standard-version": {
     "skip": {
       "tag": true
-    }
+    },
+    "types": [{
+      "type": "feat", "section": "Features"
+    },{
+      "type": "fix", "section": "Bug Fixes"
+    },{
+      "type": "refactor", "section": "Code Refactoring"
+    },{
+      "type": "perf", "section": "Performance Improvements"
+    },{
+      "type": "style", "section": "Styles"
+    }]
   },
   "scripts": {
     "api:dev": "mock -p 5000 -w ./src/services",
@@ -83,7 +95,7 @@
     "@patternfly/react-styles": "4.5.0",
     "@patternfly/react-table": "4.12.1",
     "@patternfly/react-tokens": "4.6.0",
-    "@redhat-cloud-services/frontend-components": "2.3.11",
+    "@redhat-cloud-services/frontend-components": "2.3.13",
     "@redhat-cloud-services/frontend-components-notifications": "2.1.1",
     "@redhat-cloud-services/frontend-components-utilities": "2.1.0",
     "axios": "^0.19.2",

public/locales/en-US.json

@@ -1,8 +1,7 @@
 {
   "curiosity-auth": {
     "pending": "Authenticating...",
-    "authorizedTitle": "You do not have access to {{appName}}.",
-    "authorizedCopy": "Contact your organization administrator for more information."
+    "maintenanceCopy": "We are currently undergoing scheduled maintenance and will be back shortly. Thank you for your patience."
   },
   "curiosity-graph": {
     "cardHeading": "CPU usage",
@@ -42,11 +41,22 @@
     "tooltipSummary": "Your subscription data facets. With one level of column and row headers."
   },
   "curiosity-inventory": {
+    "cardHeading": "Current systems",
     "tableAriaLabel": "{{appName}} systems inventory table.",
     "tableSummary": "A generated table with one level of column headers.",
     "tableEmptyInventoryTitle": "No results found",
     "tableEmptyInventoryMessage": "No results match the filter criteria. Remove filters or clear all filters to show results.",
-    "tableSkeletonAriaLabel": "Loading"
+    "tableSkeletonAriaLabel": "Loading",
+    "hardwareType_hypervisor": "Hypervisor",
+    "hardwareType_physical": "Physical",
+    "hardwareType_virtual": "Virtual",
+    "header": "{{context}}",
+    "header_cores": "Cores",
+    "header_displayName": "Name",
+    "header_hardwareType": "Infrastructure",
+    "header_inventoryId": "UUID",
+    "header_sockets": "Sockets",
+    "header_lastSeen": "Last seen"
   },
   "curiosity-toolbar": {
     "category": "Filter by",
@@ -59,6 +69,8 @@
     "slaPremium": "Premium",
     "slaSelfSupport": "Self-Support",
     "slaStandard": "Standard",
+    "uom_cores": "Cores",
+    "uom_sockets": "Sockets",
     "usageDevelopment": "Development/Test",
     "usageDisaster": "Disaster Recovery",
     "usageProduction": "Production",

src/components/authentication/__tests__/__snapshots__/authentication.test.js.snap

@@ -59,10 +59,10 @@ exports[`Authentication Component should render a non-connected component error:
   t={[Function]}
 >
   <MessageView
-    icon={[Function]}
-    message="t(curiosity-auth.authorizedCopy, ...)"
+    icon={null}
+    message={null}
     pageTitle={null}
-    title="t(curiosity-auth.authorizedTitle, [object Object])"
+    title={null}
   >
     <PageLayout>
       <PageHeader
@@ -100,73 +100,113 @@ exports[`Authentication Component should render a non-connected component error:
       </PageHeader>
       <PageSection
         className="curiosity"
+        padding={
+          Object {
+            "default": "noPadding",
+          }
+        }
       >
         <section
-          className="pf-c-page__main-section curiosity"
+          className="pf-c-page__main-section pf-m-no-padding curiosity"
         >
-          <EmptyState
-            className="fadein"
+          <PageSection
             key=".1"
-            variant="full"
           >
-            <div
-              className="pf-c-empty-state fadein"
-            >
-              <div
-                className="pf-c-empty-state__content"
+            <Section>
+              <section
+                className=""
               >
-                <EmptyStateIcon
-                  icon={[Function]}
+
+                <NotAuthorized
+                  serviceName="Subscription Watch"
                 >
-                  <LockIcon
-                    aria-hidden="true"
-                    className="pf-c-empty-state__icon"
-                    color="currentColor"
-                    noVerticalAlign={false}
-                    size="sm"
+                  <EmptyState
+                    className="ins-c-not-authorized"
+                    variant="full"
                   >
-                    <svg
-                      aria-hidden="true"
-                      aria-labelledby={null}
-                      className="pf-c-empty-state__icon"
-                      fill="currentColor"
-                      height="1em"
-                      role="img"
-                      style={
-                        Object {
-                          "verticalAlign": "-0.125em",
-                        }
-                      }
-                      viewBox="0 0 448 512"
-                      width="1em"
+                    <div
+                      className="pf-c-empty-state ins-c-not-authorized"
                     >
-                      <path
-                        d="M400 224h-24v-72C376 68.2 307.8 0 224 0S72 68.2 72 152v72H48c-26.5 0-48 21.5-48 48v192c0 26.5 21.5 48 48 48h352c26.5 0 48-21.5 48-48V272c0-26.5-21.5-48-48-48zm-104 0H152v-72c0-39.7 32.3-72 72-72s72 32.3 72 72v72z"
-                        transform=""
-                      />
-                    </svg>
-                  </LockIcon>
-                </EmptyStateIcon>
-                <Title
-                  headingLevel="h2"
-                  size="lg"
-                >
-                  <h2
-                    className="pf-c-title pf-m-lg"
-                  >
-                    t(curiosity-auth.authorizedTitle, [object Object])
-                  </h2>
-                </Title>
-                <EmptyStateBody>
-                  <div
-                    className="pf-c-empty-state__body"
-                  >
-                    t(curiosity-auth.authorizedCopy, ...)
-                  </div>
-                </EmptyStateBody>
-              </div>
-            </div>
-          </EmptyState>
+                      <div
+                        className="pf-c-empty-state__content"
+                      >
+                        <EmptyStateIcon
+                          icon={[Function]}
+                        >
+                          <LockIcon
+                            aria-hidden="true"
+                            className="pf-c-empty-state__icon"
+                            color="currentColor"
+                            noVerticalAlign={false}
+                            size="sm"
+                          >
+                            <svg
+                              aria-hidden="true"
+                              aria-labelledby={null}
+                              className="pf-c-empty-state__icon"
+                              fill="currentColor"
+                              height="1em"
+                              role="img"
+                              style={
+                                Object {
+                                  "verticalAlign": "-0.125em",
+                                }
+                              }
+                              viewBox="0 0 448 512"
+                              width="1em"
+                            >
+                              <path
+                                d="M400 224h-24v-72C376 68.2 307.8 0 224 0S72 68.2 72 152v72H48c-26.5 0-48 21.5-48 48v192c0 26.5 21.5 48 48 48h352c26.5 0 48-21.5 48-48V272c0-26.5-21.5-48-48-48zm-104 0H152v-72c0-39.7 32.3-72 72-72s72 32.3 72 72v72z"
+                                transform=""
+                              />
+                            </svg>
+                          </LockIcon>
+                        </EmptyStateIcon>
+                        <Title
+                          headingLevel="h5"
+                          size="lg"
+                        >
+                          <h5
+                            className="pf-c-title pf-m-lg"
+                          >
+                             You do not have access to 
+                            Subscription Watch
+                          </h5>
+                        </Title>
+                        <EmptyStateBody>
+                          <div
+                            className="pf-c-empty-state__body"
+                          >
+                            Contact your organization administrator(s) for more information.
+                          </div>
+                        </EmptyStateBody>
+                        <Button
+                          component="a"
+                          href="."
+                          variant="primary"
+                        >
+                          <a
+                            aria-disabled={false}
+                            aria-label={null}
+                            className="pf-c-button pf-m-primary"
+                            data-ouia-component-id={0}
+                            data-ouia-component-type="PF4/Button"
+                            data-ouia-safe={true}
+                            disabled={null}
+                            href="."
+                            type={null}
+                          >
+                            Go to landing page
+                          </a>
+                        </Button>
+                      </div>
+                    </div>
+                  </EmptyState>
+                </NotAuthorized>
+
+              </section>
+            </Section>
+          </PageSection>
         </section>
       </PageSection>
     </PageLayout>
@@ -185,22 +225,30 @@ exports[`Authentication Component should render a non-connected component pendin
 
 exports[`Authentication Component should return a message on 401 error: 401 error 1`] = `
 <MessageView
-  icon={[Function]}
-  message="t(curiosity-auth.authorizedCopy, ...)"
+  icon={null}
+  message={null}
   pageTitle={null}
-  title="t(curiosity-auth.authorizedTitle, [object Object])"
-/>
+  title={null}
+>
+  <NotAuthorized
+    serviceName="Subscription Watch"
+  />
+</MessageView>
 `;
 
 exports[`Authentication Component should return a redirect on 418 error: 418 error 1`] = `"418 redirect"`;
 
 exports[`Authentication Component should return a redirect on a specific 403 error and error code: 403 error 1`] = `
 <MessageView
-  icon={[Function]}
-  message="t(curiosity-auth.authorizedCopy, ...)"
+  icon={null}
+  message={null}
   pageTitle={null}
-  title="t(curiosity-auth.authorizedTitle, [object Object])"
-/>
+  title={null}
+>
+  <NotAuthorized
+    serviceName="Subscription Watch"
+  />
+</MessageView>
 `;
 
 exports[`Authentication Component should return a redirect on a specific 403 error and error code: 403 redirect error 1`] = `"403 redirect"`;

src/components/authentication/authentication.js

@@ -1,6 +1,8 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { BinocularsIcon, LockIcon } from '@patternfly/react-icons';
+import { BinocularsIcon } from '@patternfly/react-icons';
+import { Maintenance } from '@redhat-cloud-services/frontend-components/components/cjs/Maintenance';
+import { NotAuthorized } from '@redhat-cloud-services/frontend-components/components/cjs/NotAuthorized';
 import { connectRouter, reduxActions, reduxSelectors } from '../../redux';
 import { rhsmApiTypes } from '../../types';
 import { helpers } from '../../common';
@@ -52,6 +54,14 @@ class Authentication extends Component {
   render() {
     const { children, session, t } = this.props;
 
+    if (helpers.UI_DISABLED) {
+      return (
+        <MessageView>
+          <Maintenance description={t('curiosity-auth.maintenanceCopy', '...')} />
+        </MessageView>
+      );
+    }
+
     if (session.authorized) {
       return <React.Fragment>{children}</React.Fragment>;
     }
@@ -71,11 +81,9 @@ class Authentication extends Component {
     }
 
     return (
-      <MessageView
-        title={t('curiosity-auth.authorizedTitle', { appName: helpers.UI_DISPLAY_NAME })}
-        message={t('curiosity-auth.authorizedCopy', '...')}
-        icon={LockIcon}
-      />
+      <MessageView>
+        <NotAuthorized serviceName={helpers.UI_DISPLAY_NAME} />
+      </MessageView>
     );
   }
 }