Merge branch 'development' of https://github.com/huridocs/uwazi into …

…4850/add-graceful-shutdown-to-worker
huridocs · Oct 24, 2024 · 29750d0 · 29750d0
2 parents 8df7ff1 + e3368a9
commit 29750d0
Show file tree

Hide file tree

Showing 41 changed files with 1,012 additions and 197 deletions.
diff --git a/app/react/App/App.js b/app/react/App/App.js
@@ -1,21 +1,21 @@
+/* eslint-disable import/no-named-as-default */
 import React, { useState, useMemo } from 'react';
 import PropTypes from 'prop-types';
 import { Outlet, useLocation, useParams } from 'react-router-dom';
-import { useSetAtom } from 'jotai';
+import { useAtom } from 'jotai';
 import Notifications from 'app/Notifications';
 import Cookiepopup from 'app/App/Cookiepopup';
 import { TranslateForm, t } from 'app/I18N';
 import { Icon } from 'UI';
 import { socket } from 'app/socket';
 import { NotificationsContainer } from 'V2/Components/UI';
-import { Matomo } from 'app/V2/Components/Analitycs';
+import { Matomo, CleanInsights } from 'app/V2/Components/Analitycs';
 import { settingsAtom } from 'V2/atoms/settingsAtom';
 import Confirm from './Confirm';
 import { Menu } from './Menu';
 import { AppMainContext } from './AppMainContext';
 import SiteName from './SiteName';
 import GoogleAnalytics from './GoogleAnalytics';
-import { CleanInsights } from 'app/V2/Components/Analitycs';
 import 'react-widgets/dist/css/react-widgets.css';
 import 'bootstrap/dist/css/bootstrap.css';
 import 'nprogress/nprogress.css';
