Merge branch 'master' of https://github.com/concord-consortium/codap-…

…data-interactives
concord-consortium · Feb 9, 2024 · 0e0bba8 · 0e0bba8
2 parents ce069bd + 7a8663d
commit 0e0bba8
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 30 deletions.
diff --git a/TP-Sampler/src/strings.json b/TP-Sampler/src/strings.json
@@ -110,7 +110,8 @@
     "DG.plugin.Scrambler.sMeasureDatasetPrefix": "measures_from_",
     "DG.plugin.Sampler.title": "Sampler",
     "DG.plugin.Sampler.description": "Create random datasets from scratch or existing datasets.",
-    "DG.plugin.Sampler.tab.sampler": "Sampler",
+    "DG.plugin.Sampler.tab.devices": "Model",
+    "DG.plugin.Sampler.tab.measures": "Measures",
     "DG.plugin.Sampler.tab.options": "Options",
     "DG.plugin.Sampler.tab.about": "About",
     "DG.plugin.Sampler.top-bar.run": "START",

diff --git a/bin/build b/bin/build
@@ -19,7 +19,7 @@ BUILD_NUM=`cat lib/build-num.txt`
 BUILD_DIR="$WORKING/plugins"
 ZIP_FILENAME=codap-data-interactives-${BUILD_NUM}.zip
 
-STATIC_PLUGIN_DIRS="TP-Sampler DrawTool Importer NOAA-weather sdlc/plugin eepsmedia/plugins/Choosy eepsmedia/plugins/scrambler Sonify"
+STATIC_PLUGIN_DIRS="TP-Sampler DrawTool Importer NOAA-weather sdlc/plugin eepsmedia/plugins/Choosy Sonify eepsmedia/plugins/scrambler "
 HIDDEN_DIRS="Common eepsmedia/common"
 BUILT_PLUGIN_DIRS="onboarding
                    ../codap-transformers

diff --git a/build/asset-manifest.json b/build/asset-manifest.json
@@ -1,14 +1,14 @@
 {
   "files": {
     "main.css": "./static/css/main.36bc8d80.chunk.css",
-    "main.js": "./static/js/main.703e18fb.chunk.js",
-    "main.js.map": "./static/js/main.703e18fb.chunk.js.map",
+    "main.js": "./static/js/main.c693d1f6.chunk.js",
+    "main.js.map": "./static/js/main.c693d1f6.chunk.js.map",
     "runtime-main.js": "./static/js/runtime-main.42b58e32.js",
     "runtime-main.js.map": "./static/js/runtime-main.42b58e32.js.map",
     "static/js/2.c80c4b2d.chunk.js": "./static/js/2.c80c4b2d.chunk.js",
     "static/js/2.c80c4b2d.chunk.js.map": "./static/js/2.c80c4b2d.chunk.js.map",
     "index.html": "./index.html",
-    "precache-manifest.50006c56e19073402d72ae675adcab72.js": "./precache-manifest.50006c56e19073402d72ae675adcab72.js",
+    "precache-manifest.b78c79a36dd4399b008eaae85bc3ded5.js": "./precache-manifest.b78c79a36dd4399b008eaae85bc3ded5.js",
     "service-worker.js": "./service-worker.js",
     "static/css/main.36bc8d80.chunk.css.map": "./static/css/main.36bc8d80.chunk.css.map",
     "static/js/2.c80c4b2d.chunk.js.LICENSE.txt": "./static/js/2.c80c4b2d.chunk.js.LICENSE.txt",
@@ -18,6 +18,6 @@
     "static/js/runtime-main.42b58e32.js",
     "static/js/2.c80c4b2d.chunk.js",
     "static/css/main.36bc8d80.chunk.css",
-    "static/js/main.703e18fb.chunk.js"
+    "static/js/main.c693d1f6.chunk.js"
   ]
 }
