@suffolklitlab/alkiln 5.0.0-experimental3 → 5.0.0-experimental5

package/CHANGELOG.md

@@ -58,11 +58,11 @@ Format:
 - Docassemble Project name prefix now includes ALKiln in it for clarity
 
 ### Fixed
+- DOCKER UPDATE (for ALKilnInThePlayground): Allows ALKilnInThePlayground to upload files. See https://github.com/SuffolkLITLab/docassemble-ALKilnInThePlayground/issues/18. This may require some developers to update their system (updating their docker image) as described in [the documentation](https://suffolklitlab.org/legal-tech-class/docs/practical-guide-docassemble/maintaining-docassemble#updates-to-the-docassemble-container). Updating to a new docker images is something that all docassemble users will have to do sometime anyway, sometimes for security.
+- Conform upload file behavior to that of other Story Table rows - avoid erroring when field isn't set properly unless using all variables is required.
 - Projects created in da each have a unique name. https://github.com/SuffolkLITLab/ALKiln/issues/663
 - Shorten path names to try to accommodate limitations of windows systems while still keeping enough useful information to help devs identify the test outputs. https://github.com/SuffolkLITLab/ALKiln/issues/618
 - Updated field decoding to handle new object field encoding. See [#711](https://github.com/SuffolkLITLab/ALKiln/issues/711)
-- Allows ALKilnInThePlayground to upload files. See https://github.com/SuffolkLITLab/docassemble-ALKilnInThePlayground/issues/18.
-- Conform upload file behavior to that of other Story Table rows - avoid erroring when field isn't set properly unless using all variables is required.
 
 ### Security
 - Pass docassemble API keys through HTTP headers instead of as parameters.

package/lib/scope.js

@@ -1795,7 +1795,7 @@ module.exports = {
     }
 
     // Make sure sources directory exists
-    let dirs = fg.sync([ `**/data/sources` ], { onlyFiles: false });
+    let dirs = fg.sync([ `**/docassemble/**/data/sources` ], { onlyFiles: false });
     if ( dirs.length === 0 ) {
       await scope.addToReport( scope, {
         type: `warning`,
@@ -1803,19 +1803,32 @@ module.exports = {
       });
       return false;
     }
-    let dir = dirs[0];
+    let dir = null;
 
     let paths = [];
-    let missing_files = [];
+    let missing_files = [];  // For any user warnings
     for ( let name of uploads_names ) {
       let trimmed_name = name.trim();
-      let matching_paths = fg.sync([ `${ dir }/${ trimmed_name }` ]);
+      let matching_paths = [];
+      if ( dir === null ) {
+        for ( let one_dir of dirs ) {
+          console.log( one_dir );
+          matching_paths = fg.sync([ `${ one_dir }/${ trimmed_name }` ]);
+          if ( matching_paths.length > 0 ) {
+            dir = one_dir;
+            break;
+          }
+        }  // ends for each dir
+      } else {
+        matching_paths = fg.sync([ `${ dir }/${ trimmed_name }` ]);
+      }
+
       if ( matching_paths.length === 0 ) {
         missing_files.push( trimmed_name );
       } else {
         paths.push( matching_paths[0] );
       }
-    }
+    }  // ends for each file
 
     if ( missing_files.length > 0 ) {
       await scope.addToReport( scope, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@suffolklitlab/alkiln",
-  "version": "5.0.0-experimental3",
+  "version": "5.0.0-experimental5",
   "description": "Integrated automated end-to-end testing with docassemble, puppeteer, and cucumber.",
   "main": "lib/index.js",
   "scripts": {
@@ -41,8 +41,8 @@
     "cheerio": "1.0.0-rc.10",
     "deep-equal-in-any-order": "^2.0.0",
     "dotenv": "8.2.0",
-    "fast-glob": "^3.2.12",
-    "glob": "^10.2.7",
+    "fast-glob": "3.2.12",
+    "glob": "10.2.7",
     "mocha": "9.2.0",
     "puppeteer": "13.1.3",
     "qs": "6.10.2",