ode-explorer 1.4.12-develop-b2school.202406121448 → 1.4.12-develop-b2school.202406131654

package/dist/index.js

@@ -56388,38 +56388,48 @@ const useDropdown = (placement, extraTriggerKeyDownHandler) => {
   };
 }, useDropdown$1 = useDropdown, useDropzone = () => {
   const [dragging, setDragging] = reactExports.useState(false), [files, setFiles] = reactExports.useState([]), inputRef = reactExports.useRef(null), addFile = (file) => {
-    setFiles((prevFiles) => [...prevFiles, file]);
+    addFiles([file]);
   }, deleteFile = (file) => {
     setFiles((prevFiles) => prevFiles.filter((prevFile) => prevFile.name !== file.name));
+  }, addFiles = (files2) => {
+    setFiles((prevFiles) => [...prevFiles, ...files2]);
   }, cleanFiles = () => {
     setFiles([]);
   }, handleOnChange = (event) => {
     const files2 = event.target.files;
-    files2 && [...files2].forEach((file) => {
-      addFile(file);
-    });
+    files2 && addFiles([...files2]);
   }, handleDragging = (event) => {
     event.preventDefault(), event.stopPropagation(), setDragging(true);
   }, handleDragLeave = (event) => {
     event.preventDefault(), event.stopPropagation(), setDragging(false);
   };
   return {
+    /** Reference to an `input[type=file]` HTMLElement, null at first. */
     inputRef,
+    /** Read-only list of File·s  managed by this hook. */
     files,
+    /** Truthy when a drag event is triggered. */
     dragging,
+    /** Callback to attach to your drop zone (any HTMLElement). */
     handleDragging,
+    /** Callback to attach to your drop zone (any HTMLElement). */
     handleDragLeave,
+    /** Callback to attach to your drop zone (any HTMLElement). */
     handleDrop: (event) => {
       var _a2;
       handleDragLeave(event);
       const files2 = (_a2 = event.dataTransfer) == null ? void 0 : _a2.files;
-      files2 && [...files2].forEach((file) => {
-        addFile(file);
-      }), inputRef != null && inputRef.current && files2 && (inputRef.current.files = files2);
+      files2 && (addFiles([...files2]), inputRef != null && inputRef.current && (inputRef.current.files = files2));
     },
+    /** Use it to remove a file from the `files` list. */
     deleteFile,
+    /** Use it to add a file to the `files` list. */
     addFile,
+    /** Use it to add many files to the `files` list. */
+    addFiles,
+    /** Use it to empty the `files` list. */
     cleanFiles,
+    /** Callback to attach to your `input[type=file]` HTMLElement. */
     handleOnChange
   };
 }, useDropzone$1 = useDropzone, DEFAULT_POSITION = "top-right";
@@ -59077,7 +59087,49 @@ const useSlug = ({
       ] })
     ] })
   ] });
