Skip to content

Enable data region filtration based on Ontologies#512

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

Merged
Sigmonia merged 36 commits into from
May 1, 2021
Merged

Enable data region filtration based on Ontologies #512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
0f1cd8f
*in-progress* Add OntologyBrowserFilterPanel as a component
Sigmonia Apr 9, 2021
dcf37bd
v2.22.1-fb-ontFilter.0
Sigmonia Apr 9, 2021
4d9e972
v2.22.1-fb-ontFilter.1
Sigmonia Apr 14, 2021
b31234b
Split FileTree.Header component into it's own file
Sigmonia Apr 15, 2021
a1ee520
v2.22.1-fb-ontFilter.2
Sigmonia Apr 16, 2021
86c1d44
Add filter types
Sigmonia Apr 16, 2021
efb841f
add filtering based on ontology hierarchy paths
Sigmonia Apr 20, 2021
2975d04
v2.22.1-fb-ontFilter.3
Sigmonia Apr 20, 2021
1b19c9a
updating lock & json files and for alpha
Sigmonia Apr 20, 2021
1d9a316
Fix filter type not getting set
Sigmonia Apr 21, 2021
004d9d5
v2.22.1-fb-ontFilter.4
Sigmonia Apr 21, 2021
8dd3414
Update change log
Sigmonia Apr 21, 2021
b6c264e
Fix up jest tests
Sigmonia Apr 23, 2021
1df027e
Update snap
Sigmonia Apr 23, 2021
0a6fd2e
Merge develop into branch
Sigmonia Apr 23, 2021
00bcfb1
v2.24.4-fb-ontFilter.5
Sigmonia Apr 23, 2021
3849e8e
Bump js alpha to .3
Sigmonia Apr 23, 2021
29ab01f
v2.24.4-fb-ontFilter.6
Sigmonia Apr 23, 2021
f4bb512
Code review requested changes.
Sigmonia Apr 23, 2021
9d54bbf
v2.24.4-fb-ontFilter.7
Sigmonia Apr 23, 2021
fc82a6b
CR recommendations
Sigmonia Apr 26, 2021
21090e2
Merge from develop
Sigmonia Apr 26, 2021
da79310
v2.25.0-fb-ontFilter.8
Sigmonia Apr 26, 2021
32f6979
Consolidate tree headers
Sigmonia Apr 27, 2021
c857dfd
v2.25.0-fb-ontFilter.9
Sigmonia Apr 27, 2021
7ace801
Move css block to platform entrypoint css file
Sigmonia Apr 28, 2021
14500dc
Fix flag
Sigmonia Apr 28, 2021
69c0763
merge develop into fb
Sigmonia Apr 28, 2021
91691e2
v2.26.0-fb-ontFilter.10
Sigmonia Apr 28, 2021
b4fe885
Fixed selected FileTree node's render state not being updated
Sigmonia Apr 28, 2021
28ffddf
Fix error message not clearing on change
Sigmonia Apr 28, 2021
4a0921a
v2.26.0-fb-ontFilter.11
Sigmonia Apr 29, 2021
9390d79
merge develop into branch
Sigmonia Apr 29, 2021
209aeef
Add some jest test for the ontology filter
Sigmonia May 1, 2021
9d36c41
v2.26.2-fb-ontFilter.12
Sigmonia May 1, 2021
59ba338
Final merge from develop
Sigmonia May 1, 2021
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: 2 additions & 2 deletions packages/components/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
"name": "@labkey/components",
"version": "2.26.3",
"version": "2.27.0",
"description": "Components, models, actions, and utility functions for LabKey applications and pages",
"main": "dist/components.js",
"module": "dist/components.js",
Expand DownExpand Up@@ -44,7 +44,7 @@
"@fortawesome/free-regular-svg-icons": "5.15.2",
"@fortawesome/free-solid-svg-icons": "5.15.2",
"@fortawesome/react-fontawesome": "0.1.14",
"@labkey/api": "1.3.0",
"@labkey/api": "1.4.0",
"bootstrap": "3.4.1",
"classnames": "2.2.6",
"font-awesome": "4.7.0",
Expand Down
9 changes: 9 additions & 0 deletions packages/components/releaseNotes/components.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
# @labkey/components
Components, models, actions, and utility functions for LabKey applications and pages.

### version 2.27.0
*Released*: 01 May 2021
* Changes to allow data region filtration based on ontology concepts
* Added OntologyBrowserFilterPanel to handle FilterDialog injection
* Updated OntologyBrowser to optionally hide conceptinfo
* Updated OntologyTreePanel to show filter selections
* Updated FileTree to take header parameter
* Split FileTree.Header into its own file

### version 2.26.3
*Released*: 30 April 2021
* Issue 43028: QuerySelect - fallback to "valueColumn" as option label
Expand Down
2 changes: 2 additions & 0 deletions packages/components/src/index.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -420,6 +420,7 @@ import {
import { createMockWithRouterProps } from './test/mockUtils';
import { OntologyBrowserPanel } from './internal/components/ontology/OntologyBrowserPanel';
import { OntologyConceptOverviewPanel } from './internal/components/ontology/ConceptOverviewPanel';
import { OntologyBrowserFilterPanel } from './internal/components/ontology/OntologyBrowserFilterPanel';
import { AppModel, LogoutReason } from './internal/app/models';
import {
AppReducers,
Expand DownExpand Up@@ -1029,6 +1030,7 @@ export {
// Ontology
OntologyBrowserPanel,
OntologyConceptOverviewPanel,
OntologyBrowserFilterPanel,
};

// Due to babel-loader & typescript babel plugins we need to export/import types separately. The babel plugins require
Expand Down
54 changes: 27 additions & 27 deletions ...omponents/src/internal/components/domainproperties/__snapshots__/DomainForm.spec.tsx.snap
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -488,11 +488,11 @@ exports[`DomainForm domain form add, expand, and delete field 1`] = `
}
store={
Object {
"@@observable": [Function],
"dispatch": [Function],
"getState": [Function],
"replaceReducer": [Function],
"subscribe": [Function],
Symbol(observable): [Function],
}
}
>
Expand DownExpand Up@@ -675,7 +675,7 @@ exports[`DomainForm domain form add, expand, and delete field 1`] = `
</div>
</div>
</Sticky>
<ConnectFunction
<Connect(Droppable)
direction="vertical"
droppableId="domain-form-droppable"
getContainerForClone={[Function]}
Expand DownExpand Up@@ -3180,7 +3180,7 @@ exports[`DomainForm domain form add, expand, and delete field 1`] = `
</Form>
</div>
</Droppable>
</ConnectFunction>
</Connect(Droppable)>
</div>
</Container>
</Provider>
Expand DownExpand Up@@ -4243,11 +4243,11 @@ exports[`DomainForm domain form header and search 1`] = `
}
store={
Object {
"@@observable": [Function],
"dispatch": [Function],
"getState": [Function],
"replaceReducer": [Function],
"subscribe": [Function],
Symbol(observable): [Function],
}
}
>
Expand DownExpand Up@@ -4430,7 +4430,7 @@ exports[`DomainForm domain form header and search 1`] = `
</div>
</div>
</Sticky>
<ConnectFunction
<Connect(Droppable)
direction="vertical"
droppableId="domain-form-droppable"
getContainerForClone={[Function]}
Expand DownExpand Up@@ -13383,7 +13383,7 @@ exports[`DomainForm domain form header and search 1`] = `
</Form>
</div>
</Droppable>
</ConnectFunction>
</Connect(Droppable)>
</div>
</Container>
</Provider>
Expand DownExpand Up@@ -14481,11 +14481,11 @@ exports[`DomainForm domain form initCollapsed 1`] = `
}
store={
Object {
"@@observable": [Function],
"dispatch": [Function],
"getState": [Function],
"replaceReducer": [Function],
"subscribe": [Function],
Symbol(observable): [Function],
}
}
>
Expand DownExpand Up@@ -14668,7 +14668,7 @@ exports[`DomainForm domain form initCollapsed 1`] = `
</div>
</div>
</Sticky>
<ConnectFunction
<Connect(Droppable)
direction="vertical"
droppableId="domain-form-droppable"
getContainerForClone={[Function]}
Expand DownExpand Up@@ -19193,7 +19193,7 @@ exports[`DomainForm domain form initCollapsed 1`] = `
</Form>
</div>
</Droppable>
</ConnectFunction>
</Connect(Droppable)>
</div>
</Container>
</Provider>
Expand DownExpand Up@@ -19923,11 +19923,11 @@ exports[`DomainForm domain form initCollapsed and markComplete 1`] = `
}
store={
Object {
"@@observable": [Function],
"dispatch": [Function],
"getState": [Function],
"replaceReducer": [Function],
"subscribe": [Function],
Symbol(observable): [Function],
}
}
>
Expand DownExpand Up@@ -20110,7 +20110,7 @@ exports[`DomainForm domain form initCollapsed and markComplete 1`] = `
</div>
</div>
</Sticky>
<ConnectFunction
<Connect(Droppable)
direction="vertical"
droppableId="domain-form-droppable"
getContainerForClone={[Function]}
Expand DownExpand Up@@ -24635,7 +24635,7 @@ exports[`DomainForm domain form initCollapsed and markComplete 1`] = `
</Form>
</div>
</Droppable>
</ConnectFunction>
</Connect(Droppable)>
</div>
</Container>
</Provider>
Expand DownExpand Up@@ -25193,11 +25193,11 @@ exports[`DomainForm domain form no file or attachment type 1`] = `
}
store={
Object {
"@@observable": [Function],
"dispatch": [Function],
"getState": [Function],
"replaceReducer": [Function],
"subscribe": [Function],
Symbol(observable): [Function],
}
}
>
Expand DownExpand Up@@ -25380,7 +25380,7 @@ exports[`DomainForm domain form no file or attachment type 1`] = `
</div>
</div>
</Sticky>
<ConnectFunction
<Connect(Droppable)
direction="vertical"
droppableId="domain-form-droppable"
getContainerForClone={[Function]}
Expand DownExpand Up@@ -27679,7 +27679,7 @@ exports[`DomainForm domain form no file or attachment type 1`] = `
</Form>
</div>
</Droppable>
</ConnectFunction>
</Connect(Droppable)>
</div>
</Container>
</Provider>
Expand DownExpand Up@@ -28237,11 +28237,11 @@ exports[`DomainForm domain form updated field, cleared details 1`] = `
}
store={
Object {
"@@observable": [Function],
"dispatch": [Function],
"getState": [Function],
"replaceReducer": [Function],
"subscribe": [Function],
Symbol(observable): [Function],
}
}
>
Expand DownExpand Up@@ -28424,7 +28424,7 @@ exports[`DomainForm domain form updated field, cleared details 1`] = `
</div>
</div>
</Sticky>
<ConnectFunction
<Connect(Droppable)
direction="vertical"
droppableId="domain-form-droppable"
getContainerForClone={[Function]}
Expand DownExpand Up@@ -30684,7 +30684,7 @@ exports[`DomainForm domain form updated field, cleared details 1`] = `
</Form>
</div>
</Droppable>
</ConnectFunction>
</Connect(Droppable)>
</div>
</Container>
</Provider>
Expand DownExpand Up@@ -32922,11 +32922,11 @@ exports[`DomainForm domain form with all field types 1`] = `
}
store={
Object {
"@@observable": [Function],
"dispatch": [Function],
"getState": [Function],
"replaceReducer": [Function],
"subscribe": [Function],
Symbol(observable): [Function],
}
}
>
Expand DownExpand Up@@ -33109,7 +33109,7 @@ exports[`DomainForm domain form with all field types 1`] = `
</div>
</div>
</Sticky>
<ConnectFunction
<Connect(Droppable)
direction="vertical"
droppableId="domain-form-droppable"
getContainerForClone={[Function]}
Expand DownExpand Up@@ -56087,7 +56087,7 @@ exports[`DomainForm domain form with all field types 1`] = `
</Form>
</div>
</Droppable>
</ConnectFunction>
</Connect(Droppable)>
</div>
</Container>
</Provider>
Expand DownExpand Up@@ -56919,11 +56919,11 @@ exports[`DomainForm domain form with hide required 1`] = `
}
store={
Object {
"@@observable": [Function],
"dispatch": [Function],
"getState": [Function],
"replaceReducer": [Function],
"subscribe": [Function],
Symbol(observable): [Function],
}
}
>
Expand DownExpand Up@@ -57102,7 +57102,7 @@ exports[`DomainForm domain form with hide required 1`] = `
</div>
</div>
</Sticky>
<ConnectFunction
<Connect(Droppable)
direction="vertical"
droppableId="domain-form-droppable"
getContainerForClone={[Function]}
Expand DownExpand Up@@ -59300,7 +59300,7 @@ exports[`DomainForm domain form with hide required 1`] = `
</Form>
</div>
</Droppable>
</ConnectFunction>
</Connect(Droppable)>
</div>
</Container>
</Provider>
Expand DownExpand Up@@ -60724,11 +60724,11 @@ exports[`DomainForm domain form with updated fields 1`] = `
}
store={
Object {
"@@observable": [Function],
"dispatch": [Function],
"getState": [Function],
"replaceReducer": [Function],
"subscribe": [Function],
Symbol(observable): [Function],
}
}
>
Expand DownExpand Up@@ -60911,7 +60911,7 @@ exports[`DomainForm domain form with updated fields 1`] = `
</div>
</div>
</Sticky>
<ConnectFunction
<Connect(Droppable)
direction="vertical"
droppableId="domain-form-droppable"
getContainerForClone={[Function]}
Expand DownExpand Up@@ -68971,7 +68971,7 @@ exports[`DomainForm domain form with updated fields 1`] = `
</Form>
</div>
</Droppable>
</ConnectFunction>
</Connect(Droppable)>
</div>
</Container>
</Provider>
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Enable data region filtration based on Ontologies by Sigmonia · Pull Request #512 · LabKey/labkey-ui-components · GitHub
Skip to content
Enable data region filtration based on Ontologies#512

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

 Merged

Sigmonia
merged 36 commits into

from

May 1, 2021
 Merged


Enable data region filtration based on Ontologies
#512
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


36 commits


Select commit
Hold shift + click to select a range
0f1cd8f

*in-progress* Add OntologyBrowserFilterPanel as a component


Sigmonia Apr 9, 2021
dcf37bd

v2.22.1-fb-ontFilter.0


Sigmonia Apr 9, 2021
4d9e972

v2.22.1-fb-ontFilter.1


Sigmonia Apr 14, 2021
b31234b

Split FileTree.Header component into it's own file


Sigmonia Apr 15, 2021
a1ee520

v2.22.1-fb-ontFilter.2


Sigmonia Apr 16, 2021
86c1d44

Add filter types


Sigmonia Apr 16, 2021
efb841f

add filtering based on ontology hierarchy paths


Sigmonia Apr 20, 2021
2975d04

v2.22.1-fb-ontFilter.3


Sigmonia Apr 20, 2021
1b19c9a

updating lock & json files and for alpha


Sigmonia Apr 20, 2021
1d9a316

Fix filter type not getting set


Sigmonia Apr 21, 2021
004d9d5

v2.22.1-fb-ontFilter.4


Sigmonia Apr 21, 2021
8dd3414

Update change log


Sigmonia Apr 21, 2021
b6c264e

Fix up jest tests


Sigmonia Apr 23, 2021
1df027e

Update snap


Sigmonia Apr 23, 2021
0a6fd2e

Merge develop into branch


Sigmonia Apr 23, 2021
00bcfb1

v2.24.4-fb-ontFilter.5


Sigmonia Apr 23, 2021
3849e8e

Bump js alpha to .3


Sigmonia Apr 23, 2021
29ab01f

v2.24.4-fb-ontFilter.6


Sigmonia Apr 23, 2021
f4bb512

Code review requested changes.


Sigmonia Apr 23, 2021
9d54bbf

v2.24.4-fb-ontFilter.7


Sigmonia Apr 23, 2021
fc82a6b

CR recommendations


Sigmonia Apr 26, 2021
21090e2

Merge from develop


Sigmonia Apr 26, 2021
da79310

v2.25.0-fb-ontFilter.8


Sigmonia Apr 26, 2021
32f6979

Consolidate tree headers


Sigmonia Apr 27, 2021
c857dfd

v2.25.0-fb-ontFilter.9


Sigmonia Apr 27, 2021
7ace801

Move css block to platform entrypoint css file


Sigmonia Apr 28, 2021
14500dc

Fix flag


Sigmonia Apr 28, 2021
69c0763

merge develop into fb


Sigmonia Apr 28, 2021
91691e2

v2.26.0-fb-ontFilter.10


Sigmonia Apr 28, 2021
b4fe885

Fixed selected FileTree node's render state not being updated


Sigmonia Apr 28, 2021
28ffddf

Fix error message not clearing on change


Sigmonia Apr 28, 2021
4a0921a

v2.26.0-fb-ontFilter.11


Sigmonia Apr 29, 2021
9390d79

merge develop into branch


Sigmonia Apr 29, 2021
209aeef

Add some jest test for the ontology filter


Sigmonia May 1, 2021
9d36c41

v2.26.2-fb-ontFilter.12


Sigmonia May 1, 2021
59ba338

Final merge from develop


Sigmonia May 1, 2021

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: 2 additions & 2 deletions
packages/components/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
 "name": "@labkey/components",
 "version": "2.26.3",
 "version": "2.27.0",
 "description": "Components, models, actions, and utility functions for LabKey applications and pages",
 "main": "dist/components.js",
 "module": "dist/components.js",
Expand DownExpand Up@@ -44,7 +44,7 @@
 "@fortawesome/free-regular-svg-icons": "5.15.2",
 "@fortawesome/free-solid-svg-icons": "5.15.2",
 "@fortawesome/react-fontawesome": "0.1.14",
 "@labkey/api": "1.3.0",
 "@labkey/api": "1.4.0",
 "bootstrap": "3.4.1",
 "classnames": "2.2.6",
 "font-awesome": "4.7.0",
Expand Down

9 changes: 9 additions & 0 deletions
packages/components/releaseNotes/components.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
# @labkey/components
Components, models, actions, and utility functions for LabKey applications and pages.

### version 2.27.0
*Released*: 01 May 2021
* Changes to allow data region filtration based on ontology concepts
 * Added OntologyBrowserFilterPanel to handle FilterDialog injection
 * Updated OntologyBrowser to optionally hide conceptinfo
 * Updated OntologyTreePanel to show filter selections
* Updated FileTree to take header parameter
* Split FileTree.Header into its own file

### version 2.26.3
*Released*: 30 April 2021
* Issue 43028: QuerySelect - fallback to "valueColumn" as option label
Expand Down

2 changes: 2 additions & 0 deletions
packages/components/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -420,6 +420,7 @@ import {
import { createMockWithRouterProps } from './test/mockUtils';
import { OntologyBrowserPanel } from './internal/components/ontology/OntologyBrowserPanel';
import { OntologyConceptOverviewPanel } from './internal/components/ontology/ConceptOverviewPanel';
import { OntologyBrowserFilterPanel } from './internal/components/ontology/OntologyBrowserFilterPanel';
import { AppModel, LogoutReason } from './internal/app/models';
import {
 AppReducers,
Expand DownExpand Up@@ -1029,6 +1030,7 @@ export {
 // Ontology
 OntologyBrowserPanel,
 OntologyConceptOverviewPanel,
 OntologyBrowserFilterPanel,
};

// Due to babel-loader & typescript babel plugins we need to export/import types separately. The babel plugins require
Expand Down

54 changes: 27 additions & 27 deletions
...omponents/src/internal/components/domainproperties/__snapshots__/DomainForm.spec.tsx.snap

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -488,11 +488,11 @@ exports[`DomainForm domain form add, expand, and delete field 1`] = `
 }
 store={
 Object {
 "@@observable": [Function],
 "dispatch": [Function],
 "getState": [Function],
 "replaceReducer": [Function],
 "subscribe": [Function],
 Symbol(observable): [Function],
 }
 }
 >
