v1.0.7-beta branch (#454)

* Bumped version number.

* Changes to fix wget download issues. (#452)

* changes to fix wget download issues: multiple download, direct link handed to browser

* Removed uneccessary import

Co-authored-by: Sasha Ames <[email protected]>

* Update dependency @types/jest to v28.1.6 (#444)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update typescript-eslint monorepo to v5.30.7 (#445)

* hotfix to get wget script download to work (#449) (#450)

* hotfix to get wget script download to work (#449)

* hotfix to get wget script download to work

* fix removed return

* Updating file to fix minor blank line issue.

Co-authored-by: Sasha Ames <[email protected]>

* Update typescript-eslint monorepo to v5.30.7

Co-authored-by: Carlos Downie <[email protected]>
Co-authored-by: Sasha Ames <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update dependency moment to v2.29.4 [SECURITY] (#443)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Bump terser from 5.12.1 to 5.14.2 in /frontend (#451)

Bumps [terser](https://github.com/terser/terser) from 5.12.1 to 5.14.2.
- [Release notes](https://github.com/terser/terser/releases)
- [Changelog](https://github.com/terser/terser/blob/master/CHANGELOG.md)
- [Commits](https://github.com/terser/terser/commits)

---
updated-dependencies:
- dependency-name: terser
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump moment from 2.29.2 to 2.29.4 in /frontend (#442)

Bumps [moment](https://github.com/moment/moment) from 2.29.2 to 2.29.4.
- [Release notes](https://github.com/moment/moment/releases)
- [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md)
- [Commits](moment/moment@2.29.2...2.29.4)

---
updated-dependencies:
- dependency-name: moment
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Carlos Downie <[email protected]>

* Feature/453 update deployment configs (#458)

* Testing the use of a central config file and a manager script. Created a metagrid_configs folder where different configs can be stored and used.

* updates to scripts and dockerfile for traefik to handle empty prefx variables.

* More fixes and updates.

* Refactoring to fix issues with the variables used in the master config file, so that they don't repeat in the config. Removed unnecessary folders and updated the manage_metagrid script to allow saving and restoring of config files in an automated way. Every time changes are made to the config, a backup will be created which will have date and time associated to it. Users can then restore that backup with a simple command in the script (which will also save the current config that is replaced. Note that if lots of changes are made, config backups should probably be deleted now and then.

* Updated script to include sudo that was missing and also copy to traefik when a backup is restored.

* updates t the script for local testing. Fixed a docker-compose minor issue in the backend production so it points to correct config file.

* Updated the scripts to save environment file in each docker directory. It seems that the frontend uses the package.json build call rather than the one in docker compose, so the environment file was not found when building react. Modifications should help fix that issue.

* Added cors proxy variable because it still seems necessary for the backend communication with frontend...

* Updates to the metagrid documentation. A restructuring update needs to be done for getting_started_production.md in order to reflect the new way which configuration is setup and updated in production.

* Updated manage script to include the option for starting/stopping the docs local containers. Updated django version to 3.2.15

* Updated the documentation to specify the manage_metagrid.sh scripts and how to update the projects. Also updated the configuration steps and how to get production started.

* Feature/447 generalize redirects (#465)

* redirect test.

* Change the order in the server location directive and update the entrypoint to use the new PREVIOUS_URL variable.

* Connected environment variables in config to the front-end redirect logic to allow frontend to redirect if a previous url is specified in the config

* Updated the manage_metagrid script to not use sudo. Updated the previous url env variable name so that it is useable in the front end. All variables used in the frontend need to be prefixed with REACT_APP_ otherwise they aren't visible and are undefined. Removed the console log statements.

* Updated the git ignore files. Attempted to create mock imports for testing the generateRedirects function, however after various attempts and research, found out it would have required a significant rewrite and the test itself is not going to be worth it, so I cleaned up my changes and resorted to using the istanbul ignore.

* Feature/459 expand all button facets (#467)

* redirect test.

* Change the order in the server location directive and update the entrypoint to use the new PREVIOUS_URL variable.

* Added expand and collapse functionality to the facet forms. Opened the additional properties panel by default.

* Updated tests for full coverage. Updated the joyride tour to include the new expand/collapse button functionality.

Co-authored-by: Sasha Ames <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Sasha Ames <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Author: 4 people

.gitignore

@@ -4,6 +4,8 @@
 # pytest
 .pytest_cache/
 
+# Config backups
+metagrid_configs/backups
 
 ### Linux template
 *~

.pyup.yml

@@ -46,7 +46,7 @@ label_prs: update
 # assign users to pull requests, default is not set
 # requires private repo permissions, even on public repos
 # default: empty
-assignees: tomvothecoder
+assignees: downiec
 
 # configure the branch prefix the bot is using
 # default: pyup-

backend/.envs/.local/.django renamed to backend/.envs/.django

@@ -15,7 +15,7 @@ services:
       - production_postgres_data:/var/lib/postgresql/data
       - production_postgres_data_backups:/backups
     env_file:
-      - ./.envs/.production/.postgres
+      - ./.envs/.prod.env
 
   django:
     build:
@@ -28,8 +28,7 @@ services:
     depends_on:
       - postgres
     env_file:
-      - ./.envs/.production/.django
-      - ./.envs/.production/.postgres
+      - ./.envs/.prod.env
     ports:
       - "5000:5000"
     command: /start

backend/.envs/.local/.keycloak renamed to backend/.envs/.keycloak

@@ -18,7 +18,7 @@ services:
       - local_postgres_data_backups:/backups
       - ./docker/local/postgres/init.sql:/docker-entrypoint-initdb.d/init.sql
     env_file:
-      - ./.envs/.local/.postgres
+      - ./.envs/.postgres
     ports:
       - "5433:5432"
 
@@ -32,7 +32,7 @@ services:
     volumes:
       - ./docker/local/keycloak:/opt/jboss/keycloak/imports
     env_file:
-      - ./.envs/.local/.keycloak
+      - ./.envs/.keycloak
     ports:
       - "8080:8080"
     command: -Dkeycloak.import=/opt/jboss/keycloak/imports/realm-export.json
@@ -50,8 +50,8 @@ services:
     volumes:
       - .:/app
     env_file:
-      - ./.envs/.local/.django
-      - ./.envs/.local/.postgres
+      - ./.envs/.django
+      - ./.envs/.postgres
     ports:
       - "8000:8000"
     restart: always

backend/.envs/.local/.postgres renamed to backend/.envs/.postgres

@@ -76,6 +76,5 @@ def do_request(request, urlbase):
 
     httpresp = HttpResponse(resp.text)
     httpresp.status_code = resp.status_code
-    httpresp.headers = resp.headers
-    httpresp.encoding = resp.encoding
+
     return httpresp