-}, BlogPublic$1 = BlogPublic, initialState$1 = {
+}, BlogPublic$1 = BlogPublic, ShareBookmark = ({
+  bookmark,
+  refBookmark,
+  onBookmarkChange,
+  onSave
+}) => {
+  const {
+    t: t2
+  } = useTranslation();
+  return /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "mt-16", children: /* @__PURE__ */ jsxRuntimeExports.jsxs(FormControl$1, { id: "bookmarkName", className: "d-flex flex-wrap align-items-center gap-16", children: [
+    /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "flex-fill", children: /* @__PURE__ */ jsxRuntimeExports.jsx(FormControl$1.Input, { ref: refBookmark, onChange: onBookmarkChange, placeholder: t2("explorer.modal.share.sharebookmark.placeholder"), size: "sm", type: "text" }, bookmark.id) }),
+    /* @__PURE__ */ jsxRuntimeExports.jsx(Button$1, { type: "button", color: "primary", variant: "ghost", disabled: bookmark.name.length === 0, leftIcon: /* @__PURE__ */ jsxRuntimeExports.jsx(SvgSave$1, {}), onClick: onSave, className: "text-nowrap", children: t2("explorer.modal.share.sharebookmark.save") })
+  ] }) });
+}, hasRight = (shareRight, shareAction) => shareRight.actions.filter((a2) => shareAction.id === a2.id).length > 0, showShareRightLine = (shareRight, showBookmarkMembers) => shareRight.isBookmarkMember && showBookmarkMembers || !shareRight.isBookmarkMember, ShareBookmarkLine = ({
+  shareRights,
+  showBookmark,
+  toggleBookmark,
+  shareRightActions,
+  toggleRight,
+  onDeleteRow
+}) => {
+  const {
+    t: t2
+  } = useTranslation();
+  return shareRights == null ? void 0 : shareRights.rights.map((shareRight) => showShareRightLine(shareRight, showBookmark) && /* @__PURE__ */ jsxRuntimeExports.jsxs("tr", { className: shareRight.isBookmarkMember ? "bg-light" : "", children: [
+    /* @__PURE__ */ jsxRuntimeExports.jsxs("td", { children: [
+      shareRight.type !== "sharebookmark" && /* @__PURE__ */ jsxRuntimeExports.jsx(Avatar$1, { alt: t2("explorer.modal.share.avatar.shared.alt"), size: "xs", src: shareRight.avatarUrl, variant: "circle" }),
+      shareRight.type === "sharebookmark" && /* @__PURE__ */ jsxRuntimeExports.jsx(SvgBookmark$1, {})
+    ] }),
+    /* @__PURE__ */ jsxRuntimeExports.jsx("td", { children: /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "d-flex", children: [
+      shareRight.type === "sharebookmark" && /* @__PURE__ */ jsxRuntimeExports.jsx(Button$1, { color: "tertiary", rightIcon: /* @__PURE__ */ jsxRuntimeExports.jsx(SvgRafterDown$1, { title: t2("show"), className: "w-16 min-w-0", style: {
+        transition: "rotate 0.2s ease-out",
+        rotate: showBookmark ? "-180deg" : "0deg"
+      } }), type: "button", variant: "ghost", className: "fw-normal ps-0", onClick: toggleBookmark, children: shareRight.displayName }),
+      shareRight.type !== "sharebookmark" && shareRight.displayName,
+      shareRight.type === "user" && ` (${t2(shareRight.profile || "")})`
+    ] }) }),
+    shareRightActions.map((shareRightAction) => /* @__PURE__ */ jsxRuntimeExports.jsx("td", { style: {
+      width: "80px"
+    }, className: "text-center text-white", children: /* @__PURE__ */ jsxRuntimeExports.jsx(Checkbox$1, { checked: hasRight(shareRight, shareRightAction), onChange: () => toggleRight(shareRight, shareRightAction.id) }) }, shareRightAction.displayName)),
+    /* @__PURE__ */ jsxRuntimeExports.jsx("td", { children: !shareRight.isBookmarkMember && /* @__PURE__ */ jsxRuntimeExports.jsx(IconButton$1, { "aria-label": t2("close"), color: "tertiary", icon: /* @__PURE__ */ jsxRuntimeExports.jsx(SvgClose$1, {}), type: "button", variant: "ghost", title: t2("close"), onClick: () => onDeleteRow(shareRight) }) })
+  ] }, shareRight.id));
+}, initialState$1 = {
   searchInputValue: "",
   searchResults: [],
   searchAPIResults: [],
@@ -59126,7 +59178,8 @@ const defaultActions = [{
   id: "comment",
   displayName: "comment"
 }], useSearch = ({
-  resource,
+  resourceId,
+  resourceCreatorId,
   shareRights,
   shareDispatch
 }) => {
@@ -59147,17 +59200,17 @@ const defaultActions = [{
       payload: value
     });
   }, search = async (debouncedSearchInputValue2) => {
-    if (resource) {
+    if (resourceId) {
       if (dispatch({
         type: "isSearching",
         payload: true
       }), !isAdml && debouncedSearchInputValue2.length >= 1 || isAdml && debouncedSearchInputValue2.length >= 3) {
-        const resSearchShareSubjects = await odeServices.share().searchShareSubjects(appCode, resource.assetId, debouncedSearchInputValue2);
+        const resSearchShareSubjects = await odeServices.share().searchShareSubjects(appCode, resourceId, debouncedSearchInputValue2);
         dispatch({
           type: "addApiResult",
           payload: resSearchShareSubjects
         });
-        const adaptedResults = resSearchShareSubjects.filter((right2) => !shareRights.rights.find((shareRight) => shareRight.id === right2.id)).filter((right2) => !(right2.type === "user" && right2.id === (resource == null ? void 0 : resource.creatorId))).map((searchResult) => {
+        const adaptedResults = resSearchShareSubjects.filter((right2) => !shareRights.rights.find((shareRight) => shareRight.id === right2.id)).filter((right2) => !(right2.type === "user" && right2.id === resourceCreatorId)).map((searchResult) => {
           let label = searchResult.displayName;
           return searchResult.type === "user" && searchResult.profile ? label = `${label} (${t2(searchResult.profile)})` : searchResult.type === "group" && searchResult.structureName && (label = `${label} (${searchResult.structureName})`), {
             value: searchResult.id,
@@ -59284,9 +59337,12 @@ function reducer(state, action) {
   }
 }
 function useShare({
-  onSuccess,
-  resource,
-  shareResource
+  resourceId,
+  resourceRights,
+  resourceCreatorId,
+  shareResource,
+  setIsLoading,
+  onSuccess
 }) {
   const {
     appCode
@@ -59297,20 +59353,25 @@ function useShare({
     t: t2
   } = useTranslation(), [state, dispatch] = reactExports.useReducer(reducer, initialState$2);
   return reactExports.useEffect(() => {
-    resource && (async () => {
-      const shareRightActions = await odeServices.share().getActionsForApp(appCode), shareRights = await odeServices.share().getRightsForResource(appCode, resource == null ? void 0 : resource.assetId);
-      dispatch({
-        type: "init",
-        payload: {
-          shareRightActions,
-          shareRights
-        }
-      });
+    resourceId && (async () => {
+      try {
+        const [shareRightActions, shareRights] = await Promise.all([odeServices.share().getActionsForApp(appCode), odeServices.share().getRightsForResource(appCode, resourceId)]);
+        dispatch({
+          type: "init",
+          payload: {
+            shareRightActions,
+            shareRights
+          }
+        });
+      } catch (error) {
+        console.error(error);
+      }
+      setIsLoading(false);
     })();
-  }, [resource]), {
+  }, [resourceId]), {
     state,
     dispatch,
-    currentIsAuthor: () => !!(resource && resource.creatorId === (user == null ? void 0 : user.userId)),
+    currentIsAuthor: () => resourceCreatorId === (user == null ? void 0 : user.userId),
     myAvatar: avatar,
     handleDeleteRow: (shareRight) => {
       dispatch({
@@ -59330,7 +59391,7 @@ function useShare({
         payload: true
       });
       try {
-        const myRights = resource.rights.filter((right2) => user && right2.includes(`user:${user.userId}`)).map((right2) => right2.split(":")[2]).filter((right2) => !!right2), shares = [...state.shareRights.rights];
+        const myRights = resourceRights.filter((right2) => user && right2.includes(`user:${user.userId}`)).map((right2) => right2.split(":")[2]).filter((right2) => !!right2), shares = [...state.shareRights.rights];
         if (myRights.length > 0) {
           const actions = myRights.map((right2) => ({
             displayName: right2,
@@ -59346,9 +59407,9 @@ function useShare({
           });
         }
         shareResource ? await shareResource.mutateAsync({
-          resourceId: resource == null ? void 0 : resource.assetId,
+          resourceId,
           rights: shares
-        }) : await odeServices.share().saveRights(appCode, resource == null ? void 0 : resource.assetId, shares), toast2.success(t2("explorer.shared.status.saved")), onSuccess();
+        }) : await odeServices.share().saveRights(appCode, resourceId, shares), toast2.success(t2("explorer.shared.status.saved")), onSuccess();
       } catch (error) {
         typeof error == "string" && toast2.error(t2("explorer.shared.status.error")), console.error("Failed to save share", error);
       } finally {
@@ -59464,60 +59525,20 @@ const useShareBookmark = ({
     toggleBookmark,
     toggleBookmarkInput
   };
-}, ShareBookmark = ({
-  bookmark,
-  refBookmark,
-  onBookmarkChange,
-  onSave
-}) => {
-  const {
-    t: t2
-  } = useTranslation();
-  return /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "mt-16", children: /* @__PURE__ */ jsxRuntimeExports.jsxs(FormControl$1, { id: "bookmarkName", className: "d-flex flex-wrap align-items-center gap-16", children: [
-    /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "flex-fill", children: /* @__PURE__ */ jsxRuntimeExports.jsx(FormControl$1.Input, { ref: refBookmark, onChange: onBookmarkChange, placeholder: t2("explorer.modal.share.sharebookmark.placeholder"), size: "sm", type: "text" }, bookmark.id) }),
-    /* @__PURE__ */ jsxRuntimeExports.jsx(Button$1, { type: "button", color: "primary", variant: "ghost", disabled: bookmark.name.length === 0, leftIcon: /* @__PURE__ */ jsxRuntimeExports.jsx(SvgSave$1, {}), onClick: onSave, className: "text-nowrap", children: t2("explorer.modal.share.sharebookmark.save") })
-  ] }) });
-}, hasRight = (shareRight, shareAction) => shareRight.actions.filter((a2) => shareAction.id === a2.id).length > 0, showShareRightLine = (shareRight, showBookmarkMembers) => shareRight.isBookmarkMember && showBookmarkMembers || !shareRight.isBookmarkMember, ShareBookmarkLine = ({
-  shareRights,
-  showBookmark,
-  toggleBookmark,
-  shareRightActions,
-  toggleRight,
-  onDeleteRow
-}) => {
-  const {
-    t: t2
-  } = useTranslation();
-  return shareRights == null ? void 0 : shareRights.rights.map((shareRight) => showShareRightLine(shareRight, showBookmark) && /* @__PURE__ */ jsxRuntimeExports.jsxs("tr", { className: shareRight.isBookmarkMember ? "bg-light" : "", children: [
-    /* @__PURE__ */ jsxRuntimeExports.jsxs("td", { children: [
-      shareRight.type !== "sharebookmark" && /* @__PURE__ */ jsxRuntimeExports.jsx(Avatar$1, { alt: t2("explorer.modal.share.avatar.shared.alt"), size: "xs", src: shareRight.avatarUrl, variant: "circle" }),
-      shareRight.type === "sharebookmark" && /* @__PURE__ */ jsxRuntimeExports.jsx(SvgBookmark$1, {})
-    ] }),
-    /* @__PURE__ */ jsxRuntimeExports.jsx("td", { children: /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "d-flex", children: [
-      shareRight.type === "sharebookmark" && /* @__PURE__ */ jsxRuntimeExports.jsx(Button$1, { color: "tertiary", rightIcon: /* @__PURE__ */ jsxRuntimeExports.jsx(SvgRafterDown$1, { title: t2("show"), className: "w-16 min-w-0", style: {
-        transition: "rotate 0.2s ease-out",
-        rotate: showBookmark ? "-180deg" : "0deg"
-      } }), type: "button", variant: "ghost", className: "fw-normal ps-0", onClick: toggleBookmark, children: shareRight.displayName }),
-      shareRight.type !== "sharebookmark" && shareRight.displayName,
-      shareRight.type === "user" && ` (${t2(shareRight.profile || "")})`
-    ] }) }),
-    shareRightActions.map((shareRightAction) => /* @__PURE__ */ jsxRuntimeExports.jsx("td", { style: {
-      width: "80px"
-    }, className: "text-center text-white", children: /* @__PURE__ */ jsxRuntimeExports.jsx(Checkbox$1, { checked: hasRight(shareRight, shareRightAction), onChange: () => toggleRight(shareRight, shareRightAction.id) }) }, shareRightAction.displayName)),
-    /* @__PURE__ */ jsxRuntimeExports.jsx("td", { children: !shareRight.isBookmarkMember && /* @__PURE__ */ jsxRuntimeExports.jsx(IconButton$1, { "aria-label": t2("close"), color: "tertiary", icon: /* @__PURE__ */ jsxRuntimeExports.jsx(SvgClose$1, {}), type: "button", variant: "ghost", title: t2("close"), onClick: () => onDeleteRow(shareRight) }) })
-  ] }, shareRight.id));
 };
 function ShareResourceModal({
   isOpen,
-  resourceId,
+  shareOptions,
   shareResource,
   children,
   onSuccess,
   onCancel
 }) {
   const {
-    appCode: application
-  } = useOdeClient(), resource = useResource$1(application, resourceId), {
+    resourceId,
+    resourceCreatorId,
+    resourceRights
+  } = shareOptions, [isLoading, setIsLoading] = reactExports.useState(true), {
     state: {
       isSharing,
       shareRights,
@@ -59530,8 +59551,11 @@ function ShareResourceModal({
     toggleRight,
     handleDeleteRow
   } = useShare({
-    resource,
+    resourceId,
+    resourceCreatorId,
+    resourceRights,
     shareResource,
+    setIsLoading,
     onSuccess
   }), {
     state: {
@@ -59545,7 +59569,8 @@ function ShareResourceModal({
     handleSearchInputChange,
     handleSearchResultsChange
   } = useSearch({
-    resource,
+    resourceId,
+    resourceCreatorId,
     shareRights,
     shareDispatch
   }), {
@@ -59563,11 +59588,11 @@ function ShareResourceModal({
   }), {
     t: t2
   } = useTranslation(), searchPlaceholder = showSearchAdmlHint() ? t2("explorer.search.adml.hint") : t2("explorer.modal.share.search.placeholder");
-  return resource ? /* @__PURE__ */ reactDomExports.createPortal(/* @__PURE__ */ jsxRuntimeExports.jsxs(Modal$1, { id: "share_modal", size: "lg", isOpen, onModalClose: onCancel, children: [
+  return /* @__PURE__ */ reactDomExports.createPortal(/* @__PURE__ */ jsxRuntimeExports.jsxs(Modal$1, { id: "share_modal", size: "lg", isOpen, onModalClose: onCancel, children: [
     /* @__PURE__ */ jsxRuntimeExports.jsx(Modal$1.Header, { onModalClose: onCancel, children: t2("share.title") }),
     /* @__PURE__ */ jsxRuntimeExports.jsxs(Modal$1.Body, { children: [
       /* @__PURE__ */ jsxRuntimeExports.jsx(Heading$1, { headingStyle: "h4", level: "h3", className: "mb-16", children: t2("explorer.modal.share.usersWithAccess") }),
-      /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "table-responsive", children: /* @__PURE__ */ jsxRuntimeExports.jsxs("table", { className: "table border align-middle mb-0", children: [
+      /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "table-responsive", children: isLoading ? /* @__PURE__ */ jsxRuntimeExports.jsx(LoadingScreen$1, {}) : /* @__PURE__ */ jsxRuntimeExports.jsxs("table", { className: "table border align-middle mb-0", children: [
         /* @__PURE__ */ jsxRuntimeExports.jsx("thead", { className: "bg-secondary", children: /* @__PURE__ */ jsxRuntimeExports.jsxs("tr", { children: [
           /* @__PURE__ */ jsxRuntimeExports.jsx("th", { scope: "col", className: "w-32", children: /* @__PURE__ */ jsxRuntimeExports.jsx(VisuallyHidden$1, { children: t2("explorer.modal.share.avatar.shared.alt") }) }),
           /* @__PURE__ */ jsxRuntimeExports.jsx("th", { scope: "col", children: /* @__PURE__ */ jsxRuntimeExports.jsx(VisuallyHidden$1, { children: t2("explorer.modal.share.search.placeholder") }) }),
@@ -59599,23 +59624,23 @@ function ShareResourceModal({
         /* @__PURE__ */ jsxRuntimeExports.jsx(Tooltip$1, { message: "Vos favoris de partage s’affichent en priorité dans votre liste lorsque vous recherchez un groupe ou une personne, vous pouvez les retrouver dans l’annuaire.", placement: "top", children: /* @__PURE__ */ jsxRuntimeExports.jsx(SvgInfoCircle$1, { className: "c-pointer", height: "18" }) })
       ] }),
       /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "row", children: /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "col-10", children: /* @__PURE__ */ jsxRuntimeExports.jsx(Combobox$1, { value: searchInputValue, placeholder: searchPlaceholder, isLoading: showSearchLoading(), noResult: showSearchNoResults(), options: searchResults, searchMinLength: getSearchMinLength(), onSearchInputChange: handleSearchInputChange, onSearchResultsChange: handleSearchResultsChange }) }) }),
-      typeof children == "function" ? children(resource) : children
+      children
     ] }),
     /* @__PURE__ */ jsxRuntimeExports.jsxs(Modal$1.Footer, { children: [
       /* @__PURE__ */ jsxRuntimeExports.jsx(Button$1, { type: "button", color: "tertiary", variant: "ghost", onClick: onCancel, children: t2("explorer.cancel") }),
       /* @__PURE__ */ jsxRuntimeExports.jsx(Button$1, { type: "button", color: "primary", variant: "filled", isLoading: isSharing, onClick: handleShare, disabled: isSharing, children: t2("share") })
     ] })
-  ] }), document.getElementById("portal")) : /* @__PURE__ */ jsxRuntimeExports.jsx(LoadingScreen$1, {});
+  ] }), document.getElementById("portal"));
 }
 function ShareBlog({
-  resource,
+  resourceId,
   updateResource
 }) {
   const {
     appCode
   } = useOdeClient(), {
     t: t2
-  } = useTranslation(appCode), publishType = resource && resource["publish-type"], [radioPublicationValue, setRadioPublicationValue] = reactExports.useState(publishType ?? "RESTRAINT"), handleRadioPublicationChange = async (event) => {
+  } = useTranslation(appCode), resource = useResource$1("blog", resourceId), publishType = resource && resource["publish-type"], [radioPublicationValue, setRadioPublicationValue] = reactExports.useState(publishType ?? "RESTRAINT"), handleRadioPublicationChange = async (event) => {
     const value = event.target.value;
     (async () => {
       const params = {
@@ -63136,14 +63161,18 @@ function ActionBarContainer() {
         ShareResourceModal,
         {
           isOpen: isShareResourceOpen,
-          resourceId: selectedResource.assetId,
           shareResource,
+          shareOptions: {
+            resourceCreatorId: selectedResource.creatorId,
+            resourceId: selectedResource.assetId,
+            resourceRights: selectedResource.rights
+          },
           onCancel: onShareResourceCancel,
           onSuccess: onShareResourceSuccess,
           children: appCode === "blog" ? /* @__PURE__ */ jsxRuntimeExports.jsx(
             ShareBlog,
             {
-              resource: selectedResource,
+              resourceId: selectedResource.assetId,
               updateResource
             }
           ) : null

package/dist/version.txt

@@ -1 +1 @@
-ode-explorer=1.0-b2school-SNAPSHOT 12/06/2024 14:48:47
+ode-explorer=1.0-b2school-SNAPSHOT 13/06/2024 16:54:32

package/lib/ActionBarContainer.js

@@ -4,7 +4,7 @@ import { useUser as pe, Button as W, useOdeClient as he, ActionBar as fe, Loadin
 import { useTransition as Oe, animated as ye } from "@react-spring/web";
 import { useTranslation as ee } from "react-i18next";
 import { odeServices as D, ACTION as c } from "edifice-ts-client";
-import { e as X, f as be, b as ve, h as Ae, i as se, j as Ie, k as Me, l as ge, m as Pe, d as we, n as xe, u as te, a as Fe, o as Te, p as Be, q as De } from "./index2.js";
+import { e as X, f as be, b as Ie, h as ve, i as se, j as Ae, k as ge, l as Me, m as Pe, d as we, n as xe, u as te, a as Fe, o as Te, p as Be, q as De } from "./index2.js";
 import "@edifice-ui/icons";
 import "i18next";
 import "zustand";
@@ -15,7 +15,7 @@ function Le({
   action: s
 }) {
   const [d, t] = L(!1), {
-    user: S
+    user: E
   } = pe(), h = X();
   Z(() => {
     f();
@@ -43,7 +43,7 @@ function Le({
       t(!0);
       return;
     }
-    if (h && ((r = (l = o[0]) == null ? void 0 : l.trashedBy) != null && r.includes(S == null ? void 0 : S.userId)) && s === "restore" && !((m = o[0]) != null && m.trashed)) {
+    if (h && ((r = (l = o[0]) == null ? void 0 : l.trashedBy) != null && r.includes(E == null ? void 0 : E.userId)) && s === "restore" && !((m = o[0]) != null && m.trashed)) {
       t(!0);
       return;
     }
@@ -52,7 +52,7 @@ function Le({
         if (typeof o[0] == "string")
           await R(o);
         else {
-          const b = o.map((v) => v.rights);
+          const b = o.map((I) => I.rights);
           await p(b);
         }
       else
@@ -66,7 +66,7 @@ function Le({
   };
 }
 function oe() {
-  const [n, o] = L(!1), [s, d] = L("void"), [t, S] = L(), h = be((e) => e.config), R = ve(), p = Ae(), f = se(), l = Ie(), r = Me(), m = X(), b = ge(), v = Pe(), g = we(), _ = xe(), {
+  const [n, o] = L(!1), [s, d] = L("void"), [t, E] = L(), h = be((e) => e.config), R = Ie(), p = ve(), f = se(), l = Ae(), r = ge(), m = X(), b = Me(), I = Pe(), M = we(), _ = xe(), {
     openResource: N,
     printSelectedResource: P,
     openFolder: k,
@@ -80,7 +80,7 @@ function oe() {
       o(!1);
       return;
     }
-    if (v) {
+    if (I) {
       o(!1);
       return;
     }
@@ -88,7 +88,7 @@ function oe() {
   }, [p, r]);
   async function U(e) {
     var B;
-    switch ((B = document.getElementById("root")) == null || B.setAttribute("aria-hidden", "true"), S(e), e.id) {
+    switch ((B = document.getElementById("root")) == null || B.setAttribute("aria-hidden", "true"), E(e), e.id) {
       case c.OPEN:
         return p.length > 0 ? N(f[0]) : k({
           folder: l[0],
@@ -149,18 +149,18 @@ function oe() {
         await b.mutate();
       else
         throw new Error("Cannot restore untrashed resources");
-      A();
+      v();
     } catch (e) {
       console.error(e);
     }
   }
-  function A() {
+  function v() {
     var e;
     d("void"), t != null && t.id && ((e = document.getElementById(t == null ? void 0 : t.id)) == null || e.focus());
   }
   const i = (e) => () => {
-    s === e && (A(), w(), x());
-  }, J = i("move"), E = i("move"), z = i("delete"), T = i("delete"), V = i("publish"), I = i("publish"), M = i("edit_folder"), u = i("edit_folder"), $ = i("edit_resource"), q = i("edit_resource"), ne = i("share"), re = i("share"), ce = i("export"), ae = i("export");
+    s === e && (v(), w(), x());
+  }, J = i("move"), S = i("move"), z = i("delete"), T = i("delete"), V = i("publish"), A = i("publish"), g = i("edit_folder"), u = i("edit_folder"), $ = i("edit_resource"), q = i("edit_resource"), ne = i("share"), re = i("share"), ce = i("export"), ae = i("export");
   async function ie() {
     if (f && f.length > 0) {
       const e = f[0];
@@ -171,7 +171,7 @@ function oe() {
     if (p && p.length > 0) {
       const e = f[0].assetId;
       (h == null ? void 0 : h.app) == "scrapbook" ? Te({
-        searchParams: g,
+        searchParams: M,
         assetId: e
       }) : d("edit_resource");
     } else
@@ -191,16 +191,16 @@ function oe() {
     isActionBarOpen: n,
     isMoveModalOpen: s === "move",
     onMoveCancel: J,
-    onMoveSuccess: E,
+    onMoveSuccess: S,
     isDeleteModalOpen: s === "delete",
     onDeleteCancel: T,
     onDeleteSuccess: z,
     isPublishModalOpen: s === "publish",
-    onPublishCancel: I,
+    onPublishCancel: A,
     onPublishSuccess: V,
     isEditFolderOpen: s === "edit_folder",
     onEditFolderCancel: u,
-    onEditFolderSuccess: M,
+    onEditFolderSuccess: g,
     isEditResourceOpen: s === "edit_resource",
     onEditResourceCancel: q,
     onEditResourceSuccess: $,
@@ -210,7 +210,7 @@ function oe() {
     isExportModalOpen: s === "export",
     onExportCancel: ce,
     onExportSuccess: ae,
-    onClearActionBar: A
+    onClearActionBar: v
   };
 }
 function _e({
@@ -221,7 +221,7 @@ function _e({
   renderWhenForbidden: t
 }) {
   const {
-    t: S
+    t: E
   } = ee(), {
     overrideLabel: h
   } = oe(), {
@@ -235,7 +235,7 @@ function _e({
   } = te(), f = X();
   return R ? /* @__PURE__ */ a(G, { children: d }) : t ? t() : f && !R ? /* @__PURE__ */ a(W, { type: "button", color: "primary", variant: "filled", onClick: () => {
     p(!0);
-  }, children: S(h(s)) }) : /* @__PURE__ */ a(G, {});
+  }, children: E(h(s)) }) : /* @__PURE__ */ a(G, {});
 }
 const Ne = /* @__PURE__ */ y(async () => await import("./PublishModal.js")), ke = /* @__PURE__ */ y(async () => await import("./ResourceModal.js")), He = /* @__PURE__ */ y(async () => await import("./DeleteModal.js")), Ue = /* @__PURE__ */ y(async () => await import("./MoveModal.js")), Ye = /* @__PURE__ */ y(async () => await import("./FolderModal.js")), je = /* @__PURE__ */ y(async () => await import("./ExportModal.js"));
 function es() {
@@ -247,7 +247,7 @@ function es() {
     actions: s,
     selectedElement: d,
     isMoveModalOpen: t,
-    isDeleteModalOpen: S,
+    isDeleteModalOpen: E,
     isPublishModalOpen: h,
     isActionBarOpen: R,
     isEditFolderOpen: p,
@@ -256,8 +256,8 @@ function es() {
     onEditFolderSuccess: r,
     isEditResourceOpen: m,
     onEditResourceCancel: b,
-    onEditResourceSuccess: v,
-    isShareResourceOpen: g,
+    onEditResourceSuccess: I,
+    isShareResourceOpen: M,
     onShareResourceCancel: _,
     onShareResourceSuccess: N,
     isExportModalOpen: P,
@@ -269,9 +269,9 @@ function es() {
     onDeleteSuccess: Y,
     onPublishCancel: j,
     onPublishSuccess: F,
-    isActivable: A,
+    isActivable: v,
     handleClick: i
-  } = oe(), E = se()[0], z = Be(n), T = De(n), V = Oe(R, {
+  } = oe(), S = se()[0], z = Be(n), T = De(n), V = Oe(R, {
     from: {
       opacity: 0,
       transform: "translateY(100%)"
@@ -286,20 +286,24 @@ function es() {
     }
   });
   return /* @__PURE__ */ Q(G, { children: [
-    V((I, M) => M && /* @__PURE__ */ a(ye.div, { className: "position-fixed bottom-0 start-0 end-0", style: {
-      ...I,
+    V((A, g) => g && /* @__PURE__ */ a(ye.div, { className: "position-fixed bottom-0 start-0 end-0", style: {
+      ...A,
       zIndex: 4
-    }, children: /* @__PURE__ */ a(fe, { children: s == null ? void 0 : s.filter((u) => u.available && u.target === "actionbar").map((u) => A(u) && /* @__PURE__ */ a(_e, { resourceRights: d, roleExpected: u.right, action: u, children: /* @__PURE__ */ a(W, { id: u.id, type: "button", color: "primary", variant: "filled", onClick: () => {
+    }, children: /* @__PURE__ */ a(fe, { children: s == null ? void 0 : s.filter((u) => u.available && u.target === "actionbar").map((u) => v(u) && /* @__PURE__ */ a(_e, { resourceRights: d, roleExpected: u.right, action: u, children: /* @__PURE__ */ a(W, { id: u.id, type: "button", color: "primary", variant: "filled", onClick: () => {
       i(u);
     }, children: o(f(u)) }, u.id) }, u.id)) }) })),
     /* @__PURE__ */ Q(de, { fallback: /* @__PURE__ */ a(me, {}), children: [
       t && /* @__PURE__ */ a(Ue, { isOpen: t, onCancel: x, onSuccess: H }),
-      S && /* @__PURE__ */ a(He, { isOpen: S, onCancel: U, onSuccess: Y }),
-      h && E && /* @__PURE__ */ a(Ne, { isOpen: h, resourceId: E.assetId, onCancel: j, onSuccess: F }),
+      E && /* @__PURE__ */ a(He, { isOpen: E, onCancel: U, onSuccess: Y }),
+      h && S && /* @__PURE__ */ a(Ne, { isOpen: h, resourceId: S.assetId, onCancel: j, onSuccess: F }),
       p && /* @__PURE__ */ a(Ye, { edit: !0, isOpen: p, onCancel: l, onSuccess: r }),
-      m && E && /* @__PURE__ */ a(ke, { mode: "update", isOpen: m, resourceId: E.assetId, updateResource: T, onCancel: b, onSuccess: v, children: (I, M, u, $, q) => n === "blog" && Re("createPublic", s) && /* @__PURE__ */ a(Se, { appCode: n, isUpdating: M, resource: I, watch: u, setValue: $, register: q }) }),
-      g && E && /* @__PURE__ */ a(Ee, { isOpen: g, resourceId: E.assetId, shareResource: z, onCancel: _, onSuccess: N, children: n === "blog" ? /* @__PURE__ */ a(Ce, { resource: E, updateResource: T }) : null }),
-      P && E && /* @__PURE__ */ a(je, { isOpen: P, onCancel: k, onSuccess: w })
+      m && S && /* @__PURE__ */ a(ke, { mode: "update", isOpen: m, resourceId: S.assetId, updateResource: T, onCancel: b, onSuccess: I, children: (A, g, u, $, q) => n === "blog" && Re("createPublic", s) && /* @__PURE__ */ a(Se, { appCode: n, isUpdating: g, resource: A, watch: u, setValue: $, register: q }) }),
+      M && S && /* @__PURE__ */ a(Ee, { isOpen: M, shareResource: z, shareOptions: {
+        resourceCreatorId: S.creatorId,
+        resourceId: S.assetId,
+        resourceRights: S.rights
+      }, onCancel: _, onSuccess: N, children: n === "blog" ? /* @__PURE__ */ a(Ce, { resourceId: S.assetId, updateResource: T }) : null }),
+      P && S && /* @__PURE__ */ a(je, { isOpen: P, onCancel: k, onSuccess: w })
     ] })
   ] });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ode-explorer",
-  "version": "1.4.12-develop-b2school.202406121448",
+  "version": "1.4.12-develop-b2school.202406131654",
   "description": "Edifice Explorer",
   "homepage": "https://github.com/edificeio/explorer#readme",
   "bugs": {