Merge pull request #269 from equinor/master

Release

package.json

@@ -1,7 +1,7 @@
 {
   "name": "radix-web-console",
   "description": "Radix Web Console; the web-based GUI to administer Radix applications",
-  "version": "4.7.2",
+  "version": "4.7.3",
   "license": "MIT",
   "dependencies": {
     "@fortawesome/fontawesome-free": "^5.15.2",
@@ -26,7 +26,7 @@
     "react-redux": "^7.2.2",
     "react-router": "^5.2.0",
     "react-router-dom": "^5.2.0",
-    "react-scripts": "^3.4.4",
+    "react-scripts": "^4.0.0",
     "redux": "^4.0.5",
     "redux-saga": "^1.1.3",
     "sanitize.css": "^6.0.0"

scripts/deps-license-check.js

@@ -7,6 +7,7 @@ var permittedLicenses = [
   'ISC',
   'MIT',
   'MPL',
+  'ODC-By-1.0',
   'Public Domain',
   'Unlicense',
   'WTFPL',
@@ -26,7 +27,7 @@ var excludeChecksOnPackages = [
 
 if (excludeChecksOnPackages.length) {
   console.log('Not checking these dependencies for license compliance:');
-  excludeChecksOnPackages.forEach(p =>
+  excludeChecksOnPackages.forEach((p) =>
     console.log(`- ${p.name} (${p.reason})`)
   );
   console.log('');
@@ -35,7 +36,7 @@ if (excludeChecksOnPackages.length) {
 var licenseChecker = require('license-checker');
 
 var options = {
-  excludePackages: excludeChecksOnPackages.map(p => p.name).join(';'),
+  excludePackages: excludeChecksOnPackages.map((p) => p.name).join(';'),
   onlyAllow: permittedLicenses.join(';'),
 };
 

scripts/deps-stale-check.js

@@ -25,15 +25,15 @@ var options = { ignoreMatches: [] };
 if (excludeChecksOnPackages.length) {
   console.log('Not checking these dependencies for staleness:');
 
-  excludeChecksOnPackages.forEach(p => {
+  excludeChecksOnPackages.forEach((p) => {
     console.log(`- ${p.name} (${p.reason})`);
     options.ignoreMatches.push(p.name);
   });
 
   console.log('');
 }
 
-depcheck(`${__dirname}/..`, options, unused => {
+depcheck(`${__dirname}/..`, options, (unused) => {
   if (unused.dependencies.length || unused.devDependencies.length) {
     if (unused.dependencies.length) {
       console.error('Found unused dependencies', unused.dependencies);

src/api/resources.js

@@ -12,7 +12,7 @@ import { getJson, getText } from './api-helpers';
 
 // NB: The keys here must match the Redux action prefixes for the resources in
 // the /state/{resource}/action-types.js files
-export default {
+export const apiResources = {
   APP: application,
   APPS: applications,
   DEPLOYMENT: deployment,
@@ -35,3 +35,5 @@ export const subscribe = async (resourceUrl, type = 'json') => {
 export const unsubscribe = (resourceUrl) => {
   return; // noop in REST model
 };
+
+export default apiResources;

src/components/app-overview/default-app-alias.js

@@ -5,7 +5,7 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 
 import * as routing from '../../utils/routing';
 
-export default ({ appName, appAlias }) => {
+export const DefaultAppAlias = ({ appName, appAlias }) => {
   if (!appAlias) {
     return null;
   }
@@ -46,3 +46,5 @@ export default ({ appName, appAlias }) => {
     </div>
   );
 };
+
+export default DefaultAppAlias;

src/components/app-overview/monitoring.js

@@ -4,7 +4,7 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 
 import { urlToAppMonitoring } from '../../utils/monitoring';
 
-export default ({ appName }) => {
+export const Monitoring = ({ appName }) => {
   return (
     <div className="app-overview__short-info-tile">
       <h3 className="app-overview__info-tile-head">Monitoring</h3>
@@ -22,3 +22,5 @@ export default ({ appName }) => {
     </div>
   );
 };
+
+export default Monitoring;

src/components/configure-application-github/index.js

@@ -15,8 +15,8 @@ import configHandler from '../../utils/config';
 import './style.css';
 import externalUrls from '../../externalUrls';
 
-const imageDeployKey = require('./deploy-key02.png');
-const imageWebhook = require('./webhook02.png');
+const imageDeployKey = require('./deploy-key02.png').default;
+const imageWebhook = require('./webhook02.png').default;
 
 const radixZoneDNS = configHandler.getConfig(configKeys.RADIX_CLUSTER_BASE);
 const webhookURL = `https://webhook.${radixZoneDNS}/events/github`;

src/components/deployments-list/dev.js

@@ -7,67 +7,67 @@ const deployments = [
     name: 'qa-s7zie-vlok4myf',
     createdByJob: 'radix-pipeline-20190124132335-s7zie',
     environment: 'qa',
-    activeFrom: '2019-01-24T13:27:17Z',
+    activeFrom: new Date('2019-01-24T13:27:17Z'),
   },
   {
     name: 'qa-cg4hz-xx1fbluj',
     createdByJob: 'radix-pipeline-20190124081746-cg4hz',
     environment: 'qa',
-    activeFrom: '2019-01-24T08:21:28Z',
-    activeTo: '2019-01-24T13:27:17Z',
+    activeFrom: new Date('2019-01-24T08:21:28Z'),
+    activeTo: new Date('2019-01-24T13:27:17Z'),
   },
   {
     name: 'qa-y8ib5-kjtalhmj',
     createdByJob: 'radix-pipeline-20190122134120-y8ib5',
     environment: 'qa',
-    activeFrom: '2019-01-22T13:44:46Z',
-    activeTo: '2019-01-24T08:21:28Z',
+    activeFrom: new Date('2019-01-22T13:44:46Z'),
+    activeTo: new Date('2019-01-24T08:21:28Z'),
   },
   {
     name: 'prod-tq9nx-l0jaycnm',
     createdByJob: 'radix-pipeline-20190122134007-tq9nx',
     environment: 'prod',
-    activeFrom: '2019-01-22T13:43:41Z',
+    activeFrom: new Date('2019-01-22T13:43:41Z'),
   },
   {
     name: 'qa-boo06-ixgfw4jt',
     createdByJob: 'radix-pipeline-20190122133805-boo06',
     environment: 'qa',
-    activeFrom: '2019-01-22T13:41:44Z',
-    activeTo: '2019-01-22T13:44:46Z',
+    activeFrom: new Date('2019-01-22T13:41:44Z'),
+    activeTo: new Date('2019-01-22T13:44:46Z'),
   },
   {
     name: 'qa-sywcg-zzbdpnxm',
     createdByJob: 'radix-pipeline-20190122132828-sywcg',
     environment: 'qa',
-    activeFrom: '2019-01-22T13:32:10Z',
-    activeTo: '2019-01-22T13:41:44Z',
+    activeFrom: new Date('2019-01-22T13:32:10Z'),
+    activeTo: new Date('2019-01-22T13:41:44Z'),
   },
   {
     name: 'qa-qn1cp-cuimkggt',
     createdByJob: 'radix-pipeline-20190121110657-qn1cp',
     environment: 'qa',
-    activeFrom: '2019-01-21T11:10:52Z',
-    activeTo: '2019-01-22T13:32:10Z',
+    activeFrom: new Date('2019-01-21T11:10:52Z'),
+    activeTo: new Date('2019-01-22T13:32:10Z'),
   },
   {
     name: 'qa-zgase-liokot45',
     createdByJob: 'radix-pipeline-20190121110526-zgase',
     environment: 'qa',
-    activeFrom: '2019-01-21T11:09:09Z',
-    activeTo: '2019-01-21T11:10:52Z',
+    activeFrom: new Date('2019-01-21T11:09:09Z'),
+    activeTo: new Date('2019-01-21T11:10:52Z'),
   },
   {
     name: 'qa-mzq2n-arszwzjv',
     environment: 'qa',
-    activeFrom: '2019-01-18T14:38:36Z',
-    activeTo: '2019-01-21T11:09:09Z',
+    activeFrom: new Date('2019-01-18T14:38:36Z'),
+    activeTo: new Date('2019-01-21T11:09:09Z'),
   },
   {
     name: 'prod-nje0n-0wrmvkmv',
     environment: 'prod',
-    activeFrom: '2019-01-18T14:38:25Z',
-    activeTo: '2019-01-22T13:43:41Z',
+    activeFrom: new Date('2019-01-18T14:38:25Z'),
+    activeTo: new Date('2019-01-22T13:43:41Z'),
   },
 ];
 

src/components/environments-summary/dev.js

@@ -1,5 +1,4 @@
 import React from 'react';
-
 import EnvironmentsSummary from '.';
 
 const envs = [
@@ -10,7 +9,7 @@ const envs = [
       name: 'qa-hxn4z-ugvhgj0o',
       createdByJob: 'radix-pipeline-20190111084321-hxn4z',
       environment: 'qa',
-      activeFrom: '2019-01-11T08:49:44Z',
+      activeFrom: new Date('2019-01-11T08:49:44Z'),
     },
     branchMapping: 'master',
   },
@@ -21,7 +20,7 @@ const envs = [
       name: 'prod-srqer-ffst7fqx',
       createdByJob: 'radix-pipeline-20190104063327-srqer',
       environment: 'prod',
-      activeFrom: '2019-01-04T06:39:48Z',
+      activeFrom: new Date('2019-01-04T06:39:48Z'),
     },
     branchMapping: 'release',
   },
@@ -32,7 +31,7 @@ const envs = [
       name: 'pr520-qt1dm-4r9vcdtc',
       createdByJob: 'radix-pipeline-20181227122128-qt1dm',
       environment: 'pr520',
-      activeFrom: '2018-12-27T12:26:34Z',
+      activeFrom: new Date('2018-12-27T12:26:34Z'),
     },
   },
 ];

src/components/jobs-list/dev.js

@@ -8,7 +8,7 @@ const jobs = [
     appName: 'radix-web-console',
     branch: 'master',
     commitID: 'ef85c7aeb7351de6918004facfda336def3a1f76',
-    created: '2019-01-04T11:17:29Z',
+    created: new Date('2019-01-04T11:17:29Z'),
     status: 'Queued',
     pipeline: 'build-deploy',
     environments: ['qa'],
@@ -18,8 +18,8 @@ const jobs = [
     appName: 'radix-web-console',
     branch: 'master',
     commitID: '37af2a3d841e4d4479373e467caccf550846d418',
-    created: '2019-01-10T14:35:54Z',
-    started: '2019-01-10T14:35:54Z',
+    created: new Date('2019-01-10T14:35:54Z'),
+    started: new Date('2019-01-10T14:35:54Z'),
     status: 'Running',
     pipeline: 'build-deploy',
     environments: ['qa'],
@@ -29,9 +29,9 @@ const jobs = [
     appName: 'radix-web-console',
     branch: 'master',
     commitID: '292d36c392ccbaba32b419ae56e08dcdd92b8412',
-    created: '2019-01-10T08:36:46Z',
-    started: '2019-01-10T08:36:46Z',
-    ended: '2019-01-10T08:39:04Z',
+    created: new Date('2019-01-10T08:36:46Z'),
+    started: new Date('2019-01-10T08:36:46Z'),
+    ended: new Date('2019-01-10T08:39:04Z'),
     status: 'Failed',
     pipeline: 'build-deploy',
   },
@@ -40,9 +40,9 @@ const jobs = [
     appName: 'radix-web-console',
     branch: 'master',
     commitID: '393cb144cd079886c076285167e23a23c2c783c4',
-    created: '2019-01-09T12:10:11Z',
-    started: '2019-01-09T12:10:11Z',
-    ended: '2019-01-09T12:16:47Z',
+    created: new Date('2019-01-09T12:10:11Z'),
+    started: new Date('2019-01-09T12:10:11Z'),
+    ended: new Date('2019-01-09T12:16:47Z'),
     status: 'Succeeded',
     pipeline: 'build-deploy',
     environments: ['qa'],
@@ -52,9 +52,9 @@ const jobs = [
     appName: 'radix-web-console',
     branch: 'master',
     commitID: 'b7b0caf4e9b06aa4b0b4b967fb6c88485029d72a',
-    created: '2019-01-09T08:52:50Z',
-    started: '2019-01-09T08:52:50Z',
-    ended: '2019-01-09T09:00:27Z',
+    created: new Date('2019-01-09T08:52:50Z'),
+    started: new Date('2019-01-09T08:52:50Z'),
+    ended: new Date('2019-01-09T09:00:27Z'),
     status: 'Succeeded',
     pipeline: 'build-deploy',
     environments: ['qa'],
@@ -64,21 +64,21 @@ const jobs = [
     appName: 'radix-web-console',
     branch: 'master',
     commitID: 'f175e3fabf74b846eedfb27a1978de7cb2f7b4a0',
-    created: '2019-01-04T12:31:04Z',
-    started: '2019-01-04T12:31:04Z',
-    ended: '2019-01-04T12:36:32Z',
+    created: new Date('2019-01-04T12:31:04Z'),
+    started: new Date('2019-01-04T12:31:04Z'),
+    ended: new Date('2019-01-04T12:36:32Z'),
     status: 'Succeeded',
     pipeline: 'build-deploy',
     environments: ['qa'],
   },
   {
-    name: 'radix-pipeline-20190104111729-mkni5',
+    name: 'radix-pipeline-20190104111729-mkni6',
     appName: 'radix-web-console',
     branch: 'master',
     commitID: 'ef85c7aeb7351de6918004facfda336def3a1f76',
-    created: '2019-01-04T11:17:29Z',
-    started: '2019-01-04T11:17:29Z',
-    ended: '2019-01-04T11:22:26Z',
+    created: new Date('2019-01-04T11:17:29Z'),
+    started: new Date('2019-01-04T11:17:29Z'),
+    ended: new Date('2019-01-04T11:22:26Z'),
     status: 'Succeeded',
     pipeline: 'build-deploy',
     environments: ['qa'],

src/components/page-configuration/change-repository-form.js

@@ -16,8 +16,8 @@ import { copyToClipboard } from '../../utils/string';
 import configHandler from '../../utils/config';
 import { keys as configKeys } from '../../utils/config/keys';
 
-const imageDeployKey = require('./deploy-key.png');
-const imageWebhook = require('./webhook02.png');
+const imageDeployKey = require('./deploy-key.png').default;
+const imageWebhook = require('./webhook02.png').default;
 
 const radixZoneDNS = configHandler.getConfig(configKeys.RADIX_CLUSTER_BASE);
 const webhookURL = `https://webhook.${radixZoneDNS}/events/github`;

src/models/application-cost-set/normaliser.js

@@ -5,7 +5,9 @@ import model from '.';
 /**
  * Create an Application Cost set object
  */
-export default (props) => {
+export const normaliser = (props) => {
   let costSet = Object.freeze(pick(props, Object.keys(model)));
   return costSet;
 };
+
+export default normaliser;

src/models/application-cost-set/test-data.js

@@ -1,5 +1,7 @@
-export default [
+export const testData = [
   {
     __testDescription: 'Cost Set 1',
   },
 ];
+
+export default testData;

src/models/application-cost/normaliser.js

@@ -5,7 +5,9 @@ import model from '.';
  * Create a ApplicationCost object
  */
 
-export default (props) => {
+export const normaliser = (props) => {
   let cost = Object.freeze(pick(props, Object.keys(model)));
   return cost;
 };
+
+export default normaliser;

src/models/application-cost/test-data.js

@@ -1,4 +1,4 @@
-export default [
+export const testData = [
   {
     __testDescription: 'Cost 1',
     name: 'name',
@@ -10,3 +10,5 @@ export default [
     owner: '[email protected]',
   },
 ];
+
+export default testData;

src/models/application-registration/normaliser.js

@@ -5,4 +5,7 @@ import model from '.';
 /**
  * Create an Application Registration object
  */
-export default (props) => Object.freeze(pick(props, Object.keys(model)));
+export const normaliser = (props) =>
+  Object.freeze(pick(props, Object.keys(model)));
+
+export default normaliser;

src/models/application-registration/test-data.js

@@ -1,4 +1,4 @@
-export default [
+export const testData = [
   {
     __testDescription: 'Without public key',
     adGroups: ['Group 1', 'Group 2'],
@@ -19,3 +19,5 @@ export default [
     machineUser: true,
   },
 ];
+
+export default testData;