Merge pull request #36 from Fr4nc3/main

update files batchhistory panel only delete when it is completed and remove duplicated config

Author: Fr4nc3

src/frontend/src/api/config.js

@@ -3,7 +3,7 @@
 export let API_URL = null;
 export let USER_ID = null;
 
-const config = {
+export let config = {
   API_URL: "http://localhost:8000",
   REACT_APP_MSAL_AUTH_CLIENTID: "",
   REACT_APP_MSAL_AUTH_AUTHORITY: "",
@@ -56,10 +56,9 @@ export function getApiUrl() {
   return API_URL;
 }
 
-
 export function getUserId() {
   USER_ID = window.activeUserId;
-  const userId = USER_ID??  "00000000-0000-0000-0000-000000000000";
+  const userId = USER_ID ?? "00000000-0000-0000-0000-000000000000";
   return userId;
 }
 
@@ -68,14 +67,11 @@ export function headerBuilder(headers) {
   let defaultHeaders = {
     "x-ms-client-principal-id": String(userId) || "",  // Custom header
   };
-  return { 
+  return {
     ...defaultHeaders, ...(headers ? headers : {})
   };
-
-
 }
 
-
 export default {
   setApiUrl,
   getApiUrl,

src/frontend/src/components/batchHistoryPanel.tsx

@@ -21,7 +21,7 @@ interface BatchHistoryItem {
   status: string;
 }
 const HistoryPanel: React.FC<HistoryPanelProps> = ({ isOpen, onClose }) => {
-  const headers ={}
+  const headers = {}
   const [batchHistory, setBatchHistory] = useState<BatchHistoryItem[]>([]);
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState<string | null>(null);
@@ -41,7 +41,7 @@ const HistoryPanel: React.FC<HistoryPanelProps> = ({ isOpen, onClose }) => {
         navigate(`/batch-process/${batch.batch_id}`);
       }
     });
-};
+  };
 
   useEffect(() => {
     if (isOpen && !hasFetched.current) {
@@ -124,21 +124,20 @@ const HistoryPanel: React.FC<HistoryPanelProps> = ({ isOpen, onClose }) => {
   const deleteBatchFromHistory = (batchId: string) => {
     // Get the current URL path
     const currentPath = window.location.pathname;
-    
+
     // Check if the current URL contains the batch ID being deleted
-    const isCurrentBatch = currentPath.includes(`/batch-view/${batchId}`) || 
-                           currentPath.includes(`/batch-process/${batchId}`);
-    
+    const isCurrentBatch = currentPath.includes(`/batch-view/${batchId}`) ||
+      currentPath.includes(`/batch-process/${batchId}`);
+
     const headers = {
-      "Content-Type": "application/json",
-      "user_id": "<authenticated_user_id>"
+      "Content-Type": "application/json"
     };
-    
+
     try {
       dispatch(deleteBatch({ batchId, headers })).unwrap();
       const updatedBatchHistory = batchHistory.filter(batch => batch.batch_id !== batchId);
       setBatchHistory(updatedBatchHistory);
-      
+
       // If the deleted batch is the current one, navigate to home page
       if (isCurrentBatch) {
         onClose(); // Close the panel first
@@ -154,16 +153,16 @@ const HistoryPanel: React.FC<HistoryPanelProps> = ({ isOpen, onClose }) => {
   const deleteAllBatchesFromHistory = async () => {
     // Get the current URL path
     const currentPath = window.location.pathname;
-    
+
     // Check if the current URL contains "/batch-view/" or "/batch-process/"
-    const isViewingBatch = currentPath.includes("/batch-view/") || 
-                           currentPath.includes("/batch-process/");
-    
+    const isViewingBatch = currentPath.includes("/batch-view/") ||
+      currentPath.includes("/batch-process/");
+
     try {
-      const headers = { "Content-Type": "application/json", user_id: "<authenticated_user_id>" };
+      const headers = { "Content-Type": "application/json" };
       await dispatch(deleteAllBatches({ headers })).unwrap();
       setBatchHistory([]);
-      
+
       // If the user is currently viewing any batch, navigate to home page
       if (isViewingBatch) {
         onClose(); // Close the panel first
@@ -268,7 +267,7 @@ const HistoryPanel: React.FC<HistoryPanelProps> = ({ isOpen, onClose }) => {
                     return dateFormatter.format(date);
                   })()} ({batch.file_count} {batch.file_count === 1 ? "file" : "files"})
                 </span>
-                {hoveredBatchId === batch.batch_id ? (
+                {hoveredBatchId === batch.batch_id && batch.status === "completed" ? (
                   <Tooltip content="Delete Batch" relationship="label">
                     <button className="delete-button"
                       onClick={() => {

src/frontend/src/main.jsx

@@ -6,7 +6,7 @@ import { FluentProvider, webLightTheme } from '@fluentui/react-components';
 import { Provider } from 'react-redux';
 import { store } from './store/store';
 import AuthProvider from './msal-auth/AuthProvider';
-import { setEnvData, setApiUrl } from './api/config';
+import { setEnvData, setApiUrl, config as defaultConfig } from './api/config';
 import { initializeMsalInstance } from './msal-auth/msalInstance';
 
 const Main = () => {
@@ -23,15 +23,7 @@ const Main = () => {
     const initMsal = async () => {
       try {
         const response = await fetch('/config');
-        let config = {
-          API_URL: "http://localhost:8000",
-          REACT_APP_MSAL_AUTH_CLIENTID: "",
-          REACT_APP_MSAL_AUTH_AUTHORITY: "",
-          REACT_APP_MSAL_REDIRECT_URL: "",
-          REACT_APP_MSAL_POST_REDIRECT_URL: "",
-          ENABLE_AUTH: false,
-        };
-
+        let config = defaultConfig;
         if (response.ok) {
           config = await response.json();
           config.ENABLE_AUTH = toBoolean(config.ENABLE_AUTH);
@@ -91,4 +83,4 @@ const Main = () => {
   );
 };
 
-createRoot(document.getElementById('root')).render(<Main />);
+createRoot(document.getElementById('root')).render(<Main />);