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.

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

Update master with dev/1.1.x #1545

Open
wants to merge 422 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
422 commits
Select commit Hold shift + click to select a range
72fe3a1
Check the obervation ids before request, #1337
njkim Oct 13, 2023
a935901
Merge pull request #1340 from archesproject/1332_new_project_name
chiatt Oct 13, 2023
c3c2ad0
Add file format settings to treat formats other than and 'txt' as tex…
njkim Oct 13, 2023
d23f7b6
Merge pull request #1355 from archesproject/1337_project_report_no_ob…
jacobtylerwalls Oct 13, 2023
58bde21
Fix highlighting of resource instances #1356 (#1357)
jacobtylerwalls Oct 13, 2023
988d640
adds incomplete workflows modal to init-workflow plugin #1364
chrabyrd Oct 18, 2023
08c0fcc
nit #1364
chrabyrd Oct 19, 2023
6cd1696
Assign "" for missing values, #1342 (#1362)
njkim Oct 20, 2023
2607fb3
Merge branch 'dev/1.1.x' of https://github.com/archesproject/arches-f…
chrabyrd Oct 20, 2023
aafa972
PR feedback changes #1364
chrabyrd Oct 20, 2023
e4c9d57
nit 1364
chrabyrd Oct 20, 2023
f2bb85b
Merge pull request #1369 from archesproject/1364-cbyrd-list-user-inco…
jacobtylerwalls Oct 20, 2023
2370b83
Open downloaded files in a new tab #1339
jacobtylerwalls Oct 19, 2023
12ccce1
Fix typo
jacobtylerwalls Oct 19, 2023
14de8d0
Update README with settings and url tweaks (#1375)
jacobtylerwalls Oct 24, 2023
b5fa941
Handle when there is no custom renderer, #1352 (#1358)
njkim Oct 24, 2023
7d8da5b
Prevent annotations from vanishing when toggling or canceling #1321 (…
jacobtylerwalls Oct 24, 2023
746df33
Remove temp_file from afs, arches#9749 (#1361)
njkim Oct 24, 2023
583c40f
Add migration granting Resource Reviewers view plugin access (#1366)
jacobtylerwalls Oct 25, 2023
2ad0980
Remove references to FORMATS setting, re #1380 (#1381)
chiatt Oct 25, 2023
3faea2f
Bump arches-templating to 0.1.2
jacobtylerwalls Oct 12, 2023
6c7b557
Allow filtering samples and regions out of search results #1378
jacobtylerwalls Sep 19, 2023
789cf0a
nit re #1304
jacobtylerwalls Oct 11, 2023
9236909
Add toggles re #1305
jacobtylerwalls Oct 25, 2023
5523702
Sort selected resources
jacobtylerwalls Oct 26, 2023
785757a
Fix wrapping of phys thing name in sidebar
jacobtylerwalls Oct 26, 2023
822b5e5
Group child physical things under parents re #1378
jacobtylerwalls Oct 26, 2023
1729bd9
Indent child physical things in sidebar #1378
jacobtylerwalls Oct 26, 2023
93b5774
fixes for #1328 and #1382 (#1384)
aarongundel Oct 26, 2023
dc95ae3
Update version to latest alpha (#1389)
chiatt Oct 26, 2023
d61e9d5
Show physical thing icons in resource select widgets #1391 (#1395)
jacobtylerwalls Oct 27, 2023
4c1396d
fixes incopmlete workflow toolbar width #1390 (#1392)
chrabyrd Oct 27, 2023
12e16ba
Remebers the selected file, #1376 (#1386)
njkim Oct 27, 2023
5acd6e0
stub out chemical analysis image workflow, re #1134
May 10, 2023
16cb5c4
Add chemical analysis workflow, re #1134
Jun 27, 2023
a483825
Add custom chemical analysis view, re #1134
Jun 27, 2023
15f5ec7
Resolve race condition and issue with file upload, re #1134
Jun 28, 2023
4e03ccf
Respond to PR comments, re #1134
Jul 27, 2023
0cc8092
rebase #1134
chrabyrd Oct 27, 2023
7a92682
rebase to dev/1.1.x #1134
chrabyrd Oct 27, 2023
6791369
nit #1134
chrabyrd Oct 27, 2023
982b40e
Save the step data instead of download, #1398
njkim Oct 28, 2023
23edee8
Adds clear option
aarongundel Oct 30, 2023
01bc0eb
adjust sizing slightly
aarongundel Oct 30, 2023
7739f95
allow for configurable columns
aarongundel Oct 30, 2023
bce0aa2
1349 update xyloader UI (#1394)
dwuthrich Oct 30, 2023
ec25f17
updates chemical analysis images workflow #1134
chrabyrd Oct 30, 2023
90ae9b4
Removes elements from annotation screenshot (#1402)
aarongundel Oct 31, 2023
805b094
nit #1134
chrabyrd Oct 31, 2023
5f114e4
updates completion logic in select-dataset-files-step #1363 (#1388)
chrabyrd Oct 31, 2023
153bd8e
Update preferred terms concept, #1330 (#1367)
njkim Oct 31, 2023
186cb21
Fix sample deletion #1405 (#1406)
jacobtylerwalls Oct 31, 2023
38c5f3e
updates XY crud buttons #1377 (#1385)
chrabyrd Nov 1, 2023
91728e4
Add error handling to project name step #1354 (#1374)
jacobtylerwalls Nov 1, 2023
289cbb3
Fix second edit morphing back to first edit #1360 (#1412)
jacobtylerwalls Nov 1, 2023
9fd268a
Remove references to Arches Collector in index page #1410 (#1411)
johnatawnclementawn Nov 1, 2023
96bad68
Merge branch '1134_add_chemical_analysis_image_workflow' of https://g…
chrabyrd Nov 1, 2023
66becf5
add file dropdown to file interpretation step #1397 (#1409)
chrabyrd Nov 1, 2023
252afca
Zip all files at final step as celery task, #1398
njkim Nov 1, 2023
acb47d5
Merge branch 'dev/1.1.x' into 1393-allow-clear
aarongundel Nov 2, 2023
6dd0e2a
Merge of UI changes for XY loader, various fixes, changes name of tex…
aarongundel Nov 2, 2023
a3ed407
remove important
aarongundel Nov 2, 2023
6509fe9
specificity fix
aarongundel Nov 2, 2023
6a1b625
re-fix original issue
aarongundel Nov 2, 2023
f860b9c
Adds mime type to for compatibility wildcard
aarongundel Nov 2, 2023
7487cd5
Show thumbnails without table, remove need to add title to downloaded…
dwuthrich Nov 2, 2023
1044b18
Remove the unused column from the table, #1414
njkim Nov 2, 2023
546b797
Merge pull request #1413 from archesproject/1134-add-chemical-analysi…
chiatt Nov 3, 2023
0c21332
update/move add screenshot button
dwuthrich Nov 3, 2023
64adb50
Merge pull request #1400 from archesproject/1393-allow-clear
chiatt Nov 3, 2023
696c6ce
fix delete <a> styling
dwuthrich Nov 3, 2023
4de315b
Move canvas selection over image viewer
dwuthrich Nov 4, 2023
7902ec7
update download files step UI
dwuthrich Nov 4, 2023
4088647
reposition canvas panel
dwuthrich Nov 6, 2023
0973c70
Merge branch 'dev/1.1.x' into 1387-configurable-column-names
aarongundel Nov 6, 2023
c58e3e6
various fixes after merge
aarongundel Nov 6, 2023
93a58ab
set defaults for chart
aarongundel Nov 6, 2023
1ff7173
Fix client-side validation of sample/analysis names #1419
jacobtylerwalls Nov 6, 2023
8a34e22
Surface TileValidationErrors to user in sample/analysis workflows
jacobtylerwalls Nov 6, 2023
0da3555
Update select button ui, #1424
njkim Nov 7, 2023
a457ec0
Merge pull request #1427 from archesproject/1419-sample-name-validation
jacobtylerwalls Nov 7, 2023
0d64d0b
Merge pull request #1418 from archesproject/1414_ca_final_step_table
chiatt Nov 8, 2023
55fa2ab
Merge branch 'dev/1.1.x' into 1416_update_report_worflow_ui
chiatt Nov 8, 2023
b1188cb
Merge pull request #1425 from archesproject/1416_update_report_worflo…
chiatt Nov 8, 2023
811bc05
Merge branch 'dev/1.1.x' into 1424_update_file_select_in_report
njkim Nov 8, 2023
7ac4d10
Add back the table info, #1424
njkim Nov 8, 2023
8fe5625
Update the expand styles, #1424
njkim Nov 8, 2023
f35fcd5
Merge pull request #1417 from archesproject/1404-file-selection-impor…
chiatt Nov 8, 2023
c924fa6
Merge pull request #1431 from archesproject/1424_update_file_select_i…
chiatt Nov 8, 2023
87b81d9
Merge pull request #1401 from archesproject/1387-configurable-column-…
chiatt Nov 8, 2023
371e75c
nit, #1398
njkim Nov 8, 2023
5317487
Merge pull request #1415 from archesproject/1398_update_project_download
chiatt Nov 8, 2023
e2679e7
Merge pull request #1343 from archesproject/1305-remove-sample-children
chiatt Nov 10, 2023
1b5b623
Fix typo in select-dataset-files-step
jacobtylerwalls Nov 7, 2023
bb67302
Merge pull request #1437 from jacobtylerwalls/fix-typo
chiatt Nov 10, 2023
99ec2b6
updates incomplete workflows modal for superusers #1433 (#1434)
chrabyrd Nov 10, 2023
936352f
add help panel to init workflow #1407 (#1426)
chrabyrd Nov 13, 2023
f857d4f
general project report workflow fixes #1436 (#1441)
chrabyrd Nov 14, 2023
85c7930
Loading indicator for annotations step, #1442
chiatt Nov 14, 2023
8795b17
Unused variables
chiatt Nov 14, 2023
141d46d
Loading indicators for report download step, re #1442
chiatt Nov 14, 2023
04f9118
Merge pull request #1444 from archesproject/1442_report_loading_indic…
chrabyrd Nov 15, 2023
0a1f848
fixes issue where workflow ids in incomplete workflowmodal were undef…
chrabyrd Nov 15, 2023
ba837e1
refactor first step chemical analysis images workflow #1422 (#1445)
chrabyrd Nov 15, 2023
1152dab
Create digital resources for the manifests and the canvases, #1438 (#…
njkim Nov 21, 2023
6ceef83
Fix typo in TimeSpan of Part Removal Event card
jacobtylerwalls Nov 20, 2023
e481b30
adds observation type input to workflow steps #1449 (#1450)
chrabyrd Nov 22, 2023
3e105ea
Enhances upload failures. (#1453)
aarongundel Nov 22, 2023
b8ec570
Adds thumbnail fetchers for digital and physical things (#1440)
aarongundel Nov 28, 2023
66065b9
fix file configuration step renderer selection dropdown fixes, re #1454
apeters Nov 28, 2023
11ec6a0
Retire the default primary descriptor #1368
jacobtylerwalls Nov 20, 2023
366ebe3
Implement frontend component
jacobtylerwalls Nov 21, 2023
de7ac54
Node names -> node aliases in string templates
jacobtylerwalls Nov 21, 2023
3124e29
Python backend for resource descriptor just fetches db value
jacobtylerwalls Nov 21, 2023
e08b19d
Add FUNCTION_LOCATIONS to test settings
jacobtylerwalls Nov 28, 2023
885e7df
Populate select with nodes from template value
jacobtylerwalls Nov 21, 2023
144ca60
Add django-pgtrigger
jacobtylerwalls Nov 21, 2023
1a88efb
Implement trigger
jacobtylerwalls Nov 28, 2023
5c39f01
fix select2 dropdown and config in analysis areas workflow, re #1454
apeters Nov 29, 2023
2f3420b
fix selectwoo dropdown for file interpretation step, re #1454
apeters Nov 29, 2023
4e543a2
fix selectwoo dropdown for importer configuration, re #1454
apeters Nov 29, 2023
981b2b7
fix selectwoo dropdown for add things step, re #1454
apeters Nov 29, 2023
87484d3
Add trigger for FunctionXGraph
jacobtylerwalls Nov 28, 2023
7ec9d60
Add migration
jacobtylerwalls Nov 28, 2023
366f5a0
Remove contenttypes dependency from second migration
jacobtylerwalls Nov 28, 2023
ee07138
Fix trimming issue and save to name field
jacobtylerwalls Nov 29, 2023
1187897
fix selectwoo dropdown for init-workflow help select, re #1454
apeters Nov 29, 2023
62cfb31
fix selectwoo dropdown for add-annotations step of project report wor…
apeters Nov 29, 2023
033511a
[cosmetic] Avoid string replacement, break function into chunks
jacobtylerwalls Nov 29, 2023
bd4e39d
fix selectwoo dropdown for aws-file-workfile, re #1454
apeters Nov 30, 2023
eadee34
fix selectwoo dropdown for afs-reader for file reader card, re #1454
apeters Nov 30, 2023
6440b58
adds thumbnail to digital resources summary report #1458
chrabyrd Dec 1, 2023
13f025d
Handle missing string values with ' -- '
jacobtylerwalls Dec 1, 2023
eb60aa4
Remove step info from workflows #1456
jacobtylerwalls Dec 1, 2023
e5a0576
Handle a completely static descriptor template
jacobtylerwalls Dec 1, 2023
1c91bf6
Removes deferral so trigger is fired before instance is indexed
chiatt Dec 1, 2023
ba14998
Merge pull request #1462 from archesproject/1456-remove-step-info
chrabyrd Dec 1, 2023
0daf441
fix sampling info step with selectwoo integration, re #1454
apeters Dec 1, 2023
a4a020e
make sure to call callback when there are no initial values, re #1454
apeters Dec 1, 2023
061d222
Merge pull request #1459 from archesproject/1454_selectwoo_fixes_for_…
chiatt Dec 2, 2023
77fe4cd
Merge pull request #1460 from archesproject/1458-cbyrd-add-thumbnail-…
chiatt Dec 2, 2023
25a36e5
Use `<select>` tag
jacobtylerwalls Dec 4, 2023
583ef44
Instruct to extend `FUNCTION_LOCATIONS`
jacobtylerwalls Dec 4, 2023
e4a4caf
Add missing migration re #1368
jacobtylerwalls Dec 4, 2023
36e5911
Consolidate to one migration for triggers
jacobtylerwalls Dec 4, 2023
a56915f
Two more `<input>` -> `<select>`
jacobtylerwalls Dec 4, 2023
6745159
Flatten data array re #1368
jacobtylerwalls Dec 4, 2023
bb5661f
Sort cards by name re #1368
jacobtylerwalls Dec 4, 2023
6f8be93
Improve undo action in instrument info steps #1428
jacobtylerwalls Dec 4, 2023
817c5dc
Prevent file interpretation save button from operating when disabled …
aarongundel Dec 4, 2023
cf15b9b
Align labels under manifest thumbnails #1470
jacobtylerwalls Dec 4, 2023
c360ea0
Merge pull request #1478 from archesproject/1470-manifest-label-align…
chrabyrd Dec 4, 2023
82340eb
Allow undoing observation type
jacobtylerwalls Dec 5, 2023
168e2d4
Prevent dirty state regression when restoring step w/o entries
jacobtylerwalls Dec 5, 2023
a9fca5b
update positioning of workflow buttons, add section titles, fix tool …
dwuthrich Dec 7, 2023
8451779
Revert elastic workaround
jacobtylerwalls Dec 7, 2023
e2c5098
Fix failing test
jacobtylerwalls Dec 7, 2023
073f09a
update font size
dwuthrich Dec 7, 2023
e1f9ddf
Merge pull request #1473 from archesproject/1428-observation-ko-computed
jacobtylerwalls Dec 7, 2023
7cc8fcd
Merge pull request #1493 from archesproject/revert-search-all-languages
chiatt Dec 8, 2023
a98815b
Merge pull request #1494 from archesproject/1492_update_worflow_home_…
chiatt Dec 8, 2023
0078441
Remove resource-component-abstract selector
jacobtylerwalls Dec 11, 2023
9b880e4
logger.warn (deprecated) -> logger.warning
jacobtylerwalls Dec 11, 2023
db217bb
CI: install arches dev version
jacobtylerwalls Dec 11, 2023
40a6f20
Merge pull request #1496 from archesproject/remove-selector
chiatt Dec 12, 2023
f5a6e6c
Fix button toggling when manipulating sample areas #1471 (#1481)
jacobtylerwalls Dec 12, 2023
55b766b
create -> update_or_create
jacobtylerwalls Dec 12, 2023
9fd24fa
Add FunctionXGraph related changes to migration re #1368
jacobtylerwalls Dec 12, 2023
2175749
nit re #1368
jacobtylerwalls Dec 12, 2023
30a5a78
Update create project wf for recent change in descriptor, #1498 (#1499)
njkim Dec 13, 2023
b9208b6
Add observation type to X/Y and CA final step reports #1469 (#1479)
jacobtylerwalls Dec 13, 2023
f8de390
Merge pull request #1452 from archesproject/multi-card-primary-descri…
chiatt Dec 21, 2023
fa729d5
empty files allowed in for project creation (#1465)
aarongundel Dec 21, 2023
5e869d1
Show unique top concepts for AAT concepts in search (#1514)
chiatt Jan 4, 2024
41e64eb
Moves selection into observations (#1483)
aarongundel Jan 4, 2024
98796d7
fixes multiple image generation in generated documents #1472 (#1474)
chrabyrd Jan 9, 2024
97c238a
lock select project step immediately instead of on delay (#1522)
aarongundel Jan 9, 2024
aa83ed1
adds canvas relationship to manifest (#1528)
aarongundel Jan 9, 2024
38e8514
Fetch descriptors from database #1511 (#1513)
jacobtylerwalls Jan 12, 2024
bc71e28
Replace workflow slug with workflow name in incomplete workflow modal…
ryan86 Jan 15, 2024
32e6c8e
adds resource instance creator component (#1537)
aarongundel Jan 16, 2024
28e2a14
Require arches 7.6
jacobtylerwalls Dec 27, 2023
32bf25f
Add LOCALE_PATHS to settings
jacobtylerwalls Dec 27, 2023
90767c8
Remove sample files
jacobtylerwalls Dec 27, 2023
11ae258
Mark strings for translation in report and plugin templates #1503
jacobtylerwalls Dec 27, 2023
7674ef0
Mark strings for translation in workflow templates #1503
jacobtylerwalls Dec 28, 2023
bfa2d5f
Mark strings for translation in index page #1503
jacobtylerwalls Dec 28, 2023
0194f73
Rename project type node #12334
jacobtylerwalls Dec 28, 2023
473050a
Remove client-side validation for missing values #1269
jacobtylerwalls Dec 28, 2023
07120d5
Mark python strings for translation #1503
jacobtylerwalls Dec 28, 2023
d9f96ac
Small performance improvements
jacobtylerwalls Dec 28, 2023
985ee09
Traverse label-based graph through node ids #1503
jacobtylerwalls Dec 29, 2023
716d237
Mark some strings for translation in JS files #1503
jacobtylerwalls Dec 29, 2023
62df07c
Mark strings for translation in /plugins #1503
jacobtylerwalls Jan 2, 2024
ab248b4
Mark strings for translation in /reports #1503
jacobtylerwalls Jan 3, 2024
e00c449
Mark strings for translation in /workflows #1503
jacobtylerwalls Jan 4, 2024
2cbd48b
Standardize todo statements
jacobtylerwalls Jan 4, 2024
25fa871
Mark ReportTemplate descriptions for translation #1503
jacobtylerwalls Jan 4, 2024
766fef7
Rename "region" to "analysis area" #1504
jacobtylerwalls Jan 4, 2024
a4ddfad
Localize another string #1503
jacobtylerwalls Jan 4, 2024
fc225b6
Remove single quotes from placeholder #1503
jacobtylerwalls Jan 5, 2024
893f786
Resolve TODOs for strings not yet translated #1517
jacobtylerwalls Jan 5, 2024
053e332
Remove hard-coded sample name on backend #1516
jacobtylerwalls Jan 12, 2024
4fe4143
Remove hard-coded sample name on frontend #1516
jacobtylerwalls Jan 12, 2024
86484f8
Standardize sampleOf and analysisAreaOf #1516
jacobtylerwalls Jan 12, 2024
696415b
Localize two more strings #1516
jacobtylerwalls Jan 12, 2024
4ffbcee
Remove more hardcoded sample logic #1516
jacobtylerwalls Jan 12, 2024
5880a50
Remove hardcoded sample substrings #1516
jacobtylerwalls Jan 12, 2024
644a4fc
Add handling for no label re #1516
jacobtylerwalls Jan 15, 2024
e1aaade
Fix typo
jacobtylerwalls Jan 14, 2024
d731eaf
Update chemical analysis digital resource created, #1538
njkim Jan 18, 2024
6ab7fc9
Remove digital files section, #1538
njkim Jan 18, 2024
8a74595
Remove digital files section in template, #1538
njkim Jan 18, 2024
85df5ae
Remove unused a custom view, #1538
njkim Jan 18, 2024
7848d39
Remove ref to custom view, #1538
njkim Jan 18, 2024
da4b098
Merge pull request #1542 from archesproject/1538_chem_analysis_digita…
chiatt Jan 18, 2024
f5b1145
Add migration to update obs types, #1540 (#1541)
chiatt Jan 18, 2024
e15b84e
Reindex dig resource if manifest name/statement are changed, #1529
chiatt Jan 18, 2024
2ff06ef
Update version and arches req version
chiatt Jan 18, 2024
adb5619
First pass at digital resource changes
aarongundel Jan 11, 2024
e2bb18b
purges keys that are used as untranslated text
aarongundel Jan 11, 2024
cf9f3f2
finish with physical thing updates
aarongundel Jan 12, 2024
d31a3fd
Version and dependency changes for 1.1.0a3 release (#1549)
chiatt Feb 6, 2024
19dd6ac
Prevent crash when reverse migrating 0004 (#1551)
jacobtylerwalls Feb 13, 2024
695f293
Avoid lazy strings in initial migration (#1552)
jacobtylerwalls Feb 13, 2024
d0fc4d7
Update create-project-workflow-help.htm
ekansa Feb 27, 2024
e58bf2f
Removed overflow style
ekansa Feb 27, 2024
32b8d44
Update project-collection-workflow-help.htm
ekansa Feb 27, 2024
8b4238f
Update project-report-workflow-help.htm
ekansa Feb 27, 2024
65c85b1
Fixed outcome paragraph
ekansa Feb 27, 2024
721c0c0
Update outcomes in project-collection-workflow-help.htm
ekansa Feb 27, 2024
23c5bb2
Update sample-taking-workflow-help.htm
ekansa Feb 27, 2024
231fe3a
Update tab consistency create-project-workflow-help.htm
ekansa Feb 27, 2024
e9e0d51
Update tab consistency project-collection-workflow-help.htm
ekansa Feb 27, 2024
b6da81f
Update analysis-areas-workflow-help.htm
ekansa Feb 27, 2024
097521f
Update upload-dataset-workflow-help.htm
ekansa Feb 27, 2024
3819186
Update review-dataset-workflow-help.htm
ekansa Feb 27, 2024
aa4824c
Update chemical-analysis-workflow-help.htm
ekansa Feb 27, 2024
f3e2111
Update add-chemical-analysis-images-workflow-help.htm
ekansa Feb 27, 2024
d16d9eb
Fix string lookup for "TimeSpan"
jacobtylerwalls Feb 6, 2024
fabb650
Lint backend
jacobtylerwalls Feb 15, 2024
5d5cce5
Fix issues found by pylint
jacobtylerwalls Feb 15, 2024
2832347
Move linting config to pyproject.toml
jacobtylerwalls Feb 15, 2024
3217e9c
upgrade the config for s3 to use sigv4 for uppy endpoint
aarongundel Feb 13, 2024
9e95211
change inheritance for boto config
aarongundel Mar 13, 2024
da5337c
Update version to 1.1.0a4
chiatt Mar 13, 2024
90f0109
Prevent display of heading when related workflows are not visible #1547
chiatt Mar 13, 2024
ba547c1
Merge pull request #1563 from archesproject/chem_analysis_heading_1547
aarongundel Mar 14, 2024
00c90d7
Remove compressor from INSTALLED_APPS in test_settings
jacobtylerwalls Mar 11, 2024
2b1cc49
Fix used-before-assignment in ManifestXCanvasView
jacobtylerwalls Jun 27, 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
Prev Previous commit
Next Next commit
Sort cards by name re #1368
jacobtylerwalls committed Dec 4, 2023
commit bb5661ff4124c03732f3b1a1cc4ada4a692f617c
Original file line number Diff line number Diff line change
@@ -40,17 +40,36 @@ function($, _, arches, ko, koMapping, ListView, PrimaryDescriptorsView, multicar
),
};

this.groupedNodesForSelect2 = self.graph.cards.map(card => {
return {
text: card.name,
children: self.graph.nodes.filter(
node => node.datatype === 'string' && node.nodegroup_id === card.nodegroup_id
).map(node => {
return {
id: node.nodeid,
text: node.alias,
}
}),
// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort
const sortedCards = this.graph.cards.toSorted((a, b) => {
const nameA = a.name.toUpperCase();
const nameB = b.name.toUpperCase();
if (nameA < nameB) {
return -1;
}
if (nameA > nameB) {
return 1;
}

return 0;
});

this.groupedNodesForSelect2 = [];
sortedCards.forEach(card => {
const stringNodes = this.graph.nodes.filter(
node => node.datatype === 'string' && node.nodegroup_id === card.nodegroup_id
);

if (stringNodes.length) {
this.groupedNodesForSelect2.push({
text: card.name,
children: stringNodes.map(node => {
return {
id: node.nodeid,
text: node.alias,
}
}),
});
}
});