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

Pacs progress websockets #1256

Closed
wants to merge 29 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
5dc1248
Add LonkClient
jennydaman Sep 16, 2024
288aea3
Add new fp-ts PfdcmClient
jennydaman Sep 16, 2024
86e791c
Begin rewriting Pacs
jennydaman Sep 16, 2024
5991eda
Fix font styling conflict by antd App component
jennydaman Sep 17, 2024
0419bb7
Change LonkClient to accept handlers via init
jennydaman Sep 21, 2024
f71c38c
Merge staging (switch from npm to pnpm)
jennydaman Sep 21, 2024
c0556a5
Migrate .../Pacs/components/input.tsx to antd
jennydaman Sep 21, 2024
d2074e2
Merge remote-tracking branch 'upstream/staging' into pacs-progress-we…
jennydaman Sep 21, 2024
707d10e
LonkClient.unsubscribeAll
jennydaman Sep 21, 2024
0c5b27d
Merge staging #1249
jennydaman Sep 22, 2024
2a72864
Reorganize Pacs to be MVC-ish
jennydaman Sep 22, 2024
2ad8b55
Add helpers for testing components which use redux
jennydaman Sep 22, 2024
75ed5fa
Merge staging #1250
jennydaman Sep 22, 2024
5e3fd36
Implement PACS query
jennydaman Sep 22, 2024
6bc5f3e
Implement PACS study details
jennydaman Sep 23, 2024
8628407
Replace Radio.Group with Segmented
jennydaman Sep 23, 2024
7c530d5
Change Pacs studies to use Collapse instead of List
jennydaman Sep 23, 2024
e2cdc0e
Add AccessionNumber to study title
jennydaman Sep 23, 2024
66a0f0b
SeriesList
jennydaman Sep 23, 2024
a20b1d0
Merge remote-tracking branch 'upstream/staging' into pacs-progress-we…
jennydaman Sep 23, 2024
5b3a2c4
Remove redux from Pacs code
jennydaman Sep 23, 2024
c4a2b39
WIP
jennydaman Sep 24, 2024
5bb10d8
ReceiveState
jennydaman Sep 24, 2024
f3057a3
Fix pfdcm tests since removal of fp-ts monads
jennydaman Sep 24, 2024
02d7e39
useLonk
jennydaman Sep 24, 2024
1a66b2a
Rename things + more documentation
jennydaman Sep 24, 2024
e39a50a
Merge staging
jennydaman Sep 25, 2024
0811d4e
PACS pull is working, progress messages aren't though.
jennydaman Sep 25, 2024
76c5a75
Pull study works, except for the last part.
jennydaman Sep 25, 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
Merge remote-tracking branch 'upstream/staging' into pacs-progress-we…
…bsockets
  • Loading branch information
jennydaman committed Sep 21, 2024
commit d2074e251caebd982352a9139d4de08731445ee0
2 changes: 1 addition & 1 deletion lefthook.yml
Original file line number Diff line number Diff line change
@@ -3,4 +3,4 @@ pre-commit:
commands:
check:
glob: "*.{js,ts,cjs,mjs,d.cts,d.mts,jsx,tsx,json,jsonc}"
run: npx biome format --no-errors-on-unmatched --files-ignore-unknown=true {staged_files}
run: pnpm exec biome format --no-errors-on-unmatched --files-ignore-unknown=true {staged_files}
5 changes: 2 additions & 3 deletions src/app.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
body {
font-family: "Inter"
body {
font-family: "Inter";
}

.dcm-preview {
@@ -66,7 +66,6 @@
padding-block-end: 0;
}


.small-button {
width: 20px;
height: 20px;
5 changes: 2 additions & 3 deletions src/components/AddNode/add-node.css
Original file line number Diff line number Diff line change
@@ -143,10 +143,9 @@
}

.autogenerated__text {
font-family:"monospace";
font-family: "monospace";
}


.patternfly-card-component {
padding-block-end: 0.25em;
}
}
1 change: 0 additions & 1 deletion src/components/Common/common.css
Original file line number Diff line number Diff line change
@@ -5,4 +5,3 @@
height: 100%;
width: 100%;
}

2 changes: 0 additions & 2 deletions src/components/CreateFeed/createFeed.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


.pf-v5-c-wizard__main-body {
height: 100%;
padding-block-start: 0;
8 changes: 6 additions & 2 deletions src/components/Dashboard/dashboard.css
Original file line number Diff line number Diff line change
@@ -2,13 +2,17 @@
color: white;
}

