HMS-5039: eliminates re-uploads of finished uploads

src/Pages/Repositories/ContentListTable/components/UploadContent/UploadContent.test.tsx

@@ -20,7 +20,7 @@ it('Render base upload modal', async () => {
 
   jest
     .spyOn(React, 'useState')
-    .mockImplementationOnce(() => realUseState([{ sha256: 'string', uuid: 'string' }] as unknown))
+    .mockImplementationOnce(() => realUseState([{ sha256: 'string', uuid: 'string', href: '' }] as unknown))
     .mockImplementationOnce(() => realUseState(true as unknown));
 
   const { queryByText } = render(<UploadContent />);

src/Pages/Repositories/ContentListTable/components/UploadContent/UploadContent.tsx

@@ -25,7 +25,7 @@ const useStyles = createUseStyles({
 const UploadContent = () => {
   const classes = useStyles();
   const { repoUUID: uuid } = useParams();
-  const [fileUUIDs, setFileUUIDs] = useState<{ sha256: string; uuid: string }[]>([]);
+  const [fileUUIDs, setFileUUIDs] = useState<{ sha256: string; uuid: string; href: string }[]>([]);
   const [confirmModal, setConfirmModal] = useState(false);
 
   const rootPath = useRootPath();
@@ -37,7 +37,18 @@ const UploadContent = () => {
 
   const { mutateAsync: uploadItems, isLoading } = useAddUploadsQuery({
     repoUUID: uuid!,
-    uploads: fileUUIDs,
+    uploads: fileUUIDs
+      .filter((f) => f.href.length == 0)
+      .map((f) => ({
+        sha256: f.sha256,
+        uuid: f.uuid,
+      })),
+    artifacts: fileUUIDs
+      .filter((f) => f.href.length > 0)
+      .map((f) => ({
+        sha256: f.sha256,
+        href: f.href,
+      })),
   });
 
   return (

src/Pages/Repositories/ContentListTable/components/UploadContent/components/FileUploader.tsx

@@ -9,7 +9,7 @@ import UploadStatusItem from './UploadStatusItem';
 import StatusIcon from 'Pages/Repositories/AdminTaskTable/components/StatusIcon';
 import { getFileChecksumSHA256, type Chunk, type FileInfo } from './helpers';
 import { createUseStyles } from 'react-jss';
-import { createUpload, uploadChunk } from 'services/Content/ContentApi';
+import { createUpload, searchUploads, uploadChunk } from 'services/Content/ContentApi';
 import Loader from 'components/Loader';
 import { UploadIcon } from '@patternfly/react-icons';
 
@@ -27,7 +27,9 @@ export const BATCH_SIZE = 5;
 export const MAX_RETRY_COUNT = 3;
 
 interface Props {
-  setFileUUIDs: React.Dispatch<React.SetStateAction<{ sha256: string; uuid: string }[]>>;
+  setFileUUIDs: React.Dispatch<
+    React.SetStateAction<{ sha256: string; uuid: string; href: string }[]>
+  >;
   isLoading: boolean;
 }
 
@@ -53,9 +55,10 @@ export default function FileUploader({ setFileUUIDs, isLoading }: Props) {
 
   useEffect(() => {
     if (completedCount === fileCount) {
-      const items = Object.values(currentFiles).map(({ uuid, checksum }) => ({
+      const items = Object.values(currentFiles).map(({ uuid, checksum, artifactHref }) => ({
         sha256: checksum,
         uuid,
+        href: artifactHref ?? '',
       }));
 
       setFileUUIDs(items);
@@ -181,7 +184,7 @@ export default function FileUploader({ setFileUUIDs, isLoading }: Props) {
       chunks.push({ start, end, queued: false, completed: false, retryCount: 0 });
     }
 
-    let checksum: string;
+    let checksum: string = '';
     let error: string | undefined = undefined;
 
     try {
@@ -192,18 +195,38 @@ export default function FileUploader({ setFileUUIDs, isLoading }: Props) {
 
     let uuid: string = '';
     let created: string = '';
+    let artifactHref: string | undefined = undefined;
     if (!error) {
-      try {
-        const res = await createUpload(file.size);
-        uuid = res.upload_uuid;
-        created = res.created;
-      } catch (err) {
-        error = 'Failed to create upload file: ' + (err as Error).message;
+      const res = await searchUploads({ sha256: [checksum] });
+      const href = res.found.get(checksum);
+      if (href !== undefined) {
+        artifactHref = href;
+        for (const ch of chunks) {
+          ch.completed = true;
+        }
+      } else {
+        try {
+          const res = await createUpload(file.size);
+          uuid = res.upload_uuid;
+          created = res.created;
+        } catch (err) {
+          error = 'Failed to create upload file: ' + (err as Error).message;
+        }
       }
     }
 
     setCurrentFiles((prev) => {
-      prev[file.name] = { uuid, created, chunks, file, checksum, error, failed: !!error };
+      prev[file.name] = {
+        uuid,
+        created,
+        chunks: chunks,
+        file,
+        checksum,
+        artifactHref,
+        completed: !!artifactHref,
+        error,
+        failed: !!error,
+      };
       return { ...prev };
     });
   };

src/Pages/Repositories/ContentListTable/components/UploadContent/components/helpers.tsx

@@ -40,6 +40,7 @@ export type FileInfo = {
   created: string;
   chunks: Chunk[];
   checksum: string;
+  artifactHref?: string;
   error?: string;
   completed?: boolean;
   failed?: boolean;

src/services/Content/ContentApi.ts

@@ -258,6 +258,7 @@ export interface UploadChunkRequest {
 
 export interface AddUploadRequest {
   uploads: { sha256: string; uuid: string }[];
+  artifacts: { sha256: string; href: string }[];
   repoUUID: string;
 }
 
@@ -274,6 +275,15 @@ export interface AddUploadResponse {
   object_uuid: string;
 }
 
+export interface SearchUploadsRequest {
+  sha256: string[];
+}
+
+export interface SearchUploadsResponse {
+  found: Map<string, string>;
+  missing: string[];
+}
+
 export const getPopularRepositories: (
   page: number,
   limit: number,
@@ -561,11 +571,25 @@ export const uploadChunk: (chunkRequest: UploadChunkRequest) => Promise<UploadRe
 
 export const addUploads: (chunkRequest: AddUploadRequest) => Promise<AddUploadResponse> = async ({
   uploads,
+  artifacts,
   repoUUID,
 }) => {
   const { data } = await axios.post(
     `/api/content-sources/v1.0/repositories/${repoUUID}/add_uploads/`,
-    { uploads },
+    {
+      uploads: uploads,
+      artifacts: artifacts,
+    },
   );
   return data;
 };
+
+export const searchUploads: (
+  searchRequest: SearchUploadsRequest,
+) => Promise<SearchUploadsResponse> = async (hashes) => {
+  const { data } = await axios.post('/api/content-sources/v1/repositories/uploads/search', {
+    sha256: hashes.sha256,
+  });
+  data.found = new Map<string, string>(Object.entries(data.found));
+  return data;
+};