Merge branch 'imprv/89622-refactoring-usePutBackPageModal' into imprv/89624-revalidate-pagelist-on-trash-page

packages/app/src/components/Page/TrashPageAlert.jsx

@@ -52,7 +52,7 @@ const TrashPageAlert = (props) => {
 
   function openPutbackPageModalHandler() {
     const putBackedHandler = (path) => {
-      window.location.href = path;
+      window.location.reload();
     };
     openPutBackPageModal({ pageId, path }, { onPutBacked: putBackedHandler });
   }

packages/app/test/cypress/integration/1-install/install.spec.ts

@@ -52,7 +52,9 @@ context('Installing', () => {
 
     cy.getByTestid('btnSubmit').click();
 
-    cy.screenshot(`${ssPrefix}-installed`);
+    cy.screenshot(`${ssPrefix}-installed`, {
+      blackout: ['.grw-sidebar-content-container'],
+    });
   });
 
 });

packages/app/test/cypress/integration/2-basic-features/access-to-page.spec.ts

@@ -30,10 +30,9 @@ context('Access to page', () => {
   it('/Sandbox with anchor hash is successfully loaded', () => {
     cy.visit('/Sandbox#Headers');
     // eslint-disable-next-line cypress/no-unnecessary-waiting
-    cy.wait(400);
-
-    cy.getByTestid('grw-fab-create-page').should('be.visible');
-    cy.getByTestid('grw-fab-return-to-top').should('be.visible');
+    cy.wait(1000);
+    cy.getByTestid('grw-fab-create-page').should('have.class', 'fadeInUp').should('be.visible');
+    cy.getByTestid('grw-fab-return-to-top').should('have.class', 'fadeInUp').should('be.visible');
     cy.screenshot(`${ssPrefix}-sandbox-headers`);
   });
 

packages/app/test/cypress/integration/3-search/access-to-result-page-directly.spec.ts

@@ -22,7 +22,7 @@ context('Access to search result page directly', () => {
   });
 
   it('/_search with "q" param is successfully loaded', () => {
-    cy.visit('/_search', { qs: { q: 'block labels alerts cards' } });
+    cy.visit('/_search', { qs: { q: 'Bootstrap4 Tips -Diagrams -Math' } });
 
     cy.getByTestid('search-result-list').should('be.visible');
     cy.getByTestid('search-result-content').should('be.visible');
@@ -31,7 +31,7 @@ context('Access to search result page directly', () => {
   });
 
   it('checkboxes behaviors', () => {
-    cy.visit('/_search', { qs: { q: 'block labels alerts cards' } });
+    cy.visit('/_search', { qs: { q: 'Bootstrap4 Tips -Diagrams -Math' } });
 
     cy.getByTestid('search-result-base').should('be.visible');
     cy.getByTestid('search-result-list').should('be.visible');