@media screen and (min-width: pf-global--breakpoint--sm) and (max-width: pf-global--breakpoint--md) {
@media screen and (min-width: pf-global--breakpoint--sm) and (
max-width: pf-global--breakpoint--md
) {
.dashboard-carddisplay img:nth-last-of-type(-n + 2) {
display: none;
}
}

@media screen and (min-width: pf-global--breakpoint--xs) and (max-width: pf-global--breakpoint--sm) {
@media screen and (min-width: pf-global--breakpoint--xs) and (
max-width: pf-global--breakpoint--sm
) {
.dashboard-carddisplay img:nth-last-of-type(-n + 3) {
display: none;
}
2 changes: 1 addition & 1 deletion src/components/DisplayPage/display-page.css
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@

.plugin-item-name > .plugin-star {
position: absolute;

bottom: 0.75em;
right: 0.75em;
margin-left: 0.5em;
2 changes: 1 addition & 1 deletion src/components/DragFileUpload/DragFileUpload.css
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@
color: #6c757d;
}

// Add the following CSS styles
/*Add the following CSS styles*/

/* Animation Styles */
@keyframes fadeInUp {
1 change: 0 additions & 1 deletion src/components/FeedOutputBrowser/FeedOutputBrowser.css
Original file line number Diff line number Diff line change
@@ -129,5 +129,4 @@
margin: 0 0 0.25em 0;
top: 0;
background: inherit;

}
1 change: 0 additions & 1 deletion src/components/FeedTree/FeedTree.css
Original file line number Diff line number Diff line change
@@ -149,7 +149,6 @@
}
}


.node {
cursor: pointer;
fill: white;
25 changes: 13 additions & 12 deletions src/components/Feeds/Feeds.css
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@

.feed-header {
display: flex;
flex-wrap: wrap;
align-items: center;
justify-content: space-between;
padding-block-end: 0 !important;
min-height:60px;
padding-block-start:0
min-height: 60px;
padding-block-start: 0;
}

.feed-list .error {
@@ -25,18 +24,20 @@
outline: none;
}


.chart {
text-align: right;
text-align: right;
height: 40px;
width: 40px;
display: block;
}

.chart.dark tspan {
fill: white !important;
}

.feed-table tbody:where(.pf-v5-c-table__tbody) > tr:where(.pf-v5-c-table__tr) > * {
vertical-align:middle !important;
}
.chart.dark tspan {
fill: white !important;
}

.feed-table
tbody:where(.pf-v5-c-table__tbody)
> tr:where(.pf-v5-c-table__tr)
> * {
vertical-align: middle !important;
}
4 changes: 2 additions & 2 deletions src/components/Login/Login.css
Original file line number Diff line number Diff line change
@@ -12,14 +12,14 @@
}

@media (min-width: 576px) {
.pf-background{
.pf-background {
background-image: url("../../assets/loginbg_768.png");
}
}

@media (min-width: 576px) and (-webkit-min-device-pixel-ratio: 2),
(min-width: 576px) and (min-resolution: 192dpi) {
.pf-background{
.pf-background {
background-image: url("../../assets/loginbg_768@2x.png");
}
}
10 changes: 4 additions & 6 deletions src/components/NewLibrary/components/Card.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
.large-checkbox > input {
/* Increase the size */
width: 16px;
height: 16px;
}


/* Increase the size */
width: 16px;
height: 16px;
}
40 changes: 18 additions & 22 deletions src/components/NewLibrary/components/Cart.css
Original file line number Diff line number Diff line change
@@ -1,27 +1,23 @@
.operation-cart .ant-list-empty-text {
display: none !important ;
}
.operation-cart .ant-list-empty-text {
display: none !important;
}

.progress-ring {
transition: 0.35s stroke-dashoffset;
transform: rotate(-90deg);
transform-origin: 50% 50%;
height:2em;
width:2em
}

.progress-ring__circle {
transition: 0.35s stroke-dashoffset;
transform: rotate(-90deg);
transform-origin: 50% 50%;
}
transition: 0.35s stroke-dashoffset;
transform: rotate(-90deg);
transform-origin: 50% 50%;
height: 2em;
width: 2em;
}

.progress-ring__circle {
transition: 0.35s stroke-dashoffset;
transform: rotate(-90deg);
transform-origin: 50% 50%;
}

.chip-group-for-paths {
.pf-v5-c-chip__text {
font-size:0.75rem
}
.chip-group-for-paths {
.pf-v5-c-chip__text {
font-size: 0.75rem;
}



}
11 changes: 6 additions & 5 deletions src/components/NewLibrary/components/Operations.css
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
.remove-toolbar-padding {
padding-top: 0 !important;
padding-top: 0 !important;
}

.library-table.pf-v5-c-table.pf-m-compact tr:where(.pf-v5-c-table__tr):not(.pf-v5-c-table__expandable-row) {
--pf-v5-c-table--cell--PaddingTop: 1em;
--pf-v5-c-table--cell--PaddingBottom: 1em;
}
.library-table.pf-v5-c-table.pf-m-compact
tr:where(.pf-v5-c-table__tr):not(.pf-v5-c-table__expandable-row) {
--pf-v5-c-table--cell--PaddingTop: 1em;
--pf-v5-c-table--cell--PaddingBottom: 1em;
}
Original file line number Diff line number Diff line change
@@ -29,6 +29,10 @@
}

@keyframes hide {
from {left: 0}
to {left: -100px}
from {
left: 0;
}
to {
left: -100px;
}
}
Original file line number Diff line number Diff line change
@@ -2,6 +2,7 @@
background-color: var(--pf-v5-global--BackgroundColor--300);
}