Expand DownExpand Up@@ -675,7 +675,7 @@ exports[`DomainForm domain form add, expand, and delete field 1`] = `
 </div>
 </div>
 </Sticky>
 <ConnectFunction
 <Connect(Droppable)
 direction="vertical"
 droppableId="domain-form-droppable"
 getContainerForClone={[Function]}
Expand DownExpand Up@@ -3180,7 +3180,7 @@ exports[`DomainForm domain form add, expand, and delete field 1`] = `
 </Form>
 </div>
 </Droppable>
 </ConnectFunction>
 </Connect(Droppable)>
 </div>
 </Container>
 </Provider>
Expand DownExpand Up@@ -4243,11 +4243,11 @@ exports[`DomainForm domain form header and search 1`] = `
 }
 store={
 Object {
 "@@observable": [Function],
 "dispatch": [Function],
 "getState": [Function],
 "replaceReducer": [Function],
 "subscribe": [Function],
 Symbol(observable): [Function],
 }
 }
 >
Expand DownExpand Up@@ -4430,7 +4430,7 @@ exports[`DomainForm domain form header and search 1`] = `
 </div>
 </div>
 </Sticky>
 <ConnectFunction
 <Connect(Droppable)
 direction="vertical"
 droppableId="domain-form-droppable"
 getContainerForClone={[Function]}
Expand DownExpand Up@@ -13383,7 +13383,7 @@ exports[`DomainForm domain form header and search 1`] = `
 </Form>
 </div>
 </Droppable>
 </ConnectFunction>
 </Connect(Droppable)>
 </div>
 </Container>
 </Provider>
Expand DownExpand Up@@ -14481,11 +14481,11 @@ exports[`DomainForm domain form initCollapsed 1`] = `
 }
 store={
 Object {
 "@@observable": [Function],
 "dispatch": [Function],
 "getState": [Function],
 "replaceReducer": [Function],
 "subscribe": [Function],
 Symbol(observable): [Function],
 }
 }
 >
Expand DownExpand Up@@ -14668,7 +14668,7 @@ exports[`DomainForm domain form initCollapsed 1`] = `
 </div>
 </div>
 </Sticky>
 <ConnectFunction
 <Connect(Droppable)
 direction="vertical"
 droppableId="domain-form-droppable"
 getContainerForClone={[Function]}
Expand DownExpand Up@@ -19193,7 +19193,7 @@ exports[`DomainForm domain form initCollapsed 1`] = `
 </Form>
 </div>
 </Droppable>
 </ConnectFunction>
 </Connect(Droppable)>
 </div>
 </Container>
 </Provider>
Expand DownExpand Up@@ -19923,11 +19923,11 @@ exports[`DomainForm domain form initCollapsed and markComplete 1`] = `
 }
 store={
 Object {
 "@@observable": [Function],
 "dispatch": [Function],
 "getState": [Function],
 "replaceReducer": [Function],
 "subscribe": [Function],
 Symbol(observable): [Function],
 }
 }
 >
Expand DownExpand Up@@ -20110,7 +20110,7 @@ exports[`DomainForm domain form initCollapsed and markComplete 1`] = `
 </div>
 </div>
 </Sticky>
 <ConnectFunction
 <Connect(Droppable)
 direction="vertical"
 droppableId="domain-form-droppable"
 getContainerForClone={[Function]}
Expand DownExpand Up@@ -24635,7 +24635,7 @@ exports[`DomainForm domain form initCollapsed and markComplete 1`] = `
 </Form>
 </div>
 </Droppable>
 </ConnectFunction>
 </Connect(Droppable)>
 </div>
 </Container>
 </Provider>
Expand DownExpand Up@@ -25193,11 +25193,11 @@ exports[`DomainForm domain form no file or attachment type 1`] = `
 }
 store={
 Object {
 "@@observable": [Function],
 "dispatch": [Function],
 "getState": [Function],
 "replaceReducer": [Function],
 "subscribe": [Function],
 Symbol(observable): [Function],
 }
 }
 >
Expand DownExpand Up@@ -25380,7 +25380,7 @@ exports[`DomainForm domain form no file or attachment type 1`] = `
 </div>
 </div>
 </Sticky>
 <ConnectFunction
 <Connect(Droppable)
 direction="vertical"
 droppableId="domain-form-droppable"
 getContainerForClone={[Function]}
Expand DownExpand Up@@ -27679,7 +27679,7 @@ exports[`DomainForm domain form no file or attachment type 1`] = `
 </Form>
 </div>
 </Droppable>
 </ConnectFunction>
 </Connect(Droppable)>
 </div>
 </Container>
 </Provider>
Expand DownExpand Up@@ -28237,11 +28237,11 @@ exports[`DomainForm domain form updated field, cleared details 1`] = `
 }
 store={
 Object {
 "@@observable": [Function],
 "dispatch": [Function],
 "getState": [Function],
 "replaceReducer": [Function],
 "subscribe": [Function],
 Symbol(observable): [Function],
 }
 }
 >
Expand DownExpand Up@@ -28424,7 +28424,7 @@ exports[`DomainForm domain form updated field, cleared details 1`] = `
 </div>
 </div>
 </Sticky>
 <ConnectFunction
 <Connect(Droppable)
 direction="vertical"
 droppableId="domain-form-droppable"
 getContainerForClone={[Function]}
Expand DownExpand Up@@ -30684,7 +30684,7 @@ exports[`DomainForm domain form updated field, cleared details 1`] = `
 </Form>
 </div>
 </Droppable>
 </ConnectFunction>
 </Connect(Droppable)>
 </div>
 </Container>
 </Provider>
Expand DownExpand Up@@ -32922,11 +32922,11 @@ exports[`DomainForm domain form with all field types 1`] = `
 }
 store={
 Object {
 "@@observable": [Function],
 "dispatch": [Function],
 "getState": [Function],
 "replaceReducer": [Function],
 "subscribe": [Function],
 Symbol(observable): [Function],
 }
 }
 >
Expand DownExpand Up@@ -33109,7 +33109,7 @@ exports[`DomainForm domain form with all field types 1`] = `
 </div>
 </div>
 </Sticky>
 <ConnectFunction
 <Connect(Droppable)
 direction="vertical"
 droppableId="domain-form-droppable"
 getContainerForClone={[Function]}
Expand DownExpand Up@@ -56087,7 +56087,7 @@ exports[`DomainForm domain form with all field types 1`] = `
 </Form>
 </div>
 </Droppable>
 </ConnectFunction>
 </Connect(Droppable)>
 </div>
 </Container>
 </Provider>
Expand DownExpand Up@@ -56919,11 +56919,11 @@ exports[`DomainForm domain form with hide required 1`] = `
 }
 store={
 Object {
 "@@observable": [Function],
 "dispatch": [Function],
 "getState": [Function],
 "replaceReducer": [Function],
 "subscribe": [Function],
 Symbol(observable): [Function],
 }
 }
 >
Expand DownExpand Up@@ -57102,7 +57102,7 @@ exports[`DomainForm domain form with hide required 1`] = `
 </div>
 </div>
 </Sticky>
 <ConnectFunction
 <Connect(Droppable)
 direction="vertical"
 droppableId="domain-form-droppable"
 getContainerForClone={[Function]}
Expand DownExpand Up@@ -59300,7 +59300,7 @@ exports[`DomainForm domain form with hide required 1`] = `
 </Form>
 </div>
 </Droppable>
 </ConnectFunction>
 </Connect(Droppable)>
 </div>
 </Container>
 </Provider>
Expand DownExpand Up@@ -60724,11 +60724,11 @@ exports[`DomainForm domain form with updated fields 1`] = `
 }
 store={
 Object {
 "@@observable": [Function],
 "dispatch": [Function],
 "getState": [Function],
 "replaceReducer": [Function],
 "subscribe": [Function],
 Symbol(observable): [Function],
 }
 }
 >
Expand DownExpand Up@@ -60911,7 +60911,7 @@ exports[`DomainForm domain form with updated fields 1`] = `
 </div>
 </div>
 </Sticky>
 <ConnectFunction
 <Connect(Droppable)
 direction="vertical"
 droppableId="domain-form-droppable"
 getContainerForClone={[Function]}
Expand DownExpand Up@@ -68971,7 +68971,7 @@ exports[`DomainForm domain form with updated fields 1`] = `
 </Form>
 </div>
 </Droppable>
 </ConnectFunction>
 </Connect(Droppable)>
 </div>
 </Container>
 </Provider>
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Enable data region filtration based on Ontologies by Sigmonia · Pull Request #512 · LabKey/labkey-ui-components · GitHub
Skip to content
Enable data region filtration based on Ontologies#512

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

 Merged

Sigmonia
merged 36 commits into

from

May 1, 2021
 Merged


Enable data region filtration based on Ontologies
#512
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


36 commits


Select commit
Hold shift + click to select a range
0f1cd8f

*in-progress* Add OntologyBrowserFilterPanel as a component


Sigmonia Apr 9, 2021
dcf37bd

v2.22.1-fb-ontFilter.0


Sigmonia Apr 9, 2021
4d9e972

v2.22.1-fb-ontFilter.1


