From d4e4bdec9494c9fb8e86e31422d6b7d712345f35 Mon Sep 17 00:00:00 2001 From: Cyrus Hiatt Date: Wed, 2 Oct 2024 15:01:31 -0700 Subject: [PATCH 1/7] Prevent map layer manager error when getting default perms --- arches/app/permissions/arches_permission_base.py | 1 + 1 file changed, 1 insertion(+) diff --git a/arches/app/permissions/arches_permission_base.py b/arches/app/permissions/arches_permission_base.py index 14396761efe..3a289d30077 100644 --- a/arches/app/permissions/arches_permission_base.py +++ b/arches/app/permissions/arches_permission_base.py @@ -585,6 +585,7 @@ def get_all_default_permissions(self, model: Model = None): if ( not default_permissions_settings or model is None + or hasattr(model, "graph_id") is False or str(model.graph_id) not in default_permissions_settings ): return [] From a25e9d1bc68c4153f965a59fe1d615985badbce4 Mon Sep 17 00:00:00 2001 From: Cyrus Hiatt Date: Wed, 2 Oct 2024 15:24:13 -0700 Subject: [PATCH 2/7] Add release notes for 7.6.1 with changelog entry --- releases/7.6.1.md | 62 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 releases/7.6.1.md diff --git a/releases/7.6.1.md b/releases/7.6.1.md new file mode 100644 index 00000000000..4509652f902 --- /dev/null +++ b/releases/7.6.1.md @@ -0,0 +1,62 @@ +Arches 7.6.1 Release Notes +-------------------------- + +### Bug Fixes and Enhancements + +- Fixes bug causing the map layer manager to fail if a system uses DEFAULT_PERMISSIONS setting #[115522](https://github.com/archesproject/arches/issues/11522) + +### Dependency changes: +``` +Python: + Upgraded: + None + +JavaScript: + Upgraded: + none +``` + +### Upgrading Arches + +1. Upgrade to version 7.6.0 before proceeding by following the upgrade process in the [Version 7.6.0 release notes](https://github.com/archesproject/arches/blob/dev/7.6.x/releases/7.6.0.md) + +2. Upgrade to Arches 7.6.1 + ``` + pip install --upgrade arches==7.6.1 + ``` + +3. Update the JavaScript dependencies and devDependencies: + In the project's `package.json` file change arches from `stable/7.6.0` to `stable/7.6.1`: + ``` + "dependencies": { + "arches": "archesproject/arches#stable/7.6.1", + }, + "devDependencies": { + "arches-dev-dependencies": "archesproject/arches-dev-dependencies#stable/7.6.1" + } + ``` + In in your terminal navigate to the directory with your project's package.json file. Then run: + + yarn install + + +4. Start your application server in a separate terminal if it's not already running. Your webpack build will not complete without your application server running. + +5. In a different terminal navigate to the directory with your project's package.json file, run `npm start` or `npm run build_development`. This will generate your `media/build` directory. + - If running your project in development: + - `npm start` will build the frontend of the application and then start a webpack development server + - `npm run build_development` will build a development bundle for the frontend assests of the application -- this should complete in less than 2 minutes + - If running your project in production: + - `npm run build_production` This builds a production bundle. **takes up to 2hrs depending on resources** + - Alternatively you can `cd ..` up a directory and run `python manage.py build_production`. This will create a production bundle of frontend assessts and also call `collectstatic`. + + +6. If you are running Arches on Apache, be sure to run: + + ``` + collectstatic + ``` + and restart your server: + ``` + sudo service apache2 reload + ``` From c9c2492b7d4dfbbeb30627ff51aed5f6049c8f9a Mon Sep 17 00:00:00 2001 From: Cyrus Hiatt Date: Thu, 3 Oct 2024 11:42:52 -0700 Subject: [PATCH 3/7] 761 release prep (#11526) * Remove roadmap entry for 7.6 * Update version number --- README.md | 16 +--------------- arches/__init__.py | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index d9eca89841b..f0c21a059b2 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Issue reports are encouraged! [Please read this article](http://polite.technolog * [Report a Bug](https://github.com/archesproject/arches/issues/new?template=bug.md) * [File a Feature Ticket](https://github.com/archesproject/arches/issues/new?template=feature.md) -[Version 7.6.0 release notes](https://github.com/archesproject/arches/blob/dev/7.6.x/releases/7.6.0.md) +[Version 7.6.1 release notes](https://github.com/archesproject/arches/blob/dev/7.6.x/releases/7.6.1.md) #### Quick Install @@ -63,20 +63,6 @@ Our general release cycle will typically be a functional release (either major i The following a general plan for the Arches project. Be aware this plan is tentative and subject to change. -## 7.6 LTS - Release date: Sept 15, 2024 -- Arches Application improvements -- Security enhancements -- Default deny permissions -- Support for pluggable permissions frameworks -- Standalone plugins -- Customizable Search -- Concept label bulk editor module -- Map performance improvments -- Postgres 14 becomes minimum Postgres version - -## 7.6 - Supported Applications - - Workflow Builder - ## 8.0 - Release date: June 15, 2025 - Activity stream enhancements - Support for editing and publishing graphs without having to remove resource instances diff --git a/arches/__init__.py b/arches/__init__.py index 59ec910e3d2..093725de3b2 100644 --- a/arches/__init__.py +++ b/arches/__init__.py @@ -11,6 +11,6 @@ pass # VERSION[3] options = "alpha", "beta", "rc", or "final" -VERSION = (7, 6, 0, "beta", 0) +VERSION = (7, 6, 1, "beta", 0) __version__ = get_version(VERSION) diff --git a/package.json b/package.json index cacd7bd8071..039f104c50a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "arches", - "version": "7.6.0", + "version": "7.6.1", "license": "AGPL-3.0-only", "scripts": { "build_development": "npm run eslint:check && npm run ts:check && cross-env NODE_OPTIONS=--max-old-space-size=2048 webpack --config ./webpack/webpack.config.dev.js", From 40590c89ed51186607447111242e251676acf214 Mon Sep 17 00:00:00 2001 From: Cyrus Hiatt Date: Thu, 3 Oct 2024 13:59:30 -0700 Subject: [PATCH 4/7] Simplfy upgrade instructions (#11527) --- releases/7.6.1.md | 33 +-------------------------------- 1 file changed, 1 insertion(+), 32 deletions(-) diff --git a/releases/7.6.1.md b/releases/7.6.1.md index 4509652f902..47db54dd23c 100644 --- a/releases/7.6.1.md +++ b/releases/7.6.1.md @@ -25,38 +25,7 @@ JavaScript: pip install --upgrade arches==7.6.1 ``` -3. Update the JavaScript dependencies and devDependencies: - In the project's `package.json` file change arches from `stable/7.6.0` to `stable/7.6.1`: - ``` - "dependencies": { - "arches": "archesproject/arches#stable/7.6.1", - }, - "devDependencies": { - "arches-dev-dependencies": "archesproject/arches-dev-dependencies#stable/7.6.1" - } - ``` - In in your terminal navigate to the directory with your project's package.json file. Then run: - - yarn install - - -4. Start your application server in a separate terminal if it's not already running. Your webpack build will not complete without your application server running. - -5. In a different terminal navigate to the directory with your project's package.json file, run `npm start` or `npm run build_development`. This will generate your `media/build` directory. - - If running your project in development: - - `npm start` will build the frontend of the application and then start a webpack development server - - `npm run build_development` will build a development bundle for the frontend assests of the application -- this should complete in less than 2 minutes - - If running your project in production: - - `npm run build_production` This builds a production bundle. **takes up to 2hrs depending on resources** - - Alternatively you can `cd ..` up a directory and run `python manage.py build_production`. This will create a production bundle of frontend assessts and also call `collectstatic`. - - -6. If you are running Arches on Apache, be sure to run: - - ``` - collectstatic - ``` - and restart your server: +3. If you are running Arches on Apache, be restart your server: ``` sudo service apache2 reload ``` From 9cd7de533cf2fac60c238123bc4220e2d7ed4e16 Mon Sep 17 00:00:00 2001 From: Aaron Gundel Date: Thu, 10 Oct 2024 13:43:22 -0600 Subject: [PATCH 5/7] uuid type conversion error to fix #11536 --- arches/app/models/resource.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arches/app/models/resource.py b/arches/app/models/resource.py index 6cf3c40f20d..b0d88c85b3e 100644 --- a/arches/app/models/resource.py +++ b/arches/app/models/resource.py @@ -887,8 +887,8 @@ def get_relations( ) filtered_instances = filtered_instances if user is not None else [] - resourceid_to_permission = resourceid_to not in filtered_instances - resourceid_from_permission = resourceid_from not in filtered_instances + resourceid_to_permission = str(resourceid_to) not in filtered_instances + resourceid_from_permission = str(resourceid_from) not in filtered_instances if exclusive_set: resourceid_to_permission = not (resourceid_to_permission) From 31b3ac4f4d5668606541a44c647a442135f25303 Mon Sep 17 00:00:00 2001 From: Aaron Gundel Date: Fri, 11 Oct 2024 09:31:31 -0600 Subject: [PATCH 6/7] Adds 7.6.2 release notes --- releases/7.6.2.md | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 releases/7.6.2.md diff --git a/releases/7.6.2.md b/releases/7.6.2.md new file mode 100644 index 00000000000..c8c7763148e --- /dev/null +++ b/releases/7.6.2.md @@ -0,0 +1,32 @@ +## Arches 7.6.2 Release Notes + +### Bug Fixes and Enhancements + +- Fixes bug in which resource relationships fail to appear in visualize mode if using default deny as a non-superuser #[11539](https://github.com/archesproject/arches/pull/11539) + +### Dependency changes: + +``` +Python: + Upgraded: + None + +JavaScript: + Upgraded: + none +``` + +### Upgrading Arches + +1. Upgrade to version 7.6.0 before proceeding by following the upgrade process in the [Version 7.6.0 release notes](https://github.com/archesproject/arches/blob/dev/7.6.x/releases/7.6.0.md) + +2. Upgrade to Arches 7.6.2 + + ``` + pip install --upgrade arches==7.6.2 + ``` + +3. If you are running Arches on Apache, be restart your server: + ``` + sudo service apache2 reload + ``` From 4a719f5b5580d87aea653ab2de7d3957cb431be7 Mon Sep 17 00:00:00 2001 From: CWDamm-Kint Date: Tue, 15 Oct 2024 12:16:24 +0100 Subject: [PATCH 7/7] fix nav menu width to have minumum value --- arches/app/media/css/sidenav.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/arches/app/media/css/sidenav.scss b/arches/app/media/css/sidenav.scss index 29b394dc79f..d28a5e8e514 100644 --- a/arches/app/media/css/sidenav.scss +++ b/arches/app/media/css/sidenav.scss @@ -96,6 +96,7 @@ a { padding: 3px 20px; font-weight: 400; + min-width: 120px; } } .list-divider-dark {