@manuscripts/style-guide 1.1.8-LEAN-2457-1 → 1.1.8-LEAN-2158

package/dist/cjs/components/Dropdown.js

@@ -14,7 +14,7 @@ exports.DropdownList = styled_components_1.default.div `
   box-shadow: 0 4px 9px rgba(0, 0, 0, 0.3);
   background: ${(props) => props.theme.colors.background.primary};
   width: ${(props) => (props.width ? props.width + 'px' : 'auto')};
-  ${(props) => props.height && `max-height: ${props.height}px`};
+  ${(props) => props.height && `height: ${props.height}px`};
   ${(props) => (props.direction === 'right' ? ' right: 0' : 'left : 0')};
   top: ${(props) => props.theme.grid.unit * (props.top || 3)}px;
   position: absolute;

package/dist/cjs/components/FileManager/ConfirmationPopUp.js

@@ -1,45 +1,11 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MoveFilePopup = exports.ConfirmationPopUp = void 0;
-const json_schema_1 = require("@manuscripts/json-schema");
-const transform_1 = require("@manuscripts/transform");
-const react_1 = __importStar(require("react"));
+exports.ConfirmationPopUp = void 0;
+const react_1 = __importDefault(require("react"));
 const Dialog_1 = require("../Dialog");
-const FileManagerProvider_1 = require("./FileManagerProvider");
-const FileSectionState_1 = require("./FileSectionState");
-const util_1 = require("./util");
 const ConfirmationPopUp = ({ popupHeader, popUpMessage, isOpen, handleClose, handleMove }) => {
     return (react_1.default.createElement(Dialog_1.Dialog, { isOpen: isOpen, category: Dialog_1.Category.confirmation, header: popupHeader, message: popUpMessage, actions: {
             primary: {
@@ -53,38 +19,3 @@ const ConfirmationPopUp = ({ popupHeader, popUpMessage, isOpen, handleClose, han
         } }));
 };
 exports.ConfirmationPopUp = ConfirmationPopUp;
-const MoveFilePopup = ({ dispatch, }) => {
-    const { moveFilePopup: { isOpen, fileSection, attachmentId }, saveModel, deleteModel, modelMap, getAttachments, setMoveFilePopupData, } = (0, react_1.useContext)(FileManagerProvider_1.FileManagerContext);
-    const isSupplement = fileSection === util_1.FileSectionType.Supplements;
-    const message = {
-        popupHeader: `Are you sure you want to move this file to “${(!isSupplement && 'Supplements') || 'Other files'}”?`,
-        popUpMessage: `The file will be removed from the “${(isSupplement && 'Supplements') || 'Other files'}” and added to “${(!isSupplement && 'Supplements') || 'Other files'}”.`,
-    };
-    const closePopup = (0, react_1.useCallback)(() => setMoveFilePopupData({
-        isOpen: false,
-        fileSection: fileSection,
-    }), [fileSection, setMoveFilePopupData]);
-    const showSuccessMessage = (0, react_1.useCallback)(() => dispatch(FileSectionState_1.actions.HANDLE_SUCCESS_MESSAGE(`File moved to ${(isSupplement && 'Other files') || 'Supplements'}.`, fileSection)), [dispatch, fileSection, isSupplement]);
-    const moveToSupplement = (0, react_1.useCallback)(() => __awaiter(void 0, void 0, void 0, function* () {
-        closePopup();
-        const attachment = getAttachments().find(({ id }) => id === attachmentId);
-        if (!attachment) {
-            return;
-        }
-        const model = (0, transform_1.buildSupplementaryMaterial)(attachment.name, `attachment:${attachment.id}`);
-        yield saveModel(Object.assign(Object.assign({}, model), { title: attachment.name, href: `attachment:${attachment.id}` }));
-        showSuccessMessage();
-    }), [getAttachments, saveModel, showSuccessMessage, closePopup, attachmentId]);
-    const moveSupplementToOtherFiles = (0, react_1.useCallback)(() => __awaiter(void 0, void 0, void 0, function* () {
-        closePopup();
-        const model = (0, transform_1.getModelsByType)(modelMap, json_schema_1.ObjectTypes.Supplement).find(({ href }) => (href === null || href === void 0 ? void 0 : href.replace('attachment:', '')) === attachmentId);
-        if (!model) {
-            return;
-        }
-        yield deleteModel(model._id);
-        showSuccessMessage();
-    }), [attachmentId, closePopup, deleteModel, modelMap, showSuccessMessage]);
-    return (react_1.default.createElement(react_1.default.Fragment, null,
-        react_1.default.createElement(exports.ConfirmationPopUp, Object.assign({ isOpen: isOpen }, message, { handleMove: () => (!isSupplement && moveToSupplement()) || moveSupplementToOtherFiles(), handleClose: closePopup }))));
-};
-exports.MoveFilePopup = MoveFilePopup;

package/dist/cjs/components/FileManager/FileManager.js

@@ -43,8 +43,6 @@ const react_tooltip_1 = __importDefault(require("react-tooltip"));
 const index_1 = require("../../index");
 const Inspector_1 = require("../Inspector");
 const InspectorSection_1 = require("../InspectorSection");
-const ConfirmationPopUp_1 = require("./ConfirmationPopUp");
-const FileManagerProvider_1 = require("./FileManagerProvider");
 const DraggableFileSectionItem_1 = require("./FileSectionItem/DraggableFileSectionItem");
 const DragLayer_1 = require("./FileSectionItem/DragLayer");
 const FileSectionItem_1 = require("./FileSectionItem/FileSectionItem");
@@ -54,7 +52,7 @@ const InlineFilesSection_1 = require("./InlineFilesSection");
 const TooltipDiv_1 = require("./TooltipDiv");
 const util_1 = require("./util");
 exports.PermissionsContext = (0, react_1.createContext)(null);
-const FileManager = ({ modelMap, saveModel, deleteModel, enableDragAndDrop, can, fileManagement: { getAttachments, replace, upload }, addAttachmentToState, }) => {
+const FileManager = ({ modelMap, saveModel, enableDragAndDrop, can, fileManagement: { getAttachments, replace, upload }, addAttachmentToState, }) => {
     const [state, dispatch] = (0, react_1.useReducer)(FileSectionState_1.reducer, (0, FileSectionState_1.getInitialState)());
     const handleReplaceFile = (0, react_1.useCallback)((attachmentId, name, file) => __awaiter(void 0, void 0, void 0, function* () {
         dispatch(FileSectionState_1.actions.HANDLE_UPLOAD_ACTION());
@@ -138,7 +136,7 @@ const FileManager = ({ modelMap, saveModel, deleteModel, enableDragAndDrop, can,
         });
         return filesItems;
     };
-    return (react_1.default.createElement(FileManagerProvider_1.FileManagerProvider, { saveModel: saveModel, modelMap: modelMap, deleteModel: deleteModel, getAttachments: getAttachments },
+    return (react_1.default.createElement(react_1.default.Fragment, null,
         react_1.default.createElement(DragLayer_1.DragLayer, null),
         react_1.default.createElement(exports.PermissionsContext.Provider, { value: can },
             react_1.default.createElement(InspectorSection_1.InspectorSection, { title: 'Files', contentStyles: { margin: '24px' } },
@@ -165,7 +163,6 @@ const FileManager = ({ modelMap, saveModel, deleteModel, enableDragAndDrop, can,
                         react_1.default.createElement(Inspector_1.InspectorTabPanel, null,
                             react_1.default.createElement(FilesSection_1.FilesSection, { enableDragAndDrop: enableDragAndDrop, handleUpload: handleUploadFileWithSupplement, fileSection: index_1.FileSectionType.Supplements, filesItem: getFileSectionExternalFile(index_1.FileSectionType.Supplements), state: state, dispatch: dispatch })),
                         react_1.default.createElement(Inspector_1.InspectorTabPanel, null,
-                            react_1.default.createElement(FilesSection_1.FilesSection, { enableDragAndDrop: enableDragAndDrop, handleUpload: handleUploadFile, fileSection: index_1.FileSectionType.OtherFile, filesItem: getFileSectionExternalFile(index_1.FileSectionType.OtherFile), state: state, dispatch: dispatch }))))),
-            react_1.default.createElement(ConfirmationPopUp_1.MoveFilePopup, { dispatch: dispatch }))));
+                            react_1.default.createElement(FilesSection_1.FilesSection, { enableDragAndDrop: enableDragAndDrop, handleUpload: handleUploadFile, fileSection: index_1.FileSectionType.OtherFile, filesItem: getFileSectionExternalFile(index_1.FileSectionType.OtherFile), state: state, dispatch: dispatch }))))))));
 };
 exports.FileManager = FileManager;

package/dist/cjs/components/FileManager/FileSectionItem/FileSectionItem.js

@@ -36,7 +36,7 @@ const FileSectionItem = ({ fileSection, externalFile, title, showAttachmentName
         handleDownload && handleReplace && (react_1.default.createElement(Dropdown_1.DropdownContainer, { ref: wrapperRef },
             react_1.default.createElement(exports.ActionsIcon, { onClick: toggleOpen, type: "button", "aria-label": "Download or Replace", "aria-pressed": isOpen },
                 react_1.default.createElement(dots_icon_1.default, null)),
-            isOpen && (react_1.default.createElement(ItemActions_1.ItemActions, { fileSection: fileSection, isMainManuscript: isMainManuscript, replaceAttachmentHandler: handleReplace, showReplaceAction: showReplaceAction, downloadAttachmentHandler: handleDownload, handleSupplementReplace: handleSupplementReplace, attachmentId: externalFile.id, fileName: externalFile.name, publicUrl: externalFile.link, hideActionList: toggleOpen, dispatch: dispatch }))))));
+            isOpen && (react_1.default.createElement(ItemActions_1.ItemActions, { fileSection: fileSection, replaceAttachmentHandler: handleReplace, showReplaceAction: showReplaceAction, downloadAttachmentHandler: handleDownload, handleSupplementReplace: handleSupplementReplace, attachmentId: externalFile.id, fileName: externalFile.name, publicUrl: externalFile.link, hideActionList: toggleOpen, dispatch: dispatch }))))));
 };
 exports.FileSectionItem = FileSectionItem;
 const IconCloseButton = styled_components_1.default.button `