Sigmonia Apr 14, 2021
b31234b

Split FileTree.Header component into it's own file


Sigmonia Apr 15, 2021
a1ee520

v2.22.1-fb-ontFilter.2


Sigmonia Apr 16, 2021
86c1d44

Add filter types


Sigmonia Apr 16, 2021
efb841f

add filtering based on ontology hierarchy paths


Sigmonia Apr 20, 2021
2975d04

v2.22.1-fb-ontFilter.3


Sigmonia Apr 20, 2021
1b19c9a

updating lock & json files and for alpha


Sigmonia Apr 20, 2021
1d9a316

Fix filter type not getting set


Sigmonia Apr 21, 2021
004d9d5

v2.22.1-fb-ontFilter.4


Sigmonia Apr 21, 2021
8dd3414

Update change log


Sigmonia Apr 21, 2021
b6c264e

Fix up jest tests


Sigmonia Apr 23, 2021
1df027e

Update snap


Sigmonia Apr 23, 2021
0a6fd2e

Merge develop into branch


Sigmonia Apr 23, 2021
00bcfb1

v2.24.4-fb-ontFilter.5


Sigmonia Apr 23, 2021
3849e8e

Bump js alpha to .3


Sigmonia Apr 23, 2021
29ab01f

v2.24.4-fb-ontFilter.6


Sigmonia Apr 23, 2021
f4bb512

Code review requested changes.


Sigmonia Apr 23, 2021
9d54bbf

v2.24.4-fb-ontFilter.7


Sigmonia Apr 23, 2021
fc82a6b

CR recommendations


Sigmonia Apr 26, 2021
21090e2

Merge from develop


Sigmonia Apr 26, 2021
da79310

v2.25.0-fb-ontFilter.8


Sigmonia Apr 26, 2021
32f6979

Consolidate tree headers


Sigmonia Apr 27, 2021
c857dfd

v2.25.0-fb-ontFilter.9


Sigmonia Apr 27, 2021
7ace801

Move css block to platform entrypoint css file


Sigmonia Apr 28, 2021
14500dc

Fix flag


Sigmonia Apr 28, 2021
69c0763

merge develop into fb


Sigmonia Apr 28, 2021
91691e2

v2.26.0-fb-ontFilter.10


Sigmonia Apr 28, 2021
b4fe885

Fixed selected FileTree node's render state not being updated


Sigmonia Apr 28, 2021
28ffddf

Fix error message not clearing on change


Sigmonia Apr 28, 2021
4a0921a

v2.26.0-fb-ontFilter.11


Sigmonia Apr 29, 2021
9390d79

merge develop into branch


Sigmonia Apr 29, 2021
209aeef

Add some jest test for the ontology filter


Sigmonia May 1, 2021
9d36c41

v2.26.2-fb-ontFilter.12


Sigmonia May 1, 2021
59ba338

Final merge from develop


Sigmonia May 1, 2021

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: 2 additions & 2 deletions
packages/components/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
 "name": "@labkey/components",
 "version": "2.26.3",
 "version": "2.27.0",
 "description": "Components, models, actions, and utility functions for LabKey applications and pages",
 "main": "dist/components.js",
 "module": "dist/components.js",
Expand DownExpand Up@@ -44,7 +44,7 @@
 "@fortawesome/free-regular-svg-icons": "5.15.2",
 "@fortawesome/free-solid-svg-icons": "5.15.2",
 "@fortawesome/react-fontawesome": "0.1.14",
 "@labkey/api": "1.3.0",
 "@labkey/api": "1.4.0",
 "bootstrap": "3.4.1",
 "classnames": "2.2.6",
 "font-awesome": "4.7.0",
Expand Down

9 changes: 9 additions & 0 deletions
packages/components/releaseNotes/components.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
# @labkey/components
Components, models, actions, and utility functions for LabKey applications and pages.

### version 2.27.0
*Released*: 01 May 2021
* Changes to allow data region filtration based on ontology concepts
 * Added OntologyBrowserFilterPanel to handle FilterDialog injection
 * Updated OntologyBrowser to optionally hide conceptinfo
 * Updated OntologyTreePanel to show filter selections
* Updated FileTree to take header parameter
* Split FileTree.Header into its own file

### version 2.26.3
*Released*: 30 April 2021
* Issue 43028: QuerySelect - fallback to "valueColumn" as option label
Expand Down

2 changes: 2 additions & 0 deletions
packages/components/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -420,6 +420,7 @@ import {
import { createMockWithRouterProps } from './test/mockUtils';
import { OntologyBrowserPanel } from './internal/components/ontology/OntologyBrowserPanel';
import { OntologyConceptOverviewPanel } from './internal/components/ontology/ConceptOverviewPanel';
import { OntologyBrowserFilterPanel } from './internal/components/ontology/OntologyBrowserFilterPanel';
import { AppModel, LogoutReason } from './internal/app/models';
import {
 AppReducers,
Expand DownExpand Up@@ -1029,6 +1030,7 @@ export {
 // Ontology
 OntologyBrowserPanel,
 OntologyConceptOverviewPanel,
 OntologyBrowserFilterPanel,
};

// Due to babel-loader & typescript babel plugins we need to export/import types separately. The babel plugins require
Expand Down

54 changes: 27 additions & 27 deletions
...omponents/src/internal/components/domainproperties/__snapshots__/DomainForm.spec.tsx.snap

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -488,11 +488,11 @@ exports[`DomainForm domain form add, expand, and delete field 1`] = `
 }
 store={
 Object {
 "@@observable": [Function],
 "dispatch": [Function],
 "getState": [Function],
 "replaceReducer": [Function],
 "subscribe": [Function],
 Symbol(observable): [Function],
 }
 }
 >
Expand DownExpand Up@@ -675,7 +675,7 @@ exports[`DomainForm domain form add, expand, and delete field 1`] = `
 </div>
 </div>
 </Sticky>
 <ConnectFunction
 <Connect(Droppable)
 direction="vertical"
 droppableId="domain-form-droppable"
 getContainerForClone={[Function]}
Expand DownExpand Up@@ -3180,7 +3180,7 @@ exports[`DomainForm domain form add, expand, and delete field 1`] = `
 </Form>
 </div>
 </Droppable>
 </ConnectFunction>
 </Connect(Droppable)>
 </div>
 </Container>
 </Provider>
Expand DownExpand Up@@ -4243,11 +4243,11 @@ exports[`DomainForm domain form header and search 1`] = `
 }
 store={
 Object {
 "@@observable": [Function],
 "dispatch": [Function],
 "getState": [Function],
 "replaceReducer": [Function],
 "subscribe": [Function],
 Symbol(observable): [Function],
 }
 }
 >
Expand DownExpand Up@@ -4430,7 +4430,7 @@ exports[`DomainForm domain form header and search 1`] = `
 </div>
 </div>
 </Sticky>
 <ConnectFunction
 <Connect(Droppable)
 direction="vertical"
 droppableId="domain-form-droppable"
 getContainerForClone={[Function]}
Expand DownExpand Up@@ -13383,7 +13383,7 @@ exports[`DomainForm domain form header and search 1`] = `
 </Form>
 </div>
 </Droppable>
 </ConnectFunction>
 </Connect(Droppable)>
 </div>
 </Container>
 </Provider>
Expand DownExpand Up@@ -14481,11 +14481,11 @@ exports[`DomainForm domain form initCollapsed 1`] = `
 }
 store={
 Object {
 "@@observable": [Function],
 "dispatch": [Function],
 "getState": [Function],
 "replaceReducer": [Function],
 "subscribe": [Function],
 Symbol(observable): [Function],
 }
 }
 >
Expand DownExpand Up@@ -14668,7 +14668,7 @@ exports[`DomainForm domain form initCollapsed 1`] = `
 </div>
 </div>
 </Sticky>
 <ConnectFunction
 <Connect(Droppable)
 direction="vertical"
 droppableId="domain-form-droppable"
 getContainerForClone={[Function]}
Expand DownExpand Up@@ -19193,7 +19193,7 @@ exports[`DomainForm domain form initCollapsed 1`] = `
 </Form>
 </div>
 </Droppable>
 </ConnectFunction>
 </Connect(Droppable)>
 </div>
 </Container>
 </Provider>
Expand DownExpand Up@@ -19923,11 +19923,11 @@ exports[`DomainForm domain form initCollapsed and markComplete 1`] = `
 }
 store={
 Object {
 "@@observable": [Function],
 "dispatch": [Function],
 "getState": [Function],
 "replaceReducer": [Function],
 "subscribe": [Function],
 Symbol(observable): [Function],
 }
 }
 >
Expand DownExpand Up@@ -20110,7 +20110,7 @@ exports[`DomainForm domain form initCollapsed and markComplete 1`] = `
 </div>
 </div>
 </Sticky>
 <ConnectFunction
 <Connect(Droppable)
 direction="vertical"
 droppableId="domain-form-droppable"
 getContainerForClone={[Function]}
Expand DownExpand Up@@ -24635,7 +24635,7 @@ exports[`DomainForm domain form initCollapsed and markComplete 1`] = `
 </Form>
 </div>
 </Droppable>
 </ConnectFunction>
 </Connect(Droppable)>
 </div>
 </Container>
 </Provider>
Expand DownExpand Up@@ -25193,11 +25193,11 @@ exports[`DomainForm domain form no file or attachment type 1`] = `
 }
 store={
 Object {
 "@@observable": [Function],
 "dispatch": [Function],
 "getState": [Function],
 "replaceReducer": [Function],
 "subscribe": [Function],
 Symbol(observable): [Function],
 }
 }
 >
Expand DownExpand Up@@ -25380,7 +25380,7 @@ exports[`DomainForm domain form no file or attachment type 1`] = `
 </div>
 </div>
 </Sticky>
 <ConnectFunction
 <Connect(Droppable)
 direction="vertical"
 droppableId="domain-form-droppable"
 getContainerForClone={[Function]}
Expand DownExpand Up@@ -27679,7 +27679,7 @@ exports[`DomainForm domain form no file or attachment type 1`] = `
 </Form>
 </div>
 </Droppable>
 </ConnectFunction>
 </Connect(Droppable)>
 </div>
 </Container>
 </Provider>
Expand DownExpand Up@@ -28237,11 +28237,11 @@ exports[`DomainForm domain form updated field, cleared details 1`] = `
 }
 store={
 Object {
 "@@observable": [Function],
 "dispatch": [Function],
 "getState": [Function],
 "replaceReducer": [Function],
 "subscribe": [Function],
 Symbol(observable): [Function],
 }
 }
 >
Expand DownExpand Up@@ -28424,7 +28424,7 @@ exports[`DomainForm domain form updated field, cleared details 1`] = `
 </div>
 </div>
 </Sticky>
 <ConnectFunction
 <Connect(Droppable)
 direction="vertical"
 droppableId="domain-form-droppable"
 getContainerForClone={[Function]}
Expand DownExpand Up@@ -30684,7 +30684,7 @@ exports[`DomainForm domain form updated field, cleared details 1`] = `
 </Form>
 </div>
 </Droppable>
 </ConnectFunction>
 </Connect(Droppable)>
 </div>
 </Container>
 </Provider>
Expand DownExpand Up@@ -32922,11 +32922,11 @@ exports[`DomainForm domain form with all field types 1`] = `
 }
 store={
 Object {
 "@@observable": [Function],
 "dispatch": [Function],
 "getState": [Function],
 "replaceReducer": [Function],
 "subscribe": [Function],
 Symbol(observable): [Function],
 }
 }
 >
Expand DownExpand Up@@ -33109,7 +33109,7 @@ exports[`DomainForm domain form with all field types 1`] = `
 </div>
 </div>
 </Sticky>
 <ConnectFunction
 <Connect(Droppable)
 direction="vertical"
 droppableId="domain-form-droppable"
 getContainerForClone={[Function]}
Expand DownExpand Up@@ -56087,7 +56087,7 @@ exports[`DomainForm domain form with all field types 1`] = `
 </Form>
 </div>
 </Droppable>
 </ConnectFunction>
 </Connect(Droppable)>
 </div>
 </Container>
 </Provider>
Expand DownExpand Up@@ -56919,11 +56919,11 @@ exports[`DomainForm domain form with hide required 1`] = `
 }
 store={
 Object {
 "@@observable": [Function],
 "dispatch": [Function],
 "getState": [Function],
 "replaceReducer": [Function],
 "subscribe": [Function],
 Symbol(observable): [Function],
 }
 }
 >
Expand DownExpand Up@@ -57102,7 +57102,7 @@ exports[`DomainForm domain form with hide required 1`] = `
 </div>
 </div>
 </Sticky>
 <ConnectFunction
 <Connect(Droppable)
 direction="vertical"
 droppableId="domain-form-droppable"
 getContainerForClone={[Function]}
Expand DownExpand Up@@ -59300,7 +59300,7 @@ exports[`DomainForm domain form with hide required 1`] = `
 </Form>
 </div>
 </Droppable>
 </ConnectFunction>
 </Connect(Droppable)>
 </div>
 </Container>
 </Provider>
Expand DownExpand Up@@ -60724,11 +60724,11 @@ exports[`DomainForm domain form with updated fields 1`] = `
 }
 store={
 Object {
 "@@observable": [Function],
 "dispatch": [Function],
 "getState": [Function],
 "replaceReducer": [Function],
 "subscribe": [Function],
 Symbol(observable): [Function],
 }
 }
 >
Expand DownExpand Up@@ -60911,7 +60911,7 @@ exports[`DomainForm domain form with updated fields 1`] = `
 </div>
 </div>
 </Sticky>
 <ConnectFunction
 <Connect(Droppable)
 direction="vertical"
 droppableId="domain-form-droppable"
 getContainerForClone={[Function]}
