Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#11561 Load all components from arches apps before looking in core #11562

Merged
merged 6 commits into from
Oct 30, 2024
Merged

#11561 Load all components from arches apps before looking in core #11562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9a578da
Load all components from arches apps before looking in core #11561
johnatawnclementawn Oct 22, 2024
79bd5dd
Add release note & explanatory comment #11561
johnatawnclementawn Oct 22, 2024
2c7e239
Merge branch 'dev/7.6.x' into jmc/11561_load_components_from_all_arch…
johnatawnclementawn Oct 28, 2024
2d0db6f
Update load-component-dependencies.js
chrabyrd Oct 28, 2024
cda91ee
Merge branch 'dev/7.6.x' into jmc/11561_load_components_from_all_arch…
johnatawnclementawn Oct 30, 2024
3260acf
Add 7.6.3 release notes & move #11561 bug fix note there
johnatawnclementawn Oct 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 37 additions & 24 deletions arches/app/media/js/utils/load-component-dependencies.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,64 +3,70 @@
define([], function() {
return function loadComponentDependencies(componentPaths){
for (const componentPath of componentPaths) {
try {
if (!ARCHES_APPLICATIONS.length) { // assumption os running Arches without a project
throw new Error()
let componentLoaded = false;

for (const archesApp of ARCHES_APPLICATIONS) {
try {
require(`${SITE_PACKAGES_DIRECTORY}/${archesApp}/media/js/${componentPath}`);
componentLoaded = true;
break;
}
for (const archesApp of ARCHES_APPLICATIONS) {
catch(e) {
try {
require(`${SITE_PACKAGES_DIRECTORY}/${archesApp}/media/js/${componentPath}`);
require(`${LINKED_APPLICATION_PATH_0}/media/js/${componentPath}`);
componentLoaded = true;
break;
}
// Handle editable installations (with pip install -e).
// Webpack needs string literals, hence arbitrary limit of 9.
// https://github.com/archesproject/arches/issues/11274
catch(e) {
catch {
try {
require(`${LINKED_APPLICATION_PATH_0}/media/js/${componentPath}`);
require(`${LINKED_APPLICATION_PATH_1}/media/js/${componentPath}`);
componentLoaded = true;
break;
}
catch {
try {
require(`${LINKED_APPLICATION_PATH_1}/media/js/${componentPath}`);
require(`${LINKED_APPLICATION_PATH_2}/media/js/${componentPath}`);
componentLoaded = true;
break;
}
catch {
try {
require(`${LINKED_APPLICATION_PATH_2}/media/js/${componentPath}`);
require(`${LINKED_APPLICATION_PATH_3}/media/js/${componentPath}`);
componentLoaded = true;
break;
}
catch {
try {
require(`${LINKED_APPLICATION_PATH_3}/media/js/${componentPath}`);
require(`${LINKED_APPLICATION_PATH_4}/media/js/${componentPath}`);
componentLoaded = true;
break;
}
catch {
try {
require(`${LINKED_APPLICATION_PATH_4}/media/js/${componentPath}`);
require(`${LINKED_APPLICATION_PATH_5}/media/js/${componentPath}`);
componentLoaded = true;
break;
}
catch {
try {
require(`${LINKED_APPLICATION_PATH_5}/media/js/${componentPath}`);
require(`${LINKED_APPLICATION_PATH_6}/media/js/${componentPath}`);
componentLoaded = true;
break;
}
catch {
try {
require(`${LINKED_APPLICATION_PATH_6}/media/js/${componentPath}`);
require(`${LINKED_APPLICATION_PATH_7}/media/js/${componentPath}`);
componentLoaded = true;
break;
}
catch {
try {
require(`${LINKED_APPLICATION_PATH_7}/media/js/${componentPath}`);
require(`${LINKED_APPLICATION_PATH_8}/media/js/${componentPath}`);
componentLoaded = true;
break;
}
catch {
try {
require(`${LINKED_APPLICATION_PATH_8}/media/js/${componentPath}`);
break;
}
catch { throw new Error(); } // if all attempts fail within the loop, throw error for outer try/catch
// Component not found in linked paths, continue to next archesApp
}
}
}
Expand All @@ -72,9 +78,16 @@ define([], function() {
}
}
}
catch(e) { // finally, look in Arches core for component
require(`${ARCHES_CORE_DIRECTORY}/app/media/js/${componentPath}`);

if (!componentLoaded) { // Finally, look in Arches core for the component
try {
require(`${ARCHES_CORE_DIRECTORY}/app/media/js/${componentPath}`);
}
catch (e) {
console.error(`Component "${componentPath}" not found in any application or in Arches core.`);
}
}
}
};
});

30 changes: 30 additions & 0 deletions releases/7.6.3.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
## Arches 7.6.3 Release Notes

### Bug Fixes and Enhancements

- Fixes bug that prevented some Arches Application front-end components from being loaded #[11561](https://github.com/archesproject/arches/issues/11561)

### 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.3
```
pip install --upgrade arches==7.6.3
```

3. If you are running Arches on Apache, restart your server:
```
sudo service apache2 reload
```