edit bulk terms completed

ddelpiano · ddelpiano · commit ca70a7597f5e · 2025-09-18T16:54:10.000+02:00
diff --git a/nginx/default.conf b/nginx/default.conf
@@ -57,6 +57,34 @@ server {
         add_header Access-Control-Allow-Credentials true always;
     }
 
+    # Handle PATCH/PUT/POST requests to ilx_ endpoints (for bulk term editing)
+    location ~ ^/[^/]+/ilx_[^/]+$ {
+        proxy_pass https://uri.olympiangods.org;
+        proxy_set_header Host uri.olympiangods.org;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_set_header Content-Type application/json;
+        
+        # Pass through auth/cookies if present
+        proxy_set_header Authorization $http_authorization;
+        proxy_set_header Cookie $http_cookie;
+        
+        proxy_ssl_verify off;
+        
+        # CORS headers for all methods including preflight
+        add_header Access-Control-Allow-Origin $http_origin always;
+        add_header Access-Control-Allow-Credentials true always;
+        add_header Access-Control-Allow-Methods "GET, POST, PUT, PATCH, DELETE, OPTIONS" always;
+        add_header Access-Control-Allow-Headers "Content-Type, Authorization, Cookie, X-Requested-With" always;
+        add_header Access-Control-Expose-Headers "X-Redirect-Location" always;
+        
+        # Handle preflight OPTIONS requests
+        if ($request_method = OPTIONS) {
+            return 204;
+        }
+    }
+
     location ~ ^/[^/]+/ontologies/uris/.*\.(html|jsonld)$ {
         proxy_pass https://uri.olympiangods.org;
         proxy_set_header Host uri.olympiangods.org;
diff --git a/src/api/endpoints/index.ts b/src/api/endpoints/index.ts
@@ -243,7 +243,7 @@ export const patchTerm = async (group, termID, term) => {
   const {patchEndpointsIlx} = useApi();
 
   /** Call Endpoint */
-  return patchEndpointsIlx(group, termID, term).then((data: any) => {
+  return patchEndpointsIlx(group, termID, { data: term }).then((data: any) => {
       let termParsed = getTerm(data.data);
       let response = {
         status : data.status,
diff --git a/src/api/endpoints/interLexURIStructureAPI.ts b/src/api/endpoints/interLexURIStructureAPI.ts
@@ -9794,7 +9794,7 @@ export const patchEndpointsIlx = (
       
       
       return customInstance<void>(
-      {url: `${API_CONFIG.OLYMPIAN_GODS}/${group}/${fragPrefId}`, method: 'PATCH'
+      {url: `${group}/${fragPrefId}`, method: 'PATCH'
     },
       options);
     }
diff --git a/src/components/Dashboard/EditBulkTerms/EditBulkTermsDialog.jsx b/src/components/Dashboard/EditBulkTerms/EditBulkTermsDialog.jsx
@@ -11,10 +11,11 @@ import CustomizedDialog from "../../common/CustomizedDialog";
 import ArrowForwardIcon from '@mui/icons-material/ArrowForward';
 import EditOutlinedIcon from '@mui/icons-material/EditOutlined';
 import SearchTermsData from "../../../static/SearchTermsData.json";
+import { patchTerm } from "../../../api/endpoints";
 
 const initialSearchConditions = { attribute: '', value: '', condition: 'where', relation: SearchTermsData.objectOptions[0].value }
 
-const HeaderRightSideContent = ({ handleClose, activeStep, handleNext, handleBack, setActiveStep, isAllFieldsFilled, selectedOntology }) => {
+const HeaderRightSideContent = ({ handleClose, activeStep, handleNext, handleBack, setActiveStep, isAllFieldsFilled, selectedOntology, isUpdating }) => {
   return (
     <Box display='flex' alignItems='center' gap='.75rem'>
       <MobileStepper
@@ -41,8 +42,14 @@ const HeaderRightSideContent = ({ handleClose, activeStep, handleNext, handleBac
               Previous
             </Button>
           }
-          <Button endIcon={<ArrowForwardIcon />} variant='contained' color='primary' onClick={handleNext} disabled={activeStep === 0 && !isAllFieldsFilled && !selectedOntology}>
-            Continue
+          <Button 
+            endIcon={!isUpdating && <ArrowForwardIcon />} 
+            variant='contained' 
+            color='primary' 
+            onClick={handleNext} 
+            disabled={(activeStep === 0 && !isAllFieldsFilled && !selectedOntology) || isUpdating}
+          >
+            {isUpdating ? 'Saving Changes...' : 'Continue'}
           </Button>
         </>
       }
@@ -65,7 +72,117 @@ const EditBulkTermsDialog = ({ open, handleClose, activeStep, setActiveStep }) =
   const [ontologyTerms, setOntologyTerms] = useState([]);
   const [ontologyAttributes, setOntologyAttributes] = useState([]);
   const [selectedOntology, setSelectedOntology] = useState(null);
-  const handleNext = () => {
+  const [originalTerms, setOriginalTerms] = useState([]);
+  const [batchUpdateResults, setBatchUpdateResults] = useState(null);
+  const [isUpdating, setIsUpdating] = useState(false);
+  const performBatchUpdate = async (termsToUpdate = null) => {
+    setIsUpdating(true);
+    
+    // Use provided terms or all ontology terms
+    const terms = termsToUpdate || ontologyTerms;
+    
+    const results = {
+      successful: [],
+      failed: [],
+      total: terms.length
+    };
+
+    try {
+      // Store original terms before starting updates (only if not retrying)
+      if (!termsToUpdate) {
+        setOriginalTerms([...ontologyTerms]);
+      }
+
+      // Process each term
+      for (const term of terms) {
+        try {
+          // Extract the group and term ID from the term
+          let termId = term.id || term['@id'];
+          
+          // If termId is in full URI format, extract just the ID part
+          if (termId && termId.includes('/')) {
+            termId = termId.split('/').pop();
+          }
+          
+          const group = 'base'; // Default group, can be made configurable
+          
+          // Create the JSON-LD payload with the current term data
+          const jsonLdPayload = {
+            "@context": term["@context"] || {
+              "@vocab": "http://uri.interlex.org/base/",
+              "owl": "http://www.w3.org/2002/07/owl#",
+              "rdfs": "http://www.w3.org/2000/01/rdf-schema#"
+            },
+            "@id": term['@id'] || termId,
+            ...term
+          };
+
+          // Send PATCH request
+          const response = await patchTerm(group, termId, jsonLdPayload);
+          
+          if (response.status === 200 || response.status === 201) {
+            results.successful.push({
+              termId,
+              term: response.term,
+              status: response.status
+            });
+          } else {
+            results.failed.push({
+              termId,
+              error: `HTTP ${response.status}`,
+              term
+            });
+          }
+        } catch (error) {
+          console.error(`Failed to update term ${term.id}:`, error);
+          results.failed.push({
+            termId: term.id,
+            error: error.message || 'Unknown error',
+            term
+          });
+        }
+      }
+
+      // If retrying, merge with existing results
+      if (termsToUpdate && batchUpdateResults) {
+        setBatchUpdateResults({
+          successful: [...batchUpdateResults.successful, ...results.successful],
+          failed: results.failed, // Replace failed list with new attempt results
+          total: batchUpdateResults.total
+        });
+      } else {
+        setBatchUpdateResults(results);
+      }
+    } catch (error) {
+      console.error('Batch update failed:', error);
+      const failureResults = {
+        successful: termsToUpdate && batchUpdateResults ? batchUpdateResults.successful : [],
+        failed: terms.map(term => ({
+          termId: term.id,
+          error: error.message || 'Batch operation failed',
+          term
+        })),
+        total: termsToUpdate && batchUpdateResults ? batchUpdateResults.total : terms.length
+      };
+      setBatchUpdateResults(failureResults);
+    } finally {
+      setIsUpdating(false);
+    }
+  };
+
+  const handleTryAgain = async () => {
+    if (batchUpdateResults && batchUpdateResults.failed.length > 0) {
+      // Extract failed terms for retry
+      const failedTerms = batchUpdateResults.failed.map(failedItem => failedItem.term);
+      await performBatchUpdate(failedTerms);
+    }
+  };
+
+  const handleNext = async () => {
+    // If we're moving from step 1 (EditTerms) to step 2 (Status), perform batch update
+    if (activeStep === 1) {
+      await performBatchUpdate();
+    }
     setActiveStep((prevActiveStep) => prevActiveStep + 1);
   };
 
@@ -83,7 +200,7 @@ const EditBulkTermsDialog = ({ open, handleClose, activeStep, setActiveStep }) =
   };
 
   // put success by default, should be changed later
-  const statusProps = getStatusProps({ success: true });
+
 
   return (
     <CustomizedDialog
@@ -99,6 +216,7 @@ const EditBulkTermsDialog = ({ open, handleClose, activeStep, setActiveStep }) =
           setActiveStep={setActiveStep}
           isAllFieldsFilled={isAllFieldsFilled(searchConditions)}
           selectedOntology={selectedOntology}
+          isUpdating={isUpdating}
         />
       }
       sx={{
@@ -119,6 +237,7 @@ const EditBulkTermsDialog = ({ open, handleClose, activeStep, setActiveStep }) =
             setOntologyAttributes={setOntologyAttributes}
             selectedOntology={selectedOntology}
             setSelectedOntology={setSelectedOntology}
+            setOriginalTerms={setOriginalTerms}
           />
         }
         {
@@ -130,7 +249,12 @@ const EditBulkTermsDialog = ({ open, handleClose, activeStep, setActiveStep }) =
           />
         }
         {
-          activeStep === 2 && <StatusStep statusProps={statusProps} onAction={() => setActiveStep(0)} actionButtonStartIcon={<EditOutlinedIcon />} />
+          activeStep === 2 && <StatusStep 
+            statusProps={getStatusProps(batchUpdateResults, isUpdating)} 
+            onAction={() => setActiveStep(0)} 
+            actionButtonStartIcon={<EditOutlinedIcon />}
+            onTryAgain={handleTryAgain}
+          />
         }
       </>
     </CustomizedDialog>
@@ -143,7 +267,9 @@ HeaderRightSideContent.propTypes = {
   handleNext: PropTypes.func.isRequired,
   handleBack: PropTypes.func.isRequired,
   setActiveStep: PropTypes.func.isRequired,
-  isAllFieldsFilled: PropTypes.func.isRequired,
+  isAllFieldsFilled: PropTypes.bool.isRequired,
+  selectedOntology: PropTypes.object,
+  isUpdating: PropTypes.bool.isRequired,
 };
 
 EditBulkTermsDialog.propTypes = {
diff --git a/src/components/Dashboard/EditBulkTerms/SearchTerms.jsx b/src/components/Dashboard/EditBulkTerms/SearchTerms.jsx
@@ -48,7 +48,7 @@ const styles = {
   },
 }
 
-const SearchTerms = ({ searchConditions, setSearchConditions, initialSearchConditions, ontologyTerms, setOntologyTerms, ontologyAttributes, setOntologyAttributes, selectedOntology, setSelectedOntology }) => {
+const SearchTerms = ({ searchConditions, setSearchConditions, initialSearchConditions, ontologyTerms, setOntologyTerms, ontologyAttributes, setOntologyAttributes, selectedOntology, setSelectedOntology, setOriginalTerms }) => {
   const [ontologyEditOption, setOntologyEditOption] = useState(Confirmation.Yes);
   const [attributesLoading, setAttributesLoading] = useState(false);
   const { user } = useContext(GlobalDataContext);
@@ -232,14 +232,15 @@ const SearchTerms = ({ searchConditions, setSearchConditions, initialSearchCondi
       }
       
       setOntologyTerms(termsData);
+      setOriginalTerms([...termsData]); // Store original terms for undo functionality
     } catch (error) {
       console.error('Error fetching ontology attributes:', error);
       setOntologyAttributes([]);
       setOntologyTerms([]);
     } finally {
       setAttributesLoading(false);
     }
-  }, [setOntologyAttributes, setOntologyTerms, setSelectedOntology]);
+  }, [setOntologyAttributes, setOntologyTerms, setSelectedOntology, setOriginalTerms]);
 
   const updatedColumnsArray = useMemo(() => {
     // If an ontology is selected and we have attributes, use those
@@ -432,6 +433,7 @@ SearchTerms.propTypes = {
   setOntologyAttributes: PropTypes.func.isRequired,
   selectedOntology: PropTypes.object,
   setSelectedOntology: PropTypes.func.isRequired,
+  setOriginalTerms: PropTypes.func.isRequired,
 };
 
 export default SearchTerms;
diff --git a/src/components/Dashboard/EditBulkTerms/editBulkTermStatusProps.js b/src/components/Dashboard/EditBulkTerms/editBulkTermStatusProps.js
@@ -1,9 +1,50 @@
-export const getStatusProps = (responseStatus) => ({
-    statusResponse: responseStatus,
-    successMessage: "Bulk terms edit successful",
-    failureMessage: "Unable to create the bulk term",
-    successDescription: `Your changes has been applied. Click finish to close the modal, or restart editing.`,
-    failureDescription: `Your changes hasn't been applied. Click finish to close the modal, or restart editing.`,
-    actionButtonMessage: responseStatus?.success ? "Edit bulk terms" : null,
-    isTryButtonVisible: responseStatus?.success ? false : true,
-});
+export const getStatusProps = (batchResults, isUpdating = false) => {
+    if (!batchResults) {
+        return {
+            statusResponse: { success: false },
+            successMessage: "Bulk terms edit in progress",
+            failureMessage: "Bulk terms edit in progress",
+            successDescription: "Please wait while changes are being applied...",
+            failureDescription: "Please wait while changes are being applied...",
+            actionButtonMessage: null,
+            isTryButtonVisible: false,
+        };
+    }
+
+    const isSuccess = batchResults.failed.length === 0;
+    const successCount = batchResults.successful.length;
+    const failureCount = batchResults.failed.length;
+    const totalCount = batchResults.total;
+
+    // If currently updating (retry in progress), show appropriate messages
+    if (isUpdating) {
+        return {
+            statusResponse: { success: false },
+            successMessage: "Retrying failed updates...",
+            failureMessage: "Retrying failed updates...",
+            successDescription: `Retrying ${failureCount} failed term updates. Please wait...`,
+            failureDescription: `Retrying ${failureCount} failed term updates. Please wait...`,
+            actionButtonMessage: null,
+            isTryButtonVisible: false,
+        };
+    }
+
+    return {
+        statusResponse: { success: isSuccess },
+        successMessage: isSuccess 
+            ? `Bulk terms edit successful - ${successCount}/${totalCount} terms updated`
+            : `Bulk terms edit partially successful - ${successCount}/${totalCount} terms updated`,
+        failureMessage: `Bulk terms edit failed - ${failureCount}/${totalCount} terms failed to update`,
+        successDescription: isSuccess 
+            ? `All ${successCount} term changes have been successfully applied. Click finish to close the modal, or restart editing.`
+            : `${successCount} terms were updated successfully, but ${failureCount} failed. You can try again for the failed terms. Click finish to close the modal, or restart editing.`,
+        failureDescription: `${failureCount} out of ${totalCount} term updates failed. Check the error details and try again for the failed terms. Click finish to close the modal, or restart editing.`,
+        actionButtonMessage: "Edit bulk terms",
+        isTryButtonVisible: !isSuccess && failureCount > 0,
+        batchDetails: {
+            successful: batchResults.successful,
+            failed: batchResults.failed,
+            total: totalCount
+        }
+    };
+};
diff --git a/src/components/SingleTermView/index.jsx b/src/components/SingleTermView/index.jsx
diff --git a/src/components/TermEditor/TermDialogContent.jsx b/src/components/TermEditor/TermDialogContent.jsx
diff --git a/vite.config.js b/vite.config.js

Original file line number	Diff line number	Diff line change
`@@ -9794,7 +9794,7 @@ export const patchEndpointsIlx = (`
`9794`	`9794`
`9795`	`9795`
`9796`	`9796`	`return customInstance<void>(`
`9797`		- {url: `${API_CONFIG.OLYMPIAN_GODS}/${group}/${fragPrefId}`, method: 'PATCH'
	`9797`	+ {url: `${group}/${fragPrefId}`, method: 'PATCH'
`9798`	`9798`	`},`
`9799`	`9799`	`options);`
`9800`	`9800`	`}`