Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Release/1.0.0 #75

Merged
merged 213 commits into from
Jun 7, 2024
Merged
Changes from 1 commit
Commits
Show all changes
213 commits
Select commit Hold shift + click to select a range
40da104
CFOS-91 fix: Reset atlas position only on atlas changes
afonsobspinto Feb 27, 2024
238bbd6
Fixed sobel paramters and transformed to 2bits with anti-alliasing
enicolasgomez Mar 4, 2024
a03f419
Refactored slice change through a helper function
enicolasgomez Mar 4, 2024
8e9cc66
CFOS-97 added tests
SimaoBolota-MetaCell Mar 7, 2024
7166950
CFOS-88 feat: WIP - Change opacity with intensity
afonsobspinto Mar 7, 2024
e950d1d
CFOS-88 fix: Fix activity map transparency
afonsobspinto Mar 8, 2024
92c541d
CFOS-88 feat: Validate correct loading of data
afonsobspinto Mar 8, 2024
ab6d7d8
CFOS-88 feat: Disable atlas slider
afonsobspinto Mar 11, 2024
d6a87cd
CFOS-88 feat: Reintroduce global intensity slider
afonsobspinto Mar 11, 2024
91b3192
CFOS-88 feat: Connect global intensity slider
afonsobspinto Mar 11, 2024
df78645
enabled headless mode
SimaoBolota-MetaCell Mar 11, 2024
82ef69e
adding test to pipeline
SimaoBolota-MetaCell Mar 11, 2024
1789c43
adding test to pipeline - fixed identation
SimaoBolota-MetaCell Mar 11, 2024
2703be8
adding test to pipeline - fixed stage
SimaoBolota-MetaCell Mar 11, 2024
621ee19
Merge pull request #29 from MetaCell/feature/CFOS-91
ddelpiano Mar 13, 2024
b01c82c
Update README.md
ddelpiano Mar 13, 2024
6e88214
Update codefresh-dev.yaml
ddelpiano Mar 14, 2024
0424865
Merge pull request #30 from MetaCell/feature/96-scroll-speed-increase
ddelpiano Mar 14, 2024
d332f77
Merge pull request #32 from MetaCell/feature/CFOS-88
ddelpiano Mar 14, 2024
4c87d96
Merge remote-tracking branch 'origin/develop' into feature/CFOS-97
SimaoBolota-MetaCell Mar 15, 2024
592cecb
CFOS-97 missing dickerfile
SimaoBolota-MetaCell Mar 15, 2024
3e80a3b
CFOS-97 addiing package-lock for codefresh purposes
SimaoBolota-MetaCell Mar 15, 2024
455a421
CFOS-97 removed unused devependencies
SimaoBolota-MetaCell Mar 15, 2024
e08238f
CFOS-97 regenerating package files
SimaoBolota-MetaCell Mar 15, 2024
9469cc7
CFOS-97 test command
SimaoBolota-MetaCell Mar 15, 2024
853cdfd
CFOS-97 added page.url log + changed page instance name for control p…
SimaoBolota-MetaCell Mar 18, 2024
d217792
CFOS-97 added sleep before tests
SimaoBolota-MetaCell Mar 18, 2024
53d5830
CFOS-97 skipping intensity tests
SimaoBolota-MetaCell Mar 18, 2024
0952a1f
CFOS-97 fixed codefresh volume command
SimaoBolota-MetaCell Mar 18, 2024
40d6d07
CFOS-97 changed screenshot to be page onstead of canvas
SimaoBolota-MetaCell Mar 19, 2024
8ba4162
CFOS-97 process.env.url
SimaoBolota-MetaCell Mar 20, 2024
47daae3
packahe-lock.json addition
SimaoBolota-MetaCell Mar 20, 2024
11ccf99
url changed to DOMAIN variable
SimaoBolota-MetaCell Mar 20, 2024
a414bf4
changed way of checking download
SimaoBolota-MetaCell Mar 20, 2024
42b9a21
fix snapshot
SimaoBolota-MetaCell Mar 20, 2024
4928093
updated image considering fix
SimaoBolota-MetaCell Mar 20, 2024
696eb27
Merge pull request #33 from MetaCell/feature/CFOS-97
ddelpiano Mar 22, 2024
ae646bc
Merge branch 'develop' into feature/wireframe-filter
enicolasgomez Mar 22, 2024
ebec063
Merge pull request #31 from MetaCell/feature/wireframe-filter
enicolasgomez Mar 22, 2024
a5d2bfd
Added back ActivityMap
enicolasgomez Mar 26, 2024
82e4e67
CFOS-103 feat: Update slider logic
afonsobspinto Mar 28, 2024
c9ad3f9
CFOS-102 chore: Remove unused webpack configs
afonsobspinto Mar 30, 2024
532d62f
CFOS-102 chore: Remove unused package-lock.json
afonsobspinto Mar 30, 2024
3b3bdf4
CFOS-102 feat: WIP - Add probe widget
afonsobspinto Mar 30, 2024
2e30c80
Merge pull request #35 from MetaCell/feature/CFOS-103
enicolasgomez Apr 1, 2024
95cbfc7
Removed commented out lines
enicolasgomez Apr 1, 2024
35944ec
changed parameters to use dev bucket
enicolasgomez Apr 1, 2024
b9d7516
Changed env storage location
enicolasgomez Apr 1, 2024
00fba21
CFOS-102 feat: WIP - Connect probe widget
afonsobspinto Apr 1, 2024
1368c3a
CFOS-102 feat: Update frame deserialization
afonsobspinto Apr 1, 2024
d3e5858
create CustomTooltip.js
Salam-Dalloul Apr 2, 2024
fc47d0c
Merge pull request #37 from MetaCell/bug/120-ingestion
afonsobspinto Apr 2, 2024
1409451
Implement UI changes as per design changes
Salam-Dalloul Apr 3, 2024
cf686d8
CFOS-102 feat: WIP - Add react component instead of dom manipulation
afonsobspinto Apr 3, 2024
cdf577b
Merge pull request #38 from MetaCell/feature/CFOS-104
enicolasgomez Apr 4, 2024
28a20bc
CFOS-102 refactor: Refactor out viewerProbe component
afonsobspinto Apr 4, 2024
602ef43
CFOS-102 feat: Update tooltip content
afonsobspinto Apr 4, 2024
a898c58
CFOS-102 feat: Add LUT prototype
afonsobspinto Apr 4, 2024
7b811b0
CFOS-102 feat: Update tooltip open logic
afonsobspinto Apr 5, 2024
b3f55f9
CFOS-102 feat: WIP - Add location panel
afonsobspinto Apr 5, 2024
ab386ee
CFOS-102 feat: WIP - Add activity map intensity information
afonsobspinto Apr 5, 2024
4449780
CFOS-102 feat: Add activity map intensity information
afonsobspinto Apr 5, 2024
f347c09
Merge branch 'develop' into feature/CFOS-102
afonsobspinto Apr 5, 2024
74136b9
CFOS-102 feat: Merge with develop
afonsobspinto Apr 5, 2024
1ad4add
fix map position
Salam-Dalloul Apr 5, 2024
e70a41b
CFOS-92 fix: Resize viewer according to parent dimensions
afonsobspinto Apr 5, 2024
6f10aa0
adjust the tooltip position on mouse move
Salam-Dalloul Apr 5, 2024
111489b
disable the max width for MuiTooltip
Salam-Dalloul Apr 5, 2024
e04929e
make the bk of Map details transparent to not affect other elements s…
Salam-Dalloul Apr 5, 2024
1232084
CFOS-102 feat: Update location panel visible logic
afonsobspinto Apr 5, 2024
47b04e1
CFOS-102 feat: Update camera range
afonsobspinto Apr 5, 2024
470e883
CFOS-102 feat: Include only visible stacks on location panel
afonsobspinto Apr 5, 2024
6afc89e
CFOS-102 fix: Update wheel event handling to work with tooltips
afonsobspinto Apr 8, 2024
ac020a0
CFOS-96 fix: Get the new slice index within range
afonsobspinto Apr 8, 2024
9bd9234
CFOS-102 feat: Update serialization/deserialization
afonsobspinto Apr 8, 2024
ce7ada2
CFOS-102 fix: Ignore on move ticks with errors
afonsobspinto Apr 8, 2024
d07f0b5
CFOS-102 fix: Update activity map index after added to the scene
afonsobspinto Apr 8, 2024
97b096e
CFOS-102 fix: Update pixelData capture for activity maps
afonsobspinto Apr 9, 2024
79978b3
CFOS-102 feat: Update gradient strategy
afonsobspinto Apr 9, 2024
d662e2b
CFOS-102 feat: Reactive controls
afonsobspinto Apr 9, 2024
98573be
CFOS-102 feat: Remove renderer antialias
afonsobspinto Apr 9, 2024
64973c0
Merge pull request #40 from MetaCell/feature/CFOS-102-b
afonsobspinto Apr 9, 2024
b5dd215
CFOS-102 feat: Update controls
afonsobspinto Apr 9, 2024
bc6b909
Merge branch 'feature/CFOS-102-b' into feature/CFOS-102
afonsobspinto Apr 9, 2024
c26793f
CFOS-102 feat: Add wireframe object to the scene
afonsobspinto Apr 9, 2024
a8117a3
CFOS-102 fix: Fix normalized min gradient calculation
afonsobspinto Apr 9, 2024
8ef62c6
CFOS-127 feat: Remove slice interpolation
afonsobspinto Apr 10, 2024
c1f31ef
chore: Add mock_download_as_stream
afonsobspinto Apr 10, 2024
0a053bc
CFOS-121: placeholder for details component
ddelpiano Apr 10, 2024
54f0fc0
CFOS-99: deployment with nginx and letsencrypt
ddelpiano Apr 11, 2024
7b7b341
Merge pull request #42 from MetaCell/feature/CFOS-121
Salam-Dalloul Apr 11, 2024
cf4fdf9
CFOS-99: deployment fix
ddelpiano Apr 11, 2024
d5855cd
fixing certificate
ddelpiano Apr 11, 2024
69e718e
add some theme variables
Salam-Dalloul Apr 11, 2024
a829052
add alert component
Salam-Dalloul Apr 11, 2024
9b90993
Added tests into pipeline + updated snapshots
SimaoBolota-MetaCell Apr 11, 2024
4a81073
add tabs component
Salam-Dalloul Apr 11, 2024
38b5df1
handle alert click
Salam-Dalloul Apr 11, 2024
2ea96d3
handle tabs change
Salam-Dalloul Apr 11, 2024
33ff3ab
CFOS-102 fix: Fix typo
afonsobspinto Apr 11, 2024
a05abad
Merge pull request #43 from MetaCell/feature/CFOS-99
enicolasgomez Apr 11, 2024
bd2942f
Merge pull request #36 from MetaCell/feature/122-dev-eng
enicolasgomez Apr 11, 2024
a398856
Merge branch 'develop' into feature/CFOS-102
afonsobspinto Apr 11, 2024
10e220d
Merge pull request #45 from MetaCell/feature/CFOS-38
ddelpiano Apr 11, 2024
a3c63ea
CFOS-102 chore: Merge with develop
afonsobspinto Apr 11, 2024
09e31ee
Merge pull request #39 from MetaCell/feature/CFOS-102
ddelpiano Apr 12, 2024
29f5420
CFOS-71 Add drag-drop logic to reorder layer list
aranega Apr 11, 2024
d625ab7
CFOS-71 Add planes reordering
aranega Apr 11, 2024
d0da3ad
CFOS-71 Fix reorder for the dragndrop
aranega Apr 12, 2024
6f507ff
CFOS-71 Add some comments about the viewer order
aranega Apr 12, 2024
1c26389
CFOS-71 Remove "comming soon" message
aranega Apr 12, 2024
012c62c
CFOS-71 Enable visualy dragNdrop button
aranega Apr 12, 2024
c6f8be5
CFOS-71 Add different message for Atlas dNd button
aranega Apr 12, 2024
07484b7
Merge pull request #46 from MetaCell/feature/CFOS-71
ddelpiano Apr 15, 2024
e0e6c47
#39 details tab component for metadata visualization
Salam-Dalloul Apr 15, 2024
32bd121
fix alert background
Salam-Dalloul Apr 15, 2024
08fb28e
#69 Experiments sharing the same atlas tab
Salam-Dalloul Apr 18, 2024
5c7589f
fix the tabs position when scrolling
Salam-Dalloul Apr 18, 2024
5bd3729
CFOS-132: fixing ingestion (not computing activity maps before) and s…
ddelpiano Apr 18, 2024
bce6f24
Merge pull request #47 from MetaCell/feature/CFOS-39
ddelpiano Apr 18, 2024
fb72562
Merge pull request #49 from MetaCell/feature/CFOS-132
ddelpiano Apr 18, 2024
4df9727
#69 treeItem styling, details modal
Salam-Dalloul Apr 18, 2024
43467bd
CustomTextField maintaining state
enicolasgomez Apr 19, 2024
c488750
105 and 107
enicolasgomez Apr 20, 2024
ada0573
Merge branch 'develop' into feature/104-upgrades
enicolasgomez Apr 20, 2024
bb7b0aa
leave the ingestion when done
ddelpiano Apr 22, 2024
189d104
Merge pull request #48 from MetaCell/feature/CFOS-69
ddelpiano Apr 22, 2024
2ed5b83
Merge branch 'develop' into feature/104-upgrades
enicolasgomez Apr 22, 2024
7a2168f
Merge pull request #51 from MetaCell/feature/CFOS-132
ddelpiano Apr 22, 2024
7d66ebc
CFOS-134 Add first atlas reorder support
aranega Apr 22, 2024
059b759
CFOS-134 Add transparency on base atlas
aranega Apr 22, 2024
b9031bb
CFOS-134 Remove comments and unused imports
aranega Apr 22, 2024
170f6cc
Merge pull request #50 from MetaCell/feature/104-upgrades
ddelpiano Apr 23, 2024
08af913
Merge branch 'develop' into feature/CFOS-134
aranega Apr 23, 2024
0dcb964
CFOS-119 Remove hidden file during ingestion
aranega Apr 23, 2024
03fcdc1
Merge pull request #52 from MetaCell/feature/CFOS-134
afonsobspinto Apr 24, 2024
4a4b9b8
Merge pull request #53 from MetaCell/feature/CFOS-119
enicolasgomez Apr 24, 2024
c3e9304
#69 treeItem styling, details modal
Salam-Dalloul Apr 29, 2024
b524a59
#135 add HierarchyActivityMaps
Salam-Dalloul Apr 29, 2024
fb86912
#135 point main.py index file to the correct one
Salam-Dalloul Apr 29, 2024
d05cd8a
CFOS-123 worked on the slider tests
SimaoBolota-MetaCell Apr 29, 2024
e98b03c
#40 #133 convert the data to a treeview + implement the cosmetics fix…
Salam-Dalloul Apr 30, 2024
06b5189
refactor treeItem code to use a common component
Salam-Dalloul Apr 30, 2024
2fc0c07
fix tree item bug
Salam-Dalloul Apr 30, 2024
7ae9c4e
fix tree item bug
Salam-Dalloul Apr 30, 2024
d9800f1
CFOS-137 feat: Update ingestion step to include metadata.json
afonsobspinto Apr 30, 2024
c3f6d05
CFOS-137 feat: Update store to include metadata
afonsobspinto Apr 30, 2024
29f1cc8
Merge pull request #56 from MetaCell/feature/CFOS-40
Salam-Dalloul May 1, 2024
6998cdb
CFOS-138 fix: Properly connect reset slider intensity
afonsobspinto May 1, 2024
b87faf5
CFOS-126 feat: Add and connect min value inclusion toggle icon button
afonsobspinto May 1, 2024
084b698
Merge pull request #58 from MetaCell/feature/CFOS-137
ddelpiano May 2, 2024
65c9460
Merge pull request #59 from MetaCell/feature/CFOS-138
ddelpiano May 2, 2024
1f7042c
Merge pull request #60 from MetaCell/feature/CFOS-126
ddelpiano May 2, 2024
83feb52
#49 view only experiments that's shares the same atlas + add arrow cl…
Salam-Dalloul May 2, 2024
f6ea94c
#49 view atlas id
Salam-Dalloul May 2, 2024
ad1379f
merging develop
Salam-Dalloul May 2, 2024
cf822b6
merging develop
Salam-Dalloul May 2, 2024
01a68dc
view Experience Details
Salam-Dalloul May 2, 2024
888fe96
view empty placeholder
Salam-Dalloul May 2, 2024
aefc6e9
CFOS-123 completing sliders tests + snapshot updates
SimaoBolota-MetaCell May 2, 2024
05e8525
CFOS-137 feat: Update ingestion step to include metadata.json
afonsobspinto Apr 30, 2024
349cc00
CFOS-137 feat: Update store to include metadata
afonsobspinto Apr 30, 2024
5ddb540
CFOS-138 fix: Properly connect reset slider intensity
afonsobspinto May 1, 2024
4f48e00
CFOS-126 feat: Add and connect min value inclusion toggle icon button
afonsobspinto May 1, 2024
3a575e7
CFOS-123 extra selector
SimaoBolota-MetaCell May 2, 2024
29e6b34
fix concatenating nested experiments issue
Salam-Dalloul May 2, 2024
02b0e64
CFOS-106 feat: Connect max picker
afonsobspinto May 3, 2024
0db3cfd
use active alas directly from the redux store + update the experiment…
Salam-Dalloul May 3, 2024
ba9ef00
CFOS-106 chore: Remove deprecated methods
afonsobspinto May 3, 2024
213d2ee
Merge pull request #61 from MetaCell/feature/CFOS-49-
afonsobspinto May 3, 2024
1fa0ec1
CFOS-106 chore: Use destructuration on hexToNormalizedRGBA
afonsobspinto May 3, 2024
bc94510
Merge pull request #63 from MetaCell/feature/CFOS-106
ddelpiano May 6, 2024
6c7857b
Merge pull request #55 from MetaCell/feature/CFOS-135
ddelpiano May 6, 2024
1101f40
Merge branch 'develop' into test/CFOS-123
SimaoBolota-MetaCell May 6, 2024
0b03d9a
fix details spacing + add check for hierarchy prop
Salam-Dalloul May 7, 2024
d14d96e
CFOS-134 Fix regression about transparent background
aranega May 7, 2024
7656ec0
CFOS-105 Disable drag and drop if layer is locked
aranega May 7, 2024
2d8633a
CFOS-105 Disable all icons when a layer is locked
aranega May 7, 2024
b4b640c
Merge pull request #64 from MetaCell/fix-app-crashing
ddelpiano May 7, 2024
18c9134
CFOS-126 feat: Connect input text
afonsobspinto May 9, 2024
3070df6
Merge pull request #62 from MetaCell/test/CFOS-123
ddelpiano May 9, 2024
1029856
Merge pull request #65 from MetaCell/feature/CFOS-134
ddelpiano May 9, 2024
0cd7ebb
Merge pull request #66 from MetaCell/feature/CFOS-105
ddelpiano May 9, 2024
bc18b78
CFOS-130 chore: Update build scripts and configuration files
afonsobspinto May 9, 2024
0d05fbb
CFOS-130 chore: Update dockerfile
afonsobspinto May 9, 2024
d911406
fixing deployment
ddelpiano May 9, 2024
81eb91c
fixing deployment 2
ddelpiano May 9, 2024
11321bd
CFOS-126 feat: Update slider input field logic
afonsobspinto May 10, 2024
3c7e9c8
Update cfos.yaml
zsinnema May 10, 2024
a01d1c1
Merge branch 'develop' into feature/CFOS-130
afonsobspinto May 10, 2024
52ccead
chore: Merge with development
afonsobspinto May 10, 2024
e0b71c4
CFOS-130 chore: Update codefresh configuration
afonsobspinto May 10, 2024
067b328
CFOS-130 chore: Update codefresh configuration
afonsobspinto May 10, 2024
b94a202
Merge pull request #67 from MetaCell/feature/CFOS-126_b
ddelpiano May 13, 2024
d52cbe2
CFOS-130 chore: Fix typo in .env file
afonsobspinto May 13, 2024
2256172
fixing table styling
ddelpiano May 13, 2024
e3a1150
Merge pull request #69 from MetaCell/feature/client_feedback
ddelpiano May 13, 2024
30cc2c6
fixing table styling 2
ddelpiano May 13, 2024
bc4caea
Merge pull request #70 from MetaCell/feature/client_feedback
ddelpiano May 13, 2024
23beb15
Merge pull request #68 from MetaCell/feature/CFOS-130
enicolasgomez May 14, 2024
96e4a02
refactor images tab code to view the hierarchy levels properly
Salam-Dalloul May 14, 2024
715f03c
split logic code into a separated file
Salam-Dalloul May 15, 2024
b7a6048
Merge pull request #71 from MetaCell/feature/CFOS-40-refactor-images
ddelpiano May 15, 2024
bddb1cf
fix crashing bug due to duplicated parent nodes
Salam-Dalloul May 15, 2024
12b4086
Merge pull request #72 from MetaCell/feature/CFOS-40-refactor-images
ddelpiano May 15, 2024
f5f8cf3
fix crashing bug
Salam-Dalloul May 15, 2024
4d27615
refactor DoDataPreprocessing function
Salam-Dalloul May 15, 2024
ef1c8ce
Merge pull request #73 from MetaCell/feature/CFOS-40-refactor-images
ddelpiano May 16, 2024
730296c
Feature/cfos 40 refactor images (#74)
Salam-Dalloul May 16, 2024
0537f5c
Update README.md
ddelpiano May 20, 2024
f3a56ba
Update README.md
ddelpiano May 20, 2024
49bb558
added wipe bucket functionality (#54)
enicolasgomez Jun 7, 2024
8e4e59b
cfos version update
ddelpiano Jun 7, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix crashing bug due to duplicated parent nodes
Salam-Dalloul committed May 15, 2024
commit bddb1cf416ee8317f217d7e00caf31b159bca29b
47 changes: 23 additions & 24 deletions client/src/helpers/ImagesTreeViewHelpers.js
Original file line number Diff line number Diff line change
@@ -13,42 +13,41 @@ export const DoDataPreprocessing = (filteredActivityMaps, currentExperimentName)
* If the experiment key or hierarchy key are not exists then add hierarchy array with one element "Experiment Name"
* Target is : we have the hierarchy array for each object
*/
for(const obj of Object.values(filteredActivityMaps)){
Object.values(filteredActivityMaps).map(obj => {
// if experiment key exists
if(obj.experiment !== undefined){
if(obj.experiment === true){
if (obj.experiment !== undefined) {
if (obj.experiment === true) {
// experiment is true
if(obj.hierarchy === undefined){ // no hierarchy key
obj.hierarchy = [currentExperimentName]
}else{
// hierarchy key exists
obj.hierarchy =[currentExperimentName,...obj.hierarchy]
}
}else {
obj.hierarchy = obj.hierarchy === undefined || obj.hierarchy.includes(currentExperimentName)
? obj.hierarchy
: [currentExperimentName, ...obj.hierarchy];
} else {
// experiment is false
obj.hierarchy = ['others']
obj.hierarchy = ['others'];
}
}else {
} else {
// experiment key not exists
if(obj.hierarchy === undefined){
obj.hierarchy =[currentExperimentName]
}else {
obj.hierarchy =[currentExperimentName,...obj.hierarchy]
}
obj.hierarchy = obj.hierarchy === undefined || obj.hierarchy.includes(currentExperimentName)
? obj.hierarchy
: [currentExperimentName, ...obj.hierarchy];
}
}


return obj;
});

/**
* Set the level key for each object and the level
* Convert map to array
*/
for(const [key, value] of Object.entries(filteredActivityMaps)) {
value.key = key
}
Object.entries(filteredActivityMaps).reduce((acc, [key, value]) => {
value.key = key;
acc[key] = value;
return acc;
}, {});

return filteredActivityMaps
}
return filteredActivityMaps;
};


export const GetUniqueHierarchyRoots = (processedFilteredActivityMaps) => {
// Get unique roots of the tree