#11015 remove more params causing re-renders, fix unit tests

metasfresh · Sep 8, 2021 · 330305f · 330305f
1 parent a4bfd39
commit 330305f
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 27 deletions.
diff --git a/frontend/src/__tests__/containers/DocList.test.js b/frontend/src/__tests__/containers/DocList.test.js
@@ -62,6 +62,10 @@ import attributesData from '../../../test_setup/fixtures/attributes.json';
 
 jest.mock(`../../components/app/QuickActions`);
 
+// so that we don't have collision with other tests running in parallel
+const serverPort = serverTestPort + 2;
+global.config.WS_URL = `ws://localhost:${serverPort}/ws`;
+
 // jest.useFakeTimers();
 
 const middleware = [thunk];
@@ -114,7 +118,7 @@ describe.skip('DocList', () => {
       path: '/ws',
     });
 
-    server.listen(serverTestPort+1); // this is defined in the jestSetup file
+    server.listen(serverPort); // this is defined in the jestSetup file
   });
 
   // afterEach stop server
@@ -152,6 +156,11 @@ describe.skip('DocList', () => {
         .get('/userSession')
         .reply(200, userSessionData);
 
+      nock(config.API_URL)
+        .defaultReplyHeaders({ 'access-control-allow-origin': '*' })
+        .get('/login/isLoggedIn')
+        .reply(200, true);
+
       nock(config.API_URL)
         .defaultReplyHeaders({ 'access-control-allow-origin': '*' })
         .get(`/notifications/websocketEndpoint`)
@@ -255,7 +264,7 @@ describe.skip('DocList', () => {
         );
       });
 
-      await act( async() => {
+      await act(async() => {
         wrapper.update();
 
         await waitFor(async () => {
@@ -264,7 +273,7 @@ describe.skip('DocList', () => {
         });
       });      
 
-      await act( async() => {
+      await act(async() => {
         wrapper.update();
 
         await waitFor(async () => {
@@ -282,7 +291,7 @@ describe.skip('DocList', () => {
 
       const quickActionsId = getQuickActionsId({ windowId: includedWindowId, viewId: includedViewId });
 
-      await act( async() => {
+      await act(async() => {
         waitFor(() => {
           expect(
             store.getState().actionsHandler[quickActionsId]

diff --git a/frontend/src/__tests__/containers/MasterWindow.test.js b/frontend/src/__tests__/containers/MasterWindow.test.js
@@ -142,6 +142,11 @@ describe.skip('MasterWindowContainer', () => {
       .get('/userSession')
       .reply(200, userSessionData);
 
+    nock(config.API_URL)
+      .defaultReplyHeaders({ 'access-control-allow-origin': '*' })
+      .get('/login/isLoggedIn')
+      .reply(200, true);
+
     nock(config.API_URL)
       .defaultReplyHeaders({ 'access-control-allow-origin': '*' })
       .get(`/notifications/websocketEndpoint`)

diff --git a/frontend/src/containers/Dashboard.js b/frontend/src/containers/Dashboard.js
@@ -37,27 +37,27 @@ export class Dashboard extends Component {
     rawModal: PropTypes.any,
   };
 
-  componentDidUpdate() {
-    // TODO: Resolve this hotfix
-    return;
+  // componentDidUpdate() {
+  // TODO: Resolve this hotfix
+  // return;
 
-    /*
-        const { me } = this.props;
+  /*
+      const { me } = this.props;
 
-        if (me) {
-            let docIntroHints;
+      if (me) {
+          let docIntroHints;
 
-            if (Array.isArray(introHints['default'])) {
-                docIntroHints = introHints['default'];
-            }
+          if (Array.isArray(introHints['default'])) {
+              docIntroHints = introHints['default'];
+          }
 
-            this.setState({
-                hintsEnabled: (docIntroHints && (docIntroHints.length > 0)),
-                introHints: docIntroHints,
-            });
-        }
-        */
-  }
+          this.setState({
+              hintsEnabled: (docIntroHints && (docIntroHints.length > 0)),
+              introHints: docIntroHints,
+          });
+      }
+      */
+  // }
 
   toggleEditMode = () => {
     this.setState((prevState) => ({ editmode: !prevState.editmode }));

diff --git a/frontend/src/containers/DocList.js b/frontend/src/containers/DocList.js
@@ -50,10 +50,10 @@ class DocList extends PureComponent {
    * @summary Update the url with query params if needed (ie add viewId, page etc)
    */
   updateUriCallback = (updatedQuery) => {
-    const { query } = this.props;
+    const { query, pathname } = this.props;
     const { viewId } = updatedQuery;
 
-    viewId && updateUri(location.pathname, query, updatedQuery);
+    viewId && updateUri(pathname, query, updatedQuery);
   };
 
   render() {
@@ -160,7 +160,7 @@ class DocList extends PureComponent {
  * @prop {object} query - routing query
  * @prop {object} rawModal
  * @prop {string} windowId
- * @prop {object} location
+ * @prop {string} pathname
  */
 DocList.propTypes = {
   includedView: PropTypes.object,
@@ -170,7 +170,7 @@ DocList.propTypes = {
   rawModal: PropTypes.object.isRequired,
   windowId: PropTypes.string,
   getWindowBreadcrumb: PropTypes.func.isRequired,
-  location: PropTypes.object.isRequired,
+  pathname: PropTypes.string.isRequired,
   query: PropTypes.object.isRequired,
 };
 

diff --git a/frontend/src/routes/KeyRoutes.js b/frontend/src/routes/KeyRoutes.js
@@ -43,13 +43,15 @@ function queriesAreEqual(prevProps, nextProps) {
  * @description Route for the document's lists
  */
 const RawDocListRoute = ({ location, match }) => {
-  const { search } = location;
+  const { search, pathname } = location;
   const { params } = match;
   const query = queryString.parse(search, {
     ignoreQueryPrefix: true,
   });
 
-  return <DocList query={query} windowId={params.windowId} />;
+  return (
+    <DocList query={query} windowId={params.windowId} pathname={pathname} />
+  );
 };
 
 RawDocListRoute.propTypes = {