Expand DownExpand Up@@ -68971,7 +68971,7 @@ exports[`DomainForm domain form with updated fields 1`] = `
 </Form>
 </div>
 </Droppable>
 </ConnectFunction>
 </Connect(Droppable)>
 </div>
 </Container>
 </Provider>
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Enable data region filtration based on Ontologies by Sigmonia · Pull Request #512 · LabKey/labkey-ui-components · GitHub
Skip to content
Enable data region filtration based on Ontologies#512

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

 Merged

Sigmonia
merged 36 commits into

from

May 1, 2021
 Merged


Enable data region filtration based on Ontologies
#512
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


36 commits


Select commit
Hold shift + click to select a range
0f1cd8f

*in-progress* Add OntologyBrowserFilterPanel as a component


Sigmonia Apr 9, 2021
dcf37bd

v2.22.1-fb-ontFilter.0


Sigmonia Apr 9, 2021
4d9e972

v2.22.1-fb-ontFilter.1


Sigmonia Apr 14, 2021
b31234b

Split FileTree.Header component into it's own file


Sigmonia Apr 15, 2021
a1ee520

v2.22.1-fb-ontFilter.2


Sigmonia Apr 16, 2021
86c1d44

Add filter types


Sigmonia Apr 16, 2021
efb841f

add filtering based on ontology hierarchy paths


Sigmonia Apr 20, 2021
2975d04

v2.22.1-fb-ontFilter.3


Sigmonia Apr 20, 2021
1b19c9a

updating lock & json files and for alpha


Sigmonia Apr 20, 2021
1d9a316

Fix filter type not getting set


Sigmonia Apr 21, 2021
004d9d5

v2.22.1-fb-ontFilter.4


Sigmonia Apr 21, 2021
8dd3414

Update change log


Sigmonia Apr 21, 2021
b6c264e

Fix up jest tests


Sigmonia Apr 23, 2021
1df027e

Update snap


Sigmonia Apr 23, 2021
0a6fd2e

Merge develop into branch


Sigmonia Apr 23, 2021
00bcfb1

v2.24.4-fb-ontFilter.5


Sigmonia Apr 23, 2021
3849e8e

Bump js alpha to .3


Sigmonia Apr 23, 2021
29ab01f

v2.24.4-fb-ontFilter.6


Sigmonia Apr 23, 2021
f4bb512

Code review requested changes.


Sigmonia Apr 23, 2021
9d54bbf

v2.24.4-fb-ontFilter.7


Sigmonia Apr 23, 2021
fc82a6b

CR recommendations


Sigmonia Apr 26, 2021
21090e2

Merge from develop


Sigmonia Apr 26, 2021
da79310

v2.25.0-fb-ontFilter.8


Sigmonia Apr 26, 2021
32f6979

Consolidate tree headers


Sigmonia Apr 27, 2021
c857dfd

v2.25.0-fb-ontFilter.9


Sigmonia Apr 27, 2021
7ace801

Move css block to platform entrypoint css file


Sigmonia Apr 28, 2021
14500dc

Fix flag


Sigmonia Apr 28, 2021
69c0763

merge develop into fb


Sigmonia Apr 28, 2021
91691e2

v2.26.0-fb-ontFilter.10


Sigmonia Apr 28, 2021
b4fe885

Fixed selected FileTree node's render state not being updated


Sigmonia Apr 28, 2021
28ffddf

Fix error message not clearing on change


Sigmonia Apr 28, 2021
4a0921a

v2.26.0-fb-ontFilter.11


Sigmonia Apr 29, 2021
9390d79

merge develop into branch


Sigmonia Apr 29, 2021
209aeef

Add some jest test for the ontology filter


Sigmonia May 1, 2021
9d36c41

v2.26.2-fb-ontFilter.12


Sigmonia May 1, 2021
59ba338

Final merge from develop


Sigmonia May 1, 2021

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: 2 additions & 2 deletions
packages/components/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
 "name": "@labkey/components",
 "version": "2.26.3",
 "version": "2.27.0",
 "description": "Components, models, actions, and utility functions for LabKey applications and pages",
 "main": "dist/components.js",
 "module": "dist/components.js",
Expand DownExpand Up@@ -44,7 +44,7 @@
 "@fortawesome/free-regular-svg-icons": "5.15.2",
 "@fortawesome/free-solid-svg-icons": "5.15.2",
 "@fortawesome/react-fontawesome": "0.1.14",
 "@labkey/api": "1.3.0",
 "@labkey/api": "1.4.0",
 "bootstrap": "3.4.1",
 "classnames": "2.2.6",
 "font-awesome": "4.7.0",
Expand Down

9 changes: 9 additions & 0 deletions
packages/components/releaseNotes/components.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
# @labkey/components
Components, models, actions, and utility functions for LabKey applications and pages.

### version 2.27.0
*Released*: 01 May 2021
* Changes to allow data region filtration based on ontology concepts
 * Added OntologyBrowserFilterPanel to handle FilterDialog injection
 * Updated OntologyBrowser to optionally hide conceptinfo
 * Updated OntologyTreePanel to show filter selections
* Updated FileTree to take header parameter
* Split FileTree.Header into its own file

### version 2.26.3
*Released*: 30 April 2021
* Issue 43028: QuerySelect - fallback to "valueColumn" as option label
Expand Down

2 changes: 2 additions & 0 deletions
packages/components/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -420,6 +420,7 @@ import {
import { createMockWithRouterProps } from './test/mockUtils';
import { OntologyBrowserPanel } from './internal/components/ontology/OntologyBrowserPanel';
import { OntologyConceptOverviewPanel } from './internal/components/ontology/ConceptOverviewPanel';
import { OntologyBrowserFilterPanel } from './internal/components/ontology/OntologyBrowserFilterPanel';
import { AppModel, LogoutReason } from './internal/app/models';
import {
 AppReducers,
Expand DownExpand Up@@ -1029,6 +1030,7 @@ export {
 // Ontology
 OntologyBrowserPanel,
 OntologyConceptOverviewPanel,
 OntologyBrowserFilterPanel,
};

// Due to babel-loader & typescript babel plugins we need to export/import types separately. The babel plugins require
Expand Down

54 changes: 27 additions & 27 deletions
...omponents/src/internal/components/domainproperties/__snapshots__/DomainForm.spec.tsx.snap

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -488,11 +488,11 @@ exports[`DomainForm domain form add, expand, and delete field 1`] = `
 }
 store={
 Object {
 "@@observable": [Function],
 "dispatch": [Function],
 "getState": [Function],
 "replaceReducer": [Function],
 "subscribe": [Function],
 Symbol(observable): [Function],
 }
 }
 >
Expand DownExpand Up@@ -675,7 +675,7 @@ exports[`DomainForm domain form add, expand, and delete field 1`] = `
 </div>
 </div>
 </Sticky>
 <ConnectFunction
 <Connect(Droppable)
 direction="vertical"
 droppableId="domain-form-droppable"
 getContainerForClone={[Function]}
Expand DownExpand Up@@ -3180,7 +3180,7 @@ exports[`DomainForm domain form add, expand, and delete field 1`] = `
 </Form>
 </div>
 </Droppable>
 </ConnectFunction>
 </Connect(Droppable)>
 </div>
 </Container>
 </Provider>
Expand DownExpand Up@@ -4243,11 +4243,11 @@ exports[`DomainForm domain form header and search 1`] = `
 }
 store={
 Object {
 "@@observable": [Function],
 "dispatch": [Function],
 "getState": [Function],
 "replaceReducer": [Function],
 "subscribe": [Function],
 Symbol(observable): [Function],
 }
 }
 >
Expand DownExpand Up@@ -4430,7 +4430,7 @@ exports[`DomainForm domain form header and search 1`] = `
 </div>
 </div>
 </Sticky>
 <ConnectFunction
 <Connect(Droppable)
 direction="vertical"
 droppableId="domain-form-droppable"
 getContainerForClone={[Function]}
Expand DownExpand Up@@ -13383,7 +13383,7 @@ exports[`DomainForm domain form header and search 1`] = `
 </Form>
 </div>
 </Droppable>
 </ConnectFunction>
 </Connect(Droppable)>
 </div>
 </Container>
 </Provider>
Expand DownExpand Up@@ -14481,11 +14481,11 @@ exports[`DomainForm domain form initCollapsed 1`] = `
 }
 store={
 Object {
 "@@observable": [Function],
 "dispatch": [Function],
 "getState": [Function],
 "replaceReducer": [Function],
 "subscribe": [Function],
 Symbol(observable): [Function],
 }
 }
 >
Expand DownExpand Up@@ -14668,7 +14668,7 @@ exports[`DomainForm domain form initCollapsed 1`] = `
 </div>
 </div>
 </Sticky>
 <ConnectFunction
 <Connect(Droppable)
 direction="vertical"
 droppableId="domain-form-droppable"
 getContainerForClone={[Function]}
Expand DownExpand Up@@ -19193,7 +19193,7 @@ exports[`DomainForm domain form initCollapsed 1`] = `
 </Form>
 </div>
 </Droppable>
 </ConnectFunction>
 </Connect(Droppable)>
 </div>
 </Container>
 </Provider>
Expand DownExpand Up@@ -19923,11 +19923,11 @@ exports[`DomainForm domain form initCollapsed and markComplete 1`] = `
 }
 store={
 Object {
 "@@observable": [Function],
 "dispatch": [Function],
 "getState": [Function],
 "replaceReducer": [Function],
 "subscribe": [Function],
 Symbol(observable): [Function],
 }
 }
 >
Expand DownExpand Up@@ -20110,7 +20110,7 @@ exports[`DomainForm domain form initCollapsed and markComplete 1`] = `
 </div>
 </div>
 </Sticky>
 <ConnectFunction
 <Connect(Droppable)
 direction="vertical"
 droppableId="domain-form-droppable"
 getContainerForClone={[Function]}
Expand DownExpand Up@@ -24635,7 +24635,7 @@ exports[`DomainForm domain form initCollapsed and markComplete 1`] = `
 </Form>
 </div>
 </Droppable>
 </ConnectFunction>
 </Connect(Droppable)>
 </div>
 </Container>
 </Provider>
Expand DownExpand Up@@ -25193,11 +25193,11 @@ exports[`DomainForm domain form no file or attachment type 1`] = `
 }
 store={
 Object {
 "@@observable": [Function],
 "dispatch": [Function],
 "getState": [Function],
 "replaceReducer": [Function],
 "subscribe": [Function],
 Symbol(observable): [Function],
 }
 }
 >
Expand DownExpand Up@@ -25380,7 +25380,7 @@ exports[`DomainForm domain form no file or attachment type 1`] = `
 </div>
 </div>
 </Sticky>
 <ConnectFunction
 <Connect(Droppable)
 direction="vertical"
 droppableId="domain-form-droppable"
 getContainerForClone={[Function]}
Expand DownExpand Up@@ -27679,7 +27679,7 @@ exports[`DomainForm domain form no file or attachment type 1`] = `
 </Form>
 </div>
 </Droppable>
 </ConnectFunction>
 </Connect(Droppable)>
 </div>
 </Container>
 </Provider>
Expand DownExpand Up@@ -28237,11 +28237,11 @@ exports[`DomainForm domain form updated field, cleared details 1`] = `
 }
 store={
 Object {
 "@@observable": [Function],
 "dispatch": [Function],
 "getState": [Function],
 "replaceReducer": [Function],
 "subscribe": [Function],
 Symbol(observable): [Function],
 }
 }
 >
Expand DownExpand Up@@ -28424,7 +28424,7 @@ exports[`DomainForm domain form updated field, cleared details 1`] = `
 </div>
 </div>
 </Sticky>
 <ConnectFunction
 <Connect(Droppable)
 direction="vertical"
 droppableId="domain-form-droppable"
 getContainerForClone={[Function]}
Expand DownExpand Up@@ -30684,7 +30684,7 @@ exports[`DomainForm domain form updated field, cleared details 1`] = `
 </Form>
 </div>
 </Droppable>
 </ConnectFunction>
 </Connect(Droppable)>
 </div>
 </Container>
 </Provider>
Expand DownExpand Up@@ -32922,11 +32922,11 @@ exports[`DomainForm domain form with all field types 1`] = `
 }
 store={
 Object {
 "@@observable": [Function],
 "dispatch": [Function],
 "getState": [Function],
 "replaceReducer": [Function],
 "subscribe": [Function],
 Symbol(observable): [Function],
 }
 }
 >
Expand DownExpand Up@@ -33109,7 +33109,7 @@ exports[`DomainForm domain form with all field types 1`] = `
 </div>
 </div>
 </Sticky>
 <ConnectFunction
 <Connect(Droppable)
 direction="vertical"
 droppableId="domain-form-droppable"
 getContainerForClone={[Function]}
Expand DownExpand Up@@ -56087,7 +56087,7 @@ exports[`DomainForm domain form with all field types 1`] = `
 </Form>
 </div>
 </Droppable>
 </ConnectFunction>
 </Connect(Droppable)>
 </div>
 </Container>
 </Provider>
Expand DownExpand Up@@ -56919,11 +56919,11 @@ exports[`DomainForm domain form with hide required 1`] = `
 }
 store={
 Object {
 "@@observable": [Function],
 "dispatch": [Function],
 "getState": [Function],
 "replaceReducer": [Function],
 "subscribe": [Function],
 Symbol(observable): [Function],
 }
 }
 >
Expand DownExpand Up@@ -57102,7 +57102,7 @@ exports[`DomainForm domain form with hide required 1`] = `
 </div>
 </div>
 </Sticky>
 <ConnectFunction
 <Connect(Droppable)
 direction="vertical"
 droppableId="domain-form-droppable"
 getContainerForClone={[Function]}
Expand DownExpand Up@@ -59300,7 +59300,7 @@ exports[`DomainForm domain form with hide required 1`] = `
 </Form>
 </div>
 </Droppable>
 </ConnectFunction>
 </Connect(Droppable)>
 </div>
 </Container>
 </Provider>
Expand DownExpand Up@@ -60724,11 +60724,11 @@ exports[`DomainForm domain form with updated fields 1`] = `
 }
 store={
 Object {
 "@@observable": [Function],
 "dispatch": [Function],
 "getState": [Function],
 "replaceReducer": [Function],
 "subscribe": [Function],
 Symbol(observable): [Function],
 }
 }
 >
Expand DownExpand Up@@ -60911,7 +60911,7 @@ exports[`DomainForm domain form with updated fields 1`] = `
 </div>
 </div>
 </Sticky>
 <ConnectFunction
 <Connect(Droppable)
 direction="vertical"
 droppableId="domain-form-droppable"
 getContainerForClone={[Function]}
Expand DownExpand Up@@ -68971,7 +68971,7 @@ exports[`DomainForm domain form with updated fields 1`] = `
 </Form>
 </div>
 </Droppable>
 </ConnectFunction>
 </Connect(Droppable)>
 </div>
 </Container>
 </Provider>
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Enable data region filtration based on Ontologies by Sigmonia · Pull Request #512 · LabKey/labkey-ui-components · GitHub
Skip to content
Enable data region filtration based on Ontologies#512

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

 Merged

Sigmonia
merged 36 commits into

from

May 1, 2021
 Merged


Enable data region filtration based on Ontologies
#512
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


36 commits


Select commit
Hold shift + click to select a range
0f1cd8f

*in-progress* Add OntologyBrowserFilterPanel as a component


