Página Principal Explorar Ajuda
Iniciar Sessão
wiki
/
weseek__growi
mirror de https://github.com/weseek/growi
2
0
Fork 0
Ficheiros Problemas 0 Wiki
Ver Fonte

Merge pull request #6986 from weseek/fix/109444-normalize-vrt

fix: Normalize VRT (20-basic-features/access-to-page.spec.ts/access-to-special-pages--tags.png)
Shun Miyazawa há 3 anos atrás
pai
36c393c89f c5e40db845
commit
e84f34866d
2 ficheiros alterados com 32 adições e 9 exclusões
Visão Unificada Mostrar Estatísticas Diff
  1. 20 0
      packages/app/src/pages/tags.page.tsx
  2. 12 9
      packages/app/test/cypress/integration/20-basic-features/access-to-page.spec.ts

+ 20 - 0
packages/app/src/pages/tags.page.tsx
Ver Ficheiro 

@@ -7,10 +7,14 @@ import dynamic from 'next/dynamic';
 
 import Head from 'next/head';
 
 import Head from 'next/head';
 
 
 
 import type { CrowiRequest } from '~/interfaces/crowi-request';
 
 import type { CrowiRequest } from '~/interfaces/crowi-request';
 
+import type { ISidebarConfig } from '~/interfaces/sidebar-config';
 
 import type { IDataTagCount } from '~/interfaces/tag';
 
 import type { IDataTagCount } from '~/interfaces/tag';
 
 import type { IUserUISettings } from '~/interfaces/user-ui-settings';
 
 import type { IUserUISettings } from '~/interfaces/user-ui-settings';
 
 import type { UserUISettingsModel } from '~/server/models/user-ui-settings';
 
 import type { UserUISettingsModel } from '~/server/models/user-ui-settings';
 
 import { useSWRxTagsList } from '~/stores/tag';
 
 import { useSWRxTagsList } from '~/stores/tag';
 
+import {
 
+  usePreferDrawerModeByUser, usePreferDrawerModeOnEditByUser, useSidebarCollapsed, useCurrentSidebarContents, useCurrentProductNavWidth,
 
+} from '~/stores/ui';
 
 
 
 import { BasicLayout } from '../components/Layout/BasicLayout';
 
 import { BasicLayout } from '../components/Layout/BasicLayout';
 
 import {
 
 import {
 
@@ -30,7 +34,12 @@ type Props = CommonProps & {
 
   isSearchServiceConfigured: boolean,
 
   isSearchServiceConfigured: boolean,
 
   isSearchServiceReachable: boolean,
 
   isSearchServiceReachable: boolean,
 
   isSearchScopeChildrenAsDefault: boolean,
 
   isSearchScopeChildrenAsDefault: boolean,
 
+
 
+  // ui
 
   userUISettings?: IUserUISettings
 
   userUISettings?: IUserUISettings
 
+
 
+  // sidebar
 
+  sidebarConfig: ISidebarConfig,
 
 };
 
 };
 
 
 
 const TagList = dynamic(() => import('~/components/TagList'), { ssr: false });
 
 const TagList = dynamic(() => import('~/components/TagList'), { ssr: false });
 
@@ -58,6 +67,12 @@ const TagPage: NextPage<CommonProps> = (props: Props) => {
 
   useIsSearchServiceReachable(props.isSearchServiceReachable);
 
   useIsSearchServiceReachable(props.isSearchServiceReachable);
 
   useIsSearchScopeChildrenAsDefault(props.isSearchScopeChildrenAsDefault);
 
   useIsSearchScopeChildrenAsDefault(props.isSearchScopeChildrenAsDefault);
 
 
 
+  usePreferDrawerModeByUser(props.userUISettings?.preferDrawerModeByUser ?? props.sidebarConfig.isSidebarDrawerMode);
 
+  usePreferDrawerModeOnEditByUser(props.userUISettings?.preferDrawerModeOnEditByUser);
 
+  useSidebarCollapsed(props.userUISettings?.isSidebarCollapsed ?? props.sidebarConfig.isSidebarClosedAtDockMode);
 
+  useCurrentSidebarContents(props.userUISettings?.currentSidebarContents);
 
+  useCurrentProductNavWidth(props.userUISettings?.currentProductNavWidth);
 
+
 
   return (
 
   return (
 
     <>
 
     <>
 
       <Head>
 
       <Head>
 
@@ -117,6 +132,11 @@ function injectServerConfigurations(context: GetServerSidePropsContext, props: P
 
   props.isSearchServiceConfigured = searchService.isConfigured;
 
   props.isSearchServiceConfigured = searchService.isConfigured;
 
   props.isSearchServiceReachable = searchService.isReachable;
 
   props.isSearchServiceReachable = searchService.isReachable;
 
   props.isSearchScopeChildrenAsDefault = configManager.getConfig('crowi', 'customize:isSearchScopeChildrenAsDefault');
 
   props.isSearchScopeChildrenAsDefault = configManager.getConfig('crowi', 'customize:isSearchScopeChildrenAsDefault');
 
+
 
+  props.sidebarConfig = {
 
+    isSidebarDrawerMode: configManager.getConfig('crowi', 'customize:isSidebarDrawerMode'),
 
+    isSidebarClosedAtDockMode: configManager.getConfig('crowi', 'customize:isSidebarClosedAtDockMode'),
 
+  };
 
 }
 
 }
 
 
 
 export const getServerSideProps: GetServerSideProps = async(context: GetServerSidePropsContext) => {
 
 export const getServerSideProps: GetServerSideProps = async(context: GetServerSidePropsContext) => {

+ 12 - 9
packages/app/test/cypress/integration/20-basic-features/access-to-page.spec.ts
Ver Ficheiro 

@@ -119,19 +119,22 @@ context('Access to special pages', () => {
 
     cy.screenshot(`${ssPrefix}-trash`);
 
     cy.screenshot(`${ssPrefix}-trash`);
 
   });
 
   });
 
 
 
-  it('/tags is successfully loaded', () => {
 
-
 
+  it('/tags is successfully loaded', { scrollBehavior: false } ,() => {
 
     // open sidebar
 
     // open sidebar
 
-    cy.collapseSidebar(false);
 
+    // cy.collapseSidebar(false);
 
 
 
     cy.visit('/tags');
 
     cy.visit('/tags');
 
-    // select tags
 
-    cy.getByTestid('grw-sidebar-nav-primary-tags').click();
 
-    cy.getByTestid('grw-sidebar-content-tags').should('be.visible');
 
-    cy.getByTestid('grw-tags-list').should('be.visible');
 
-    cy.getByTestid('grw-tags-list').contains('You have no tag, You can set tags on pages');
 
 
 
-    cy.getByTestid('tags-page').should('be.visible');
 
+    // cy.getByTestid('grw-sidebar-content-tags').within(() => {
 
+    //   cy.getByTestid('grw-tags-list').should('be.visible');
 
+    //   cy.getByTestid('grw-tags-list').contains('You have no tag, You can set tags on pages');
 
+    // })
 
+
 
+    cy.getByTestid('tags-page').within(() => {
 
+      cy.getByTestid('grw-tags-list').should('be.visible');
 
+      cy.getByTestid('grw-tags-list').contains('You have no tag, You can set tags on pages');
 
+    });
 
+
 
     cy.screenshot(`${ssPrefix}-tags`);
 
     cy.screenshot(`${ssPrefix}-tags`);
 
   });
 
   });