Skip to content

Commit

Permalink
Clean up code, clarify CHANGELOG
Browse files Browse the repository at this point in the history
Co-authored-by: Bryce Willey <Bryce.Steven.Willey@gmail.com>
  • Loading branch information
plocket and BryceStevenWilley authored Jul 11, 2023
1 parent 968b0e2 commit ee98a37
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 6 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ Format:
- Docassemble Project name prefix now includes ALKiln in it for clarity

### Fixed
- DOCKER UPDATE (for ALKilnInThePlayground): Allows ALKilnInThePlayground to upload files (though S3 is not consistent yet). 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.
- DOCKER UPDATE (for ALKilnInThePlayground): Allows ALKilnInThePlayground to upload files (though S3 is not consistent yet). See https://github.com/SuffolkLITLab/docassemble-ALKilnInThePlayground/issues/18. This may require some developers to update their system (updating their docker image) if they are below [docassemble-os 1.0.8](https://github.com/jhpyle/docassemble-os/releases/tag/v1.0.8). You can tell if you are below docassemble-os 1.0.8 if you run `docker image inspect jhpyle/docassemble | grep Created` on your host server (Lightsail, etc.) and the created date is before 2023-04-09. You can update 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
Expand Down
5 changes: 0 additions & 5 deletions lib/scope.js
Original file line number Diff line number Diff line change
Expand Up @@ -1798,10 +1798,6 @@ module.exports = {
[ `/usr/share/docassemble/files/playgroundsources/${session_vars.get_user_id()}/${session_vars.get_user_project_name()}` ],
{ onlyFiles: false, suppressErrors: true }
);

// TODO: This dir doesn't hold onto files (according to feedback). We
// need to find a better way to get these files from S3. Python lib s4cmd
// was recommended.
let files_s3 = fg.sync(
[ `/tmp/playgroundsources/${session_vars.get_user_id()}/${session_vars.get_user_project_name()}` ],
{ onlyFiles: false, suppressErrors: true }
Expand Down Expand Up @@ -1835,7 +1831,6 @@ module.exports = {
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 ) {
// Once we've found a matching file, we choose to use that directory
Expand Down

0 comments on commit ee98a37

Please sign in to comment.