Sigmonia Apr 9, 2021
dcf37bd

v2.22.1-fb-ontFilter.0


Sigmonia Apr 9, 2021
4d9e972

v2.22.1-fb-ontFilter.1


Sigmonia Apr 14, 2021
b31234b

Split FileTree.Header component into it's own file


Sigmonia Apr 15, 2021
a1ee520

v2.22.1-fb-ontFilter.2


Sigmonia Apr 16, 2021
86c1d44

Add filter types


Sigmonia Apr 16, 2021
efb841f

add filtering based on ontology hierarchy paths


Sigmonia Apr 20, 2021
2975d04

v2.22.1-fb-ontFilter.3


Sigmonia Apr 20, 2021
1b19c9a

updating lock & json files and for alpha


Sigmonia Apr 20, 2021
1d9a316

Fix filter type not getting set


Sigmonia Apr 21, 2021
004d9d5

v2.22.1-fb-ontFilter.4


Sigmonia Apr 21, 2021
8dd3414

Update change log


Sigmonia Apr 21, 2021
b6c264e

Fix up jest tests


Sigmonia Apr 23, 2021
1df027e

Update snap


Sigmonia Apr 23, 2021
0a6fd2e

Merge develop into branch


Sigmonia Apr 23, 2021
00bcfb1

v2.24.4-fb-ontFilter.5


Sigmonia Apr 23, 2021
3849e8e

Bump js alpha to .3


Sigmonia Apr 23, 2021
29ab01f

v2.24.4-fb-ontFilter.6


Sigmonia Apr 23, 2021
f4bb512

Code review requested changes.


Sigmonia Apr 23, 2021
9d54bbf

v2.24.4-fb-ontFilter.7


Sigmonia Apr 23, 2021
fc82a6b

CR recommendations


Sigmonia Apr 26, 2021
21090e2

Merge from develop


Sigmonia Apr 26, 2021
da79310

v2.25.0-fb-ontFilter.8


Sigmonia Apr 26, 2021
32f6979

Consolidate tree headers


Sigmonia Apr 27, 2021
c857dfd

v2.25.0-fb-ontFilter.9


Sigmonia Apr 27, 2021
7ace801

Move css block to platform entrypoint css file


Sigmonia Apr 28, 2021
14500dc

Fix flag


Sigmonia Apr 28, 2021
69c0763

merge develop into fb


Sigmonia Apr 28, 2021
91691e2

v2.26.0-fb-ontFilter.10


Sigmonia Apr 28, 2021
b4fe885

Fixed selected FileTree node's render state not being updated


Sigmonia Apr 28, 2021
28ffddf

Fix error message not clearing on change


Sigmonia Apr 28, 2021
4a0921a

v2.26.0-fb-ontFilter.11


Sigmonia Apr 29, 2021
9390d79

merge develop into branch


Sigmonia Apr 29, 2021
209aeef

Add some jest test for the ontology filter


Sigmonia May 1, 2021
9d36c41

v2.26.2-fb-ontFilter.12


Sigmonia May 1, 2021
59ba338

Final merge from develop


Sigmonia May 1, 2021

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: 2 additions & 2 deletions
packages/components/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
 "name": "@labkey/components",
 "version": "2.26.3",
 "version": "2.27.0",
 "description": "Components, models, actions, and utility functions for LabKey applications and pages",
 "main": "dist/components.js",
 "module": "dist/components.js",
Expand DownExpand Up@@ -44,7 +44,7 @@
 "@fortawesome/free-regular-svg-icons": "5.15.2",
 "@fortawesome/free-solid-svg-icons": "5.15.2",
 "@fortawesome/react-fontawesome": "0.1.14",
 "@labkey/api": "1.3.0",
 "@labkey/api": "1.4.0",
 "bootstrap": "3.4.1",
 "classnames": "2.2.6",
 "font-awesome": "4.7.0",
Expand Down

9 changes: 9 additions & 0 deletions
packages/components/releaseNotes/components.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
# @labkey/components
Components, models, actions, and utility functions for LabKey applications and pages.

### version 2.27.0
*Released*: 01 May 2021
* Changes to allow data region filtration based on ontology concepts
 * Added OntologyBrowserFilterPanel to handle FilterDialog injection
 * Updated OntologyBrowser to optionally hide conceptinfo
 * Updated OntologyTreePanel to show filter selections
* Updated FileTree to take header parameter
* Split FileTree.Header into its own file

### version 2.26.3
*Released*: 30 April 2021
* Issue 43028: QuerySelect - fallback to "valueColumn" as option label
Expand Down

2 changes: 2 additions & 0 deletions
packages/components/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -420,6 +420,7 @@ import {
import { createMockWithRouterProps } from './test/mockUtils';
import { OntologyBrowserPanel } from './internal/components/ontology/OntologyBrowserPanel';
import { OntologyConceptOverviewPanel } from './internal/components/ontology/ConceptOverviewPanel';
import { OntologyBrowserFilterPanel } from './internal/components/ontology/OntologyBrowserFilterPanel';
import { AppModel, LogoutReason } from './internal/app/models';
import {
 AppReducers,
Expand DownExpand Up@@ -1029,6 +1030,7 @@ export {
 // Ontology
 OntologyBrowserPanel,
 OntologyConceptOverviewPanel,
 OntologyBrowserFilterPanel,
};

// Due to babel-loader & typescript babel plugins we need to export/import types separately. The babel plugins require
Expand Down

54 changes: 27 additions & 27 deletions
...omponents/src/internal/components/domainproperties/__snapshots__/DomainForm.spec.tsx.snap

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -488,11 +488,11 @@ exports[`DomainForm domain form add, expand, and delete field 1`] = `
 }
 store={
 Object {
 "@@observable": [Function],
 "dispatch": [Function],
 "getState": [Function],
 "replaceReducer": [Function],
 "subscribe": [Function],
 Symbol(observable): [Function],
 }
 }
 >
Expand DownExpand Up@@ -675,7 +675,7 @@ exports[`DomainForm domain form add, expand, and delete field 1`] = `
 </div>
 </div>
 </Sticky>
 <ConnectFunction
 <Connect(Droppable)
 direction="vertical"
 droppableId="domain-form-droppable"
 getContainerForClone={[Function]}
Expand DownExpand Up@@ -3180,7 +3180,7 @@ exports[`DomainForm domain form add, expand, and delete field 1`] = `
 </Form>
 </div>
 </Droppable>
 </ConnectFunction>
 </Connect(Droppable)>
 </div>
 </Container>
 </Provider>
Expand DownExpand Up@@ -4243,11 +4243,11 @@ exports[`DomainForm domain form header and search 1`] = `
 }
 store={
 Object {
 "@@observable": [Function],
 "dispatch": [Function],
 "getState": [Function],
 "replaceReducer": [Function],
 "subscribe": [Function],
 Symbol(observable): [Function],
 }
 }
 >
Expand DownExpand Up@@ -4430,7 +4430,7 @@ exports[`DomainForm domain form header and search 1`] = `
 </div>
 </div>
 </Sticky>
 <ConnectFunction
 <Connect(Droppable)
 direction="vertical"
 droppableId="domain-form-droppable"
 getContainerForClone={[Function]}
Expand DownExpand Up@@ -13383,7 +13383,7 @@ exports[`DomainForm domain form header and search 1`] = `
 </Form>
 </div>
 </Droppable>
 </ConnectFunction>
 </Connect(Droppable)>
 </div>
 </Container>
 </Provider>
Expand DownExpand Up@@ -14481,11 +14481,11 @@ exports[`DomainForm domain form initCollapsed 1`] = `
 }
 store={
 Object {
 "@@observable": [Function],
 "dispatch": [Function],
 "getState": [Function],
 "replaceReducer": [Function],
 "subscribe": [Function],
 Symbol(observable): [Function],
 }
 }
 >
Expand DownExpand Up@@ -14668,7 +14668,7 @@ exports[`DomainForm domain form initCollapsed 1`] = `
 </div>
 </div>
 </Sticky>
 <ConnectFunction
 <Connect(Droppable)
 direction="vertical"
 droppableId="domain-form-droppable"
 getContainerForClone={[Function]}
Expand DownExpand Up@@ -19193,7 +19193,7 @@ exports[`DomainForm domain form initCollapsed 1`] = `
 </Form>
 </div>
 </Droppable>
 </ConnectFunction>
 </Connect(Droppable)>
 </div>
 </Container>
 </Provider>
Expand DownExpand Up@@ -19923,11 +19923,11 @@ exports[`DomainForm domain form initCollapsed and markComplete 1`] = `
 }
 store={
 Object {
 "@@observable": [Function],
 "dispatch": [Function],
 "getState": [Function],
 "replaceReducer": [Function],
 "subscribe": [Function],
 Symbol(observable): [Function],
 }
 }
 >
Expand DownExpand Up@@ -20110,7 +20110,7 @@ exports[`DomainForm domain form initCollapsed and markComplete 1`] = `
 </div>
 </div>
 </Sticky>
 <ConnectFunction
 <Connect(Droppable)
 direction="vertical"
 droppableId="domain-form-droppable"
 getContainerForClone={[Function]}
Expand DownExpand Up@@ -24635,7 +24635,7 @@ exports[`DomainForm domain form initCollapsed and markComplete 1`] = `
 </Form>
 </div>
 </Droppable>
 </ConnectFunction>
 </Connect(Droppable)>
 </div>
 </Container>
 </Provider>
Expand DownExpand Up@@ -25193,11 +25193,11 @@ exports[`DomainForm domain form no file or attachment type 1`] = `
 }
 store={
 Object {
 "@@observable": [Function],
 "dispatch": [Function],
 "getState": [Function],
 "replaceReducer": [Function],
 "subscribe": [Function],
 Symbol(observable): [Function],
 }
 }
 >
Expand DownExpand Up@@ -25380,7 +25380,7 @@ exports[`DomainForm domain form no file or attachment type 1`] = `
 </div>
 </div>
 </Sticky>
 <ConnectFunction
 <Connect(Droppable)
 direction="vertical"
 droppableId="domain-form-droppable"
 getContainerForClone={[Function]}
Expand DownExpand Up@@ -27679,7 +27679,7 @@ exports[`DomainForm domain form no file or attachment type 1`] = `
 </Form>
 </div>
 </Droppable>
 </ConnectFunction>
 </Connect(Droppable)>
 </div>
 </Container>
 </Provider>
Expand DownExpand Up@@ -28237,11 +28237,11 @@ exports[`DomainForm domain form updated field, cleared details 1`] = `
 }
 store={
 Object {
 "@@observable": [Function],
 "dispatch": [Function],
 "getState": [Function],
 "replaceReducer": [Function],
 "subscribe": [Function],
 Symbol(observable): [Function],
 }
 }
 >
Expand DownExpand Up@@ -28424,7 +28424,7 @@ exports[`DomainForm domain form updated field, cleared details 1`] = `
 </div>
 </div>
 </Sticky>
 <ConnectFunction
 <Connect(Droppable)
 direction="vertical"
 droppableId="domain-form-droppable"
 getContainerForClone={[Function]}
Expand DownExpand Up@@ -30684,7 +30684,7 @@ exports[`DomainForm domain form updated field, cleared details 1`] = `
 </Form>
 </div>
 </Droppable>
 </ConnectFunction>
 </Connect(Droppable)>
 </div>
 </Container>
 </Provider>
Expand DownExpand Up@@ -32922,11 +32922,11 @@ exports[`DomainForm domain form with all field types 1`] = `
 }
 store={
 Object {
 "@@observable": [Function],
 "dispatch": [Function],
 "getState": [Function],
 "replaceReducer": [Function],
 "subscribe": [Function],
 Symbol(observable): [Function],
 }
 }
 >
Expand DownExpand Up@@ -33109,7 +33109,7 @@ exports[`DomainForm domain form with all field types 1`] = `
 </div>
 </div>
 </Sticky>
 <ConnectFunction
 <Connect(Droppable)
 direction="vertical"
 droppableId="domain-form-droppable"
 getContainerForClone={[Function]}
Expand DownExpand Up@@ -56087,7 +56087,7 @@ exports[`DomainForm domain form with all field types 1`] = `
 </Form>
 </div>
 </Droppable>
 </ConnectFunction>
 </Connect(Droppable)>
 </div>
 </Container>
 </Provider>
Expand DownExpand Up@@ -56919,11 +56919,11 @@ exports[`DomainForm domain form with hide required 1`] = `
 }
 store={
 Object {
 "@@observable": [Function],
 "dispatch": [Function],
 "getState": [Function],
 "replaceReducer": [Function],
 "subscribe": [Function],
 Symbol(observable): [Function],
 }
 }
 >
Expand DownExpand Up@@ -57102,7 +57102,7 @@ exports[`DomainForm domain form with hide required 1`] = `
 </div>
 </div>
 </Sticky>
 <ConnectFunction
 <Connect(Droppable)
 direction="vertical"
 droppableId="domain-form-droppable"
 getContainerForClone={[Function]}
Expand DownExpand Up@@ -59300,7 +59300,7 @@ exports[`DomainForm domain form with hide required 1`] = `
 </Form>
 </div>
 </Droppable>
 </ConnectFunction>
 </Connect(Droppable)>
 </div>
 </Container>
 </Provider>
Expand DownExpand Up@@ -60724,11 +60724,11 @@ exports[`DomainForm domain form with updated fields 1`] = `
 }
 store={
 Object {
 "@@observable": [Function],
 "dispatch": [Function],
 "getState": [Function],
 "replaceReducer": [Function],
 "subscribe": [Function],
 Symbol(observable): [Function],
 }
 }
 >
Expand DownExpand Up@@ -60911,7 +60911,7 @@ exports[`DomainForm domain form with updated fields 1`] = `
 </div>
 </div>
 </Sticky>
 <ConnectFunction
 <Connect(Droppable)
 direction="vertical"
 droppableId="domain-form-droppable"
 getContainerForClone={[Function]}
