Cosmos infra

package.json

@@ -5,7 +5,7 @@
   "main": "index.js",
   "dependencies": {
     "@bbc/aes31-adl-composer": "^1.1.0",
-    "@bbc/digital-paper-edit-storybook": "^1.21.0",
+    "@bbc/digital-paper-edit-storybook": "^1.22.0",
     "@bbc/fcpx-xml-composer": "^1.0.0",
     "@bbc/react-transcript-editor": "^1.4.0",
     "@datapunt/matomo-tracker-react": "^0.3.1",
@@ -70,7 +70,7 @@
     "deploy:all": "rimraf build && npm run build && firebase deploy",
     "deploy:ghpages": "rimraf build && cross-env REACT_APP_NODE_ENV=demo npm run build && gh-pages -d build",
     "deploy:dev:hosting": "rimraf build && npm run build && firebase deploy -P dev --only hosting:digital-paper-edit-dev",
-    "deploy:prod:hosting": "rimraf build && npm run build && firebase deploy -P prod --only hosting:digital-paper-edit",
+    "deploy:prod:hosting": "rimraf build && npm run build && firebase deploy -P prod --only hosting:digital-paper-edit-prod",
     "publish:prep": "npm run build && cp package.json ./build/package.json && cp README.md ./build/README.md && rimraf ./build/db",
     "publish:public": "npm run publish:prep && npm publish build --access public"
   },

src/Components/Admin/TranscriptsView/Row.js

