Merge branch 'fix/105459-vrt-3-dots-button-dropdown-menu-in-pagelist' of https://github.com/weseek/growi into fix/105459-vrt-3-dots-button-dropdown-menu-in-pagelist

packages/app/public/static/locales/ja_JP/translation.json

@@ -882,8 +882,8 @@
       "attrMapId": "ID",
       "attrMapUsername": "ユーザー名",
       "attrMapMail": "メールアドレス",
-      "attrMapFirstName": "姓",
-      "attrMapLastName": "名",
+      "attrMapFirstName": "名",
+      "attrMapLastName": "姓",
       "ABLCRule": "ルール"
     }
   },

packages/app/test/cypress/integration/20-basic-features/access-to-pagelist.spec.ts

@@ -87,6 +87,7 @@ context('Access to timeline', () => {
     cy.getByTestid('page-accessories-modal').parent().should('have.class','show').within(() => {
       cy.get('.nav-title > li').eq(1).find('a').click();
     });
+    cy.get('#wiki').should('be.visible'); // wait for rendering
     cy.screenshot(`${ssPrefix}1-timeline-list`, {capture: 'viewport'});
   });
 

packages/app/test/cypress/integration/21-basic-features-for-guest/access-to-page.spec.ts

@@ -11,6 +11,9 @@ context('Access to page by guest', () => {
     cy.visit('/Sandbox#Headers');
     cy.collapseSidebar(true, true);
 
+    // eslint-disable-next-line cypress/no-unnecessary-waiting
+    cy.wait(500);
+
     // hide fab
     cy.getByTestid('grw-fab-container').invoke('attr', 'style', 'display: none');
 
@@ -31,6 +34,10 @@ context('Access to page by guest', () => {
   it('/Sandbox with edit is successfully loaded', () => {
     cy.visit('/Sandbox#edit');
     cy.collapseSidebar(true, true);
+
+    // eslint-disable-next-line cypress/no-unnecessary-waiting
+    cy.wait(500);
+
     cy.screenshot(`${ssPrefix}-sandbox-edit-page`);
   })
 

packages/app/test/cypress/integration/30-search/search.spec.ts

@@ -103,10 +103,12 @@ context('Search all pages', () => {
     cy.getByTestid('search-result-list').should('be.visible');
     cy.getByTestid('search-result-content').should('be.visible');
     cy.get('#wiki').should('be.visible');
-    // for avoid mismatch by auto scrolling
-    cy.get('.search-result-content-body-container').scrollTo('top');
     // force to add 'active' to pass VRT: https://github.com/weseek/growi/pull/6603
     cy.getByTestid('page-list-item-L').first().invoke('addClass', 'active');
+    // for avoid mismatch by auto scrolling
+    cy.get('.search-result-content-body-container').scrollTo('top');
+    // eslint-disable-next-line cypress/no-unnecessary-waiting
+    cy.wait(1500);
     cy.screenshot(`${ssPrefix}3-search-page-results`, { capture: 'viewport'});
 
     cy.getByTestid('open-page-item-control-btn').eq(1).click();