Expand DownExpand Up@@ -68971,7 +68971,7 @@ exports[`DomainForm domain form with updated fields 1`] = `
 </Form>
 </div>
 </Droppable>
 </ConnectFunction>
 </Connect(Droppable)>
 </div>
 </Container>
 </Provider>
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Enable data region filtration based on Ontologies by Sigmonia · Pull Request #512 · LabKey/labkey-ui-components · GitHub
Skip to content
Enable data region filtration based on Ontologies#512

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

 Merged

Sigmonia
merged 36 commits into

from

May 1, 2021
 Merged


Enable data region filtration based on Ontologies
#512
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


36 commits


Select commit
Hold shift + click to select a range
0f1cd8f

*in-progress* Add OntologyBrowserFilterPanel as a component


Sigmonia Apr 9, 2021
dcf37bd

v2.22.1-fb-ontFilter.0


Sigmonia Apr 9, 2021
4d9e972

v2.22.1-fb-ontFilter.1


Sigmonia Apr 14, 2021
b31234b

Split FileTree.Header component into it's own file


Sigmonia Apr 15, 2021
a1ee520

v2.22.1-fb-ontFilter.2


Sigmonia Apr 16, 2021
86c1d44

Add filter types


Sigmonia Apr 16, 2021
efb841f

add filtering based on ontology hierarchy paths


Sigmonia Apr 20, 2021
2975d04

v2.22.1-fb-ontFilter.3


Sigmonia Apr 20, 2021
1b19c9a

updating lock & json files and for alpha


Sigmonia Apr 20, 2021
1d9a316

Fix filter type not getting set


Sigmonia Apr 21, 2021
004d9d5

v2.22.1-fb-ontFilter.4


Sigmonia Apr 21, 2021
8dd3414

Update change log


Sigmonia Apr 21, 2021
b6c264e

Fix up jest tests


Sigmonia Apr 23, 2021
1df027e

Update snap


Sigmonia Apr 23, 2021
0a6fd2e

Merge develop into branch


Sigmonia Apr 23, 2021
00bcfb1

v2.24.4-fb-ontFilter.5


Sigmonia Apr 23, 2021
3849e8e

Bump js alpha to .3


Sigmonia Apr 23, 2021
29ab01f

v2.24.4-fb-ontFilter.6


Sigmonia Apr 23, 2021
f4bb512

Code review requested changes.


Sigmonia Apr 23, 2021
9d54bbf

v2.24.4-fb-ontFilter.7


Sigmonia Apr 23, 2021
fc82a6b

CR recommendations


Sigmonia Apr 26, 2021
21090e2

Merge from develop


Sigmonia Apr 26, 2021
da79310

v2.25.0-fb-ontFilter.8


Sigmonia Apr 26, 2021
32f6979

Consolidate tree headers


Sigmonia Apr 27, 2021
c857dfd

v2.25.0-fb-ontFilter.9


Sigmonia Apr 27, 2021
7ace801

Move css block to platform entrypoint css file


Sigmonia Apr 28, 2021
14500dc

Fix flag


Sigmonia Apr 28, 2021
69c0763

merge develop into fb


Sigmonia Apr 28, 2021
91691e2

v2.26.0-fb-ontFilter.10


Sigmonia Apr 28, 2021
b4fe885

Fixed selected FileTree node's render state not being updated


Sigmonia Apr 28, 2021
28ffddf

Fix error message not clearing on change


Sigmonia Apr 28, 2021
4a0921a

v2.26.0-fb-ontFilter.11


Sigmonia Apr 29, 2021
9390d79

merge develop into branch


Sigmonia Apr 29, 2021
209aeef

Add some jest test for the ontology filter


Sigmonia May 1, 2021
9d36c41

v2.26.2-fb-ontFilter.12


Sigmonia May 1, 2021
59ba338

Final merge from develop


Sigmonia May 1, 2021

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: 2 additions & 2 deletions
packages/components/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
 "name": "@labkey/components",
 "version": "2.26.3",
 "version": "2.27.0",
 "description": "Components, models, actions, and utility functions for LabKey applications and pages",
 "main": "dist/components.js",
 "module": "dist/components.js",
Expand DownExpand Up@@ -44,7 +44,7 @@
 "@fortawesome/free-regular-svg-icons": "5.15.2",
 "@fortawesome/free-solid-svg-icons": "5.15.2",
 "@fortawesome/react-fontawesome": "0.1.14",
 "@labkey/api": "1.3.0",
 "@labkey/api": "1.4.0",
 "bootstrap": "3.4.1",
 "classnames": "2.2.6",
 "font-awesome": "4.7.0",
Expand Down

9 changes: 9 additions & 0 deletions
packages/components/releaseNotes/components.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
# @labkey/components
Components, models, actions, and utility functions for LabKey applications and pages.

### version 2.27.0
*Released*: 01 May 2021
* Changes to allow data region filtration based on ontology concepts
 * Added OntologyBrowserFilterPanel to handle FilterDialog injection
 * Updated OntologyBrowser to optionally hide conceptinfo
 * Updated OntologyTreePanel to show filter selections
* Updated FileTree to take header parameter
* Split FileTree.Header into its own file

### version 2.26.3
*Released*: 30 April 2021
* Issue 43028: QuerySelect - fallback to "valueColumn" as option label
Expand Down

2 changes: 2 additions & 0 deletions
packages/components/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -420,6 +420,7 @@ import {
import { createMockWithRouterProps } from './test/mockUtils';
import { OntologyBrowserPanel } from './internal/components/ontology/OntologyBrowserPanel';
import { OntologyConceptOverviewPanel } from './internal/components/ontology/ConceptOverviewPanel';
import { OntologyBrowserFilterPanel } from './internal/components/ontology/OntologyBrowserFilterPanel';
import { AppModel, LogoutReason } from './internal/app/models';
import {
 AppReducers,
Expand DownExpand Up@@ -1029,6 +1030,7 @@ export {
 // Ontology
 OntologyBrowserPanel,
 OntologyConceptOverviewPanel,
 OntologyBrowserFilterPanel,
};

// Due to babel-loader & typescript babel plugins we need to export/import types separately. The babel plugins require
Expand Down

54 changes: 27 additions & 27 deletions
...omponents/src/internal/components/domainproperties/__snapshots__/DomainForm.spec.tsx.snap

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -488,11 +488,11 @@ exports[`DomainForm domain form add, expand, and delete field 1`] = `
 }
 store={
 Object {
 "@@observable": [Function],
 "dispatch": [Function],
 "getState": [Function],
 "replaceReducer": [Function],
 "subscribe": [Function],
 Symbol(observable): [Function],
 }
 }
 >
Expand DownExpand Up@@ -675,7 +675,7 @@ exports[`DomainForm domain form add, expand, and delete field 1`] = `
 </div>
 </div>
 </Sticky>
 <ConnectFunction
 <Connect(Droppable)
 direction="vertical"
 droppableId="domain-form-droppable"
 getContainerForClone={[Function]}
Expand DownExpand Up@@ -3180,7 +3180,7 @@ exports[`DomainForm domain form add, expand, and delete field 1`] = `
 </Form>
 </div>
 </Droppable>
 </ConnectFunction>
 </Connect(Droppable)>
 </div>
 </Container>
 </Provider>
Expand DownExpand Up@@ -4243,11 +4243,11 @@ exports[`DomainForm domain form header and search 1`] = `
 }
 store={
 Object {
 "@@observable": [Function],
 "dispatch": [Function],
 "getState": [Function],
 "replaceReducer": [Function],
 "subscribe": [Function],
 Symbol(observable): [Function],
 }
 }
 >
Expand DownExpand Up@@ -4430,7 +4430,7 @@ exports[`DomainForm domain form header and search 1`] = `
 </div>
 </div>
 </Sticky>
 <ConnectFunction
 <Connect(Droppable)
 direction="vertical"
 droppableId="domain-form-droppable"
 getContainerForClone={[Function]}
Expand DownExpand Up@@ -13383,7 +13383,7 @@ exports[`DomainForm domain form header and search 1`] = `
 </Form>
 </div>
 </Droppable>
 </ConnectFunction>
 </Connect(Droppable)>
 </div>
 </Container>
 </Provider>
Expand DownExpand Up@@ -14481,11 +14481,11 @@ exports[`DomainForm domain form initCollapsed 1`] = `
 }
 store={
 Object {
 "@@observable": [Function],
 "dispatch": [Function],
 "getState": [Function],
 "replaceReducer": [Function],
 "subscribe": [Function],
 Symbol(observable): [Function],
 }
 }
 >
Expand DownExpand Up@@ -14668,7 +14668,7 @@ exports[`DomainForm domain form initCollapsed 1`] = `
 </div>
 </div>
 </Sticky>
 <ConnectFunction
 <Connect(Droppable)
 direction="vertical"
 droppableId="domain-form-droppable"
 getContainerForClone={[Function]}
Expand DownExpand Up@@ -19193,7 +19193,7 @@ exports[`DomainForm domain form initCollapsed 1`] = `
 </Form>
 </div>
 </Droppable>
 </ConnectFunction>
 </Connect(Droppable)>
 </div>
 </Container>
 </Provider>
Expand DownExpand Up@@ -19923,11 +19923,11 @@ exports[`DomainForm domain form initCollapsed and markComplete 1`] = `
 }
 store={
 Object {
 "@@observable": [Function],
 "dispatch": [Function],
 "getState": [Function],
 "replaceReducer": [Function],
 "subscribe": [Function],
 Symbol(observable): [Function],
 }
 }
 >
Expand DownExpand Up@@ -20110,7 +20110,7 @@ exports[`DomainForm domain form initCollapsed and markComplete 1`] = `
 </div>
 </div>
 </Sticky>
 <ConnectFunction
 <Connect(Droppable)
 direction="vertical"
 droppableId="domain-form-droppable"
 getContainerForClone={[Function]}
Expand DownExpand Up@@ -24635,7 +24635,7 @@ exports[`DomainForm domain form initCollapsed and markComplete 1`] = `
 </Form>
 </div>
 </Droppable>
 </ConnectFunction>
 </Connect(Droppable)>
 </div>
 </Container>
 </Provider>
Expand DownExpand Up@@ -25193,11 +25193,11 @@ exports[`DomainForm domain form no file or attachment type 1`] = `
 }
 store={
 Object {
 "@@observable": [Function],
 "dispatch": [Function],
 "getState": [Function],
 "replaceReducer": [Function],
 "subscribe": [Function],
 Symbol(observable): [Function],
 }
 }
 >
Expand DownExpand Up@@ -25380,7 +25380,7 @@ exports[`DomainForm domain form no file or attachment type 1`] = `
 </div>
 </div>
 </Sticky>
 <ConnectFunction
 <Connect(Droppable)
 direction="vertical"
 droppableId="domain-form-droppable"
 getContainerForClone={[Function]}
Expand DownExpand Up@@ -27679,7 +27679,7 @@ exports[`DomainForm domain form no file or attachment type 1`] = `
 </Form>
 </div>
 </Droppable>
 </ConnectFunction>
 </Connect(Droppable)>
 </div>
 </Container>
 </Provider>
Expand DownExpand Up@@ -28237,11 +28237,11 @@ exports[`DomainForm domain form updated field, cleared details 1`] = `
 }
 store={
 Object {
 "@@observable": [Function],
 "dispatch": [Function],
 "getState": [Function],
 "replaceReducer": [Function],
 "subscribe": [Function],
 Symbol(observable): [Function],
 }
 }
 >
Expand DownExpand Up@@ -28424,7 +28424,7 @@ exports[`DomainForm domain form updated field, cleared details 1`] = `
 </div>
 </div>
 </Sticky>
 <ConnectFunction
 <Connect(Droppable)
 direction="vertical"
 droppableId="domain-form-droppable"
 getContainerForClone={[Function]}
Expand DownExpand Up@@ -30684,7 +30684,7 @@ exports[`DomainForm domain form updated field, cleared details 1`] = `
 </Form>
 </div>
 </Droppable>
 </ConnectFunction>
 </Connect(Droppable)>
 </div>
 </Container>
 </Provider>
Expand DownExpand Up@@ -32922,11 +32922,11 @@ exports[`DomainForm domain form with all field types 1`] = `
 }
 store={
 Object {
 "@@observable": [Function],
 "dispatch": [Function],
 "getState": [Function],
 "replaceReducer": [Function],
 "subscribe": [Function],
 Symbol(observable): [Function],
 }
 }
 >
Expand DownExpand Up@@ -33109,7 +33109,7 @@ exports[`DomainForm domain form with all field types 1`] = `
 </div>
 </div>
 </Sticky>
 <ConnectFunction
 <Connect(Droppable)
 direction="vertical"
 droppableId="domain-form-droppable"
 getContainerForClone={[Function]}
Expand DownExpand Up@@ -56087,7 +56087,7 @@ exports[`DomainForm domain form with all field types 1`] = `
 </Form>
 </div>
 </Droppable>
 </ConnectFunction>
 </Connect(Droppable)>
 </div>
 </Container>
 </Provider>
Expand DownExpand Up@@ -56919,11 +56919,11 @@ exports[`DomainForm domain form with hide required 1`] = `
 }
 store={
 Object {
 "@@observable": [Function],
 "dispatch": [Function],
 "getState": [Function],
 "replaceReducer": [Function],
 "subscribe": [Function],
 Symbol(observable): [Function],
 }
 }
 >
Expand DownExpand Up@@ -57102,7 +57102,7 @@ exports[`DomainForm domain form with hide required 1`] = `
 </div>
 </div>
 </Sticky>
 <ConnectFunction
 <Connect(Droppable)
 direction="vertical"
 droppableId="domain-form-droppable"
 getContainerForClone={[Function]}
Expand DownExpand Up@@ -59300,7 +59300,7 @@ exports[`DomainForm domain form with hide required 1`] = `
 </Form>
 </div>
 </Droppable>
 </ConnectFunction>
 </Connect(Droppable)>
 </div>
 </Container>
 </Provider>
Expand DownExpand Up@@ -60724,11 +60724,11 @@ exports[`DomainForm domain form with updated fields 1`] = `
 }
 store={
 Object {
 "@@observable": [Function],
 "dispatch": [Function],
 "getState": [Function],
 "replaceReducer": [Function],
 "subscribe": [Function],
 Symbol(observable): [Function],
 }
 }
 >
Expand DownExpand Up@@ -60911,7 +60911,7 @@ exports[`DomainForm domain form with updated fields 1`] = `
 </div>
 </div>
 </Sticky>
 <ConnectFunction
 <Connect(Droppable)
 direction="vertical"
 droppableId="domain-form-droppable"
 getContainerForClone={[Function]}
Expand DownExpand Up@@ -68971,7 +68971,7 @@ exports[`DomainForm domain form with updated fields 1`] = `
 </Form>
 </div>
 </Droppable>
 </ConnectFunction>
 </Connect(Droppable)>
 </div>
 </Container>
 </Provider>
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Enable data region filtration based on Ontologies by Sigmonia · Pull Request #512 · LabKey/labkey-ui-components · GitHub
Skip to content
Enable data region filtration based on Ontologies#512

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

 Merged

Sigmonia
merged 36 commits into

