@manuscripts/style-guide 0.31.7 → 0.31.10

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

@@ -32,6 +32,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FileManager = exports.PermissionsContext = void 0;
+const manuscript_transform_1 = require("@manuscripts/manuscript-transform");
+const manuscripts_json_schema_1 = require("@manuscripts/manuscripts-json-schema");
 const react_1 = __importStar(require("react"));
 const react_tooltip_1 = __importDefault(require("react-tooltip"));
 const inlineFiles_1 = __importDefault(require("../../lib/inlineFiles"));
@@ -47,7 +49,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 = ({ submissionId, attachments, modelMap, enableDragAndDrop, can, handleUpload, handleDownload, handleReplace, handleChangeDesignation, }) => {
+const FileManager = ({ submissionId, attachments, modelMap, saveModel, enableDragAndDrop, can, handleUpload, handleDownload, handleReplace, handleChangeDesignation, }) => {
     const [state, dispatch] = (0, react_1.useReducer)(FileSectionState_1.reducer, (0, FileSectionState_1.getInitialState)());
     const handleReplaceFile = (0, react_1.useCallback)((submissionId, attachmentId, name, file, typeId) => __awaiter(void 0, void 0, void 0, function* () {
         dispatch(FileSectionState_1.actions.HANDLE_UPLOAD_ACTION());
@@ -65,6 +67,14 @@ const FileManager = ({ submissionId, attachments, modelMap, enableDragAndDrop, c
         dispatch(FileSectionState_1.actions.HANDLE_FINISH_UPLOAD());
         return res;
     }), [handleUpload]);
+    const handleUploadFileWithSupplement = (0, react_1.useCallback)((submissionId, file, designation) => __awaiter(void 0, void 0, void 0, function* () {
+        const res = (yield handleUploadFile(submissionId, file, designation));
+        if (res && res.data) {
+            const { id, name } = res.data.uploadAttachment;
+            yield saveModel((0, manuscript_transform_1.buildSupplementaryMaterial)(name, `attachment:${id}`));
+        }
+        return res;
+    }), [handleUploadFile, saveModel]);
     const handleChangeDesignationFile = (0, react_1.useCallback)((submissionId, attachmentId, typeId, name) => __awaiter(void 0, void 0, void 0, function* () {
         const res = yield handleChangeDesignation(submissionId, attachmentId, typeId, name);
         if (res) {
@@ -85,15 +95,26 @@ const FileManager = ({ submissionId, attachments, modelMap, enableDragAndDrop, c
         });
         return attachmentsIDs;
     }, [inlineFiles]);
+    const supplementFiles = (0, react_1.useMemo)(() => {
+        const supplements = new Map((0, manuscript_transform_1.getModelsByType)(modelMap, manuscripts_json_schema_1.ObjectTypes.Supplement).map((supplement) => {
+            var _a;
+            return [
+                (_a = supplement.href) === null || _a === void 0 ? void 0 : _a.replace('attachment:', ''),
+                supplement,
+            ];
+        }));
+        return attachments.filter((attachment) => supplements.has(attachment.id));
+    }, [attachments, modelMap.size]);
     const getFileSectionExternalFile = (fileSection) => {
         const isSupplementOrOtherFilesTab = fileSection === util_1.FileSectionType.Supplements ||
             fileSection === util_1.FileSectionType.OtherFile;
-        const itemsData = attachments.filter((element) => {
-            const designation = util_1.namesWithDesignationMap.get(element.type.label);
-            return (designation !== undefined &&
-                util_1.designationWithFileSectionsMap.get(designation) === fileSection &&
-                !inlineAttachmentsIds.has(element.id));
-        });
+        const itemsData = (fileSection === util_1.FileSectionType.Supplements && supplementFiles) ||
+            attachments.filter((element) => {
+                const designation = util_1.namesWithDesignationMap.get(element.type.label);
+                return (designation !== undefined &&
+                    util_1.designationWithFileSectionsMap.get(designation) === fileSection &&
+                    !inlineAttachmentsIds.has(element.id));
+            });
         const itemsDataWithTitle = (0, util_1.generateAttachmentsTitles)(itemsData, fileSection);
         const filesItems = itemsDataWithTitle.map((element) => {
             const itemProps = {
@@ -144,7 +165,7 @@ const FileManager = ({ submissionId, attachments, modelMap, enableDragAndDrop, c
                         react_1.default.createElement(Inspector_1.InspectorTabPanel, null,
                             react_1.default.createElement(InlineFilesSection_1.InlineFilesSection, { inlineFiles: inlineFiles, submissionId: submissionId, handleReplace: handleReplace, handleDownload: handleDownload, isEditor: enableDragAndDrop, dispatch: dispatch })),
                         react_1.default.createElement(Inspector_1.InspectorTabPanel, null,
-                            react_1.default.createElement(FilesSection_1.FilesSection, { submissionId: submissionId, enableDragAndDrop: enableDragAndDrop, handleUpload: handleUploadFile, fileSection: util_1.FileSectionType.Supplements, filesItem: getFileSectionExternalFile(util_1.FileSectionType.Supplements), state: state, dispatch: dispatch })),
+                            react_1.default.createElement(FilesSection_1.FilesSection, { submissionId: submissionId, enableDragAndDrop: enableDragAndDrop, handleUpload: handleUploadFileWithSupplement, fileSection: util_1.FileSectionType.Supplements, filesItem: getFileSectionExternalFile(util_1.FileSectionType.Supplements), state: state, dispatch: dispatch })),
                         react_1.default.createElement(Inspector_1.InspectorTabPanel, null,
                             react_1.default.createElement(FilesSection_1.FilesSection, { submissionId: submissionId, enableDragAndDrop: enableDragAndDrop, handleUpload: handleUploadFile, fileSection: util_1.FileSectionType.OtherFile, filesItem: getFileSectionExternalFile(util_1.FileSectionType.OtherFile), state: state, dispatch: dispatch })))))),
         state.isShowSuccessMessage &&

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

@@ -51,8 +51,7 @@ const InlineFilesSection = ({ submissionId, handleReplace, handleDownload, inlin
                 util_1.fileTypesWithIconMap.get(file.type),
                 react_1.default.createElement(FileInfo_1.FileInfoContainer, null,
                     react_1.default.createElement(FileInfo_1.FileNameTitleContainer, null,
-                        react_1.default.createElement(FileInfo_1.FileTitle, null, file.label)),
-                    file.caption && (react_1.default.createElement(FileInfo_1.FileDescription, null, file.caption))))));
+                        react_1.default.createElement(FileInfo_1.FileTitle, null, file.label))))));
     })));
 };
 exports.InlineFilesSection = InlineFilesSection;

