Merge branch 'master' into gh-pages

# Conflicts: # published-plugins.json # src/data_interactive_map.json
concord-consortium · Apr 5, 2024 · 6de6f86 · 6de6f86
2 parents ef34fac + 04d82cf
commit 6de6f86
Show file tree

Hide file tree

Showing 79 changed files with 11,788 additions and 154 deletions.
diff --git a/Common/js/build-include.js b/Common/js/build-include.js
@@ -1,3 +1,3 @@
 window.codapPluginConfig = {
-  buildNumber: "0063"
+  buildNumber: "0064"
 }
diff --git a/TP-Sampler/src/codap-com.js b/TP-Sampler/src/codap-com.js
@@ -274,7 +274,7 @@ CodapCom.prototype = {
     if (oldDeviceName !== deviceName) {
       codapInterface.sendRequest({
         action: "update",
-        resource: `dataContext[${targetDataSetName}].collection[items].attribute[${oldDeviceName}]`,
+        resource: `dataContext[${targetDataSetName}].collection[${collectionNames.items}].attribute[${oldDeviceName}]`,
         values: {
           "name": deviceName
         }
@@ -315,13 +315,13 @@ CodapCom.prototype = {
         } else {
           codapInterface.sendRequest({
             action: "get",
-            resource: `dataContext[${targetDataSetName}].collection[items].attributeList`,
+            resource: `dataContext[${targetDataSetName}].collection[${collectionNames.items}].attributeList`,
           }).then((res) => {
             const {values} = res;
             if (!values.length || !values.find((attr) => attr.name === deviceName)) {
               codapInterface.sendRequest({
                 action: "create",
-                resource: `dataContext[${targetDataSetName}].collection[items].attribute`,
+                resource: `dataContext[${targetDataSetName}].collection[${collectionNames.items}].attribute`,
                 values: [
                   {
                     name: deviceName,

diff --git a/bin/build b/bin/build
@@ -60,7 +60,11 @@ function buildPlugins() {
       PLUGIN_BUILD_DIR=target
     fi
     echo Building $plugin
-    ( cd $plugin && npm install && npm run build && cp -r $PLUGIN_BUILD_DIR "$BUILD_DIR/$PLUGIN_NAME" )
+    if [ "$plugin" == "../noaa-codap-plugin" ] ; then
+      ( cd $plugin && npm install && npm run build && cp -r "dist" "$BUILD_DIR/$PLUGIN_NAME" )
+    else
+      ( cd $plugin && npm install && npm run build && cp -r $PLUGIN_BUILD_DIR "$BUILD_DIR/$PLUGIN_NAME" )
+    fi
   done
 }