from

May 1, 2021
 Merged


Enable data region filtration based on Ontologies
#512
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


36 commits


Select commit
Hold shift + click to select a range
0f1cd8f

*in-progress* Add OntologyBrowserFilterPanel as a component


Sigmonia Apr 9, 2021
dcf37bd

v2.22.1-fb-ontFilter.0


Sigmonia Apr 9, 2021
4d9e972

v2.22.1-fb-ontFilter.1


Sigmonia Apr 14, 2021
b31234b

Split FileTree.Header component into it's own file


Sigmonia Apr 15, 2021
a1ee520

v2.22.1-fb-ontFilter.2


Sigmonia Apr 16, 2021
86c1d44

Add filter types


Sigmonia Apr 16, 2021
efb841f

add filtering based on ontology hierarchy paths


Sigmonia Apr 20, 2021
2975d04

v2.22.1-fb-ontFilter.3


Sigmonia Apr 20, 2021
1b19c9a

updating lock & json files and for alpha


Sigmonia Apr 20, 2021
1d9a316

Fix filter type not getting set


Sigmonia Apr 21, 2021
004d9d5

v2.22.1-fb-ontFilter.4


Sigmonia Apr 21, 2021
8dd3414

Update change log


Sigmonia Apr 21, 2021
b6c264e

Fix up jest tests


Sigmonia Apr 23, 2021
1df027e

Update snap


Sigmonia Apr 23, 2021
0a6fd2e

Merge develop into branch


Sigmonia Apr 23, 2021
00bcfb1

v2.24.4-fb-ontFilter.5


Sigmonia Apr 23, 2021
3849e8e

Bump js alpha to .3


Sigmonia Apr 23, 2021
29ab01f

v2.24.4-fb-ontFilter.6


Sigmonia Apr 23, 2021
f4bb512

Code review requested changes.


Sigmonia Apr 23, 2021
9d54bbf

v2.24.4-fb-ontFilter.7


Sigmonia Apr 23, 2021
fc82a6b

CR recommendations


Sigmonia Apr 26, 2021
21090e2

Merge from develop


Sigmonia Apr 26, 2021
da79310

v2.25.0-fb-ontFilter.8


Sigmonia Apr 26, 2021
32f6979

Consolidate tree headers


Sigmonia Apr 27, 2021
c857dfd

v2.25.0-fb-ontFilter.9


Sigmonia Apr 27, 2021
7ace801

Move css block to platform entrypoint css file


Sigmonia Apr 28, 2021
14500dc

Fix flag


Sigmonia Apr 28, 2021
69c0763

merge develop into fb


Sigmonia Apr 28, 2021
91691e2

v2.26.0-fb-ontFilter.10


Sigmonia Apr 28, 2021
b4fe885

Fixed selected FileTree node's render state not being updated


Sigmonia Apr 28, 2021
28ffddf

Fix error message not clearing on change


Sigmonia Apr 28, 2021
4a0921a

v2.26.0-fb-ontFilter.11


Sigmonia Apr 29, 2021
9390d79

merge develop into branch


Sigmonia Apr 29, 2021
209aeef

Add some jest test for the ontology filter


Sigmonia May 1, 2021
9d36c41

v2.26.2-fb-ontFilter.12


Sigmonia May 1, 2021
59ba338

Final merge from develop


Sigmonia May 1, 2021

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: 2 additions & 2 deletions
packages/components/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
 "name": "@labkey/components",
 "version": "2.26.3",
 "version": "2.27.0",
 "description": "Components, models, actions, and utility functions for LabKey applications and pages",
 "main": "dist/components.js",
 "module": "dist/components.js",
Expand DownExpand Up@@ -44,7 +44,7 @@
 "@fortawesome/free-regular-svg-icons": "5.15.2",
 "@fortawesome/free-solid-svg-icons": "5.15.2",
 "@fortawesome/react-fontawesome": "0.1.14",
 "@labkey/api": "1.3.0",
 "@labkey/api": "1.4.0",
 "bootstrap": "3.4.1",
 "classnames": "2.2.6",
 "font-awesome": "4.7.0",
Expand Down

9 changes: 9 additions & 0 deletions
packages/components/releaseNotes/components.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
# @labkey/components
Components, models, actions, and utility functions for LabKey applications and pages.

### version 2.27.0
*Released*: 01 May 2021
* Changes to allow data region filtration based on ontology concepts
 * Added OntologyBrowserFilterPanel to handle FilterDialog injection
 * Updated OntologyBrowser to optionally hide conceptinfo
 * Updated OntologyTreePanel to show filter selections
* Updated FileTree to take header parameter
* Split FileTree.Header into its own file

### version 2.26.3
*Released*: 30 April 2021
* Issue 43028: QuerySelect - fallback to "valueColumn" as option label
Expand Down

2 changes: 2 additions & 0 deletions
packages/components/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -420,6 +420,7 @@ import {
import { createMockWithRouterProps } from './test/mockUtils';
import { OntologyBrowserPanel } from './internal/components/ontology/OntologyBrowserPanel';
import { OntologyConceptOverviewPanel } from './internal/components/ontology/ConceptOverviewPanel';
import { OntologyBrowserFilterPanel } from './internal/components/ontology/OntologyBrowserFilterPanel';
import { AppModel, LogoutReason } from './internal/app/models';
import {
 AppReducers,
Expand DownExpand Up@@ -1029,6 +1030,7 @@ export {
 // Ontology
 OntologyBrowserPanel,
 OntologyConceptOverviewPanel,
 OntologyBrowserFilterPanel,
};

// Due to babel-loader & typescript babel plugins we need to export/import types separately. The babel plugins require
Expand Down

54 changes: 27 additions & 27 deletions
...omponents/src/internal/components/domainproperties/__snapshots__/DomainForm.spec.tsx.snap

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -488,11 +488,11 @@ exports[`DomainForm domain form add, expand, and delete field 1`] = `
 }
 store={
 Object {
 "@@observable": [Function],
 "dispatch": [Function],
 "getState": [Function],
 "replaceReducer": [Function],
 "subscribe": [Function],
 Symbol(observable): [Function],
 }
 }
 >
Expand DownExpand Up@@ -675,7 +675,7 @@ exports[`DomainForm domain form add, expand, and delete field 1`] = `
 </div>
 </div>
 </Sticky>
 <ConnectFunction
 <Connect(Droppable)
 direction="vertical"
 droppableId="domain-form-droppable"
 getContainerForClone={[Function]}
Expand DownExpand Up@@ -3180,7 +3180,7 @@ exports[`DomainForm domain form add, expand, and delete field 1`] = `
 </Form>
 </div>
 </Droppable>
 </ConnectFunction>
 </Connect(Droppable)>
 </div>
 </Container>
 </Provider>
Expand DownExpand Up@@ -4243,11 +4243,11 @@ exports[`DomainForm domain form header and search 1`] = `
 }
 store={
 Object {
 "@@observable": [Function],
 "dispatch": [Function],
 "getState": [Function],
 "replaceReducer": [Function],
 "subscribe": [Function],
 Symbol(observable): [Function],
 }
 }
 >
Expand DownExpand Up@@ -4430,7 +4430,7 @@ exports[`DomainForm domain form header and search 1`] = `
 </div>
 </div>
 </Sticky>
 <ConnectFunction
 <Connect(Droppable)
 direction="vertical"
 droppableId="domain-form-droppable"
 getContainerForClone={[Function]}
Expand DownExpand Up@@ -13383,7 +13383,7 @@ exports[`DomainForm domain form header and search 1`] = `
 </Form>
 </div>
 </Droppable>
 </ConnectFunction>
 </Connect(Droppable)>
 </div>
 </Container>
 </Provider>
Expand DownExpand Up@@ -14481,11 +14481,11 @@ exports[`DomainForm domain form initCollapsed 1`] = `
 }
 store={
 Object {
 "@@observable": [Function],
 "dispatch": [Function],
 "getState": [Function],
 "replaceReducer": [Function],
 "subscribe": [Function],
 Symbol(observable): [Function],
 }
 }
 >
Expand DownExpand Up@@ -14668,7 +14668,7 @@ exports[`DomainForm domain form initCollapsed 1`] = `
 </div>
 </div>
 </Sticky>
 <ConnectFunction
 <Connect(Droppable)
 direction="vertical"
 droppableId="domain-form-droppable"
 getContainerForClone={[Function]}
Expand DownExpand Up@@ -19193,7 +19193,7 @@ exports[`DomainForm domain form initCollapsed 1`] = `
 </Form>
 </div>
 </Droppable>
 </ConnectFunction>
 </Connect(Droppable)>
 </div>
 </Container>
 </Provider>
Expand DownExpand Up@@ -19923,11 +19923,11 @@ exports[`DomainForm domain form initCollapsed and markComplete 1`] = `
 }
 store={
 Object {
 "@@observable": [Function],
 "dispatch": [Function],
 "getState": [Function],
 "replaceReducer": [Function],
 "subscribe": [Function],
 Symbol(observable): [Function],
 }
 }
 >
Expand DownExpand Up@@ -20110,7 +20110,7 @@ exports[`DomainForm domain form initCollapsed and markComplete 1`] = `
 </div>
 </div>
 </Sticky>
 <ConnectFunction
 <Connect(Droppable)
 direction="vertical"
 droppableId="domain-form-droppable"
 getContainerForClone={[Function]}
Expand DownExpand Up@@ -24635,7 +24635,7 @@ exports[`DomainForm domain form initCollapsed and markComplete 1`] = `
 </Form>
 </div>
 </Droppable>
 </ConnectFunction>
 </Connect(Droppable)>
 </div>
 </Container>
 </Provider>
Expand DownExpand Up@@ -25193,11 +25193,11 @@ exports[`DomainForm domain form no file or attachment type 1`] = `
 }
 store={
 Object {
 "@@observable": [Function],
 "dispatch": [Function],
 "getState": [Function],
 "replaceReducer": [Function],
 "subscribe": [Function],
 Symbol(observable): [Function],
 }
 }
 >
Expand DownExpand Up@@ -25380,7 +25380,7 @@ exports[`DomainForm domain form no file or attachment type 1`] = `
 </div>
 </div>
 </Sticky>
 <ConnectFunction
 <Connect(Droppable)
 direction="vertical"
 droppableId="domain-form-droppable"
 getContainerForClone={[Function]}
Expand DownExpand Up@@ -27679,7 +27679,7 @@ exports[`DomainForm domain form no file or attachment type 1`] = `
 </Form>
 </div>
 </Droppable>
 </ConnectFunction>
 </Connect(Droppable)>
 </div>
 </Container>
 </Provider>
Expand DownExpand Up@@ -28237,11 +28237,11 @@ exports[`DomainForm domain form updated field, cleared details 1`] = `
 }
 store={
 Object {
 "@@observable": [Function],
 "dispatch": [Function],
 "getState": [Function],
 "replaceReducer": [Function],
 "subscribe": [Function],
 Symbol(observable): [Function],
 }
 }
 >
Expand DownExpand Up@@ -28424,7 +28424,7 @@ exports[`DomainForm domain form updated field, cleared details 1`] = `
 </div>
 </div>
 </Sticky>
 <ConnectFunction
 <Connect(Droppable)
 direction="vertical"
 droppableId="domain-form-droppable"
 getContainerForClone={[Function]}
Expand DownExpand Up@@ -30684,7 +30684,7 @@ exports[`DomainForm domain form updated field, cleared details 1`] = `
 </Form>
 </div>
 </Droppable>
 </ConnectFunction>
 </Connect(Droppable)>
 </div>
 </Container>
 </Provider>
Expand DownExpand Up@@ -32922,11 +32922,11 @@ exports[`DomainForm domain form with all field types 1`] = `
 }
 store={
 Object {
 "@@observable": [Function],
 "dispatch": [Function],
 "getState": [Function],
 "replaceReducer": [Function],
 "subscribe": [Function],
 Symbol(observable): [Function],
 }
 }
 >
Expand DownExpand Up@@ -33109,7 +33109,7 @@ exports[`DomainForm domain form with all field types 1`] = `
 </div>
 </div>
 </Sticky>
 <ConnectFunction
 <Connect(Droppable)
 direction="vertical"
 droppableId="domain-form-droppable"
 getContainerForClone={[Function]}
Expand DownExpand Up@@ -56087,7 +56087,7 @@ exports[`DomainForm domain form with all field types 1`] = `
 </Form>
 </div>
 </Droppable>
 </ConnectFunction>
 </Connect(Droppable)>
 </div>
 </Container>
 </Provider>
Expand DownExpand Up@@ -56919,11 +56919,11 @@ exports[`DomainForm domain form with hide required 1`] = `
 }
 store={
 Object {
 "@@observable": [Function],
 "dispatch": [Function],
 "getState": [Function],
 "replaceReducer": [Function],
 "subscribe": [Function],
 Symbol(observable): [Function],
 }
 }
 >
Expand DownExpand Up@@ -57102,7 +57102,7 @@ exports[`DomainForm domain form with hide required 1`] = `
 </div>
 </div>
 </Sticky>
 <ConnectFunction
 <Connect(Droppable)
 direction="vertical"
 droppableId="domain-form-droppable"
 getContainerForClone={[Function]}
Expand DownExpand Up@@ -59300,7 +59300,7 @@ exports[`DomainForm domain form with hide required 1`] = `
 </Form>
 </div>
 </Droppable>
 </ConnectFunction>
 </Connect(Droppable)>
 </div>
 </Container>
 </Provider>
Expand DownExpand Up@@ -60724,11 +60724,11 @@ exports[`DomainForm domain form with updated fields 1`] = `
 }
 store={
 Object {
 "@@observable": [Function],
 "dispatch": [Function],
 "getState": [Function],
 "replaceReducer": [Function],
 "subscribe": [Function],
 Symbol(observable): [Function],
 }
 }
 >
Expand DownExpand Up@@ -60911,7 +60911,7 @@ exports[`DomainForm domain form with updated fields 1`] = `
 </div>
 </div>
 </Sticky>
 <ConnectFunction
 <Connect(Droppable)
 direction="vertical"
 droppableId="domain-form-droppable"
 getContainerForClone={[Function]}
