@sjcrh/proteinpaint-client 2.191.2 → 2.191.3

package/dist/{2dmaf-V4WJ2LEK.js → 2dmaf-AGYGXGUT.js}

@@ -8,10 +8,10 @@ import {
   renderSandboxFormDiv,
   sayerror,
   to_svg
-} from "./chunk-L4TUTGTA.js";
+} from "./chunk-APO4BA2P.js";
 import "./chunk-HJ6L54YS.js";
 import "./chunk-LSEFWW72.js";
-import "./chunk-4FKWINMK.js";
+import "./chunk-X3Q6I37T.js";
 import {
   Menu
 } from "./chunk-HYOEWQ5P.js";
@@ -1370,4 +1370,4 @@ export {
   d2mafparseinput,
   d2mafui
 };
-//# sourceMappingURL=2dmaf-V4WJ2LEK.js.map
+//# sourceMappingURL=2dmaf-AGYGXGUT.js.map

package/dist/{AIProjectAdmin-JMN5O6YU.js → AIProjectAdmin-AYPMZLCD.js}

@@ -7,12 +7,12 @@ import {
   getNormalRoot,
   renderTable,
   sayerror
-} from "./chunk-L4TUTGTA.js";
+} from "./chunk-APO4BA2P.js";
 import "./chunk-HJ6L54YS.js";
 import {
   require_debounce
 } from "./chunk-LSEFWW72.js";
-import "./chunk-4FKWINMK.js";
+import "./chunk-X3Q6I37T.js";
 import "./chunk-HYOEWQ5P.js";
 import "./chunk-HBW42TDT.js";
 import "./chunk-G6O3URDN.js";
@@ -22,6 +22,7 @@ import "./chunk-RZGEKL77.js";
 import "./chunk-XVZ5UJWU.js";
 import "./chunk-WS3NUPNV.js";
 import {
+  clearServerDataCache,
   dofetch2,
   dofetch3
 } from "./chunk-6VKTEMFV.js";