package/dist/cjs/components/FileManager/FileSectionItem/ItemActions.js

@@ -36,13 +36,11 @@ exports.ItemActions = void 0;
 const react_1 = __importStar(require("react"));
 const Dropdown_1 = require("../../Dropdown");
 const FileManager_1 = require("../FileManager");
-const FileManagerProvider_1 = require("../FileManagerProvider");
 const FileSectionState_1 = require("../FileSectionState");
 const ItemsAction_1 = require("../ItemsAction");
 const util_1 = require("../util");
-const ItemActions = ({ fileSection, isMainManuscript, downloadAttachmentHandler, replaceAttachmentHandler, handleSupplementReplace, detachAttachmnetHandler, handleUpdateInline, attachmentId, fileName, publicUrl, hideActionList, dispatch, dropDownClassName, showReplaceAction, }) => {
+const ItemActions = ({ fileSection, downloadAttachmentHandler, replaceAttachmentHandler, handleSupplementReplace, detachAttachmnetHandler, handleUpdateInline, attachmentId, fileName, publicUrl, hideActionList, dispatch, dropDownClassName, showReplaceAction, }) => {
     const can = (0, react_1.useContext)(FileManager_1.PermissionsContext);
-    const { setMoveFilePopupData } = (0, react_1.useContext)(FileManagerProvider_1.FileManagerContext);
     const canBeReplaced = showReplaceAction == undefined || showReplaceAction;
     const fileInputRef = (0, react_1.useRef)(null);
     const [selectedFile, setSelectedFile] = (0, react_1.useState)();
@@ -73,20 +71,13 @@ const ItemActions = ({ fileSection, isMainManuscript, downloadAttachmentHandler,
             fileInputRef.current.click();
         }
     };
-    return (react_1.default.createElement(Dropdown_1.DropdownList, { direction: 'right', className: dropDownClassName, width: 200, height: 120, top: 5, onClick: hideActionList },
+    return (react_1.default.createElement(Dropdown_1.DropdownList, { direction: 'right', className: dropDownClassName, width: 125, height: 120, top: 5, onClick: hideActionList },
         react_1.default.createElement(ItemsAction_1.ActionsItem, { onClick: () => {
                 publicUrl !== undefined ? downloadAttachmentHandler(publicUrl) : {};
             } }, "Download"),
         (can === null || can === void 0 ? void 0 : can.replaceFile) && canBeReplaced && (react_1.default.createElement(react_1.default.Fragment, null,
             react_1.default.createElement(ItemsAction_1.ActionsItem, { onClick: openFileDialog }, "Replace"),
             react_1.default.createElement("input", { ref: fileInputRef, type: "file", style: { display: 'none' }, onChange: (e) => handleChange(e), value: '' }))),
-        (can === null || can === void 0 ? void 0 : can.editArticle) && detachAttachmnetHandler && (react_1.default.createElement(ItemsAction_1.ActionsItem, { onClick: () => detachAttachmnetHandler() }, "Detach")),
-        !isMainManuscript &&
-            fileSection !== util_1.FileSectionType.Inline &&
-            (can === null || can === void 0 ? void 0 : can.moveFile) && (react_1.default.createElement(ItemsAction_1.ActionsItem, { onClick: () => setMoveFilePopupData({ isOpen: true, attachmentId, fileSection }) },
-            "Move to",
-            ' ',
-            (fileSection === util_1.FileSectionType.OtherFile && 'Supplements') ||
-                'Other files'))));
+        (can === null || can === void 0 ? void 0 : can.editArticle) && detachAttachmnetHandler && (react_1.default.createElement(ItemsAction_1.ActionsItem, { onClick: () => detachAttachmnetHandler() }, "Detach"))));
 };
 exports.ItemActions = ItemActions;

package/dist/cjs/components/FileManager/FileSectionState.js

@@ -33,7 +33,7 @@ const reducer = (state, action) => {
                 }, successMessage: action.successMoveMessage, isShowSuccessMessage: false });
         }
         case ActionTypes.HANDLE_UPLOAD_ACTION: {
-            return Object.assign(Object.assign({}, state), { isUploadFile: true, isShowSuccessMessage: false, fileUploadedSuccessfullySection: undefined, successMessage: '' });
+            return Object.assign(Object.assign({}, state), { isUploadFile: true, isShowSuccessMessage: false, successMessage: '' });
         }
         case ActionTypes.HANDLE_CANCEL_UPLOAD: {
             return Object.assign({}, state);

package/dist/cjs/hooks/use-files.js

@@ -8,21 +8,27 @@ const json_schema_1 = require("@manuscripts/json-schema");
 const transform_1 = require("@manuscripts/transform");
 const inlineFiles_1 = __importDefault(require("../lib/inlineFiles"));
 const use_deep_compare_1 = require("./use-deep-compare");
-const getSupplementFiles = (modelMap, attachments, filePredicate) => {
+const getInlineFilesIds = (inlineFiles) => {
+    return inlineFiles
+        .map(({ attachments }) => (attachments === null || attachments === void 0 ? void 0 : attachments.map(({ id }) => ({ id }))) || [])
+        .flat();
+};
+const getSupplementFiles = (modelMap, inlineFiles, attachments, filePredicate) => {
     const supplements = new Map((0, transform_1.getModelsByType)(modelMap, json_schema_1.ObjectTypes.Supplement).map((supplement) => { var _a; return [(_a = supplement.href) === null || _a === void 0 ? void 0 : _a.replace('attachment:', ''), supplement]; }));
+    const excludedAttachmentsIds = new Set(getInlineFilesIds(inlineFiles).map(({ id }) => id));
     return attachments.filter((attachment) => {
         if (supplements.has(attachment.id) && filePredicate) {
-            return filePredicate(attachment.name);
+            return (!excludedAttachmentsIds.has(attachment.id) &&
+                filePredicate(attachment.name));
         }
         else {
-            return supplements.has(attachment.id);
+            return (!excludedAttachmentsIds.has(attachment.id) &&
+                supplements.has(attachment.id));
         }
     });
 };
 const getOtherFiles = (inlineFiles, supplementFiles, attachments, filePredicate) => {
-    const inlineFilesAttachmentIds = inlineFiles
-        .map(({ attachments }) => (attachments === null || attachments === void 0 ? void 0 : attachments.map(({ id }) => ({ id }))) || [])
-        .flat();
+    const inlineFilesAttachmentIds = getInlineFilesIds(inlineFiles);
     const excludedAttachmentsIds = new Set([...inlineFilesAttachmentIds, ...supplementFiles].map(({ id }) => id));
     return attachments.filter(({ id, name }) => {
         if (!excludedAttachmentsIds.has(id) && filePredicate) {
@@ -35,7 +41,7 @@ const getOtherFiles = (inlineFiles, supplementFiles, attachments, filePredicate)
 };
 const useFiles = (modelMap, attachments, filePredicate) => (0, use_deep_compare_1.useDeepCompareMemo)(() => {
     const inlineFiles = (0, inlineFiles_1.default)(modelMap, attachments);
-    const supplementFiles = getSupplementFiles(modelMap, attachments, filePredicate);
+    const supplementFiles = getSupplementFiles(modelMap, inlineFiles, attachments, filePredicate);
     const otherFiles = getOtherFiles(inlineFiles, supplementFiles, attachments, filePredicate);
     return {
         otherFiles,

package/dist/cjs/lib/capabilities.js

@@ -40,7 +40,6 @@ const getCapabilities = (project, profile, role, actions) => {
         downloadFiles: true,
         changeDesignation: (isOwner() || isEditor() || isWriter()) &&
             allowed(Actions.updateAttachment),
-        moveFile: isOwner() || isEditor() || isWriter(),
         replaceFile: isOwner() || isEditor() || isWriter(),
         uploadFile: isOwner() || isEditor() || isWriter(),
         handleQualityReport: isOwner() || isEditor() || isWriter(),

package/dist/es/components/Dropdown.js

@@ -8,7 +8,7 @@ export const DropdownList = styled.div `
   box-shadow: 0 4px 9px rgba(0, 0, 0, 0.3);
   background: ${(props) => props.theme.colors.background.primary};
   width: ${(props) => (props.width ? props.width + 'px' : 'auto')};
-  ${(props) => props.height && `max-height: ${props.height}px`};
+  ${(props) => props.height && `height: ${props.height}px`};
   ${(props) => (props.direction === 'right' ? ' right: 0' : 'left : 0')};
   top: ${(props) => props.theme.grid.unit * (props.top || 3)}px;
   position: absolute;

package/dist/es/components/FileManager/ConfirmationPopUp.js

@@ -1,19 +1,5 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-import { ObjectTypes } from '@manuscripts/json-schema';
-import { buildSupplementaryMaterial, getModelsByType, } from '@manuscripts/transform';
-import React, { useCallback, useContext } from 'react';
+import React from 'react';
 import { Category, Dialog } from '../Dialog';
-import { FileManagerContext } from './FileManagerProvider';
-import { actions } from './FileSectionState';
-import { FileSectionType } from './util';
 export const ConfirmationPopUp = ({ popupHeader, popUpMessage, isOpen, handleClose, handleMove }) => {
     return (React.createElement(Dialog, { isOpen: isOpen, category: Category.confirmation, header: popupHeader, message: popUpMessage, actions: {
             primary: {
@@ -26,37 +12,3 @@ export const ConfirmationPopUp = ({ popupHeader, popUpMessage, isOpen, handleClo
             },
         } }));
 };
-export const MoveFilePopup = ({ dispatch, }) => {
-    const { moveFilePopup: { isOpen, fileSection, attachmentId }, saveModel, deleteModel, modelMap, getAttachments, setMoveFilePopupData, } = useContext(FileManagerContext);
-    const isSupplement = fileSection === FileSectionType.Supplements;
-    const message = {
-        popupHeader: `Are you sure you want to move this file to “${(!isSupplement && 'Supplements') || 'Other files'}”?`,
-        popUpMessage: `The file will be removed from the “${(isSupplement && 'Supplements') || 'Other files'}” and added to “${(!isSupplement && 'Supplements') || 'Other files'}”.`,
-    };
-    const closePopup = useCallback(() => setMoveFilePopupData({
-        isOpen: false,
-        fileSection: fileSection,
-    }), [fileSection, setMoveFilePopupData]);
-    const showSuccessMessage = useCallback(() => dispatch(actions.HANDLE_SUCCESS_MESSAGE(`File moved to ${(isSupplement && 'Other files') || 'Supplements'}.`, fileSection)), [dispatch, fileSection, isSupplement]);
-    const moveToSupplement = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
-        closePopup();
-        const attachment = getAttachments().find(({ id }) => id === attachmentId);
-        if (!attachment) {
-            return;
-        }
-        const model = buildSupplementaryMaterial(attachment.name, `attachment:${attachment.id}`);
-        yield saveModel(Object.assign(Object.assign({}, model), { title: attachment.name, href: `attachment:${attachment.id}` }));
-        showSuccessMessage();
-    }), [getAttachments, saveModel, showSuccessMessage, closePopup, attachmentId]);
-    const moveSupplementToOtherFiles = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
-        closePopup();
-        const model = getModelsByType(modelMap, ObjectTypes.Supplement).find(({ href }) => (href === null || href === void 0 ? void 0 : href.replace('attachment:', '')) === attachmentId);
-        if (!model) {
-            return;
-        }
-        yield deleteModel(model._id);
-        showSuccessMessage();
-    }), [attachmentId, closePopup, deleteModel, modelMap, showSuccessMessage]);
-    return (React.createElement(React.Fragment, null,
-        React.createElement(ConfirmationPopUp, Object.assign({ isOpen: isOpen }, message, { handleMove: () => (!isSupplement && moveToSupplement()) || moveSupplementToOtherFiles(), handleClose: closePopup }))));
-};

package/dist/es/components/FileManager/FileManager.js

@@ -14,8 +14,6 @@ import ReactTooltip from 'react-tooltip';
 import { FileSectionType, useFiles } from '../../index';
 import { InspectorTab, InspectorTabList, InspectorTabPanel, InspectorTabPanels, InspectorTabs, } from '../Inspector';
 import { InspectorSection } from '../InspectorSection';
-import { MoveFilePopup } from './ConfirmationPopUp';
-import { FileManagerProvider } from './FileManagerProvider';
 import { DraggableFileSectionItem } from './FileSectionItem/DraggableFileSectionItem';
 import { DragLayer } from './FileSectionItem/DragLayer';
 import { FileSectionItem, } from './FileSectionItem/FileSectionItem';
@@ -25,7 +23,7 @@ import { InlineFilesSection } from './InlineFilesSection';
 import { TooltipDiv } from './TooltipDiv';
 import { generateAttachmentsTitles } from './util';
 export const PermissionsContext = createContext(null);
-export const FileManager = ({ modelMap, saveModel, deleteModel, enableDragAndDrop, can, fileManagement: { getAttachments, replace, upload }, addAttachmentToState, }) => {
+export const FileManager = ({ modelMap, saveModel, enableDragAndDrop, can, fileManagement: { getAttachments, replace, upload }, addAttachmentToState, }) => {
     const [state, dispatch] = useReducer(reducer, getInitialState());
     const handleReplaceFile = useCallback((attachmentId, name, file) => __awaiter(void 0, void 0, void 0, function* () {
         dispatch(actions.HANDLE_UPLOAD_ACTION());
@@ -109,7 +107,7 @@ export const FileManager = ({ modelMap, saveModel, deleteModel, enableDragAndDro
         });
         return filesItems;
     };
-    return (React.createElement(FileManagerProvider, { saveModel: saveModel, modelMap: modelMap, deleteModel: deleteModel, getAttachments: getAttachments },
+    return (React.createElement(React.Fragment, null,
         React.createElement(DragLayer, null),
         React.createElement(PermissionsContext.Provider, { value: can },
             React.createElement(InspectorSection, { title: 'Files', contentStyles: { margin: '24px' } },
@@ -136,6 +134,5 @@ export const FileManager = ({ modelMap, saveModel, deleteModel, enableDragAndDro
                         React.createElement(InspectorTabPanel, null,
                             React.createElement(FilesSection, { enableDragAndDrop: enableDragAndDrop, handleUpload: handleUploadFileWithSupplement, fileSection: FileSectionType.Supplements, filesItem: getFileSectionExternalFile(FileSectionType.Supplements), state: state, dispatch: dispatch })),
                         React.createElement(InspectorTabPanel, null,
-                            React.createElement(FilesSection, { enableDragAndDrop: enableDragAndDrop, handleUpload: handleUploadFile, fileSection: FileSectionType.OtherFile, filesItem: getFileSectionExternalFile(FileSectionType.OtherFile), state: state, dispatch: dispatch }))))),
-            React.createElement(MoveFilePopup, { dispatch: dispatch }))));
+                            React.createElement(FilesSection, { enableDragAndDrop: enableDragAndDrop, handleUpload: handleUploadFile, fileSection: FileSectionType.OtherFile, filesItem: getFileSectionExternalFile(FileSectionType.OtherFile), state: state, dispatch: dispatch }))))))));
 };

package/dist/es/components/FileManager/FileSectionItem/FileSectionItem.js

@@ -30,7 +30,7 @@ export const FileSectionItem = ({ fileSection, externalFile, title, showAttachme
         handleDownload && handleReplace && (React.createElement(DropdownContainer, { ref: wrapperRef },
             React.createElement(ActionsIcon, { onClick: toggleOpen, type: "button", "aria-label": "Download or Replace", "aria-pressed": isOpen },
                 React.createElement(DotsIcon, null)),
-            isOpen && (React.createElement(ItemActions, { fileSection: fileSection, isMainManuscript: isMainManuscript, replaceAttachmentHandler: handleReplace, showReplaceAction: showReplaceAction, downloadAttachmentHandler: handleDownload, handleSupplementReplace: handleSupplementReplace, attachmentId: externalFile.id, fileName: externalFile.name, publicUrl: externalFile.link, hideActionList: toggleOpen, dispatch: dispatch }))))));
+            isOpen && (React.createElement(ItemActions, { fileSection: fileSection, replaceAttachmentHandler: handleReplace, showReplaceAction: showReplaceAction, downloadAttachmentHandler: handleDownload, handleSupplementReplace: handleSupplementReplace, attachmentId: externalFile.id, fileName: externalFile.name, publicUrl: externalFile.link, hideActionList: toggleOpen, dispatch: dispatch }))))));
 };
 const IconCloseButton = styled.button `
   border: none;

package/dist/es/components/FileManager/FileSectionItem/ItemActions.js

@@ -10,13 +10,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import React, { useContext, useRef, useState, } from 'react';
 import { DropdownList } from '../../Dropdown';
 import { PermissionsContext } from '../FileManager';
-import { FileManagerContext } from '../FileManagerProvider';
 import { actions } from '../FileSectionState';
 import { ActionsItem } from '../ItemsAction';
 import { FileSectionType } from '../util';
-export const ItemActions = ({ fileSection, isMainManuscript, downloadAttachmentHandler, replaceAttachmentHandler, handleSupplementReplace, detachAttachmnetHandler, handleUpdateInline, attachmentId, fileName, publicUrl, hideActionList, dispatch, dropDownClassName, showReplaceAction, }) => {
+export const ItemActions = ({ fileSection, downloadAttachmentHandler, replaceAttachmentHandler, handleSupplementReplace, detachAttachmnetHandler, handleUpdateInline, attachmentId, fileName, publicUrl, hideActionList, dispatch, dropDownClassName, showReplaceAction, }) => {
     const can = useContext(PermissionsContext);
-    const { setMoveFilePopupData } = useContext(FileManagerContext);
     const canBeReplaced = showReplaceAction == undefined || showReplaceAction;
     const fileInputRef = useRef(null);
     const [selectedFile, setSelectedFile] = useState();
@@ -47,19 +45,12 @@ export const ItemActions = ({ fileSection, isMainManuscript, downloadAttachmentH
             fileInputRef.current.click();
         }
     };
-    return (React.createElement(DropdownList, { direction: 'right', className: dropDownClassName, width: 200, height: 120, top: 5, onClick: hideActionList },
+    return (React.createElement(DropdownList, { direction: 'right', className: dropDownClassName, width: 125, height: 120, top: 5, onClick: hideActionList },
         React.createElement(ActionsItem, { onClick: () => {
                 publicUrl !== undefined ? downloadAttachmentHandler(publicUrl) : {};
             } }, "Download"),
         (can === null || can === void 0 ? void 0 : can.replaceFile) && canBeReplaced && (React.createElement(React.Fragment, null,
             React.createElement(ActionsItem, { onClick: openFileDialog }, "Replace"),
             React.createElement("input", { ref: fileInputRef, type: "file", style: { display: 'none' }, onChange: (e) => handleChange(e), value: '' }))),
-        (can === null || can === void 0 ? void 0 : can.editArticle) && detachAttachmnetHandler && (React.createElement(ActionsItem, { onClick: () => detachAttachmnetHandler() }, "Detach")),
-        !isMainManuscript &&
-            fileSection !== FileSectionType.Inline &&
-            (can === null || can === void 0 ? void 0 : can.moveFile) && (React.createElement(ActionsItem, { onClick: () => setMoveFilePopupData({ isOpen: true, attachmentId, fileSection }) },
-            "Move to",
-            ' ',
-            (fileSection === FileSectionType.OtherFile && 'Supplements') ||
-                'Other files'))));
+        (can === null || can === void 0 ? void 0 : can.editArticle) && detachAttachmnetHandler && (React.createElement(ActionsItem, { onClick: () => detachAttachmnetHandler() }, "Detach"))));
 };

package/dist/es/components/FileManager/FileSectionState.js

@@ -29,7 +29,7 @@ export const reducer = (state, action) => {
                 }, successMessage: action.successMoveMessage, isShowSuccessMessage: false });
         }
         case ActionTypes.HANDLE_UPLOAD_ACTION: {
-            return Object.assign(Object.assign({}, state), { isUploadFile: true, isShowSuccessMessage: false, fileUploadedSuccessfullySection: undefined, successMessage: '' });
+            return Object.assign(Object.assign({}, state), { isUploadFile: true, isShowSuccessMessage: false, successMessage: '' });
         }
         case ActionTypes.HANDLE_CANCEL_UPLOAD: {
             return Object.assign({}, state);

package/dist/es/hooks/use-files.js

@@ -2,21 +2,27 @@ import { ObjectTypes } from '@manuscripts/json-schema';
 import { getModelsByType } from '@manuscripts/transform';
 import getInlineFiles from '../lib/inlineFiles';
 import { useDeepCompareMemo } from './use-deep-compare';
-const getSupplementFiles = (modelMap, attachments, filePredicate) => {
+const getInlineFilesIds = (inlineFiles) => {
+    return inlineFiles
+        .map(({ attachments }) => (attachments === null || attachments === void 0 ? void 0 : attachments.map(({ id }) => ({ id }))) || [])
+        .flat();
+};
+const getSupplementFiles = (modelMap, inlineFiles, attachments, filePredicate) => {
     const supplements = new Map(getModelsByType(modelMap, ObjectTypes.Supplement).map((supplement) => { var _a; return [(_a = supplement.href) === null || _a === void 0 ? void 0 : _a.replace('attachment:', ''), supplement]; }));
+    const excludedAttachmentsIds = new Set(getInlineFilesIds(inlineFiles).map(({ id }) => id));
     return attachments.filter((attachment) => {
         if (supplements.has(attachment.id) && filePredicate) {
-            return filePredicate(attachment.name);
+            return (!excludedAttachmentsIds.has(attachment.id) &&
+                filePredicate(attachment.name));
         }
         else {
-            return supplements.has(attachment.id);
+            return (!excludedAttachmentsIds.has(attachment.id) &&
+                supplements.has(attachment.id));
         }
     });
 };
 const getOtherFiles = (inlineFiles, supplementFiles, attachments, filePredicate) => {
-    const inlineFilesAttachmentIds = inlineFiles
-        .map(({ attachments }) => (attachments === null || attachments === void 0 ? void 0 : attachments.map(({ id }) => ({ id }))) || [])
-        .flat();
+    const inlineFilesAttachmentIds = getInlineFilesIds(inlineFiles);
     const excludedAttachmentsIds = new Set([...inlineFilesAttachmentIds, ...supplementFiles].map(({ id }) => id));
     return attachments.filter(({ id, name }) => {
         if (!excludedAttachmentsIds.has(id) && filePredicate) {
@@ -29,7 +35,7 @@ const getOtherFiles = (inlineFiles, supplementFiles, attachments, filePredicate)
 };
 export const useFiles = (modelMap, attachments, filePredicate) => useDeepCompareMemo(() => {
     const inlineFiles = getInlineFiles(modelMap, attachments);
-    const supplementFiles = getSupplementFiles(modelMap, attachments, filePredicate);
+    const supplementFiles = getSupplementFiles(modelMap, inlineFiles, attachments, filePredicate);
     const otherFiles = getOtherFiles(inlineFiles, supplementFiles, attachments, filePredicate);
     return {
         otherFiles,

package/dist/es/lib/capabilities.js

@@ -34,7 +34,6 @@ export const getCapabilities = (project, profile, role, actions) => {
         downloadFiles: true,
         changeDesignation: (isOwner() || isEditor() || isWriter()) &&
             allowed(Actions.updateAttachment),
-        moveFile: isOwner() || isEditor() || isWriter(),
         replaceFile: isOwner() || isEditor() || isWriter(),
         uploadFile: isOwner() || isEditor() || isWriter(),
         handleQualityReport: isOwner() || isEditor() || isWriter(),

package/dist/types/components/FileManager/ConfirmationPopUp.d.ts

@@ -1,5 +1,4 @@
-import React, { Dispatch } from 'react';
-import { Action } from './FileSectionState';
+import React from 'react';
 export declare const ConfirmationPopUp: React.FC<{
     popupHeader: string;
     popUpMessage: string;
@@ -7,6 +6,3 @@ export declare const ConfirmationPopUp: React.FC<{
     handleClose: () => void;
     handleMove: () => void;
 }>;
-export declare const MoveFilePopup: React.FC<{
-    dispatch: Dispatch<Action>;
-}>;

package/dist/types/components/FileManager/FileManager.d.ts

@@ -15,7 +15,6 @@ export declare const FileManager: React.FC<{
     fileManagement: FileManagement;
     modelMap: Map<string, Model>;
     saveModel: <T extends Model>(model: T | Build<T> | Partial<T>) => Promise<T>;
-    deleteModel: (id: string) => Promise<string>;
     enableDragAndDrop: boolean;
     can: Capabilities;
     addAttachmentToState?: (a: FileAttachment) => void;

package/dist/types/components/FileManager/FileSectionItem/ItemActions.d.ts

@@ -5,7 +5,6 @@ import { FileSectionType } from '../util';
 import { FileAttachment } from './FileSectionItem';
 export declare const ItemActions: React.FC<{
     fileSection: FileSectionType;
-    isMainManuscript?: boolean;
     downloadAttachmentHandler: (url: string) => void;
     replaceAttachmentHandler: Replace;
     detachAttachmnetHandler?: () => void;

package/dist/types/lib/capabilities.d.ts

@@ -20,7 +20,6 @@ export type Capabilities = {
     restoreVersion: boolean;
     downloadFiles: boolean;
     changeDesignation: boolean;
-    moveFile: boolean;
     replaceFile: boolean;
     uploadFile: boolean;
     handleQualityReport: boolean;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@manuscripts/style-guide",
   "description": "Shared components for Manuscripts applications",
-  "version": "1.1.8-LEAN-2457-1",
+  "version": "1.1.8-LEAN-2158",
   "repository": "github:Atypon-OpenSource/manuscripts-style-guide",
   "license": "Apache-2.0",
   "main": "dist/cjs",

package/dist/cjs/components/FileManager/FileManagerProvider.js

@@ -1,44 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.FileManagerProvider = exports.FileManagerContext = void 0;
-const react_1 = __importStar(require("react"));
-exports.FileManagerContext = (0, react_1.createContext)({
-    saveModel: () => '',
-    moveFilePopup: { isOpen: false },
-    setMoveFilePopupData: () => '',
-});
-const FileManagerProvider = ({ children, saveModel, deleteModel, modelMap, getAttachments }) => {
-    const [moveFilePopup, setMoveFilePopupData] = (0, react_1.useState)({ isOpen: false });
-    return (react_1.default.createElement(exports.FileManagerContext.Provider, { value: {
-            saveModel,
-            deleteModel,
-            modelMap,
-            getAttachments,
-            moveFilePopup,
-            setMoveFilePopupData,
-        } }, children));
-};
-exports.FileManagerProvider = FileManagerProvider;

package/dist/es/components/FileManager/FileManagerProvider.js

@@ -1,17 +0,0 @@
-import React, { createContext, useState } from 'react';
-export const FileManagerContext = createContext({
-    saveModel: () => '',
-    moveFilePopup: { isOpen: false },
-    setMoveFilePopupData: () => '',
-});
-export const FileManagerProvider = ({ children, saveModel, deleteModel, modelMap, getAttachments }) => {
-    const [moveFilePopup, setMoveFilePopupData] = useState({ isOpen: false });
-    return (React.createElement(FileManagerContext.Provider, { value: {
-            saveModel,
-            deleteModel,
-            modelMap,
-            getAttachments,
-            moveFilePopup,
-            setMoveFilePopupData,
-        } }, children));
-};

package/dist/types/components/FileManager/FileManagerProvider.d.ts

@@ -1,25 +0,0 @@
-import { Model } from '@manuscripts/json-schema';
-import { Build } from '@manuscripts/transform';
-import React, { Dispatch, SetStateAction } from 'react';
-import { FileAttachment } from './FileSectionItem/FileSectionItem';
-import { FileSectionType } from './util';
-type MoveFilePopup = {
-    isOpen: boolean;
-    fileSection?: FileSectionType;
-    attachmentId?: string;
-};
-export declare const FileManagerContext: React.Context<{
-    saveModel: <T extends Model>(model: T | Build<T> | Partial<T>) => Promise<T>;
-    deleteModel: (id: string) => Promise<string>;
-    modelMap: Map<string, Model>;
-    getAttachments: () => FileAttachment[];
-    moveFilePopup: MoveFilePopup;
-    setMoveFilePopupData: Dispatch<SetStateAction<MoveFilePopup>>;
-}>;
-export declare const FileManagerProvider: React.FC<{
-    saveModel: <T extends Model>(model: T | Build<T> | Partial<T>) => Promise<T>;
-    deleteModel: (id: string) => Promise<string>;
-    modelMap: Map<string, Model>;
-    getAttachments: () => FileAttachment[];
-}>;
-export {};