Expand DownExpand Up@@ -68971,7 +68971,7 @@ exports[`DomainForm domain form with updated fields 1`] = `
 </Form>
 </div>
 </Droppable>
 </ConnectFunction>
 </Connect(Droppable)>
 </div>
 </Container>
 </Provider>
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Enable data region filtration based on Ontologies by Sigmonia · Pull Request #512 · LabKey/labkey-ui-components · GitHub
Skip to content
Enable data region filtration based on Ontologies#512

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

 Merged

Sigmonia
merged 36 commits into

from

May 1, 2021
 Merged


Enable data region filtration based on Ontologies
#512
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


36 commits


Select commit
Hold shift + click to select a range
0f1cd8f

*in-progress* Add OntologyBrowserFilterPanel as a component


Sigmonia Apr 9, 2021
dcf37bd

v2.22.1-fb-ontFilter.0


Sigmonia Apr 9, 2021
4d9e972

v2.22.1-fb-ontFilter.1


Sigmonia Apr 14, 2021
b31234b

Split FileTree.Header component into it's own file


Sigmonia Apr 15, 2021
a1ee520

v2.22.1-fb-ontFilter.2


Sigmonia Apr 16, 2021
86c1d44

Add filter types


Sigmonia Apr 16, 2021
efb841f

add filtering based on ontology hierarchy paths


Sigmonia Apr 20, 2021
2975d04

v2.22.1-fb-ontFilter.3


Sigmonia Apr 20, 2021
1b19c9a

updating lock & json files and for alpha


Sigmonia Apr 20, 2021
1d9a316

Fix filter type not getting set


Sigmonia Apr 21, 2021
004d9d5

v2.22.1-fb-ontFilter.4


Sigmonia Apr 21, 2021
8dd3414

Update change log


Sigmonia Apr 21, 2021
b6c264e

Fix up jest tests


Sigmonia Apr 23, 2021
1df027e

Update snap


Sigmonia Apr 23, 2021
0a6fd2e

Merge develop into branch


Sigmonia Apr 23, 2021
00bcfb1

v2.24.4-fb-ontFilter.5


Sigmonia Apr 23, 2021
3849e8e

Bump js alpha to .3


Sigmonia Apr 23, 2021
29ab01f

v2.24.4-fb-ontFilter.6


Sigmonia Apr 23, 2021
f4bb512

Code review requested changes.


Sigmonia Apr 23, 2021
9d54bbf

v2.24.4-fb-ontFilter.7


Sigmonia Apr 23, 2021
fc82a6b

CR recommendations


Sigmonia Apr 26, 2021
21090e2

Merge from develop


Sigmonia Apr 26, 2021
da79310

v2.25.0-fb-ontFilter.8


Sigmonia Apr 26, 2021
32f6979

Consolidate tree headers


Sigmonia Apr 27, 2021
c857dfd

v2.25.0-fb-ontFilter.9


Sigmonia Apr 27, 2021
7ace801

Move css block to platform entrypoint css file


Sigmonia Apr 28, 2021
14500dc

Fix flag


Sigmonia Apr 28, 2021
69c0763

merge develop into fb


Sigmonia Apr 28, 2021
91691e2

v2.26.0-fb-ontFilter.10


Sigmonia Apr 28, 2021
b4fe885

Fixed selected FileTree node's render state not being updated


Sigmonia Apr 28, 2021
28ffddf

Fix error message not clearing on change


Sigmonia Apr 28, 2021
4a0921a

v2.26.0-fb-ontFilter.11


Sigmonia Apr 29, 2021
9390d79

merge develop into branch


Sigmonia Apr 29, 2021
209aeef

Add some jest test for the ontology filter


Sigmonia May 1, 2021
9d36c41

v2.26.2-fb-ontFilter.12


Sigmonia May 1, 2021
59ba338

Final merge from develop


Sigmonia May 1, 2021

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: 2 additions & 2 deletions
packages/components/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
 "name": "@labkey/components",
 "version": "2.26.3",
 "version": "2.27.0",
 "description": "Components, models, actions, and utility functions for LabKey applications and pages",
 "main": "dist/components.js",
 "module": "dist/components.js",
Expand DownExpand Up@@ -44,7 +44,7 @@
 "@fortawesome/free-regular-svg-icons": "5.15.2",
 "@fortawesome/free-solid-svg-icons": "5.15.2",
 "@fortawesome/react-fontawesome": "0.1.14",
 "@labkey/api": "1.3.0",
 "@labkey/api": "1.4.0",
 "bootstrap": "3.4.1",
 "classnames": "2.2.6",
 "font-awesome": "4.7.0",
Expand Down

9 changes: 9 additions & 0 deletions
packages/components/releaseNotes/components.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
# @labkey/components
Components, models, actions, and utility functions for LabKey applications and pages.

### version 2.27.0
*Released*: 01 May 2021
* Changes to allow data region filtration based on ontology concepts
 * Added OntologyBrowserFilterPanel to handle FilterDialog injection
 * Updated OntologyBrowser to optionally hide conceptinfo
 * Updated OntologyTreePanel to show filter selections
* Updated FileTree to take header parameter
* Split FileTree.Header into its own file

### version 2.26.3
*Released*: 30 April 2021
* Issue 43028: QuerySelect - fallback to "valueColumn" as option label
Expand Down

2 changes: 2 additions & 0 deletions
packages/components/src/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -420,6 +420,7 @@ import {
import { createMockWithRouterProps } from './test/mockUtils';
import { OntologyBrowserPanel } from './internal/components/ontology/OntologyBrowserPanel';
import { OntologyConceptOverviewPanel } from './internal/components/ontology/ConceptOverviewPanel';
import { OntologyBrowserFilterPanel } from './internal/components/ontology/OntologyBrowserFilterPanel';
import { AppModel, LogoutReason } from './internal/app/models';
import {
 AppReducers,
Expand DownExpand Up@@ -1029,6 +1030,7 @@ export {
 // Ontology
 OntologyBrowserPanel,
 OntologyConceptOverviewPanel,
 OntologyBrowserFilterPanel,
};

// Due to babel-loader & typescript babel plugins we need to export/import types separately. The babel plugins require
Expand Down

54 changes: 27 additions & 27 deletions
...omponents/src/internal/components/domainproperties/__snapshots__/DomainForm.spec.tsx.snap

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -488,11 +488,11 @@ exports[`DomainForm domain form add, expand, and delete field 1`] = `
 }
 store={
 Object {
 "@@observable": [Function],
 "dispatch": [Function],
 "getState": [Function],
 "replaceReducer": [Function],
 "subscribe": [Function],
 Symbol(observable): [Function],
 }
 }
 >
Expand DownExpand Up@@ -675,7 +675,7 @@ exports[`DomainForm domain form add, expand, and delete field 1`] = `
 </div>
 </div>
 </Sticky>
 <ConnectFunction
 <Connect(Droppable)
 direction="vertical"
 droppableId="domain-form-droppable"
 getContainerForClone={[Function]}
Expand DownExpand Up@@ -3180,7 +3180,7 @@ exports[`DomainForm domain form add, expand, and delete field 1`] = `
 </Form>
 </div>
 </Droppable>
 </ConnectFunction>
 </Connect(Droppable)>
 </div>
 </Container>
 </Provider>
Expand DownExpand Up@@ -4243,11 +4243,11 @@ exports[`DomainForm domain form header and search 1`] = `
 }
 store={
 Object {
 "@@observable": [Function],
 "dispatch": [Function],
 "getState": [Function],
 "replaceReducer": [Function],
 "subscribe": [Function],
 Symbol(observable): [Function],
 }
 }
 >
Expand DownExpand Up@@ -4430,7 +4430,7 @@ exports[`DomainForm domain form header and search 1`] = `
 </div>
 </div>
 </Sticky>
 <ConnectFunction
 <Connect(Droppable)
 direction="vertical"
 droppableId="domain-form-droppable"
 getContainerForClone={[Function]}
Expand DownExpand Up@@ -13383,7 +13383,7 @@ exports[`DomainForm domain form header and search 1`] = `
 </Form>
 </div>
 </Droppable>
 </ConnectFunction>
 </Connect(Droppable)>
 </div>
 </Container>
 </Provider>
Expand DownExpand Up@@ -14481,11 +14481,11 @@ exports[`DomainForm domain form initCollapsed 1`] = `
 }
 store={
 Object {
 "@@observable": [Function],
 "dispatch": [Function],
 "getState": [Function],
 "replaceReducer": [Function],
 "subscribe": [Function],
 Symbol(observable): [Function],
 }
 }
 >
Expand DownExpand Up@@ -14668,7 +14668,7 @@ exports[`DomainForm domain form initCollapsed 1`] = `
 </div>
 </div>
 </Sticky>
 <ConnectFunction
 <Connect(Droppable)
 direction="vertical"
 droppableId="domain-form-droppable"
 getContainerForClone={[Function]}
Expand DownExpand Up@@ -19193,7 +19193,7 @@ exports[`DomainForm domain form initCollapsed 1`] = `
 </Form>
 </div>
 </Droppable>
 </ConnectFunction>
 </Connect(Droppable)>
 </div>
 </Container>
 </Provider>
Expand DownExpand Up@@ -19923,11 +19923,11 @@ exports[`DomainForm domain form initCollapsed and markComplete 1`] = `
 }
 store={
 Object {
 "@@observable": [Function],
 "dispatch": [Function],
 "getState": [Function],
 "replaceReducer": [Function],
 "subscribe": [Function],
 Symbol(observable): [Function],
 }
 }
 >
Expand DownExpand Up@@ -20110,7 +20110,7 @@ exports[`DomainForm domain form initCollapsed and markComplete 1`] = `
 </div>
 </div>
 </Sticky>
 <ConnectFunction
 <Connect(Droppable)
 direction="vertical"
 droppableId="domain-form-droppable"
 getContainerForClone={[Function]}
Expand DownExpand Up@@ -24635,7 +24635,7 @@ exports[`DomainForm domain form initCollapsed and markComplete 1`] = `
 </Form>
 </div>
 </Droppable>
 </ConnectFunction>
 </Connect(Droppable)>
 </div>
 </Container>
 </Provider>
Expand DownExpand Up@@ -25193,11 +25193,11 @@ exports[`DomainForm domain form no file or attachment type 1`] = `
 }
 store={
 Object {
 "@@observable": [Function],
 "dispatch": [Function],
 "getState": [Function],
 "replaceReducer": [Function],
 "subscribe": [Function],
 Symbol(observable): [Function],
 }
 }
 >
Expand DownExpand Up@@ -25380,7 +25380,7 @@ exports[`DomainForm domain form no file or attachment type 1`] = `
 </div>
 </div>
 </Sticky>
 <ConnectFunction
 <Connect(Droppable)
 direction="vertical"
 droppableId="domain-form-droppable"
 getContainerForClone={[Function]}
Expand DownExpand Up@@ -27679,7 +27679,7 @@ exports[`DomainForm domain form no file or attachment type 1`] = `
 </Form>
 </div>
 </Droppable>
 </ConnectFunction>
 </Connect(Droppable)>
 </div>
 </Container>
 </Provider>
Expand DownExpand Up@@ -28237,11 +28237,11 @@ exports[`DomainForm domain form updated field, cleared details 1`] = `
 }
 store={
 Object {
 "@@observable": [Function],
 "dispatch": [Function],
 "getState": [Function],
 "replaceReducer": [Function],
 "subscribe": [Function],
 Symbol(observable): [Function],
 }
 }
 >
Expand DownExpand Up@@ -28424,7 +28424,7 @@ exports[`DomainForm domain form updated field, cleared details 1`] = `
 </div>
 </div>
 </Sticky>
 <ConnectFunction
 <Connect(Droppable)
 direction="vertical"
 droppableId="domain-form-droppable"
 getContainerForClone={[Function]}
Expand DownExpand Up@@ -30684,7 +30684,7 @@ exports[`DomainForm domain form updated field, cleared details 1`] = `
 </Form>
 </div>
 </Droppable>
 </ConnectFunction>
 </Connect(Droppable)>
 </div>
 </Container>
 </Provider>
Expand DownExpand Up@@ -32922,11 +32922,11 @@ exports[`DomainForm domain form with all field types 1`] = `
 }
 store={
 Object {
 "@@observable": [Function],
 "dispatch": [Function],
 "getState": [Function],
 "replaceReducer": [Function],
 "subscribe": [Function],
 Symbol(observable): [Function],
 }
 }
 >
Expand DownExpand Up@@ -33109,7 +33109,7 @@ exports[`DomainForm domain form with all field types 1`] = `
 </div>
 </div>
 </Sticky>
 <ConnectFunction
 <Connect(Droppable)
 direction="vertical"
 droppableId="domain-form-droppable"
 getContainerForClone={[Function]}
Expand DownExpand Up@@ -56087,7 +56087,7 @@ exports[`DomainForm domain form with all field types 1`] = `
 </Form>
 </div>
 </Droppable>
 </ConnectFunction>
 </Connect(Droppable)>
 </div>
 </Container>
 </Provider>
Expand DownExpand Up@@ -56919,11 +56919,11 @@ exports[`DomainForm domain form with hide required 1`] = `
 }
 store={
 Object {
 "@@observable": [Function],
 "dispatch": [Function],
 "getState": [Function],
 "replaceReducer": [Function],
 "subscribe": [Function],
 Symbol(observable): [Function],
 }
 }
 >
Expand DownExpand Up@@ -57102,7 +57102,7 @@ exports[`DomainForm domain form with hide required 1`] = `
 </div>
 </div>
 </Sticky>
 <ConnectFunction
 <Connect(Droppable)
 direction="vertical"
 droppableId="domain-form-droppable"
 getContainerForClone={[Function]}
Expand DownExpand Up@@ -59300,7 +59300,7 @@ exports[`DomainForm domain form with hide required 1`] = `
 </Form>
 </div>
 </Droppable>
 </ConnectFunction>
 </Connect(Droppable)>
 </div>
 </Container>
 </Provider>
Expand DownExpand Up@@ -60724,11 +60724,11 @@ exports[`DomainForm domain form with updated fields 1`] = `
 }
 store={
 Object {
 "@@observable": [Function],
 "dispatch": [Function],
 "getState": [Function],
 "replaceReducer": [Function],
 "subscribe": [Function],
 Symbol(observable): [Function],
 }
 }
 >
Expand DownExpand Up@@ -60911,7 +60911,7 @@ exports[`DomainForm domain form with updated fields 1`] = `
 </div>
 </div>
 </Sticky>
 <ConnectFunction
 <Connect(Droppable)
 direction="vertical"
 droppableId="domain-form-droppable"
 getContainerForClone={[Function]}
Expand DownExpand Up@@ -68971,7 +68971,7 @@ exports[`DomainForm domain form with updated fields 1`] = `
 </Form>
 </div>
 </Droppable>
 </ConnectFunction>
 </Connect(Droppable)>
 </div>
 </Container>
 </Provider>
Expand Down
Loading