@@ -35,6 +35,18 @@ const Row = ({
     return <Badge variant={ variant }>{status}</Badge>;
   };
 
+  let mediaRef = '';
+  let mediaType = '';
+
+  try {
+    mediaRef = media.ref;
+    mediaType = media.type;
+  } catch (err) {
+    console.error(
+      `Transcript ID: ${ transcriptId } for Project ${ projectId } should be removed:`,
+      err.message);
+  }
+
   return (
     <tr key={ transcriptId }>
       <td>{getStatusBadge(status)}</td>
@@ -56,8 +68,8 @@ const Row = ({
       <td>{dhmsRuntime}</td>
       <td>{ToDhmsCompact(duration)}</td>
       <td>{size}</td>
-      <td>{media.ref}</td>
-      <td>{media.type}</td>
+      <td>{mediaRef}</td>
+      <td>{mediaType}</td>
     </tr>
   );
 };

src/Components/Admin/TranscriptsView/index.js

@@ -36,6 +36,17 @@ const TranscriptsView = props => {
     const getDataForRows = async (title, tr, user) => {
       const Uploads = new Collection(props.firebase, `users/${ user }/uploads`);
       const upload = await Uploads.getItem(tr.id);
+      let duration = 0;
+      let size = 0;
+
+      try {
+        duration = upload.duration;
+        size = upload.size;
+      } catch (err) {
+        console.error(
+          `Transcript ID: ${ tr.id } for User ${ user } should be removed:`,
+          err.message);
+      }
 
       return {
         transcriptId: tr.id,
@@ -48,8 +59,8 @@ const TranscriptsView = props => {
         status:  tr.status,
         created:  tr.created,
         updated:  tr.updated,
-        duration:  upload.duration,
-        size:upload.size,
+        duration:  duration,
+        size: size,
       };
     };
 

src/Components/Analytics/AnalyticsProvider.js

@@ -2,13 +2,25 @@ import React, { useEffect, useState } from 'react';
 import { MatomoProvider, createInstance } from '@datapunt/matomo-tracker-react';
 import { useMatomo } from '@datapunt/matomo-tracker-react';
 import PropTypes from 'prop-types';
+import isProduction from '../../Util/is-production';
 
-const instance = createInstance({
+const prodConfig = {
   urlBase: process.env.REACT_APP_MATOMO_BASE,
   siteId: process.env.REACT_APP_MATOMO_SITEID,
   trackerUrl: process.env.REACT_APP_MATOMO_TRACKER, // optional, default value: `${urlBase}matomo.php`
-  srcUrl: process.env.REACT_APP_MATOMO_SRC, // optional, default value: `${urlBase}matomo.js`
-});
+  srcUrl: process.env.REACT_APP_MATOMO_SRC // optional, default value: `${urlBase}matomo.js`
+};
+
+const devConfig = {
+  urlBase: process.env.REACT_APP_TEST_MATOMO_BASE,
+  siteId: process.env.REACT_APP_TEST_MATOMO_SITEID,
+  trackerUrl: process.env.REACT_APP_TEST_MATOMO_TRACKER, // optional, default value: `${urlBase}matomo.php`
+  srcUrl: process.env.REACT_APP_TEST_MATOMO_SRC, // optional, default value: `${urlBase}matomo.js`
+};
+
+const config = isProduction() ? prodConfig : devConfig;
+
+const instance = createInstance(config);
 
 const AnalyticsProvider = props => (
   <MatomoProvider value={ instance }>

src/Components/Firebase/firebase.js

@@ -2,15 +2,30 @@ import app from 'firebase/app';
 import 'firebase/auth';
 import 'firebase/firestore';
 import 'firebase/storage';
+import isProduction from '../../Util/is-production';
 
-const config = {
-  apiKey: process.env.REACT_APP_API_KEY,
-  authDomain: process.env.REACT_APP_AUTH_DOMAIN,
-  databaseURL: process.env.REACT_APP_DATABASE_URL,
-  projectId: process.env.REACT_APP_PROJECT_ID,
-  storageBucket: process.env.REACT_APP_STORAGE_BUCKET,
-  messagingSenderId: process.env.REACT_APP_MESSAGING_SENDER_ID
-};
+let config;
+if (isProduction()) {
+  config = {
+    apiKey: process.env.REACT_APP_API_KEY,
+    authDomain: process.env.REACT_APP_AUTH_DOMAIN,
+    databaseURL: process.env.REACT_APP_DATABASE_URL,
+    projectId: process.env.REACT_APP_PROJECT_ID,
+    storageBucket: process.env.REACT_APP_STORAGE_BUCKET,
+    messagingSenderId: process.env.REACT_APP_MESSAGING_SENDER_ID
+  };
+} else {
+  config = {
+    apiKey: process.env.REACT_APP_TEST_API_KEY,
+    authDomain: process.env.REACT_APP_TEST_AUTH_DOMAIN,
+    databaseURL: process.env.REACT_APP_TEST_DATABASE_URL,
+    projectId: process.env.REACT_APP_TEST_PROJECT_ID,
+    storageBucket: process.env.REACT_APP_TEST_STORAGE_BUCKET,
+    messagingSenderId: process.env.REACT_APP_TEST_MESSAGING_SENDER_ID
+  };
+}
+
+console.log('config: ', config);
 class Firebase {
   constructor() {
     app.initializeApp(config);

src/Util/is-production/index.js

@@ -0,0 +1,14 @@
+import url from 'url';
+
+const isProduction = () => {
+  const parsedUrl = url.parse(window.location.href, true);
+
+  if ((parsedUrl.host) === 'digital-paper-edit.tools.bbc.co.uk') {
+    return true;
+  }
+
+  return false;
+
+};
+
+export default isProduction;

src/serviceWorker.js

@@ -1,6 +1,8 @@
 // This optional code is used to register a service worker.
 // register() is not called by default.
 
+import isProduction from './Util/is-production';
+
 // This lets the app load faster on subsequent visits in production, and gives
 // it offline capabilities. However, it also means that developers (and users)
 // will only see deployed updates on subsequent visits to a page, after all the
@@ -21,7 +23,7 @@ const isLocalhost = Boolean(
 );
 
 export function register(config) {
-  if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) {
+  if (isProduction() && 'serviceWorker' in navigator) {
     // The URL constructor is available in all browsers that support SW.
     const publicUrl = new URL(process.env.PUBLIC_URL, window.location.href);
     if (publicUrl.origin !== window.location.origin) {