Yuki Takei 4 лет назад
Родитель
Сommit
8101138a0b
22 измененных файлов с 42 добавлено и 41 удалено
  1. 1 1
      packages/app/src/client/services/AdminUsersContainer.js
  2. 1 1
      packages/app/src/components/Admin/MarkdownSetting/IndentForm.jsx
  3. 1 1
      packages/app/src/components/Admin/Notification/NotificationSetting.jsx
  4. 1 1
      packages/app/src/components/Admin/Notification/SlackIntegrationNotificationSetting.jsx
  5. 1 1
      packages/app/src/components/Admin/SlackIntegration/OfficialBotSettings.jsx
  6. 1 1
      packages/app/src/components/Fab.jsx
  7. 1 1
      packages/app/src/components/Me/ImageCropModal.jsx
  8. 1 1
      packages/app/src/components/Navbar/AuthorInfo.jsx
  9. 1 1
      packages/app/src/components/Navbar/GrowiSubNavigationSwitcher.jsx
  10. 1 1
      packages/app/src/components/PageCreateModal.jsx
  11. 1 1
      packages/app/src/components/PageEditor.jsx
  12. 1 1
      packages/app/src/components/PageEditorByHackmd.jsx
  13. 1 1
      packages/app/src/components/PageEditorByHackmd/HackmdEditor.jsx
  14. 1 1
      packages/app/src/components/StaffCredit/StaffCredit.jsx
  15. 1 1
      packages/app/src/components/StickyStretchableScroller.jsx
  16. 17 17
      packages/app/src/components/TableOfContents.jsx
  17. 1 1
      packages/app/src/components/User/UserPicture.jsx
  18. 2 1
      packages/app/src/server/routes/apiv3/slack-integration-settings.js
  19. 2 2
      packages/app/src/server/routes/apiv3/slack-integration.js
  20. 1 1
      packages/app/src/server/service/search-delegator/elasticsearch.js
  21. 1 1
      packages/app/src/test/util/path-utils.test.js
  22. 3 3
      packages/app/src/utils/path-utils.ts

+ 1 - 1
packages/app/src/client/services/AdminUsersContainer.js

@@ -1,6 +1,6 @@
 import { Container } from 'unstated';
-import loggerFactory from '~/utils/logger';
 import { debounce } from 'throttle-debounce';
+import loggerFactory from '~/utils/logger';
 
 // eslint-disable-next-line no-unused-vars
 const logger = loggerFactory('growi:services:AdminUserGroupDetailContainer');

+ 1 - 1
packages/app/src/components/Admin/MarkdownSetting/IndentForm.jsx

@@ -3,10 +3,10 @@ import React from 'react';
 
 import PropTypes from 'prop-types';
 import { withTranslation } from 'react-i18next';
-import loggerFactory from '~/utils/logger';
 import {
   UncontrolledDropdown, DropdownToggle, DropdownMenu, DropdownItem,
 } from 'reactstrap';
+import loggerFactory from '~/utils/logger';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
 import { toastSuccess, toastError } from '~/client/util/apiNotification';

+ 1 - 1
packages/app/src/components/Admin/Notification/NotificationSetting.jsx

@@ -1,9 +1,9 @@
 import React, { useMemo, useState } from 'react';
 import PropTypes from 'prop-types';
 
+import { TabContent, TabPane } from 'reactstrap';
 import loggerFactory from '~/utils/logger';
 
-import { TabContent, TabPane } from 'reactstrap';
 import { withUnstatedContainers } from '../../UnstatedUtils';
 import { toastError } from '~/client/util/apiNotification';
 import { toArrayIfNot } from '~/utils/array-utils';

+ 1 - 1
packages/app/src/components/Admin/Notification/SlackIntegrationNotificationSetting.jsx

@@ -1,9 +1,9 @@
 import React, { useMemo, useState } from 'react';
 import PropTypes from 'prop-types';
 
+import { TabContent, TabPane } from 'reactstrap';
 import loggerFactory from '~/utils/logger';
 
-import { TabContent, TabPane } from 'reactstrap';
 import { withUnstatedContainers } from '../../UnstatedUtils';
 import { toastError } from '~/client/util/apiNotification';
 import { toArrayIfNot } from '~/utils/array-utils';

+ 1 - 1
packages/app/src/components/Admin/SlackIntegration/OfficialBotSettings.jsx