@@ -61,6 +62,21 @@ function getDefaultAIProjectAdminSettings(overrides = {}) {
 
 // plots/aiProjectAdmin/repo/ProjectReposity.ts
 var ProjectReposity = class {
+  async getAuthorization(genome, dslabel, actions) {
+    const body = {
+      genome,
+      dslabel,
+      for: "auth",
+      auth: actions
+    };
+    try {
+      const response = await dofetch2("aiProjectAdmin", { body });
+      return response || {};
+    } catch (error) {
+      console.error("Error fetching authorizations:", error);
+      throw error;
+    }
+  }
   async getProjects(genome, dslabel) {
     const body = {
       genome,
@@ -145,17 +161,27 @@ var ProjectReposity = class {
 // plots/aiProjectAdmin/view/ProjectAdminRender.ts
 var import_debounce = __toESM(require_debounce(), 1);
 var ProjectAdminRender = class {
-  constructor(dom, projects, interactions) {
+  constructor(dom, projects, interactions, wsiApp) {
     this.dom = dom;
     this.projects = projects;
     this.interactions = interactions;
+    this.wsiApp = wsiApp;
   }
   /** Renders project administration UI, allowing users to
    * create new projects or edit existing ones.*/
   renderProjectAdmin() {
     const projectDiv = this.dom.holder.append("div").attr("id", "sjpp-ai-prjt-admin-projects").attr("class", "sjpp-deletable-ai-prjt-admin-div");
-    this.renderCreateProject(projectDiv);
-    this.renderProjectSelection(projectDiv);
+    this.interactions.getAuthorization(["addProject"]).then((isAuthorized) => {
+      console.log(isAuthorized);
+      if (isAuthorized.addProject) {
+        this.renderCreateProject(projectDiv);
+      }
+    }).catch((e) => {
+      console.error("Error checking authorization:", e.message || e);
+      sayerror(this.dom.errorDiv, "Error checking user authorization. Please try again later.");
+    }).finally(() => {
+      this.renderProjectSelection(projectDiv);
+    });
   }
   /** Users submit a new project name before sample
    * filtering UI to finalize project creation.*/
@@ -173,6 +199,9 @@ var ProjectAdminRender = class {
           this.dom.errorDiv.selectAll("*").remove();
         }, 3e3);
       };
+      if (!(await this.interactions.getAuthorization(["addProject"])).addProject) {
+        return showError("Only users with admin role can create projects");
+      }
       if (prjtNameLen == 0) {
         return showError("Project name cannot be empty");
       }
@@ -184,7 +213,7 @@ var ProjectAdminRender = class {
         return showError(`Project name '${projectName}' already exists`);
       }
       if (this.dom.header) this.dom.header.text(`Project: ${projectName}`);
-      await this.interactions.appDispatchEdit({ settings: { project: { name: projectName, type: "new" } } });
+      await this.interactions.appDispatchEdit({ project: { name: projectName, type: "new" } });
     });
     input.on("keydown", () => {
       const debouncer = () => {
@@ -197,9 +226,13 @@ var ProjectAdminRender = class {
    * returned for the db to edit or delete, depending
    * on user roles.*/
   renderProjectSelection(projectDiv) {
-    if (!this.projects.length) return;
+    if (!this.projects.length) {
+      projectDiv.append("div").attr("class", "sjpp-project-select-table").style("padding", "10px").append("div").text("No projects found. Please create a new project or request one from your admin.");
+      return;
+    }
     const tableDiv = projectDiv.append("div").attr("class", "sjpp-project-select-table").style("padding", "10px");
     const columns = [{ label: "Project", sortable: true }];
+    let rows = this.projects.map((p) => [{ value: p.name }]);
     const columnButtons = [
       {
         text: "Edit",
@@ -207,8 +240,8 @@ var ProjectAdminRender = class {
         //_ = event, __ = idx
         callback: async (_, idx) => {
           const project = this.projects[idx];
-          await this.interactions.appDispatchEdit({ settings: { project } });
-          this.interactions.launchViewer(this.dom.holder, []);
+          await this.interactions.appDispatchEdit({ project: { ...project, type: "edit" } });
+          await this.interactions.launchViewer(this.dom.holder, []);
         }
       },
       {
@@ -223,32 +256,66 @@ var ProjectAdminRender = class {
             sayerror(this.dom.errorDiv, "Failed to export annotations");
           }
         }
-      },
-      {
-        //TODO: Add logic for admins only once user roles are implemented
-        //Leave here for development
-        text: "Delete",
-        class: "sja_menuoption",
-        callback: (_, i) => {
-          const project = this.projects[i];
-          this.interactions.deleteProject(project);
-          this.projects.splice(i, 1);
-          projectDiv.select(".sjpp-project-select-table").remove();
-          this.renderProjectSelection(projectDiv);
-        }
       }
     ];
-    renderTable({
-      div: tableDiv,
-      rows: this.projects.map((p) => {
-        return [{ value: p.name }];
-      }),
-      header: {
-        allowSort: true
-      },
-      columns,
-      singleMode: true,
-      columnButtons
+    this.interactions.getAuthorization(["deleteProject", "logOut", "required"]).then((isAuthorized) => {
+      if (isAuthorized.required) {
+        columns.push({ label: "User", sortable: false });
+        rows = this.projects.map((p) => [{ value: p.name }, { value: p.current_user ?? "Editable" }]);
+      }
+      if (isAuthorized.deleteProject) {
+        columnButtons.push({
+          text: "Delete",
+          class: "sja_menuoption",
+          callback: async (_, i) => {
+            const project = this.projects[i];
+            this.interactions.deleteProject(project).then((success) => {
+              if (success) {
+                this.projects.splice(i, 1);
+                projectDiv.select(".sjpp-project-select-table").remove();
+                this.renderProjectSelection(projectDiv);
+              }
+            });
+          }
+        });
+      }
+      if (isAuthorized.logOut) {
+        columnButtons.push({
+          text: "Force Checkout",
+          class: "sja_menuoption",
+          callback: async (_, i) => {
+            const project = this.projects[i];
+            await this.interactions.onLogOut(this.interactions.genome, this.interactions.dslabel, project.id);
+          }
+        });
+      }
+    }).catch((e) => {
+      console.error("Error checking authorization:", e.message || e);
+      sayerror(this.dom.errorDiv, "Error checking user authorization. Please try again later.");
+    }).finally(() => {
+      renderTable({
+        div: tableDiv,
+        rows,
+        header: {
+          allowSort: true
+        },
+        columns,
+        singleMode: true,
+        columnButtons
+      });
+    });
+  }
+};
+
+// plots/aiProjectAdmin/view/LogoutRenderer.ts
+var LogoutRenderer = class {
+  constructor(interactions) {
+    this.interactions = interactions;
+  }
+  render(holder, genome, dslabel, projectId) {
+    holder.append("div").style("position", "absolute").style("top", "10px").attr("data-testid", "logout-button").style("right", "20px").style("z-index", "1000").append("button").attr("type", "submit").style("font-size", "1.25em").style("padding", "10px 25px").style("border-radius", "20px").style("border", "1px solid black").style("background-color", "white").style("cursor", "pointer").text("Check Out").on("click", async () => {
+      holder.selectAll("*").remove();
+      await this.interactions.onLogOut(genome, dslabel, projectId);
     });
   }
 };
@@ -262,9 +329,18 @@ var AIProjectAdminInteractions = class {
     this.dslabel = app.vocabApi.vocab.dslabel;
     this.prjtRepo = prjtRepo;
   }
+  async getAuthorization(actions) {
+    try {
+      return await this.prjtRepo.getAuthorization(this.genome, this.dslabel, actions);
+    } catch (e) {
+      console.error("Error checking authorization:", e.message || e);
+      throw e;
+    }
+  }
   async addProject(opts) {
     const config = this.getConfig();
-    const projectObject = Object.assign({}, config.settings.project, opts.project);
+    const settings = config.settings || {};
+    const projectObject = Object.assign({}, settings.project, opts.project);
     const body = {
       genome: this.genome,
       dslabel: this.dslabel,
@@ -279,9 +355,10 @@ var AIProjectAdminInteractions = class {
   }
   async editProject(opts) {
     const config = this.getConfig();
+    const settings = config.settings || {};
     const project = Object.assign(
       {},
-      config.settings.project,
+      settings.project,
       {
         type: "edit"
       },
@@ -299,9 +376,10 @@ var AIProjectAdminInteractions = class {
       console.error("Error editing project:", e.message || e);
       throw e;
     }
-    await this.appDispatchEdit({ settings: { project } }, config);
+    await this.appDispatchEdit({ project }, config);
   }
   async deleteProject(project) {
+    let success = false;
     const body = {
       genome: this.genome,
       dslabel: this.dslabel,
@@ -311,19 +389,25 @@ var AIProjectAdminInteractions = class {
       }
     };
     try {
-      await this.prjtRepo.updateProject(body, "DELETE");
+      const response = await this.prjtRepo.updateProject(body, "DELETE");
+      if (response && response.status === "ok") {
+        success = true;
+      }
     } catch (e) {
       console.error("Error deleting project:", e.message || e);
       throw e;
     }
+    return success;
   }
   async getFilteredImages(filter) {
     const config = this.getConfig();
-    return await this.app.vocabApi.getFilteredAiImages(config.settings.project, filter);
+    const settings = config.settings || {};
+    return await this.app.vocabApi.getFilteredAiImages(settings.project, filter);
   }
   async launchViewer(holder, _images) {
-    holder.selectAll(".sjpp-deletable-ai-prjt-admin-div").remove();
     const config = this.getConfig();
+    const settings = config.settings;
+    if (!settings.project || !settings.project.id) throw new Error("Project is required to launch viewer");
     let images = [];
     if (_images && _images.length > 0) {
       images = _images;
@@ -331,22 +415,36 @@ var AIProjectAdminInteractions = class {
       const response = await this.prjtRepo.getImagePaths(
         this.genome,
         this.dslabel,
-        config.settings.project
+        settings.project
       );
+      if (response.status !== "ok") {
+        await this.appDispatchEdit({ project: { name: "", type: "logout" } }, config);
+        sayerror(holder, response.error || "Error fetching images");
+        return;
+      }
+      holder.selectAll(".sjpp-deletable-ai-prjt-admin-div").remove();
       images = response.images;
     }
-    const wsiViewer = await import("./plot.wsi-MU6AXOWO.js");
-    wsiViewer.default(this.dslabel, holder, { name: this.genome }, null, config.settings.project.id, images, true);
+    const wsiViewer = await import("./plot.wsi-QJ52IJXL.js");
+    const genome = this.genome;
+    const dslabel = this.dslabel;
+    const logoutRenderer = new LogoutRenderer(this);
+    logoutRenderer.render(holder, genome, dslabel, settings.project.id);
+    wsiViewer.default(this.dslabel, holder, { name: this.genome }, null, settings.project.id, images, true);
   }
   async appDispatchEdit(settings, config = {}) {
     if (!config?.settings) {
       config = this.getConfig();
       if (!config) throw new Error(`No plot with id='${this.id}' found.`);
     }
+    const configSettings = config.settings;
+    const mergedSettings = {
+      project: { name: "", type: "logout", ...configSettings?.project, ...settings.project }
+    };
     await this.app.dispatch({
       type: "plot_edit",
       id: this.id,
-      config: Object.assign(settings, config.settings)
+      config: { settings: mergedSettings }
     });
   }
   getConfig() {
@@ -355,6 +453,7 @@ var AIProjectAdminInteractions = class {
   async exportAnnotations(projectId) {
     const config = this.getConfig();
     if (!config || !config.settings) throw new Error(`No plot with id='${this.id}' found.`);
+    const settings = config.settings || {};
     let annotations = [];
     try {
       annotations = await this.prjtRepo.getAnnotations(this.genome, this.dslabel, projectId);
@@ -369,7 +468,7 @@ var AIProjectAdminInteractions = class {
     } else {
       content = buildAnnotationsCsv(annotations);
     }
-    const rawName = config.settings && config.settings.project && config.settings.project.name ? String(config.settings.project.name) : `project-${projectId}`;
+    const rawName = settings.project && settings.project.name ? String(settings.project.name) : `project-${projectId}`;
     const safeName = rawName.replace(/[^a-z0-9_.-]/gi, "_").slice(0, 200);
     const filename = `${safeName}-annotations.csv`;
     try {
@@ -387,6 +486,23 @@ var AIProjectAdminInteractions = class {
       throw e;
     }
   }
+  async onLogOut(genome, dslabel, projectId) {
+    try {
+      await dofetch3("aiProjectAdmin", {
+        body: {
+          genome,
+          dslabel,
+          for: "logout",
+          project: { id: projectId }
+        }
+      });
+      clearServerDataCache();
+      await this.appDispatchEdit({ project: { name: "", id: projectId, type: "logout" } });
+    } catch (e) {
+      console.error("Error logging out: " + (e.message || e));
+      throw e;
+    }
+  }
 };
 
 // plots/aiProjectAdmin/view/ClassesTableRender.ts
@@ -502,6 +618,7 @@ var SelectorTableRender = class {
     this.render();
   }
   render() {
+    if (this.images === void 0) this.dom.tableDiv.append("div").text("No images found").style("color", "red");
     const columns = this.images.cols.map((c) => ({ ...c, sortable: true })) || [];
     if (!columns.length) {
       this.dom.tableDiv.append("div").text("Missing columns data").style("color", "red");
@@ -561,7 +678,8 @@ var SelectorTableRender = class {
       const images = Array.from(this.selectedRows).map((i) => `${this.images.rows[i][0].value}.svs`);
       await this.interactions.editProject({
         project: {
-          images
+          images,
+          type: "edit"
         }
       });
       this.dom.holder.selectAll("*").remove();
@@ -577,36 +695,34 @@ var UsersRender = class {
     this.users = users.slice();
   }
   render() {
-    if (this.users.length > 0) {
-      const container = this.dom.holder.append("div").attr("id", "sjpp-users-render").attr("class", "sjpp-deletable-ai-prjt-admin-div").style("padding", "10px");
-      const inputRow = container.append("div").attr("class", "sjpp-users-input-row").style("margin-bottom", "10px");
-      const input = inputRow.append("input").attr("type", "text").attr("placeholder", "user@example.com").attr("id", "sjpp-user-email-input").style("margin-right", "8px").style("width", "300px");
-      const addBtn = inputRow.append("div").text("Add").classed("sja_menuoption", true).style("display", "inline-block").property("disabled", true).on("click", () => {
-        const email = input.property("value").trim();
-        const showError = (msg) => {
-          sayerror(this.dom.errorDiv, msg);
-          setTimeout(() => this.dom.errorDiv.selectAll("*").remove(), 3e3);
-        };
-        if (email.length === 0) {
-          return showError("Email cannot be empty");
-        }
-        const emailRe = /^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,}$/;
-        if (!emailRe.test(email)) {
-          return showError("Invalid email address");
-        }
-        if (this.users.includes(email)) {
-          return showError("Email already added");
-        }
-        this.users.push(email);
-        input.property("value", "");
-        addBtn.property("disabled", true);
-        this.renderTableArea(container);
-      });
-      input.on("input", () => {
-        addBtn.property("disabled", input.property("value").trim().length === 0);
-      });
+    const container = this.dom.holder.append("div").attr("id", "sjpp-users-render").attr("class", "sjpp-deletable-ai-prjt-admin-div").style("padding", "10px");
+    const inputRow = container.append("div").attr("class", "sjpp-users-input-row").style("margin-bottom", "10px");
+    const input = inputRow.append("input").attr("type", "text").attr("placeholder", "user@example.com").attr("id", "sjpp-user-email-input").style("margin-right", "8px").style("width", "300px");
+    const addBtn = inputRow.append("div").text("Add").classed("sja_menuoption", true).style("display", "inline-block").property("disabled", true).on("click", () => {
+      const email = input.property("value").trim();
+      const showError = (msg) => {
+        sayerror(this.dom.errorDiv, msg);
+        setTimeout(() => this.dom.errorDiv.selectAll("*").remove(), 3e3);
+      };
+      if (email.length === 0) {
+        return showError("Email cannot be empty");
+      }
+      const emailRe = /^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,}$/;
+      if (!emailRe.test(email)) {
+        return showError("Invalid email address");
+      }
+      if (this.users.includes(email)) {
+        return showError("Email already added");
+      }
+      this.users.push(email);
+      input.property("value", "");
+      addBtn.property("disabled", true);
       this.renderTableArea(container);
-    }
+    });
+    input.on("input", () => {
+      addBtn.property("disabled", input.property("value").trim().length === 0);
+    });
+    this.renderTableArea(container);
   }
   renderTableArea(container) {
     container.select(".sjpp-users-table-area").remove();
@@ -689,6 +805,11 @@ var CreateProjectRender = class {
         alert("No images match your filter criteria.");
         return;
       }
+      if (!this.usersRender || !Array.isArray(this.usersRender.users) || this.usersRender.users.length === 0) {
+        alert("Please add at least one user.");
+        btn.attr("disabled", null);
+        return;
+      }
       await this.interactions.addProject({
         project: {
           filter: this.filter,
@@ -756,17 +877,20 @@ var AIProjectAdmin = class extends PlotBase {
       filter: appState.termfilter.filter
     };
   }
-  async init(appState) {
-    this.interactions = new AIProjectAdminInteractions(this.app, this.id, this.prjtRepo);
+  async displayProjects(state, interactions) {
     try {
-      this.projects = await this.prjtRepo.getProjects(appState.vocab.genome, appState.vocab.dslabel);
+      this.projects = await this.prjtRepo.getProjects(state.vocab.genome, state.vocab.dslabel);
     } catch (e) {
       console.error("Error initializing AIProjectAdmin:", e);
       throw e;
     }
-    this.prjtAdminUI = new ProjectAdminRender(this.dom, this.projects, this.interactions);
+    this.prjtAdminUI = new ProjectAdminRender(this.dom, this.projects, interactions, this.app);
     this.prjtAdminUI.renderProjectAdmin();
   }
+  async init(appState) {
+    this.interactions = new AIProjectAdminInteractions(this.app, this.id, this.prjtRepo);
+    await this.displayProjects(appState, this.interactions);
+  }
   async main() {
     const state = structuredClone(this.state);
     const config = state.config;
@@ -803,6 +927,9 @@ var AIProjectAdmin = class extends PlotBase {
       }
       await this.interactions.launchViewer(this.dom.holder, []);
     }
+    if (project.type === "logout") {
+      await this.displayProjects(state, this.interactions);
+    }
   }
 };
 var aiProjectAdminInit = getCompInit(AIProjectAdmin);
@@ -826,4 +953,4 @@ export {
   componentInit,
   getPlotConfig
 };
-//# sourceMappingURL=AIProjectAdmin-JMN5O6YU.js.map
+//# sourceMappingURL=AIProjectAdmin-AYPMZLCD.js.map