diff --git a/build/index.html b/build/index.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="./favicon.ico"/><link rel="preconnect" href="https://fonts.gstatic.com"><link href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;700&display=swap" rel="stylesheet"><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="./logo192.png"/><link rel="manifest" href="./manifest.json"/><title>CODAP Plugins</title><link href="./static/css/main.36bc8d80.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(e){function t(t){for(var n,a,i=t[0],l=t[1],c=t[2],f=0,s=[];f<i.length;f++)a=i[f],Object.prototype.hasOwnProperty.call(o,a)&&o[a]&&s.push(o[a][0]),o[a]=0;for(n in l)Object.prototype.hasOwnProperty.call(l,n)&&(e[n]=l[n]);for(p&&p(t);s.length;)s.shift()();return u.push.apply(u,c||[]),r()}function r(){for(var e,t=0;t<u.length;t++){for(var r=u[t],n=!0,i=1;i<r.length;i++){var l=r[i];0!==o[l]&&(n=!1)}n&&(u.splice(t--,1),e=a(a.s=r[0]))}return e}var n={},o={1:0},u=[];function a(t){if(n[t])return n[t].exports;var r=n[t]={i:t,l:!1,exports:{}};return e[t].call(r.exports,r,r.exports,a),r.l=!0,r.exports}a.m=e,a.c=n,a.d=function(e,t,r){a.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},a.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},a.t=function(e,t){if(1&t&&(e=a(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(a.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var n in e)a.d(r,n,function(t){return e[t]}.bind(null,n));return r},a.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(t,"a",t),t},a.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},a.p="./";var i=this["webpackJsonpcodap-data-interactives"]=this["webpackJsonpcodap-data-interactives"]||[],l=i.push.bind(i);i.push=t,i=i.slice();for(var c=0;c<i.length;c++)t(i[c]);var p=l;r()}([])</script><script src="./static/js/2.c80c4b2d.chunk.js"></script><script src="./static/js/main.703e18fb.chunk.js"></script></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="./favicon.ico"/><link rel="preconnect" href="https://fonts.gstatic.com"><link href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;700&display=swap" rel="stylesheet"><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="./logo192.png"/><link rel="manifest" href="./manifest.json"/><title>CODAP Plugins</title><link href="./static/css/main.36bc8d80.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(e){function t(t){for(var n,a,i=t[0],l=t[1],c=t[2],f=0,s=[];f<i.length;f++)a=i[f],Object.prototype.hasOwnProperty.call(o,a)&&o[a]&&s.push(o[a][0]),o[a]=0;for(n in l)Object.prototype.hasOwnProperty.call(l,n)&&(e[n]=l[n]);for(p&&p(t);s.length;)s.shift()();return u.push.apply(u,c||[]),r()}function r(){for(var e,t=0;t<u.length;t++){for(var r=u[t],n=!0,i=1;i<r.length;i++){var l=r[i];0!==o[l]&&(n=!1)}n&&(u.splice(t--,1),e=a(a.s=r[0]))}return e}var n={},o={1:0},u=[];function a(t){if(n[t])return n[t].exports;var r=n[t]={i:t,l:!1,exports:{}};return e[t].call(r.exports,r,r.exports,a),r.l=!0,r.exports}a.m=e,a.c=n,a.d=function(e,t,r){a.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},a.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},a.t=function(e,t){if(1&t&&(e=a(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(a.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var n in e)a.d(r,n,function(t){return e[t]}.bind(null,n));return r},a.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(t,"a",t),t},a.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},a.p="./";var i=this["webpackJsonpcodap-data-interactives"]=this["webpackJsonpcodap-data-interactives"]||[],l=i.push.bind(i);i.push=t,i=i.slice();for(var c=0;c<i.length;c++)t(i[c]);var p=l;r()}([])</script><script src="./static/js/2.c80c4b2d.chunk.js"></script><script src="./static/js/main.c693d1f6.chunk.js"></script></body></html>
diff --git a/...ifest.50006c56e19073402d72ae675adcab72.js → ...ifest.b78c79a36dd4399b008eaae85bc3ded5.js b/...ifest.50006c56e19073402d72ae675adcab72.js → ...ifest.b78c79a36dd4399b008eaae85bc3ded5.js
@@ -1,10 +1,10 @@
 self.__precacheManifest = (self.__precacheManifest || []).concat([
   {
-    "revision": "64596856986271e6f21f6d5b573915e1",
+    "revision": "96f90a8925d91e8bd4999b1a1b32627f",
     "url": "./index.html"
   },
   {
-    "revision": "88e44a11d06edf1eef2c",
+    "revision": "d995087f826a9e4c6a24",
     "url": "./static/css/main.36bc8d80.chunk.css"
   },
   {
@@ -16,8 +16,8 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([
     "url": "./static/js/2.c80c4b2d.chunk.js.LICENSE.txt"
   },
   {
-    "revision": "88e44a11d06edf1eef2c",
-    "url": "./static/js/main.703e18fb.chunk.js"
+    "revision": "d995087f826a9e4c6a24",
+    "url": "./static/js/main.c693d1f6.chunk.js"
   },
   {
     "revision": "cb17529e290eed44a367",

diff --git a/build/service-worker.js b/build/service-worker.js
@@ -14,7 +14,7 @@
 importScripts("https://storage.googleapis.com/workbox-cdn/releases/4.3.1/workbox-sw.js");
 
 importScripts(
-  "./precache-manifest.50006c56e19073402d72ae675adcab72.js"
+  "./precache-manifest.b78c79a36dd4399b008eaae85bc3ded5.js"
 );
 
 self.addEventListener('message', (event) => {

diff --git a/build/static/js/main.703e18fb.chunk.js → build/static/js/main.c693d1f6.chunk.js b/build/static/js/main.703e18fb.chunk.js → build/static/js/main.c693d1f6.chunk.js
diff --git a/build/static/js/main.703e18fb.chunk.js.map → build/static/js/main.c693d1f6.chunk.js.map b/build/static/js/main.703e18fb.chunk.js.map → build/static/js/main.c693d1f6.chunk.js.map
diff --git a/sdlc/plugin/js/app.CODAPconnect.js b/sdlc/plugin/js/app.CODAPconnect.js
@@ -180,7 +180,7 @@ let CODAPconnect = {
         type : 'caseTable',
         dataContext : constants.datasetName,
         name : constants.caseTableName,
-        cannotClose : true
+        cannotClose : false
       }
     };
 

diff --git a/src/data_interactive_map.json b/src/data_interactive_map.json
@@ -853,6 +853,20 @@
         "Tools"
       ]
     },
+    {
+      "title": "Sonify",
+      "description": "Listen to your data",
+      "width": 325,
+      "height": 274,
+      "path": "/Sonify/index.html",
+      "icon": "/Sonify/src/assets/sonify.svg",
+      "visible": "true",
+      "isStandard": "true",
+      "categories": [
+        "Partners",
+        "Tools"
+      ]
+    },
     {
       "title": "Story Builder",
       "description": "Create a narrative of your investigation",
@@ -869,20 +883,6 @@
         "Tools"
       ]
     },
-    {
-      "title": "Sonify",
-      "description": "Listen to your data",
-      "width": 325,
-      "height": 274,
-      "path": "/Sonify/index.html",
-      "icon": "/Sonify/src/assets/sonify.svg",
-      "visible": "true",
-      "isStandard": "true",
-      "categories": [
-        "Partners",
-        "Tools"
-      ]
-    },
     {
       "title": "Day Length",
       "description": "Computes the day length for a year for any place in the world",