@@ -1,7 +1,7 @@
 import React, { useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
-import loggerFactory from '~/utils/logger';
 import { useTranslation } from 'react-i18next';
+import loggerFactory from '~/utils/logger';
 import AppContainer from '~/client/services/AppContainer';
 import { withUnstatedContainers } from '../../UnstatedUtils';
 import { toastSuccess, toastError } from '~/client/util/apiNotification';

+ 1 - 1
packages/app/src/components/Fab.jsx

@@ -1,8 +1,8 @@
 import React, { useState, useCallback, useEffect } from 'react';
 import PropTypes from 'prop-types';
+import StickyEvents from 'sticky-events';
 import loggerFactory from '~/utils/logger';
 
-import StickyEvents from 'sticky-events';
 
 import AppContainer from '~/client/services/AppContainer';
 import NavigationContainer from '~/client/services/NavigationContainer';

+ 1 - 1
packages/app/src/components/Me/ImageCropModal.jsx

@@ -1,6 +1,5 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import loggerFactory from '~/utils/logger';
 import canvasToBlob from 'async-canvas-to-blob';
 
 import {
@@ -11,6 +10,7 @@ import {
 } from 'reactstrap';
 import { withTranslation } from 'react-i18next';
 import ReactCrop from 'react-image-crop';
+import loggerFactory from '~/utils/logger';
 import AppContainer from '~/client/services/AppContainer';
 import { withUnstatedContainers } from '../UnstatedUtils';
 import 'react-image-crop/dist/ReactCrop.css';

+ 1 - 1
packages/app/src/components/Navbar/AuthorInfo.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { userPageRoot } from '~/utils/path-utils';
 import { format } from 'date-fns';
+import { userPageRoot } from '~/utils/path-utils';
 
 import UserPicture from '../User/UserPicture';
 

+ 1 - 1
packages/app/src/components/Navbar/GrowiSubNavigationSwitcher.jsx

@@ -1,9 +1,9 @@
 import React, { useState, useEffect, useCallback } from 'react';
 // import PropTypes from 'prop-types';
-import loggerFactory from '~/utils/logger';
 
 import StickyEvents from 'sticky-events';
 import { debounce } from 'throttle-debounce';
+import loggerFactory from '~/utils/logger';
 
 import GrowiSubNavigation from './GrowiSubNavigation';
 

+ 1 - 1
packages/app/src/components/PageCreateModal.jsx

@@ -7,10 +7,10 @@ import { Modal, ModalHeader, ModalBody } from 'reactstrap';
 import { withTranslation } from 'react-i18next';
 import { format } from 'date-fns';
 
+import { pathUtils } from 'growi-commons';
 import {
   userPageRoot, isCreatablePage, generateEditorPath,
 } from '~/utils/path-utils';
-import { pathUtils } from 'growi-commons';
 
 import AppContainer from '~/client/services/AppContainer';
 import NavigationContainer from '~/client/services/NavigationContainer';

+ 1 - 1
packages/app/src/components/PageEditor.jsx

@@ -1,10 +1,10 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import loggerFactory from '~/utils/logger';
 import detectIndent from 'detect-indent';
 
 import { throttle, debounce } from 'throttle-debounce';
 import { envUtils } from 'growi-commons';
+import loggerFactory from '~/utils/logger';
 
 import AppContainer from '~/client/services/AppContainer';
 import PageContainer from '~/client/services/PageContainer';

+ 1 - 1
packages/app/src/components/PageEditorByHackmd.jsx

@@ -1,8 +1,8 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import { withTranslation } from 'react-i18next';
 import loggerFactory from '~/utils/logger';
 
-import { withTranslation } from 'react-i18next';
 
 import AppContainer from '~/client/services/AppContainer';
 import PageContainer from '~/client/services/PageContainer';

+ 1 - 1
packages/app/src/components/PageEditorByHackmd/HackmdEditor.jsx

@@ -1,8 +1,8 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import connectToChild from 'penpal/lib/connectToChild';
 import loggerFactory from '~/utils/logger';
 
-import connectToChild from 'penpal/lib/connectToChild';
 
 const DEBUG_PENPAL = false;
 

+ 1 - 1
packages/app/src/components/StaffCredit/StaffCredit.jsx

@@ -1,9 +1,9 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import loggerFactory from '~/utils/logger';
 import {
   Modal, ModalBody,
 } from 'reactstrap';
+import loggerFactory from '~/utils/logger';
 import AppContainer from '~/client/services/AppContainer';
 import { withUnstatedContainers } from '../UnstatedUtils';
 

+ 1 - 1
packages/app/src/components/StickyStretchableScroller.jsx

@@ -1,9 +1,9 @@
 import React, { useEffect, useCallback } from 'react';
 import PropTypes from 'prop-types';
-import loggerFactory from '~/utils/logger';
 
 import { debounce } from 'throttle-debounce';
 import StickyEvents from 'sticky-events';
+import loggerFactory from '~/utils/logger';
 
 import NavigationContainer from '~/client/services/NavigationContainer';
 import { withUnstatedContainers } from './UnstatedUtils';

+ 17 - 17
packages/app/src/components/TableOfContents.jsx

@@ -1,8 +1,8 @@
 import React, { useCallback, useEffect } from 'react';
 import PropTypes from 'prop-types';
+import { withTranslation } from 'react-i18next';
 import loggerFactory from '~/utils/logger';
 
-import { withTranslation } from 'react-i18next';
 
 import PageContainer from '~/client/services/PageContainer';
 import NavigationContainer from '~/client/services/NavigationContainer';
@@ -60,22 +60,22 @@ const TableOfContents = (props) => {
       calcViewHeightFunc={calcViewHeight}
     >
       { tocHtml !== ''
-      ? (
-        <div
-          id="revision-toc-content"
-          className="revision-toc-content mb-3"
-          // eslint-disable-next-line react/no-danger
-          dangerouslySetInnerHTML={{ __html: tocHtml }}
-        />
-      )
-      : (
-        <div
-          id="revision-toc-content"
-          className="revision-toc-content mb-2"
-        >
-          <span className="text-muted">({t('page_table_of_contents.empty')})</span>
-        </div>
-      ) }
+        ? (
+          <div
+            id="revision-toc-content"
+            className="revision-toc-content mb-3"
+            // eslint-disable-next-line react/no-danger
+            dangerouslySetInnerHTML={{ __html: tocHtml }}
+          />
+        )
+        : (
+          <div
+            id="revision-toc-content"
+            className="revision-toc-content mb-2"
+          >
+            <span className="text-muted">({t('page_table_of_contents.empty')})</span>
+          </div>
+        ) }
 
     </StickyStretchableScroller>
   );

+ 1 - 1
packages/app/src/components/User/UserPicture.jsx

@@ -1,9 +1,9 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
+import { UncontrolledTooltip } from 'reactstrap';
 import { userPageRoot } from '~/utils/path-utils';
 
-import { UncontrolledTooltip } from 'reactstrap';
 
 const DEFAULT_IMAGE = '/images/icons/user.svg';
 

+ 2 - 1
packages/app/src/server/routes/apiv3/slack-integration-settings.js

@@ -1,9 +1,10 @@
+import loggerFactory from '~/utils/logger';
+
 const mongoose = require('mongoose');
 const express = require('express');
 const { body, query } = require('express-validator');
 const axios = require('axios');
 const urljoin = require('url-join');
-import loggerFactory from '~/utils/logger';
 
 const { getConnectionStatus, getConnectionStatuses, sendSuccessMessage } = require('@growi/slack');
 

+ 2 - 2
packages/app/src/server/routes/apiv3/slack-integration.js

@@ -1,9 +1,9 @@
+import loggerFactory from '~/utils/logger';
+
 const express = require('express');
 const mongoose = require('mongoose');
 const urljoin = require('url-join');
 
-import loggerFactory from '~/utils/logger';
-
 const { verifySlackRequest, generateWebClient } = require('@growi/slack');
 
 const logger = loggerFactory('growi:routes:apiv3:slack-integration');

+ 1 - 1
packages/app/src/server/service/search-delegator/elasticsearch.js

@@ -266,7 +266,7 @@ class ElasticsearchDelegator {
   }
 
   async createIndex(index) {
-    const body = require('@root/resource/search/mappings.json');
+    const body = require('^/resource/search/mappings.json');
     return this.client.indices.create({ index, body });
   }
 

+ 1 - 1
packages/app/src/test/util/path-utils.test.js

@@ -6,7 +6,7 @@ describe('TopPage Path test', () => {
     const result = isTopPage('/');
     expect(result).toBe(true);
   });
-  test('Path is not match string ', () => {
+  test('Path is not match string', () => {
     const result = isTopPage('/test');
     expect(result).toBe(false);
   });

+ 3 - 3
packages/app/src/utils/path-utils.ts

@@ -109,14 +109,14 @@ export const encodeSpaces = (path?:string): string | undefined => {
 
   // Encode SPACE and IDEOGRAPHIC SPACE
   return path.replace(/ /g, '%20').replace(/\u3000/g, '%E3%80%80');
-}
+};
 
 /**
  * Generate editor path
  * @param {string} paths
  * @returns {string}
  */
-export const generateEditorPath=(...paths)=> {
+export const generateEditorPath = (...paths) => {
   const joinedPath = [...paths].join('/');
 
   if (!isCreatablePage(joinedPath)) {
@@ -130,4 +130,4 @@ export const generateEditorPath=(...paths)=> {
   catch (err) {
     throw new Error('Invalid path format');
   }
-}
+};