package/dist/cjs/lib/capabilities.js

@@ -52,6 +52,7 @@ const getLWCapabilities = (project, profile, lwRole, actions) => {
         previewAccess: true,
         editNotTracked: false,
         accessEditor: true,
+        formatArticle: !isViewer(),
     };
 };
 exports.getLWCapabilities = getLWCapabilities;

package/dist/cjs/lib/inlineFiles.js

@@ -66,8 +66,8 @@ exports.default = (modelMap, attachments) => {
 };
 const getAuxiliaryObjects = (modelMap) => {
     var _a, _b;
-    let graphicalAbstractFigureId;
-    const figureElementIds = [], tableElementIds = [], orderObjects = {};
+    let graphicalAbstractFigureId, figureElementIds = [];
+    const tableElementIds = [], orderObjects = {};
     for (const model of modelMap.values()) {
         switch (model.objectType) {
             case manuscripts_json_schema_1.ObjectTypes.Section: {
@@ -103,6 +103,9 @@ const getAuxiliaryObjects = (modelMap) => {
             }
         }
     }
+    if (graphicalAbstractFigureId) {
+        figureElementIds = figureElementIds.filter((id) => id != graphicalAbstractFigureId);
+    }
     return {
         graphicalAbstractFigureId,
         figureElement: orderObjects[manuscripts_json_schema_1.ObjectTypes.FigureElement]

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

@@ -7,6 +7,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+import { buildSupplementaryMaterial, getModelsByType, } from '@manuscripts/manuscript-transform';
+import { ObjectTypes, } from '@manuscripts/manuscripts-json-schema';
 import React, { createContext, useCallback, useMemo, useReducer } from 'react';
 import ReactTooltip from 'react-tooltip';
 import getInlineFiles from '../../lib/inlineFiles';
@@ -22,7 +24,7 @@ import { InlineFilesSection } from './InlineFilesSection';
 import { TooltipDiv } from './TooltipDiv';
 import { Designation, designationWithFileSectionsMap, FileSectionType, generateAttachmentsTitles, namesWithDesignationMap, } from './util';
 export const PermissionsContext = createContext(null);
-export const FileManager = ({ submissionId, attachments, modelMap, enableDragAndDrop, can, handleUpload, handleDownload, handleReplace, handleChangeDesignation, }) => {
+export const FileManager = ({ submissionId, attachments, modelMap, saveModel, enableDragAndDrop, can, handleUpload, handleDownload, handleReplace, handleChangeDesignation, }) => {
     const [state, dispatch] = useReducer(reducer, getInitialState());
     const handleReplaceFile = useCallback((submissionId, attachmentId, name, file, typeId) => __awaiter(void 0, void 0, void 0, function* () {
         dispatch(actions.HANDLE_UPLOAD_ACTION());
@@ -40,6 +42,14 @@ export const FileManager = ({ submissionId, attachments, modelMap, enableDragAnd
         dispatch(actions.HANDLE_FINISH_UPLOAD());
         return res;
     }), [handleUpload]);
+    const handleUploadFileWithSupplement = useCallback((submissionId, file, designation) => __awaiter(void 0, void 0, void 0, function* () {
+        const res = (yield handleUploadFile(submissionId, file, designation));
+        if (res && res.data) {
+            const { id, name } = res.data.uploadAttachment;
+            yield saveModel(buildSupplementaryMaterial(name, `attachment:${id}`));
+        }
+        return res;
+    }), [handleUploadFile, saveModel]);
     const handleChangeDesignationFile = useCallback((submissionId, attachmentId, typeId, name) => __awaiter(void 0, void 0, void 0, function* () {
         const res = yield handleChangeDesignation(submissionId, attachmentId, typeId, name);
         if (res) {
@@ -60,15 +70,26 @@ export const FileManager = ({ submissionId, attachments, modelMap, enableDragAnd
         });
         return attachmentsIDs;
     }, [inlineFiles]);
+    const supplementFiles = useMemo(() => {
+        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,
+            ];
+        }));
+        return attachments.filter((attachment) => supplements.has(attachment.id));
+    }, [attachments, modelMap.size]);
     const getFileSectionExternalFile = (fileSection) => {
         const isSupplementOrOtherFilesTab = fileSection === FileSectionType.Supplements ||
             fileSection === FileSectionType.OtherFile;
-        const itemsData = attachments.filter((element) => {
-            const designation = namesWithDesignationMap.get(element.type.label);
-            return (designation !== undefined &&
-                designationWithFileSectionsMap.get(designation) === fileSection &&
-                !inlineAttachmentsIds.has(element.id));
-        });
+        const itemsData = (fileSection === FileSectionType.Supplements && supplementFiles) ||
+            attachments.filter((element) => {
+                const designation = namesWithDesignationMap.get(element.type.label);
+                return (designation !== undefined &&
+                    designationWithFileSectionsMap.get(designation) === fileSection &&
+                    !inlineAttachmentsIds.has(element.id));
+            });
         const itemsDataWithTitle = generateAttachmentsTitles(itemsData, fileSection);
         const filesItems = itemsDataWithTitle.map((element) => {
             const itemProps = {
@@ -119,7 +140,7 @@ export const FileManager = ({ submissionId, attachments, modelMap, enableDragAnd
                         React.createElement(InspectorTabPanel, null,
                             React.createElement(InlineFilesSection, { inlineFiles: inlineFiles, submissionId: submissionId, handleReplace: handleReplace, handleDownload: handleDownload, isEditor: enableDragAndDrop, dispatch: dispatch })),
                         React.createElement(InspectorTabPanel, null,
-                            React.createElement(FilesSection, { submissionId: submissionId, enableDragAndDrop: enableDragAndDrop, handleUpload: handleUploadFile, fileSection: FileSectionType.Supplements, filesItem: getFileSectionExternalFile(FileSectionType.Supplements), state: state, dispatch: dispatch })),
+                            React.createElement(FilesSection, { submissionId: submissionId, enableDragAndDrop: enableDragAndDrop, handleUpload: handleUploadFileWithSupplement, fileSection: FileSectionType.Supplements, filesItem: getFileSectionExternalFile(FileSectionType.Supplements), state: state, dispatch: dispatch })),
                         React.createElement(InspectorTabPanel, null,
                             React.createElement(FilesSection, { submissionId: submissionId, enableDragAndDrop: enableDragAndDrop, handleUpload: handleUploadFile, fileSection: FileSectionType.OtherFile, filesItem: getFileSectionExternalFile(FileSectionType.OtherFile), state: state, dispatch: dispatch })))))),
         state.isShowSuccessMessage &&

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

@@ -2,7 +2,7 @@ import React, { useCallback } from 'react';
 import styled from 'styled-components';
 import { useDropdown } from '../../hooks/use-dropdown';
 import DotsIcon from '../icons/dots-icon';
-import { FileDescription, FileInfoContainer, FileNameTitleContainer, FileTitle, } from './FileSectionItem/FileInfo';
+import { FileInfoContainer, FileNameTitleContainer, FileTitle, } from './FileSectionItem/FileInfo';
 import { ActionsIcon, Item, } from './FileSectionItem/FileSectionItem';
 import { ItemActions } from './FileSectionItem/ItemActions';
 import { extensionsWithFileTypesMap, fileTypesWithIconMap, } from './util';
@@ -26,8 +26,7 @@ export const InlineFilesSection = ({ submissionId, handleReplace, handleDownload
                 fileTypesWithIconMap.get(file.type),
                 React.createElement(FileInfoContainer, null,
                     React.createElement(FileNameTitleContainer, null,
-                        React.createElement(FileTitle, null, file.label)),
-                    file.caption && (React.createElement(FileDescription, null, file.caption))))));
+                        React.createElement(FileTitle, null, file.label))))));
     })));
 };
 const FileReference = ({ attachment, submissionId, handleReplace, handleDownload, dispatch, }) => {

package/dist/es/lib/capabilities.js

@@ -46,6 +46,7 @@ export const getLWCapabilities = (project, profile, lwRole, actions) => {
         previewAccess: true,
         editNotTracked: false,
         accessEditor: true,
+        formatArticle: !isViewer(),
     };
 };
 export const getAllPermitted = () => {

package/dist/es/lib/inlineFiles.js

@@ -64,8 +64,8 @@ export default (modelMap, attachments) => {
 };
 const getAuxiliaryObjects = (modelMap) => {
     var _a, _b;
-    let graphicalAbstractFigureId;
-    const figureElementIds = [], tableElementIds = [], orderObjects = {};
+    let graphicalAbstractFigureId, figureElementIds = [];
+    const tableElementIds = [], orderObjects = {};
     for (const model of modelMap.values()) {
         switch (model.objectType) {
             case ObjectTypes.Section: {
@@ -101,6 +101,9 @@ const getAuxiliaryObjects = (modelMap) => {
             }
         }
     }
+    if (graphicalAbstractFigureId) {
+        figureElementIds = figureElementIds.filter((id) => id != graphicalAbstractFigureId);
+    }
     return {
         graphicalAbstractFigureId,
         figureElement: orderObjects[ObjectTypes.FigureElement]

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

@@ -1,4 +1,5 @@
-import { Model } from '@manuscripts/manuscripts-json-schema';
+import { Build } from '@manuscripts/manuscript-transform';
+import { Model, Supplement } from '@manuscripts/manuscripts-json-schema';
 import React from 'react';
 import { Capabilities } from '../../lib/capabilities';
 import { SubmissionAttachment } from './FileSectionItem/FileSectionItem';
@@ -7,6 +8,7 @@ export declare const FileManager: React.FC<{
     submissionId: string;
     attachments: SubmissionAttachment[];
     modelMap: Map<string, Model>;
+    saveModel: (model: Build<Supplement>) => Promise<Build<Supplement>>;
     enableDragAndDrop: boolean;
     can: Capabilities;
     handleUpload: (submissionId: string, file: File, designation: string) => Promise<any>;

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

@@ -32,6 +32,7 @@ export declare type Capabilities = {
     previewAccess: boolean;
     editNotTracked: boolean;
     accessEditor: boolean;
+    formatArticle: boolean;
 };
 export interface ProviderProps {
     project?: Project;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@manuscripts/style-guide",
   "description": "Shared components for Manuscripts applications",
-  "version": "0.31.7",
+  "version": "0.31.10",
   "repository": "gitlab:atypon-opensource/manuscripts-style-guide",
   "license": "Apache-2.0",
   "main": "dist/cjs",
@@ -63,7 +63,7 @@
     "@manuscripts/comment-editor": "^0.2.3",
     "@manuscripts/data": "^0.1.0",
     "@manuscripts/examples": "^0.0.7",
-    "@manuscripts/manuscript-transform": "^0.48.16",
+    "@manuscripts/manuscript-transform": "^0.48.19",
     "@manuscripts/manuscripts-json-schema": "^1.49.11",
     "@manuscripts/publish": "^0.2.2",
     "@storybook/addon-actions": "^5.3.14",