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

DH2 beta release #436

Draft
wants to merge 581 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
581 commits
Select commit Hold shift + click to select a range
de00dee
Merge branch 'dh2-with-linkml-schema' into dh2-beta-release
kennethbruskiewicz Aug 9, 2024
75c489c
re-add 1-M. TODO: loading is too slow with this hook!
kennethbruskiewicz Aug 9, 2024
3b4c812
remove pascalcase workaround. introduce a dict for keeping track of e…
kennethbruskiewicz Aug 9, 2024
f0cbdd5
use autocomplete renderer
kennethbruskiewicz Aug 9, 2024
054d4d9
WIP: title/text distinction in menus. BUG: multiselect
kennethbruskiewicz Aug 9, 2024
ec2af4b
re-add multiselect cell change
kennethbruskiewicz Aug 9, 2024
99fd11c
prettier
kennethbruskiewicz Aug 9, 2024
da27967
WIP: title/text distinction in multiselect menus.
kennethbruskiewicz Aug 9, 2024
498a6da
Updated GRDI specification to v12.2.2 including new 1-many format
ddooley Aug 13, 2024
03f49dc
schema editor update
ddooley Aug 13, 2024
7e7e5f9
Merge branch 'dh2-beta-release' of https://github.com/cidgoh/DataHarm…
kennethbruskiewicz Aug 13, 2024
6f6d84f
Bugfix: multiple vocabularyTextToTitle merging. WIP: Support for mult…
kennethbruskiewicz Aug 13, 2024
eced670
Workaround: cancogen template merge text and title.
kennethbruskiewicz Aug 13, 2024
b531843
WIP: title/text distinction for all schemas
kennethbruskiewicz Aug 13, 2024
0d5ad05
GRDI touchup
ddooley Aug 13, 2024
914bd49
Merge branch 'dh2-beta-release' of https://github.com/cidgoh/DataHarm…
ddooley Aug 13, 2024
f88abc4
Cancogen schema update
ddooley Aug 13, 2024
0870554
WIP: ROADMAP
kennethbruskiewicz Aug 13, 2024
e706daf
MILESTONE: title-text distinction with enums and enum exports
kennethbruskiewicz Aug 14, 2024
a25e7f2
MILESTONE: title-text distinction with 1-M. WIP: file opening saving …
kennethbruskiewicz Aug 14, 2024
cc1277a
remove uneccessary script
kennethbruskiewicz Aug 14, 2024
4371382
remove WIP dev docs
kennethbruskiewicz Aug 14, 2024
575a999
Merge branch 'dh2-beta-release' of https://github.com/cidgoh/DataHarm…
kennethbruskiewicz Aug 14, 2024
6068318
french update
ddooley Aug 14, 2024
35288f2
Merge branch 'dh2-beta-release' of https://github.com/cidgoh/DataHarm…
ddooley Aug 14, 2024
4a7fa80
documentation diagram
ddooley Aug 14, 2024
0ac9c95
Adjusting menus to be handled by name, not title
ddooley Aug 15, 2024
72eb156
Fixed {Title_Case} contradicting HostGenderMenu choices
ddooley Aug 15, 2024
f235e92
Fixing detection of null or undefined object
ddooley Aug 15, 2024
6163bce
Adjustment to titleOverText() function
ddooley Aug 15, 2024
ebdcfbd
Protecting against missing see_also case
ddooley Aug 15, 2024
479f6fe
minimal export file.
ddooley Aug 15, 2024
888cef4
GRDI update to menu naming
ddooley Aug 15, 2024
93e58ac
A bit of programmer-level error trapping.
ddooley Aug 15, 2024
9fb2c45
Merge branch 'dh2-beta-release' of https://github.com/cidgoh/DataHarm…
kennethbruskiewicz Aug 16, 2024
7929407
resolve template through schema ID instead of location in container json
kennethbruskiewicz Aug 16, 2024
16ff199
resolve template through schema ID instead of location in container json
kennethbruskiewicz Aug 16, 2024
c4ac5c2
resolve template through schema ID instead of location in container json
kennethbruskiewicz Aug 16, 2024
85b2596
rename excel sheets
kennethbruskiewicz Aug 16, 2024
dda02b4
WIP: transfer between plural and singular forms of classes for contai…
kennethbruskiewicz Aug 16, 2024
56842bc
WIP: transfer between plural and singular forms of classes for contai…
kennethbruskiewicz Aug 16, 2024
5422302
WIP: transfer between plural and singular forms of classes for contai…
kennethbruskiewicz Aug 16, 2024
c21a4bc
This allows export.js to be found for this example schema
ddooley Aug 17, 2024
df9d9ab
Merge branch 'dh2-beta-release' of https://github.com/cidgoh/DataHarm…
ddooley Aug 17, 2024
5236c91
Whitespaceminimizedstring caps fix
ddooley Aug 19, 2024
33084af
Merge branch 'master' of https://github.com/cidgoh/DataHarmonizer
kennethbruskiewicz Aug 19, 2024
a576426
separate out 1m helper functions from context
kennethbruskiewicz Aug 20, 2024
709d83f
separate out 1m helper functions from context
kennethbruskiewicz Aug 20, 2024
0656d6a
mpox cosmetic update
ddooley Aug 21, 2024
9c376d4
name field used as index in enums
ddooley Aug 21, 2024
436246a
listener based crud
kennethbruskiewicz Aug 21, 2024
bf0a69d
1-m refactored to module
kennethbruskiewicz Aug 21, 2024
44e9937
1-m refactored to module with setup function
kennethbruskiewicz Aug 21, 2024
58bda0c
Merge branch 'dh2-beta-release' of https://github.com/cidgoh/DataHarm…
kennethbruskiewicz Aug 21, 2024
658455a
Merge branch 'dh2-beta-release' into dh2-context-cleanup
kennethbruskiewicz Aug 21, 2024
2cbaebe
missing context_menu_callback binding
kennethbruskiewicz Aug 21, 2024
b404d6c
Merge branch 'dh2-beta-release' into dh2-1m-rework
kennethbruskiewicz Aug 21, 2024
c4b4f82
didn't pass in proper value to autocomplete renderer
kennethbruskiewicz Aug 21, 2024
d7a9533
format prettier, small bug in createRowManager
kennethbruskiewicz Aug 21, 2024
bb30948
prettier
kennethbruskiewicz Aug 21, 2024
b24c9a6
remove console log statements
kennethbruskiewicz Aug 21, 2024
0935c7f
remove redundant hot.clear() statements. increases performance and pr…
kennethbruskiewicz Aug 21, 2024
96c7016
Merge branch 'dh2-beta-release' into dh2-1m-rework
kennethbruskiewicz Aug 21, 2024
89e0ce6
WIP: row-based selection for add-row currentSelection
kennethbruskiewicz Aug 22, 2024
f3e5fb4
WIP: export sections (no option otherwise. TODO: test import data wit…
kennethbruskiewicz Aug 22, 2024
761db04
merged permissible values warning
kennethbruskiewicz Aug 22, 2024
43d4791
warning message
kennethbruskiewicz Aug 22, 2024
429af4a
re-add sections to excel exports. empty files export both sections an…
kennethbruskiewicz Aug 22, 2024
48b27af
prettier
kennethbruskiewicz Aug 22, 2024
89df7b5
Merge branch 'dh2-beta-release' into dh2-row-selection
kennethbruskiewicz Aug 22, 2024
17a3ac2
row selection working over all shared keys
kennethbruskiewicz Aug 22, 2024
c6d473b
row selection with blank
kennethbruskiewicz Aug 22, 2024
5adadf6
Merge branch 'dh2-beta-release' into dh2-1m-rework
kennethbruskiewicz Aug 22, 2024
19130b0
new location for getColumnIndexByFieldName
kennethbruskiewicz Aug 22, 2024
856477a
follow up selections
kennethbruskiewicz Aug 22, 2024
ab870ee
rename col value to prop
kennethbruskiewicz Aug 22, 2024
ce13c83
refactor consolidate
kennethbruskiewicz Aug 22, 2024
42d2279
row removal in 1m rework
kennethbruskiewicz Aug 23, 2024
786359e
row removal in 1m rework
kennethbruskiewicz Aug 23, 2024
2f29824
row removal in 1m rework. prettier
kennethbruskiewicz Aug 23, 2024
4a52fa1
New schema_editor spec
ddooley Aug 23, 2024
7c6ad0d
accidental file duplication
kennethbruskiewicz Aug 23, 2024
749f836
tweaks
kennethbruskiewicz Aug 23, 2024
aa97362
console log removal, prettier
kennethbruskiewicz Aug 23, 2024
4404468
refactoring
kennethbruskiewicz Aug 23, 2024
73aeffb
refactoring
kennethbruskiewicz Aug 23, 2024
ab5c071
refactoring
kennethbruskiewicz Aug 23, 2024
0b46981
refactoring
kennethbruskiewicz Aug 23, 2024
28e7dde
refactoring
kennethbruskiewicz Aug 23, 2024
b30ce48
CSS import order matters?
kennethbruskiewicz Aug 23, 2024
88316fb
refactoring
kennethbruskiewicz Aug 23, 2024
ae05c53
typo
kennethbruskiewicz Aug 23, 2024
774612d
refactoring
kennethbruskiewicz Aug 23, 2024
62a7304
linting and bad var names
kennethbruskiewicz Aug 23, 2024
e7abc84
regression during refactor
kennethbruskiewicz Aug 23, 2024
8ff4d23
choosing selection approach
kennethbruskiewicz Aug 23, 2024
bcb4e67
Merge branch 'dh2-beta-release' of https://github.com/cidgoh/DataHarm…
kennethbruskiewicz Aug 26, 2024
d7b78fe
Update main.yaml with later node
kennethbruskiewicz Aug 26, 2024
3274937
Create dh-validate.py
ddooley Sep 5, 2024
7a35353
bug fixed
ddooley Sep 5, 2024
f1ac95f
Adding ontology prefixes
ddooley Sep 5, 2024
b95b1a6
tweak for better min/max numeric handling
ddooley Sep 5, 2024
06a1cb1
prefix update
ddooley Sep 5, 2024
65a9545
prefix update
ddooley Sep 5, 2024
e7b0637
revert class name change
ddooley Sep 5, 2024
61db112
Update dh-validate.py
ddooley Sep 5, 2024
ea060c4
CRUD Support for ACTION.READ, ACTION.UPDATE -> to deletion, to remapp…
kennethbruskiewicz Sep 10, 2024
f6d0407
READ after UPDATE to ensure selection sync
kennethbruskiewicz Sep 10, 2024
d408949
WIP Filter
kennethbruskiewicz Sep 10, 2024
ef7c301
iteration of new filter for testing
kennethbruskiewicz Sep 10, 2024
8e394b8
basic crud with new filter implementation to prevent infinite recursion
kennethbruskiewicz Sep 16, 2024
cb7710b
make columns read only
kennethbruskiewicz Sep 16, 2024
d0e0b48
moving code around to comments
kennethbruskiewicz Sep 16, 2024
6748717
remove large commented out code on unique key cardinality mapping
kennethbruskiewicz Sep 16, 2024
0f58465
formatting
kennethbruskiewicz Sep 16, 2024
f8a79aa
on focus change needs to be a callback
kennethbruskiewicz Sep 16, 2024
74cca5b
menu ordering
kennethbruskiewicz Sep 16, 2024
d8b7626
formatting
kennethbruskiewicz Sep 16, 2024
c4b887a
WIP: on-row-change validation
kennethbruskiewicz Sep 16, 2024
8055771
cleanup console log
kennethbruskiewicz Sep 16, 2024
babf13e
bug in addRowsToBottom, use null as blank value instead of empty string
kennethbruskiewicz Sep 17, 2024
24b1fd7
tweak
ddooley Sep 23, 2024
5b5b4f3
Merge branch 'dh2-beta-release' into dh2-1m-rework
kennethbruskiewicz Sep 23, 2024
4c11dc6
some logging
kennethbruskiewicz Sep 23, 2024
f28428c
Merge branch 'dh2-beta-release' of https://github.com/cidgoh/DataHarm…
kennethbruskiewicz Sep 23, 2024
c98d619
change to .js export to eliminate jest warnings
kennethbruskiewicz Sep 23, 2024
81efcc8
hotfix: check if unique key has shared slot name before searching for…
kennethbruskiewicz Sep 23, 2024
61c7c58
Tweaked GRDI template
ddooley Sep 24, 2024
c88f698
BUGFIX: block same-table update propagation
kennethbruskiewicz Oct 1, 2024
dbf4028
MILESTONE: only delete on shared key value being final of its kind. T…
kennethbruskiewicz Oct 1, 2024
e9cbbdd
WIP: reworking template.js tests
kennethbruskiewicz Oct 1, 2024
51bcd59
Merge branch 'dh2-beta-release' of https://github.com/cidgoh/DataHarm…
kennethbruskiewicz Oct 1, 2024
4a6e4be
Remove currying
kennethbruskiewicz Oct 1, 2024
9bafae9
Remove currying
kennethbruskiewicz Oct 1, 2024
b74c741
tweak GRDI template so it doesn't have outdated dh_interface
ddooley Oct 3, 2024
109f9b4
Update translations.json
ddooley Oct 3, 2024
5217761
Enable slot usage to be added to rather than overwritten
ddooley Oct 8, 2024
567327b
GRDI Schema update
ddooley Oct 8, 2024
6df6578
comments
kennethbruskiewicz Oct 10, 2024
7df4269
Merge branch 'dh2-beta-release' of https://github.com/cidgoh/DataHarm…
kennethbruskiewicz Oct 10, 2024
7c42439
Merge branch 'dh2-beta-release' into dh2-1m-rework
kennethbruskiewicz Oct 10, 2024
40d2174
parent-child emit/listen crud
kennethbruskiewicz Oct 22, 2024
44ddcf3
check currentSelection null
kennethbruskiewicz Oct 22, 2024
d3b81ab
WIP: route actions in childListensCRUD
kennethbruskiewicz Oct 22, 2024
7632a0e
MILESTONE: ported 1-level CRUD to parent/child emitter architecture. …
kennethbruskiewicz Oct 22, 2024
bc2ab00
WIP: filtering
kennethbruskiewicz Oct 22, 2024
464ec41
Filtering with facets in new model
kennethbruskiewicz Oct 23, 2024
8bf5c64
restore deletion propagation behaviour
kennethbruskiewicz Oct 23, 2024
d522272
gitignore
kennethbruskiewicz Oct 23, 2024
29d9775
rename ported functions
kennethbruskiewicz Oct 23, 2024
acc4687
remove deprecated 1m library
kennethbruskiewicz Oct 28, 2024
f75028d
remove console log statements
kennethbruskiewicz Oct 28, 2024
f799814
Merge branch 'master' into dh2-i18n-rc1
kennethbruskiewicz Oct 28, 2024
60239dd
remove uneccessary imports
kennethbruskiewicz Oct 28, 2024
e40aec7
refactor out buildSchemaTree
kennethbruskiewicz Oct 28, 2024
d3db945
Merge branch 'dh2-beta-release' into dh2-i18n-rc1
kennethbruskiewicz Oct 28, 2024
bae4104
disable 1-m behaviour
kennethbruskiewicz Oct 28, 2024
f80b8ef
remove large bootstrap import
kennethbruskiewicz Oct 28, 2024
58a8e25
reorg imports and remove unecessary assignment
kennethbruskiewicz Oct 28, 2024
32bdccc
hide tabs
kennethbruskiewicz Oct 28, 2024
5e95699
reorg imports and remove unecessary assignment
kennethbruskiewicz Oct 28, 2024
998f041
revert comment
kennethbruskiewicz Oct 28, 2024
ec4075c
prettier
kennethbruskiewicz Oct 28, 2024
0725f59
prettier
kennethbruskiewicz Oct 28, 2024
b66e63c
prettier
kennethbruskiewicz Oct 28, 2024
3b1630f
Merge branch 'dh2-beta-release' into dh2-i18n-rc1
kennethbruskiewicz Oct 29, 2024
796c9d3
Resolve bug with tabs not switching
kennethbruskiewicz Oct 29, 2024
0adb349
only export non-empty keys when saving in json
kennethbruskiewicz Oct 29, 2024
68791b3
BUGFIX: empty events with empty keys when selecting entire table
kennethbruskiewicz Oct 29, 2024
a62b009
BUGFIX: ensure jump to modal and fill to modal refresh contents on ac…
kennethbruskiewicz Oct 29, 2024
5dcb5fa
Merge branch 'dh2-beta-release' into dh2-1m-rework
kennethbruskiewicz Oct 29, 2024
4c2f3b4
Merge branch 'dh2-beta-release' into dh2-sparse-saving
kennethbruskiewicz Oct 29, 2024
10d78dc
put logs earlier
kennethbruskiewicz Oct 29, 2024
4c61d9e
Merge branch 'dh2-beta-release' into dh2-i18n-rc1
kennethbruskiewicz Oct 29, 2024
9ad0b6e
MILESTONE: EventTracker object to manage listeners between template s…
kennethbruskiewicz Oct 29, 2024
f8c0607
Merge branch 'dh2-beta-release' into dh2-sparse-saving
kennethbruskiewicz Oct 29, 2024
aecfe6e
WIP: translation bugs
kennethbruskiewicz Oct 29, 2024
9f9eba1
BUGFIX: language menu not going to the language of the json file
kennethbruskiewicz Oct 29, 2024
a5aa7e1
rewrite and slim down locale resources function to focus on enums only
kennethbruskiewicz Oct 30, 2024
57e8ccc
refactor translation on load code to support new cross-language names…
kennethbruskiewicz Oct 30, 2024
bce4f8a
remove conditional that was preventing loading json data when the sou…
kennethbruskiewicz Oct 30, 2024
e1a20cd
merge sparse JSON saves with improved language file loading
kennethbruskiewicz Oct 30, 2024
cf666c4
WIP
kennethbruskiewicz Oct 30, 2024
2761a28
refactor jumpToModal and fillColumnModal for compatibility with trans…
kennethbruskiewicz Oct 30, 2024
ab722a9
pleasing the linter
kennethbruskiewicz Oct 30, 2024
d026a8e
Merge branch 'dh2-beta-release' into dh2-1m-rework
kennethbruskiewicz Oct 30, 2024
df6f3a9
re-add removeNumericKeys
kennethbruskiewicz Oct 30, 2024
e538480
Updated script from master
ddooley Nov 1, 2024
653f71b
Cancogen menu update
ddooley Nov 1, 2024
6ae2c94
Merge branch 'dh2-i18n-rc1' of https://github.com/cidgoh/DataHarmoniz…
kennethbruskiewicz Nov 5, 2024
570e09f
Merge branch 'dh2-beta-release' into dh2-i18n-rc1
kennethbruskiewicz Nov 5, 2024
21a902c
workaround for jumpto/fillto menu sync
kennethbruskiewicz Nov 5, 2024
acfe97a
Merge branch 'dh2-beta-release' into dh2-i18n-rc1
kennethbruskiewicz Nov 5, 2024
6fb044b
workaround for jumpto/fillto menu sync
kennethbruskiewicz Nov 5, 2024
d32d369
Merge branch 'dh2-beta-release' into dh2-i18n-rc1
kennethbruskiewicz Nov 5, 2024
ed2a1a0
BUGFIX: toggle row visibility
kennethbruskiewicz Nov 5, 2024
b98d7cc
Merge branch 'dh2-beta-release' into dh2-i18n-rc1
kennethbruskiewicz Nov 5, 2024
dd16691
Merge branch 'master' of https://github.com/cidgoh/DataHarmonizer
kennethbruskiewicz Nov 5, 2024
03107e6
prettier
kennethbruskiewicz Nov 5, 2024
442f57c
Merge branch 'dh2-beta-release' into dh2-i18n-rc1
kennethbruskiewicz Nov 5, 2024
42e772e
remove unecessary buttons
kennethbruskiewicz Nov 12, 2024
941f5c8
use latest dh-validate script
kennethbruskiewicz Nov 12, 2024
d1803cb
merge lib/ changes from master
kennethbruskiewicz Nov 12, 2024
1628809
console log
kennethbruskiewicz Nov 12, 2024
9013cb9
Merge branch 'dh2-i18n-rc1' of https://github.com/cidgoh/DataHarmoniz…
kennethbruskiewicz Nov 12, 2024
c0d25c0
WIP test exports
kennethbruskiewicz Nov 12, 2024
808be91
remove duplicate and unused fields
kennethbruskiewicz Nov 12, 2024
25f6a1d
Merge branch 'master' of https://github.com/cidgoh/DataHarmonizer
kennethbruskiewicz Nov 12, 2024
37b7ba8
Merge branch 'master' into dh2-i18n-rc1
kennethbruskiewicz Nov 12, 2024
84cd3ae
revert packages.json and web/templates/grdi (for deliberate merge)
kennethbruskiewicz Nov 12, 2024
e5b859b
remove unecessary test
kennethbruskiewicz Nov 12, 2024
4f72935
prettier
kennethbruskiewicz Nov 12, 2024
961e7a4
add flight check command for pre-build use
kennethbruskiewicz Nov 12, 2024
49a03c6
merge post-master revisions to dh2
kennethbruskiewicz Nov 13, 2024
43a313e
change flightcheck command to not halt on lint exit
kennethbruskiewicz Nov 13, 2024
e48c216
GRDI 1-many
ddooley Nov 27, 2024
c94e04c
schema update from main branch
ddooley Nov 27, 2024
1b701ab
Merge branch 'dh2-i18n-rc1' of https://github.com/cidgoh/DataHarmoniz…
kennethbruskiewicz Nov 29, 2024
fd8541a
BUGFIX: multiple reloads when template the same accidentally cleared …
kennethbruskiewicz Nov 29, 2024
cf0604e
SCHEMA: SDRF shared ID to Cancogen Schema, causing errors in localiza…
kennethbruskiewicz Nov 29, 2024
a07f894
remove console info logs, optimize a loop
kennethbruskiewicz Nov 29, 2024
149507c
Merge branch 'dh2-i18n-rc1' into dh2-beta-release
kennethbruskiewicz Dec 9, 2024
fb51458
remove unused functions
kennethbruskiewicz Dec 9, 2024
46d5af4
remove unused functions, linter
kennethbruskiewicz Dec 9, 2024
0d53b40
grdi and mpox template content fixes
ddooley Dec 9, 2024
7a9fb6b
Merge branch 'master' into dh2-i18n-rc1
ddooley Dec 9, 2024
a3a53e6
Merge branch 'dh2-beta-release' into dh2-i18n-rc1
kennethbruskiewicz Dec 10, 2024
bec0e42
Merge and linter
kennethbruskiewicz Dec 10, 2024
7a039c5
yarn.lock
kennethbruskiewicz Dec 10, 2024
9965bc8
Merge branch 'dh2-i18n-rc1' of https://github.com/cidgoh/DataHarmoniz…
kennethbruskiewicz Dec 10, 2024
a117162
remove console log
kennethbruskiewicz Dec 10, 2024
ed6b84f
remove console log
kennethbruskiewicz Dec 10, 2024
3c4ba55
remove redundant calls to translationSelect change
kennethbruskiewicz Dec 10, 2024
0118512
linter
kennethbruskiewicz Dec 10, 2024
6737757
pushed load json data into conditional which does nothing if the cont…
kennethbruskiewicz Dec 10, 2024
b9e931b
restore tabs to dh2-beta-release
kennethbruskiewicz Dec 16, 2024
95127e9
remove unecessesary packaging
kennethbruskiewicz Dec 16, 2024
f3c2760
guard against no schema to find templatePath for
kennethbruskiewicz Dec 16, 2024
0227d53
guard against no schema to find templatePath for
kennethbruskiewicz Dec 16, 2024
527e592
use some instead of filter
kennethbruskiewicz Dec 16, 2024
f10a1d1
display tabs
kennethbruskiewicz Dec 16, 2024
40c69b1
WIP: popups
kennethbruskiewicz Dec 17, 2024
8712548
Merge branch 'master' of https://github.com/cidgoh/DataHarmonizer
kennethbruskiewicz Dec 17, 2024
7736fe9
Merge branch 'master' into dh2-beta-release. Moved back to regular im…
kennethbruskiewicz Dec 18, 2024
de4be81
Merge branch 'dh2-beta-release' into dh2-1m-rework
kennethbruskiewicz Dec 18, 2024
8aa5420
Linter
kennethbruskiewicz Dec 18, 2024
6a931d0
prettier
kennethbruskiewicz Dec 18, 2024
effa943
popup for blocking innapropriate addrows
kennethbruskiewicz Dec 18, 2024
dcf0ed9
Merge branch 'dh2-1m-rework' into dh2-beta-release
kennethbruskiewicz Dec 18, 2024
aedca7f
merge 1m-rework. addition: popup for blank selections on add rows
kennethbruskiewicz Dec 18, 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
4 changes: 3 additions & 1 deletion .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
with:
node-version: '16.x'
node-version: '18.x'
- run: yarn install --frozen-lockfile
- run: yarn format
- run: yarn lint
- run: yarn build:lib
- run: yarn build:web
- run: yarn test
10 changes: 9 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -237,5 +237,13 @@ node_modules/
# Visual Studio
.vscode/

# Project build artifacts
web/templates/manifest.json

# Miscellaneous
.local/
.notes/
web/templates/manifest.json
.jj/

# deprecated modules
lib/utils/1m_dep.js
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ nmdc: clean $(TEMPLATES_DIR)/nmdc_dh/schema.json
canada_covid19: clean $(TEMPLATES_DIR)/canada_covid19/schema.json

clean:
rm -rf $(TEMPLATES_DIR)/manifest.json
rm -rf $(TEMPLATES_DIR)/menu.json
rm -rf $(TEMPLATES_DIR)/canada_covid19/schema.json
rm -rf $(TEMPLATES_DIR)/MIxS/schema.json
Expand Down
1 change: 1 addition & 0 deletions images/linkml_schema.drawio
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<mxfile host="Electron" modified="2024-08-14T17:25:03.206Z" agent="5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/16.5.1 Chrome/96.0.4664.110 Electron/16.0.7 Safari/537.36" etag="ja8C_22b26Crj8BZayG_" version="16.5.1" type="device"><diagram id="9RqhnjSsHgssZ3iX4dD-" name="Page-1">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</diagram></mxfile>
9 changes: 9 additions & 0 deletions jsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"compilerOptions": {
"baseUrl": ".",
"paths": {
"@/*": ["./*"]
}
},
"exclude": ["node_modules"]
}
Loading
Loading