mod: update version

Author: hetao92

app/config/rules.tsx

@@ -1,62 +1,67 @@
 import React from 'react';
 import { Translation } from '@vesoft-inc/i18n';
-import { MAX_COMMENT_BYTES, NAME_REGEX, POSITIVE_INTEGER_REGEX } from '@app/utils/constant';
+import { MAX_COMMENT_BYTES, POSITIVE_INTEGER_REGEX } from '@app/utils/constant';
 import { getByteLength } from '@app/utils/function';
+
 export const hostRulesFn = () => [
   {
     required: true,
-    message: <Translation formatMessage={'formRules.hostRequired'} />,
+    message: <Translation>
+      {intl => intl.get('formRules.hostRequired')}
+    </Translation>,
   },
 ];
 
 export const usernameRulesFn = () => [
   {
     required: true,
-    message: <Translation formatMessage={'formRules.usernameRequired'} />,
+    message: <Translation>
+      {intl => intl.get('formRules.usernameRequired')}
+    </Translation>,
   },
 ];
 
 export const passwordRulesFn = () => [
   {
     required: true,
-    message: <Translation formatMessage={'formRules.passwordRequired'} />,
+    message: <Translation>
+      {intl => intl.get('formRules.passwordRequired')}
+    </Translation>,
   },
 ];
 
