Merge branch 'master' into libraryAccess

Author: AkhilTheBoss

client/src/api.ts

@@ -348,17 +348,19 @@ class API {
   }
 
   async getBookPagesDetails(bookID: string) {
+    const nonce = Math.random().toString(36).substring(7);
     const res = await axios.get<
       {
         toc: TableOfContentsDetailed;
       } & ConductorBaseResponse
-    >(`/commons/book/${bookID}/pages-details`);
+    >(`/commons/book/${bookID}/pages-details?nonce=${nonce}`);
     return res;
   }
 
   async getPageDetails(pageID: string, coverPageID: string) {
+    const nonce = Math.random().toString(36).substring(7);
     const res = await axios.get<PageDetailsResponse & ConductorBaseResponse>(
-      `/commons/pages/${pageID}?coverPageID=${coverPageID}`
+      `/commons/pages/${pageID}?coverPageID=${coverPageID}?nonce=${nonce}`,
     );
     return res;
   }
@@ -381,22 +383,38 @@ class API {
     return res;
   }
 
+  async generatePageImagesAltText(
+    pageID: string,
+    coverPageID: string,
+    overwrite: boolean
+  ) {
+    const res = await axios.post<
+      {
+        success: boolean;
+        modified_count: number;
+      } & ConductorBaseResponse
+    >(`/commons/pages/${pageID}/ai-alt-text?coverPageID=${coverPageID}`, {
+      overwrite,
+    });
+    return res;
+  }
+
   /**
    * Generates and applies AI-generated summaries, tags, or both, to all pages in a book
    * @param {string} bookID - the cover page of the book to apply the summaries to
    */
   async batchGenerateAIMetadata(
     bookID: string,
-    summaries: boolean,
-    tags: boolean,
-    alttext: boolean
+    summaries: { generate: boolean; overwrite: boolean },
+    tags: { generate: boolean; overwrite: boolean },
+    alttext: { generate: boolean; overwrite: boolean }
   ) {
     const res = await axios.post<ConductorBaseResponse>(
       `/commons/book/${bookID}/ai-metadata-batch`,
       {
-        summaries,
-        tags,
-        alttext,
+        ...(summaries.generate ? { summaries } : {}),
+        ...(tags.generate ? { tags } : {}),
+        ...(alttext.generate ? { alttext } : {}),
       }
     );
     return res;
@@ -411,7 +429,7 @@ class API {
     bookID: string,
     pages: { id: string; summary: string; tags: string[] }[]
   ) {
-    const res = await axios.post<ConductorBaseResponse>(
+    const res = await axios.post<{ msg: string } & ConductorBaseResponse>(
       `/commons/book/${bookID}/update-metadata-batch`,
       {
         pages,
@@ -1165,6 +1183,17 @@ class API {
     );
     return res;
   }
+
+  // user manager
+  async deleteUserRole(orgID: string, uuid: string) {
+    const res = await axios.delete<ConductorBaseResponse>(`/user/role/delete`, {
+      data: {
+        orgID,
+        uuid,
+      },
+    });
+    return res;
+  }
 }
 
 export default new API();

client/src/components/controlpanel/UsersManager/ManageUserRolesModal.tsx

@@ -1,9 +1,10 @@
 import axios from "axios";
-import { Button, Dropdown, List, Loader, Modal } from "semantic-ui-react";
+import { Button, Dropdown, List, Loader, Modal, Icon } from "semantic-ui-react";
 import { Organization } from "../../../types";
 import React, { useEffect, useState } from "react";
 import useGlobalError from "../../error/ErrorHooks";
 import { UserRoleOptions } from "../../../utils/userHelpers";
+import api from "../../../api";
 
 type ManageUserRolesModalProps = {
   firstName: string;
@@ -107,6 +108,18 @@ const ManageUserRolesModal: React.FC<ManageUserRolesModalProps> = ({
     }
   }
 
+  async function deleteUserRole(orgID: string) {
+    try {
+      setLoading(true);
+      const res = await api.deleteUserRole(orgID, uuid);
+      await getUserRoles();
+    } catch (err) {
+      handleGlobalError(err);
+    } finally {
+      setLoading(false);
+    }
+  }
+
   return (
     <Modal size="large" open={show} onClose={onClose} {...props}>
       <Modal.Header>
@@ -119,6 +132,10 @@ const ManageUserRolesModal: React.FC<ManageUserRolesModalProps> = ({
         {loading && <Loader />}
         <List divided verticalAlign="middle">
           {allOrganizations.map((org) => {
+            const currentRole = userRoles.find(
+              (r) => r.org?.orgID === org.orgID
+            )?.roleInternal;
+            const hasRole = !!currentRole;
             return (
               <List.Item key={org.orgID}>
                 <div className="flex-row-div">
@@ -146,11 +163,17 @@ const ManageUserRolesModal: React.FC<ManageUserRolesModalProps> = ({
                       }
                       placeholder="No role set"
                       selection
-                      value={
-                        userRoles.find((r) => r.org?.orgID === org.orgID)
-                          ?.roleInternal
-                      }
+                      value={currentRole || ""}
                     />
+                      <Button 
+                        icon 
+                        size="mini" 
+                        onClick={() => deleteUserRole(org.orgID)}
+                        style={{ marginLeft: "5px" }}
+                        disabled={!hasRole}
+                      >
+                        <Icon name="x" />
+                      </Button>
                   </div>
                 </div>
               </List.Item>

client/src/components/projects/ProjectView.jsx

@@ -1648,7 +1648,7 @@ const ProjectView = (props) => {
                           </Breakpoint>
                         </Button>
                       }
-                      {/* {
+                      {
                         project.libreLibrary && project.libreCoverID && (
                           <Button
                           as={Link}
@@ -1662,7 +1662,7 @@ const ProjectView = (props) => {
                           </Breakpoint>
                         </Button>
                         )
-                      } */}
+                      }
                       <Button
                         color='olive'
                         as={Link}

client/src/components/projects/TextbookCuration/ActiveJobAlert.tsx

@@ -0,0 +1,39 @@
+import { Button, Icon, Message } from "semantic-ui-react";
+import { ProjectBookBatchUpdateJob } from "../../../types";
+
+interface ActiveJobAlertProps {
+  job: ProjectBookBatchUpdateJob;
+  onRefresh: () => void;
+  loading: boolean;
+}
+
+const ActiveJobAlert: React.FC<ActiveJobAlertProps> = ({
+  job,
+  onRefresh,
+  loading,
+}) => {
+  return (
+    <Message icon info>
+      <Icon name="info circle" />
+      <Message.Content>
+        <div className="flex flex-row justify-between">
+          <div className="flex flex-col">
+            <Message.Header>Bulk Update Job In Progress</Message.Header>
+            <p>
+              {job.dataSource === "generated"
+                ? "AI-generated metadata is "
+                : "Metadata updates are "}
+              currently being applied. This may take some time to complete.
+              Editing is not available while this job is running.
+            </p>
+          </div>
+          <Button onClick={onRefresh} icon color="blue" loading={loading}>
+            <Icon name="refresh" />
+          </Button>
+        </div>
+      </Message.Content>
+    </Message>
+  );
+};
+
+export default ActiveJobAlert;