Merge pull request #1366 from chhsiao1981/zero-pacs

zero-instances in SeriesRow

Author: chhsiao1981

src/components/Pacs/components/SeriesRow.tsx

@@ -54,9 +54,18 @@ const SeriesRow: React.FC<SeriesRowProps> = ({
     "receivedCount:",
     receivedCount,
   );
+
+  const numberOfSeriesRelatedInstances =
+    info.NumberOfSeriesRelatedInstances || 0;
+
   const isLoading = React.useMemo(
-    () => isSeriesLoading({ pullState, inCube }),
-    [pullState, inCube],
+    () =>
+      isSeriesLoading({
+        pullState,
+        inCube,
+        numberOfSeriesRelatedInstances,
+      }),
+    [pullState, inCube, numberOfSeriesRelatedInstances],
   );
 
   const tooltipTitle = React.useMemo(() => {
@@ -103,6 +112,9 @@ const SeriesRow: React.FC<SeriesRowProps> = ({
     if (inCube) {
       return 100;
     }
+    if (info.NumberOfSeriesRelatedInstances === 0) {
+      return 100;
+    }
     if (pullState === SeriesPullState.WAITING_OR_COMPLETE) {
       return 99;
     }

src/components/Pacs/components/helpers.ts

@@ -51,7 +51,13 @@ function getDefaultPacsService(
 function isSeriesLoading({
   pullState,
   inCube,
-}: Pick<PacsSeriesState, "pullState" | "inCube">): boolean {
+  numberOfSeriesRelatedInstances,
+}: Pick<PacsSeriesState, "pullState" | "inCube"> & {
+  numberOfSeriesRelatedInstances: number;
+}): boolean {
+  if (numberOfSeriesRelatedInstances === 0) {
+    return false;
+  }
   if (pullState === SeriesPullState.WAITING_OR_COMPLETE) {
     return inCube === null;
   }