.fileMenuItem.selected, .fileMenuItem:hover {
.fileMenuItem.selected,
.fileMenuItem:hover {
background-color: var(--pf-v5-global--BackgroundColor--400);
}
Original file line number Diff line number Diff line change
@@ -12,8 +12,10 @@
* to subtract the height of the tab buttons.
*/
height: calc(
100%
- 2 * var(--pf-v5-global--spacer--sm)
- 1em * var(--pf-v5-global--LineHeight--md)
100% -
2 *
var(--pf-v5-global--spacer--sm) -
1em *
var(--pf-v5-global--LineHeight--md)
);
}
2 changes: 1 addition & 1 deletion src/components/NodeDetails/NodeDetails.css
Original file line number Diff line number Diff line change
@@ -93,7 +93,7 @@
margin: 0 0 0 2px;
padding-top: 3px;
padding-right: 0.25px;
border-color:#4F5255;
border-color: #4f5255;
}

.node-block
5 changes: 2 additions & 3 deletions src/components/PipelinesCopy/Pipelines.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

.ant-form-item-label label {
color: #73bcf7 !important;
}
color: #73bcf7 !important;
}
1 change: 0 additions & 1 deletion src/components/Preview/displays/NiiVueDisplay.module.css
Original file line number Diff line number Diff line change
@@ -3,7 +3,6 @@
height: 100%;
}


.controlBar {
position: absolute;
top: 0;
2 changes: 0 additions & 2 deletions src/components/SinglePlugin/singlePlugin.css
Original file line number Diff line number Diff line change
@@ -18,12 +18,10 @@
padding: 1em 0;
}


.plugin-body-detail-section h4 {
font-weight: bold;
}


.plugin-icon {
height: 100%;
padding: 0;
1 change: 0 additions & 1 deletion src/components/Wrapper/wrapper.css
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@

47 changes: 22 additions & 25 deletions tsconfig.app.json
Original file line number Diff line number Diff line change
@@ -1,26 +1,23 @@
{
"compilerOptions": {
"target": "ES2020",
"useDefineForClassFields": true,
"lib": ["ES2020", "DOM", "DOM.Iterable"],
"module": "ESNext",
"skipLibCheck": true,

/* Bundler mode */
"moduleResolution": "bundler",
"allowImportingTsExtensions": true,
"resolveJsonModule": true,
"isolatedModules": true,
"noEmit": true,
"jsx": "react-jsx",

/* Linting */
"strict": true,
"noUnusedLocals": true,
"noUnusedParameters": true,
"noFallthroughCasesInSwitch": true,
"noImplicitAny":true,
},
"include": ["src"]
}

"compilerOptions": {
"target": "ES2020",
"useDefineForClassFields": true,
"lib": ["ES2020", "DOM", "DOM.Iterable"],
"module": "ESNext",
"skipLibCheck": true,

"moduleResolution": "bundler",
"allowImportingTsExtensions": true,
"resolveJsonModule": true,
"isolatedModules": true,
"noEmit": true,
"jsx": "react-jsx",

"strict": true,
"noUnusedLocals": true,
"noUnusedParameters": true,
"noFallthroughCasesInSwitch": true,
"noImplicitAny": true
},
"include": ["src"]
}
You are viewing a condensed version of this merge commit. You can view the full changes here.