tycho-components 0.17.2 → 0.18.1

package/dist/Header/HeaderApps/HeaderApps.js

@@ -33,10 +33,14 @@ export default function HeaderApps({ navigateLogout, navigateNotLogged, hideKeyb
             return null;
         if (item.admin && !isAdminOfAnyCorpus())
             return null;
-        if (item.lexicon && !hasLexiconAccess())
+        if (item.lexicon &&
+            (!hasCorpus() || !hasLexiconAccess(getCorpus().uid))) {
             return null;
-        if (item.parser && !hasParserAccess())
+        }
+        if (item.parser &&
+            (!hasCorpus() || !hasParserAccess(getCorpus().uid))) {
             return null;
+        }
         return (_jsxs("div", { className: "item", title: t(`${item.code}.desc`), onClick: () => goto(item, item.external ? true : false), children: [item.icon && _jsx(Icon, { name: item.icon, size: "medium" }), item.image && _jsx("img", { src: item.image }), _jsx("span", { className: "title-app", children: t(`${item.code}.name`) }), _jsxs("div", { className: "options", children: [item.visibility && (_jsx(Tag, { text: t(`common:label.${item.visibility}`), size: "small", color: "green", className: "d-none" })), _jsx(IconButton, { name: "open_in_new", size: "x-small", className: "icon-open", mode: "ghost", onClick: (e) => {
                                 e.stopPropagation();
                                 goto(item, true);

package/dist/configs/useLoggedUtils.d.ts

@@ -5,6 +5,10 @@ export declare const useLoggedUtils: () => {
     isLogged: () => boolean;
     setLogged: (user: User | undefined) => void;
     isAdminOfAnyCorpus: () => boolean;
-    hasLexiconAccess: () => boolean;
-    hasParserAccess: () => boolean;
+    hasLexiconAccess: (lexiconUid: string, roles?: string[]) => boolean;
+    hasParserAccess: (parserUid: string, roles?: string[]) => boolean;
+    hasCorpusAccess: (corpusUid: string, roles?: string[]) => boolean;
+    hasAnyParserAccess: () => boolean;
+    hasAnyLexiconAccess: () => boolean;
+    hasAnyCorpusAccess: () => boolean;
 };

package/dist/configs/useLoggedUtils.js

@@ -2,6 +2,15 @@ import { useContext } from 'react';
 import CommonContext from './CommonContext';
 import { logged } from './store/actions';
 import { UserStatus } from './types/User';
+function escapeRegex(s) {
+    return s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
+function roleSegmentForRegex(roles) {
+    if (roles && roles.length > 0) {
+        return `(${roles.map(escapeRegex).join('|')})`;
+    }
+    return '(.*)';
+}
 export const useLoggedUtils = () => {
     const { state, dispatch } = useContext(CommonContext);
     const getLogged = () => {
@@ -24,7 +33,37 @@ export const useLoggedUtils = () => {
             return false;
         return user.permissions.some((permission) => /^ROLE_ADMIN_CORPUS_[\w-]+$/.test(permission));
     };
-    const hasParserAccess = () => {
+    const hasParserAccess = (parserUid, roles) => {
+        if (isSuper())
+            return true;
+        const user = getLogged();
+        if (!user || !user.permissions)
+            return false;
+        const id = escapeRegex(parserUid);
+        const re = new RegExp(`^ROLE_${roleSegmentForRegex(roles)}_PARSER_${id}$`);
+        return user.permissions.some((permission) => re.test(permission));
+    };
+    const hasLexiconAccess = (lexiconUid, roles) => {
+        if (isSuper())
+            return true;
+        const user = getLogged();
+        if (!user || !user.permissions)
+            return false;
+        const id = escapeRegex(lexiconUid);
+        const re = new RegExp(`^ROLE_${roleSegmentForRegex(roles)}_LEXICON_${id}$`);
+        return user.permissions.some((permission) => re.test(permission));
+    };
+    const hasCorpusAccess = (corpusUid, roles) => {
+        if (isSuper())
+            return true;
+        const user = getLogged();
+        if (!user || !user.permissions)
+            return false;
+        const id = escapeRegex(corpusUid);
+        const re = new RegExp(`^ROLE_${roleSegmentForRegex(roles)}_CORPUS_${id}$`);
+        return user.permissions.some((permission) => re.test(permission));
+    };
+    const hasAnyParserAccess = () => {
         if (isSuper())
             return true;
         const user = getLogged();
@@ -32,7 +71,7 @@ export const useLoggedUtils = () => {
             return false;
         return user.permissions.some((permission) => /^ROLE_(.*)_PARSER_[\w-]+$/.test(permission));
     };
-    const hasLexiconAccess = () => {
+    const hasAnyLexiconAccess = () => {
         if (isSuper())
             return true;
         const user = getLogged();
@@ -40,6 +79,14 @@ export const useLoggedUtils = () => {
             return false;
         return user.permissions.some((permission) => /^ROLE_(.*)_LEXICON_[\w-]+$/.test(permission));
     };
+    const hasAnyCorpusAccess = () => {
+        if (isSuper())
+            return true;
+        const user = getLogged();
+        if (!user || !user.permissions)
+            return false;
+        return user.permissions.some((permission) => /^ROLE_(.*)_CORPUS_[\w-]+$/.test(permission));
+    };
     return {
         getLogged,
         isSuper,
@@ -48,5 +95,9 @@ export const useLoggedUtils = () => {
         isAdminOfAnyCorpus,
         hasLexiconAccess,
         hasParserAccess,
+        hasCorpusAccess,
+        hasAnyParserAccess,
+        hasAnyLexiconAccess,
+        hasAnyCorpusAccess,
     };
 };

package/dist/functions/ToolsUtils.d.ts

@@ -13,6 +13,7 @@ export type RedirectPageParams = {
     hasParameter: (corpus: Corpus, param: string) => boolean;
     tool?: PlatformTools;
     ctxPath?: string;
+    sameWindow?: boolean;
 };
 type EditionToolsMenu = {
     parameter: string;
@@ -24,7 +25,7 @@ type EditionToolsMenu = {
 };
 export declare const EDITION_TOOLS: EditionToolsMenu[];
 declare const ToolsUtils: {
-    redirectPage: ({ corpus, uid, hasParameter, tool, ctxPath, }: RedirectPageParams) => void;
+    redirectPage: ({ corpus, uid, hasParameter, tool, ctxPath, sameWindow, }: RedirectPageParams) => void;
     getIcon: (defaultTool?: PlatformTools) => string;
     openDocument: ({ page, corpus, hasParameter, defaultTool, ctxPath, }: OpenDocumentParams) => void;
     getTitle: (defaultTool?: PlatformTools) => string;

package/dist/functions/ToolsUtils.js

@@ -47,34 +47,42 @@ const withCtxPath = (absolutePath, ctxPath) => {
     const path = absolutePath.startsWith('/') ? absolutePath : `/${absolutePath}`;
     return `${base}${path}`;
 };
-const openTranslations = (uid, ctxPath) => {
-    window.open(withCtxPath(`/translation/${uid}`, ctxPath));
+const navigateTo = (path, ctxPath, sameWindow) => {
+    const targetPath = withCtxPath(path, ctxPath);
+    if (sameWindow) {
+        window.location.assign(targetPath);
+        return;
+    }
+    window.open(targetPath);
+};
+const openTranslations = (uid, ctxPath, sameWindow) => {
+    navigateTo(`/translation/${uid}`, ctxPath, sameWindow);
 };
-const openTranscriber = (uid, ctxPath) => {
-    window.open(withCtxPath(`/transcriber/${uid}`, ctxPath));
+const openTranscriber = (uid, ctxPath, sameWindow) => {
+    navigateTo(`/transcriber/${uid}`, ctxPath, sameWindow);
 };
-const openEdictor = (uid, ctxPath) => {
-    window.open(withCtxPath(`/editor/${uid}`, ctxPath));
+const openEdictor = (uid, ctxPath, sameWindow) => {
+    navigateTo(`/editor/${uid}`, ctxPath, sameWindow);
 };
-const openDesign = (uid, ctxPath) => {
-    window.open(withCtxPath(`/editor/box/${uid}`, ctxPath));
+const openDesign = (uid, ctxPath, sameWindow) => {
+    navigateTo(`/editor/box/${uid}`, ctxPath, sameWindow);
 };
-const redirectPage = ({ corpus, uid, hasParameter, tool, ctxPath, }) => {
+const redirectPage = ({ corpus, uid, hasParameter, tool, ctxPath, sameWindow, }) => {
     if (tool) {
-        window.open(withCtxPath(`${EDITION_TOOLS.find((t) => t.name === tool)?.path}/${uid}`, ctxPath));
+        navigateTo(`${EDITION_TOOLS.find((t) => t.name === tool)?.path}/${uid}`, ctxPath, sameWindow);
         return;
     }
     if (hasParameter(corpus, 'useEdictor')) {
-        openEdictor(uid, ctxPath);
+        openEdictor(uid, ctxPath, sameWindow);
     }
     else if (hasParameter(corpus, 'useTranslations')) {
-        openTranslations(uid, ctxPath);
+        openTranslations(uid, ctxPath, sameWindow);
     }
     else if (hasParameter(corpus, 'useDesigner')) {
-        openDesign(uid, ctxPath);
+        openDesign(uid, ctxPath, sameWindow);
     }
     else if (hasParameter(corpus, 'useTranscriber')) {
-        openTranscriber(uid, ctxPath);
+        openTranscriber(uid, ctxPath, sameWindow);
     }
 };
 const openDocument = ({ page, corpus, hasParameter, defaultTool, ctxPath, }) => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tycho-components",
   "private": false,
-  "version": "0.17.2",
+  "version": "0.18.1",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "exports": {