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

…lopment

app/react/V2/Routes/Settings/MenuConfig/MenuConfig.tsx

@@ -5,7 +5,7 @@ import { IncomingHttpHeaders } from 'http';
 import { LoaderFunction, useLoaderData, useRevalidator, useBlocker } from 'react-router-dom';
 import { Row, RowSelectionState } from '@tanstack/react-table';
 import { useSetAtom } from 'jotai';
-import { isEqual } from 'lodash';
+import { cloneDeep, isEqual } from 'lodash';
 import { Translate } from 'app/I18N';
 import * as SettingsAPI from 'app/V2/api/settings';
 import { ConfirmNavigationModal } from 'app/V2/Components/Forms';
@@ -36,7 +36,7 @@ const menuConfigloader =
 const MenuConfig = () => {
   const links = useLoaderData() as Link[];
   const [linkState, setLinkState] = useState(links);
-  const prevLinks = useRef(links);
+  const prevLinks = useRef(cloneDeep(links));
   const [selectedLinks, setSelectedLinks] = useState<RowSelectionState>({});
   const [isSidepanelOpen, setIsSidepanelOpen] = useState(false);
   const setNotifications = useSetAtom(notificationAtom);
@@ -103,7 +103,7 @@ const MenuConfig = () => {
   }, [blocker, setShowModal]);
 
   useEffect(() => {
-    prevLinks.current = links;
+    prevLinks.current = cloneDeep(links);
     setLinkState(links);
   }, [links]);
 

cypress/e2e/settings/menu.cy.ts

@@ -15,7 +15,7 @@ describe('Menu configuration', () => {
     cy.intercept('GET', 'api/settings/links').as('fetchLinks');
   });
 
-  it('tests add links', () => {
+  it('should add links', () => {
     cy.getByTestId('menu-add-link').click();
     cy.get('#link-title').click();
     cy.get('#link-title').type('Link 1', { delay: 0 });
@@ -164,4 +164,14 @@ describe('Menu configuration', () => {
       });
     });
   });
+
+  it('should add a single child', () => {
+    cy.contains('button', 'Add link').click();
+    cy.get('#link-title').click();
+    cy.get('#link-title').type('Child 1', { delay: 0 });
+    cy.get('#link-url').type('www.subrow.com', { delay: 0 });
+    cy.get('#link-group').select('Group 1');
+    cy.getByTestId('menu-form-submit').click();
+    cy.contains('button', 'Save').click();
+  });
 });

package.json

@@ -1,6 +1,6 @@
 {
   "name": "uwazi",
-  "version": "1.185.0-rc2",
+  "version": "1.185.0-rc3",
   "description": "Uwazi is a free, open-source solution for organising, analysing and publishing your documents.",
   "keywords": [
     "react"