@@ -27,13 +27,15 @@ import 'flowbite';
 const App = ({ customParams }) => {
   const [showMenu, setShowMenu] = useState(false);
   const [confirmOptions, setConfirmOptions] = useState({});
-  const setSettings = useSetAtom(settingsAtom);
+  const [settings, setSettings] = useAtom(settingsAtom);
 
   const location = useLocation();
   const params = useParams();
   const sharedId = params.sharedId || customParams?.sharedId;
+
+  const possibleLanguages = settings.languages?.map(l => l.key) || [];
   const shouldAddAppClassName =
-    ['/', `/${params.lang}/`].includes(location.pathname) ||
+    ['/', ...possibleLanguages.map(lang => `/${lang}/`)].includes(location.pathname) ||
     location.pathname.match(/\/page\/.*\/.*/g) ||
     location.pathname.match(/\/entity\/.*/g);
 
@@ -58,8 +60,8 @@ const App = ({ customParams }) => {
 
   const appClassName = shouldAddAppClassName && sharedId ? `pageId_${sharedId}` : '';
 
-  socket.on('updateSettings', settings => {
-    setSettings(settings);
+  socket.on('updateSettings', _settings => {
+    setSettings(_settings);
   });
 
   return (

diff --git a/app/react/App/styles/globals.css b/app/react/App/styles/globals.css
@@ -1827,6 +1827,13 @@ input[type="range"]::-ms-fill-lower {
   margin-top: 1.5rem;
 }
 
+.line-clamp-2 {
+  overflow: hidden;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+}
+
 .block {
   display: block;
 }
@@ -1867,6 +1874,16 @@ input[type="range"]::-ms-fill-lower {
   display: none;
 }
 
+.size-\[20px\] {
+  width: 20px;
+  height: 20px;
+}
+
+.size-\[28px\] {
+  width: 28px;
+  height: 28px;
+}
+
 .h-10 {
   height: 2.5rem;
 }
@@ -2133,6 +2150,10 @@ input[type="range"]::-ms-fill-lower {
   width: 75%;
 }
 
+.w-\[105px\] {
+  width: 105px;
+}
+
 .w-\[17px\] {
   width: 17px;
 }
@@ -2159,6 +2180,14 @@ input[type="range"]::-ms-fill-lower {
   width: max-content;
 }
 
+.w-\[120px\] {
+  width: 120px;
+}
+
+.w-5\/6 {
+  width: 83.333333%;
+}
+
 .min-w-20 {
   min-width: 5rem;
 }

diff --git a/app/react/Documents/components/DocumentSidePanel.js b/app/react/Documents/components/DocumentSidePanel.js
@@ -794,7 +794,7 @@ DocumentSidePanel.propTypes = {
     search: PropTypes.string,
   }).isRequired,
   navigate: PropTypes.func.isRequired,
-  selectedDocument: PropTypes.instanceOf(Immutable),
+  selectedDocument: PropTypes.instanceOf(Immutable.Map),
   // relationships v2
   newRelationshipsEnabled: PropTypes.bool,
 };

diff --git a/app/react/Routes.tsx b/app/react/Routes.tsx
@@ -51,6 +51,14 @@ import {
   ParagraphExtractorDashboard,
   ParagraphExtractorLoader,
 } from 'app/V2/Routes/Settings/ParagraphExtraction/ParagraphExtraction';
+import {
+  PXEntityDashboard,
+  PXEntityLoader,
+} from 'app/V2/Routes/Settings/ParagraphExtraction/PXEntities';
+import {
+  PXParagraphDashboard,
+  PXParagraphLoader,
+} from 'app/V2/Routes/Settings/ParagraphExtraction/PXParagraphs';
 import {
   loggedInUsersRoute,
   adminsOnlyRoute,
@@ -142,12 +150,22 @@ const getRoutesLayout = (
           }
         />
       </Route>
-      <Route path="paragraph_extraction">
+      <Route path="paragraph-extraction">
         <Route
           loader={ParagraphExtractorLoader(headers)}
           index
           element={adminsOnlyRoute(<ParagraphExtractorDashboard />)}
         />
+        <Route
+          loader={PXEntityLoader(headers)}
+          path=":extractorId/entities"
+          element={adminsOnlyRoute(<PXEntityDashboard />)}
+        />
+        <Route
+          loader={PXParagraphLoader(headers)}
+          path=":extractorId/entities/:entityId/paragraphs"
+          element={adminsOnlyRoute(<PXParagraphDashboard />)}
+        />
       </Route>
       <Route path="relationship-types">
         <Route
@@ -214,20 +232,25 @@ const getRoutesLayout = (
   </Route>
 );
 
+const languageLayout = (langKey: string, layout: React.JSX.Element) => (
+  <Route key={langKey} path={langKey}>
+    {layout}
+    <Route path="*" element={<GeneralError />} />
+  </Route>
+);
+
 const getRoutes = (
   settings: ClientSettings | undefined,
   userId: string | undefined,
   headers?: IncomingHttpHeaders
 ) => {
   const { element, parameters } = getIndexElement(settings, userId);
   const layout = getRoutesLayout(settings, element, headers);
+  const languageKeys = settings?.languages?.map(lang => lang.key) || [];
   return createRoutesFromElements(
     <Route path="/" element={<App customParams={parameters} />}>
       {layout}
-      <Route path="/:lang">
-        {layout}
-        <Route path="*" element={<GeneralError />} />
-      </Route>
+      {languageKeys.map(langKey => languageLayout(langKey, layout))}
       <Route path="*" element={<GeneralError />} />
     </Route>
   );

diff --git a/app/react/Settings/components/SettingsNavigation.tsx b/app/react/Settings/components/SettingsNavigation.tsx
@@ -84,7 +84,7 @@ const SettingsNavigationComponent = ({ allowcustomJS }: { allowcustomJS: boolean
         <FeatureToggle feature="paragraphExtraction">
           <NeedAuthorization roles={['admin', 'editor']}>
             <I18NLink
-              to="settings/paragraph_extraction"
+              to="settings/paragraph-extraction"
               activeclassname="active"
               className="list-group-item"
             >

diff --git a/app/react/V2/Components/Forms/specs/MultiselectList.cy.tsx b/app/react/V2/Components/Forms/specs/MultiselectList.cy.tsx
@@ -224,7 +224,6 @@ describe('MultiselectList.cy.tsx', () => {
     });
   });
 
-  // add blank state test
   describe('blank state property', () => {
     it('should show blank state property if there is no items passed to the component', () => {
       cy.viewport(450, 650);

diff --git a/app/react/V2/Routes/Settings/Pages/PageEditor.tsx b/app/react/V2/Routes/Settings/Pages/PageEditor.tsx
@@ -31,7 +31,7 @@ const pageEditorLoader =
   (headers?: IncomingHttpHeaders): LoaderFunction =>
   async ({ params }) => {
     if (params.sharedId) {
-      const page = await pagesAPI.getBySharedId(params.sharedId, params.lang || 'en', headers);
+      const page = await pagesAPI.getBySharedId(params.sharedId, headers);
 
       return page;
     }
@@ -136,8 +136,8 @@ const PageEditor = () => {
             <Tabs.Tab id="Basic" label={<Translate>Basic</Translate>}>
               <form>
                 <input className="hidden" {...register('sharedId')} />
-                <div className="flex flex-col gap-4 max-w-2xl">
-                  <div className="flex gap-4 items-center">
+                <div className="flex flex-col max-w-2xl gap-4">
+                  <div className="flex items-center gap-4">
                     <Translate className="font-bold">
                       Enable this page to be used as an entity view page:
                     </Translate>
@@ -162,7 +162,7 @@ const PageEditor = () => {
                         : ''
                     }
                     label={<Translate>URL</Translate>}
-                    className="mb-4 w-full"
+                    className="w-full mb-4"
                     id="page-url"
                   />
 
@@ -184,9 +184,9 @@ const PageEditor = () => {
             </Tabs.Tab>
 
             <Tabs.Tab id="Code" key="html" label={<Translate>Markdown</Translate>}>
-              <div className="flex flex-col gap-2 h-full">
+              <div className="flex flex-col h-full gap-2">
                 <HTMLNotification />
-                <div className="pt-2 h-full">
+                <div className="h-full pt-2">
                   <CodeEditor
                     language="html"
                     intialValue={page.metadata?.content}
@@ -206,9 +206,9 @@ const PageEditor = () => {
             </Tabs.Tab>
 
             <Tabs.Tab id="Advanced" label={<Translate>Javascript</Translate>}>
-              <div className="flex flex-col gap-2 h-full">
+              <div className="flex flex-col h-full gap-2">
                 <JSNotification />
-                <div className="pt-2 h-full">
+                <div className="h-full pt-2">
                   <CodeEditor
                     language="javascript"
                     intialValue={page.metadata?.script}
@@ -230,7 +230,7 @@ const PageEditor = () => {
         </SettingsContent.Body>
 
         <SettingsContent.Footer>
-          <div className="flex gap-2 justify-end">
+          <div className="flex justify-end gap-2">
             <Link to="/settings/pages">
               <Button styling="light" disabled={isSubmitting}>
                 <Translate>Cancel</Translate>

diff --git a/app/react/V2/Routes/Settings/Pages/PagesList.tsx b/app/react/V2/Routes/Settings/Pages/PagesList.tsx
@@ -1,6 +1,6 @@
 /* eslint-disable react/no-multi-comp */
 import React, { useState } from 'react';
-import { Link, LoaderFunction, useLoaderData, useParams, useRevalidator } from 'react-router-dom';
+import { Link, LoaderFunction, useLoaderData, useRevalidator } from 'react-router-dom';
 import { createColumnHelper } from '@tanstack/react-table';
 import { IncomingHttpHeaders } from 'http';
 import { useSetAtom } from 'jotai';
@@ -26,8 +26,8 @@ type TablePage = Page & { rowId: string };
 
 const pagesListLoader =
   (headers?: IncomingHttpHeaders): LoaderFunction =>
-  async ({ params }) =>
-    (await pagesAPI.get(params.lang || 'en', headers)).map(page => ({ ...page, rowId: page._id }));
+  async () =>
+    (await pagesAPI.get(headers)).map(page => ({ ...page, rowId: page._id }));
 
 const deletionNotification: (hasErrors: boolean) => notificationAtomType = hasErrors => ({
   type: !hasErrors ? 'success' : 'error',
@@ -45,7 +45,6 @@ const PagesList = () => {
   const [showModal, setShowModal] = useState(false);
   const pages = useLoaderData() as TablePage[];
   const revalidator = useRevalidator();
-  const params = useParams();
   const setNotifications = useSetAtom(notificationAtom);
 
   const deleteSelected = async () => {
@@ -112,7 +111,7 @@ const PagesList = () => {
         </SettingsContent.Body>
         <SettingsContent.Footer className={selectedPages.length ? 'bg-primary-50' : ''}>
           {selectedPages.length > 0 && (
-            <div className="flex gap-2 items-center">
+            <div className="flex items-center gap-2">
               <Button
                 type="button"
                 onClick={confirmDeletion}
@@ -128,7 +127,7 @@ const PagesList = () => {
           {selectedPages.length === 0 && (
             <div className="flex justify-between w-full">
               <div className="flex gap-2">
-                <Link to={`/${params.lang || 'en'}/settings/pages/page`}>
+                <Link to="/settings/pages/page">
                   <Button styling="solid" color="primary" type="button">
                     <Translate>Add page</Translate>
                   </Button>

diff --git a/app/react/V2/Routes/Settings/Pages/components/PageListTable.tsx b/app/react/V2/Routes/Settings/Pages/components/PageListTable.tsx
@@ -19,17 +19,13 @@ const ActionCell = ({ cell }: CellContext<TablePage, string>) => {
   const isEntityView = cell.row.original.entityView;
 
   return (
-    <div className="flex gap-2 justify-end">
-      <Link
-        to={`/${cell.row.original.language}/${pageUrl}`}
-        target="_blank"
-        aria-disabled={isEntityView}
-      >
+    <div className="flex justify-end gap-2">
+      <Link to={`/${pageUrl}`} target="_blank" aria-disabled={isEntityView}>
         <Button styling="light" disabled={isEntityView}>
           <Translate>View</Translate>
         </Button>
       </Link>
-      <Link to={`/${cell.row.original.language}/settings/pages/page/${cell.getValue()}`}>
+      <Link to={`/settings/pages/page/${cell.getValue()}`}>
         <Button styling="light">
           <Translate>Edit</Translate>
         </Button>
@@ -54,7 +50,7 @@ const UrlCell = ({ cell }: CellContext<TablePage, string>) => {
 };
 
 const List = ({ items }: { items: TablePage[] }) => (
-  <ul className="flex flex-wrap gap-8 max-w-md list-disc list-inside">
+  <ul className="flex flex-wrap max-w-md gap-8 list-disc list-inside">
     {items.map(item => (
       <li key={item._id}>{item.title}</li>
     ))}