-export const nameRulesFn = () => {
-  const version = sessionStorage.getItem('nebulaVersion');
-  const nameRequired = [
-    {
-      required: true,
-      message: <Translation formatMessage={'formRules.nameRequired'} />,
-    },
-  ];
-  const nameValidate = [
-    {
-      pattern: NAME_REGEX,
-      message: <Translation formatMessage={'formRules.nameValidate'} />,
-    },
-  ];
-  return version?.startsWith('v2') ? [...nameRequired, ...nameValidate] : nameRequired;
-};
+export const nameRulesFn = () => [
+  {
+    required: true,
+    message: <Translation>
+      {intl => intl.get('formRules.nameRequired')}
+    </Translation>,
+  }
+];
 
 export const numberRulesFn = () => [
   {
     pattern: POSITIVE_INTEGER_REGEX,
-    message: <Translation formatMessage={'formRules.numberRequired'} />,
+    message: <Translation>
+      {intl => intl.get('formRules.numberRequired')}
+    </Translation>,
   },
 ];
 
 export const replicaRulesFn = (activeMachineNum) => [
   {
     pattern: POSITIVE_INTEGER_REGEX,
-    message: <Translation formatMessage={'formRules.numberRequired'} />,
+    message: <Translation>
+      {intl => intl.get('formRules.numberRequired')}
+    </Translation>,
   },
   {
     validator(_rule, value, callback) {
       if (value && Number(value) > activeMachineNum) {
         callback(
-          <Translation formatMessage={'formRules.replicaLimit'} options={{ number: activeMachineNum }} />
+          <Translation>
+            {intl => intl.get('formRules.replicaLimit', { number: activeMachineNum })}
+          </Translation>
         );
       }
       callback();
@@ -70,6 +75,8 @@ export const stringByteRulesFn = () => [
     if (byteLength <= MAX_COMMENT_BYTES) {
       return Promise.resolve();
     }
-    return Promise.reject(<Translation formatMessage={'formRules.maxBytes'} options={{ 'max': MAX_COMMENT_BYTES }} />);
+    return Promise.reject(<Translation>
+      {intl => intl.get('formRules.maxBytes', { max: MAX_COMMENT_BYTES })}
+    </Translation>);
   } }
 ];

app/pages/Welcome/index.tsx

@@ -25,8 +25,9 @@ export interface ModuleItem {
   withOrder?: boolean;
 }
 
+const { intl } = getI18n();
+
 export const getModuleList = (): ModuleItem[] => {
-  const { intl } = getI18n();
   return [
     {
       icon: 'icon-studio-nav-schema',
@@ -82,7 +83,6 @@ export interface DocItem {
 }
 
 export const getDocList = (): DocItem[] => {
-  const { intl } = getI18n();
   return [
     {
       title: intl.get('doc.getStarted'),
@@ -105,7 +105,6 @@ export const getDocList = (): DocItem[] => {
 export const shouldAlwaysShowWelcome = () => localStorage.getItem('showWelcome') !== 'false';
 
 const getDatasetList = (): DatasetItem[] => {
-  const { intl } = getI18n();
   return [
     {
       type: 'starter',

app/stores/console.ts

@@ -4,6 +4,8 @@ import { v4 as uuidv4 } from 'uuid';
 import { message } from 'antd';
 import { getI18n } from '@vesoft-inc/i18n';
 
+const { intl } = getI18n();
+
 export const splitQuery = (query: string) => {
   const _query = query.split('\n');
   const result = _query.reduce((acc, cur) => {
@@ -111,7 +113,6 @@ export class ConsoleStore {
     });
   };
   saveFavorite = async (content: string) => {
-    const { intl } = getI18n();
     const res = await service.saveFavorite({ content }, {
       trackEventConfig: {
         category: 'console',
@@ -123,7 +124,6 @@ export class ConsoleStore {
     }
   };
   deleteFavorite = async (id?: string) => {
-    const { intl } = getI18n();
     const res = id !== undefined ? await service.deleteFavorite(id) : await service.deleteAllFavorites();
     if(res.code === 0) {
       message.success(intl.get('common.deleteSuccess'));

app/stores/files.ts

@@ -3,6 +3,7 @@ import service from '@app/config/service';
 import { message } from 'antd';
 import { getI18n } from '@vesoft-inc/i18n';
 import { StudioFile } from '@app/interfaces/import';
+const { intl } = getI18n();
 
 export class FilesStore {
   fileList: any[] = [];
@@ -41,7 +42,6 @@ export class FilesStore {
   };
 
   deleteFile = async (name: string) => {
-    const { intl } = getI18n();
     const res: any = await service.deteleFile({
       filename: name,
     });

app/stores/graph.ts

@@ -11,6 +11,8 @@ import { makeRoundPosition, updateEdgeMap, updateTagMap } from '@app/config/expl
 import TwoGraph from './twoGraph';
 import { getRootStore } from '.';
 const excludesProperty = ['twoGraph', 'graph', 'canvas', 'width', 'height', 'loading'];
+const { intl } = getI18n();
+
 export class GraphStore {
   nowDataMap: IDataMap = {};
   nodes = observable.set([] as NodeObject[], { deep: false });
@@ -367,7 +369,6 @@ export class GraphStore {
   };
 
   checkVertexesExist = async (payload) => {
-    const { intl } = getI18n();
     const { preAddVertexes, inputIds, expand } = payload;
     const preAddIds = preAddVertexes.map((i) => String(i.id));
     const {

app/stores/schema.ts

@@ -10,6 +10,8 @@ import {
   getIndexCreateGQL,
 } from '@app/utils/gql';
 import { message } from 'antd';
+const { intl } = getI18n();
+
 
 const initialSchemaData = {
   edgeTypes: [],
@@ -771,7 +773,6 @@ export class SchemaStore {
       edges: [],
       indexes: [],
     };
-    const { intl } = getI18n();
     try {
       const errMsg = await this.switchSpace(space);
       if(errMsg) {

app/stores/sketchModel.ts

@@ -15,6 +15,7 @@ import { uniqBy } from 'lodash';
 import { MAX_COMMENT_BYTES } from '@app/utils/constant';
 import { getByteLength } from '@app/utils/function';
 import { trackEvent } from '@app/utils/stat';
+const { intl } = getI18n();
 
 interface IHoveringItem {
   data: ISketchNode | ISketchEdge;
@@ -98,7 +99,6 @@ export class SketchStore {
 
   validateSchema = async () => {
     const data = await this.editor?.schema?.getData();
-    const { intl } = getI18n();
     const { nodes, lines } = data;
     const nodesValid = nodes.reduce((flag, node) => this.validate(node, 'node') && flag, true);
     const edgesValid = lines.reduce((flag, line) => this.validate(line, 'edge') && flag, true);

app/utils/http.ts

@@ -18,6 +18,8 @@ export enum HttpResCode {
   ErrUnknown = 90004000,
 }
 
+const { intl } = getI18n();
+
 const service = axios.create({
   transformResponse: [
     data => {
@@ -46,7 +48,6 @@ service.interceptors.response.use(
     return response.data;
   },
   (error: any) => {
-    const { intl } = getI18n();
     if (error.response?.status) {
       const res = error.response.data || {};
       if(res.code !== 0 && res.message) {

config/webpack.base.js

@@ -3,7 +3,7 @@ const webpack = require('webpack');
 const AntdDayjsWebpackPlugin = require('antd-dayjs-webpack-plugin');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const CopyPlugin = require('copy-webpack-plugin');
-const Package = require('../package.json')
+const Package = require('../package.json');
 
 const commonConfig = {
   entry: {