Merge pull request #1367 from chhsiao1981/zero-pacs-2

pacs: more handling for zero-data series

Author: chhsiao1981

src/components/Pacs/components/PacsStudiesView.tsx

@@ -43,7 +43,12 @@ const PacsStudiesView: React.FC<Props> = ({
             isPulled={
               series.length === 0
                 ? true
-                : series.every(({ inCube }) => inCube !== null)
+                : series.every(
+                    ({ inCube, info }) =>
+                      inCube !== null ||
+                      info.NumberOfSeriesRelatedInstances === 0 ||
+                      info.NumberOfSeriesRelatedInstances === null,
+                  )
             }
             isLoading={
               series.length === 0 ? false : !!series.find(isSeriesLoading)

src/components/Pacs/components/SeriesRow.tsx

@@ -55,17 +55,14 @@ const SeriesRow: React.FC<SeriesRowProps> = ({
     receivedCount,
   );
 
-  const numberOfSeriesRelatedInstances =
-    info.NumberOfSeriesRelatedInstances || 0;
-
   const isLoading = React.useMemo(
     () =>
       isSeriesLoading({
         pullState,
         inCube,
-        numberOfSeriesRelatedInstances,
+        info,
       }),
-    [pullState, inCube, numberOfSeriesRelatedInstances],
+    [pullState, inCube, info],
   );
 
   const tooltipTitle = React.useMemo(() => {
@@ -88,9 +85,12 @@ const SeriesRow: React.FC<SeriesRowProps> = ({
     if (pullState === SeriesPullState.PULLING) {
       return <>Receiving&hellip;</>;
     }
-    if (inCube === null) {
+    if (inCube === null && info.NumberOfSeriesRelatedInstances) {
       return <>Waiting...</>;
     }
+    if (!info.NumberOfSeriesRelatedInstances) {
+      return <>No data in this series.</>;
+    }
     return (
       <>
         This series is available in <em>ChRIS</em>.

src/components/Pacs/components/helpers.ts

@@ -51,10 +51,10 @@ function getDefaultPacsService(
 function isSeriesLoading({
   pullState,
   inCube,
-  numberOfSeriesRelatedInstances,
-}: Pick<PacsSeriesState, "pullState" | "inCube"> & {
-  numberOfSeriesRelatedInstances: number;
-}): boolean {
+  info,
+}: Pick<PacsSeriesState, "pullState" | "inCube" | "info">): boolean {
+  const numberOfSeriesRelatedInstances =
+    info.NumberOfSeriesRelatedInstances || 0;
   if (numberOfSeriesRelatedInstances === 0) {
     return false;
   }

src/reducers/pacs.ts

@@ -241,7 +241,8 @@ const queryPacsSeriesByStudyUID = (
         // @ts-expect-error simplifyPypxStudyData
         const info = simplifyPypxSeriesData(eachSeries);
         const pullState =
-          info.NumberOfSeriesRelatedInstances === 0
+          info.NumberOfSeriesRelatedInstances === 0 ||
+          info.NumberOfSeriesRelatedInstances === null
             ? SeriesPullState.WAITING_OR_COMPLETE
             : SeriesPullState.CHECKING;
         const done = info.NumberOfSeriesRelatedInstances === 0;
@@ -331,9 +332,10 @@ const queryCubeSeriesState = async (series: PacsSeriesState) => {
     info: {
       RetrieveAETitle: service,
       SeriesInstanceUID: seriesUID,
-      NumberOfSeriesRelatedInstances: count,
+      NumberOfSeriesRelatedInstances,
     },
   } = series;
+  const count = NumberOfSeriesRelatedInstances || 0;
 
   const { status, data } = await queryPACSSeries(service, seriesUID);
   if (status !== STATUS_OK) {
@@ -346,8 +348,11 @@ const queryCubeSeriesState = async (series: PacsSeriesState) => {
   if (data.length) {
     series.inCube = { data: data[0] };
     series.pullState = SeriesPullState.WAITING_OR_COMPLETE;
-    series.receivedCount = count || 0;
-  } else if (series.pullState !== SeriesPullState.PULLING) {
+    series.receivedCount = count;
+  } else if (
+    series.pullState !== SeriesPullState.PULLING &&
+    series.pullState !== SeriesPullState.WAITING_OR_COMPLETE
+  ) {
     series.pullState = SeriesPullState.READY;
   }
   return series;