nasa · macrouch · Dec 19, 2023 · Nov 7, 2023 · Nov 7, 2023 · Nov 13, 2023
diff --git a/.stylelintrc.json b/.stylelintrc.json
@@ -9,18 +9,16 @@
   ],
   "rules": {
     "at-rule-no-unknown": null,
-    "scss/at-rule-no-unknown": true,
     "import-notation": "string",
     "keyframes-name-pattern": "[a-zA-Z]",
+    "no-invalid-position-at-import-rule": null,
     "property-no-unknown": [
       true,
       {
-        "ignoreProperties": [
-          "composes",
-          "compose-with"
-        ]
+        "ignoreProperties": ["composes", "compose-with"]
       }
     ],
+    "scss/at-rule-no-unknown": true,
     "selector-class-pattern": "[a-zA-Z]",
     "selector-pseudo-class-no-unknown": [
       true,
@@ -31,9 +29,7 @@
     "value-keyword-case": [
       "lower",
       {
-        "ignoreKeywords": [
-          "/[a-zA-Z]/"
-        ]
+        "ignoreKeywords": ["/[a-zA-Z]/"]
       }
     ]
   }

diff --git a/README.md b/README.md
@@ -61,12 +61,14 @@ For more information, see one of these links
 
 ##### 4. Running the CMR npm scripts
 
-To start the local CMR:
+To start the local CMR and load the test data:
+_Note: This command can be ran as two separate commands if needed:_
 
-    npm run cmr:start
+    npm run cmr:start_and_setup
 
-To load data into the local CMR:
+    < or >
 
+    npm run cmr:start
     npm run cmr:setup
 
 After you see "Done!", you can load the app in your browser and use the local CMR. After you have started CMR, to just reload the data:
@@ -155,4 +157,4 @@ These will help create more maintainable css:
 
 * [Bootstrap Docs](https://getbootstrap.com/docs/5.0/)
 * [BEM methodology](https://getbem.com/)
-* [Specificity MDN Docs](https://developer.mozilla.org/en-US/docs/Web/CSS/Specificity)
+* [Specificity MDN Docs](https://developer.mozilla.org/en-US/docs/Web/CSS/Specificity)
diff --git a/bin/deploy-bamboo.sh b/bin/deploy-bamboo.sh
@@ -10,9 +10,10 @@ set -eux
 config="`cat static.config.json`"
 
 # update keys for deployment
-config="`jq '.version = $newValue' --arg newValue ${RELEASE_VERSION} <<< $config`"
-config="`jq '.graphQlHost = $newValue' --arg newValue $bamboo_GRAPHQL_HOST <<< $config`"
-config="`jq '.apiHost = $newValue' --arg newValue $bamboo_API_HOST <<< $config`"
+config="`jq '.application.version = $newValue' --arg newValue ${RELEASE_VERSION} <<< $config`"
+config="`jq '.application.graphQlHost = $newValue' --arg newValue $bamboo_GRAPHQL_HOST <<< $config`"
+config="`jq '.application.apiHost = $newValue' --arg newValue $bamboo_API_HOST <<< $config`"
+config="`jq '.application.cmrHost = $newValue' --arg newValue $bamboo_CMR_HOST <<< $config`"
 
 # overwrite static.config.json with new values
 echo $config > tmp.$$.json && mv tmp.$$.json static.config.json

diff --git a/index.html b/index.html
@@ -1,14 +1,22 @@
 <!doctype html>
-<html lang="en">
+<html lang="en" class="h-100">
   <head>
     <meta charset="UTF-8" />
     <link rel="icon" type="image/svg+xml" href="/static/src/assets/images/logos/nasa-meatball-new.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Metadata Management Tool</title>
+    <link rel="stylesheet" type="text/css" href="/static/src/css/initial/index.scss">
   </head>
-  <body>
+  <body class="h-100 d-flex flex-column is-loading">
     <div id="earthdata-tophat2" class="th-wrapper" style="height: 34px; background: #000;"></div>
-    <div id="root"></div>
+    <div id="root" class="d-flex flex-grow-1 align-items-stretch w-100"></div>
+    <div class="app-loading-screen">
+      <div class="app-loading-screen__content">
+        <div class="spinner-border text-primary" role="status">
+        </div>
+        <span class="app-loading-screen__text">Loading Metadata Management Tool...</span>
+      </div>
+    </div>
     <script type="module" src="/static/src/main.jsx"></script>
     <script
       id="earthdata-tophat-script"

diff --git a/jest.config.js b/jest.config.js
@@ -169,9 +169,10 @@ const config = {
   // ],
 
   // An array of regexp pattern strings that are matched against all test paths, matched tests are skipped
-  // testPathIgnorePatterns: [
-  //   "/node_modules/"
-  // ],
+  testPathIgnorePatterns: [
+    '/__mocks__/',
+    '/node_modules/'
+  ],
 
   // The regexp pattern or array of patterns that Jest uses to detect test files
   // testRegex: [],
@@ -197,7 +198,9 @@ const config = {
     '/node_modules/(?!'
       + '@react-leaflet|'
       + 'react-leaflet|'
-      + 'jest-runtime'
+      + 'nanoid|'
+      + 'jest-runtime|'
+      + 'lodash-es'
       + ').+\\.js$'
   ]
 

diff --git a/jest.setup.js b/jest.setup.js
@@ -23,3 +23,8 @@ global.waitForResponse = async () => {
     }
   }))
 }
+
+// JS Dom does not have scrollIntoView, so create it here
+// https://stackoverflow.com/a/53294906
+window.HTMLElement.prototype.scrollIntoView = jest.fn()
+window.scroll = jest.fn()