fix: remove v2.x version compatible logic (#354)

vesoft-inc · Nov 11, 2022 · 44861f9 · 44861f9
1 parent 805a82d
commit 44861f9
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 35 deletions.
diff --git a/app/config/rules.ts b/app/config/rules.ts
@@ -1,4 +1,4 @@
-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';
 import intl from 'react-intl-universal';
 
@@ -23,22 +23,12 @@ export const passwordRulesFn = () => [
   },
 ];
 
-export const nameRulesFn = () => {
-  const version = sessionStorage.getItem('nebulaVersion');
-  const nameRequired = [
-    {
-      required: true,
-      message: intl.get('formRules.nameRequired'),
-    },
-  ];
-  const nameValidate = [
-    {
-      pattern: NAME_REGEX,
-      message: intl.get('formRules.nameValidate'),
-    },
-  ];
-  return version?.startsWith('v2') ? [...nameRequired, ...nameValidate] : nameRequired;
-};
+export const nameRulesFn = () => [
+  {
+    required: true,
+    message: intl.get('formRules.nameRequired'),
+  },
+];
 
 export const numberRulesFn = () => [
   {

diff --git a/app/pages/Console/index.tsx b/app/pages/Console/index.tsx
@@ -37,11 +37,10 @@ interface IProps {
   templateRender?: (data?) => JSX.Element
 }
 const Console = (props: IProps) => {
-  const { schema, console, global } = useStore();
+  const { schema, console } = useStore();
   const { onExplorer, templateRender } = props;
   const { spaces, getSpaces, switchSpace, currentSpace, spaceVidType, updateVidType } = schema;
   const { runGQL, currentGQL, results, runGQLLoading, getParams, update, paramsMap, getFavoriteList } = console;
-  const { nebulaVersion } = global;
   const [isUpDown, setUpDown] = useState(false);
   const [modalVisible, setModalVisible] = useState(false);
   const [modalData, setModalData] = useState<any>(null);
@@ -156,7 +155,7 @@ const Console = (props: IProps) => {
             </div>
           </div>
           <div className={styles.codeInput}>
-            {nebulaVersion?.startsWith('v3') && <CypherParameterBox onSelect={addParam} data={paramsMap} />}
+            <CypherParameterBox onSelect={addParam} data={paramsMap} />
             <CodeMirror
               value={currentGQL}
               onBlur={value => update({ currentGQL: value })}

diff --git a/app/stores/global.ts b/app/stores/global.ts
@@ -5,15 +5,13 @@ import { Base64 } from 'js-base64';
 import intl from 'react-intl-universal';
 import service from '@app/config/service';
 import { BrowserHistory } from 'history';
-import { NebulaVersion } from './types';
 import { getRootStore, resetStore } from '.';
 
 export class GlobalStore {
   history: BrowserHistory;
   _username = cookies.get('nu');
   _host = cookies.get('nh');
   version = process.env.VERSION;
-  nebulaVersion?: NebulaVersion = sessionStorage.getItem('nebulaVersion') as NebulaVersion;
   constructor() {
     makeObservable(this, {
       _username: observable,
@@ -53,7 +51,6 @@ export class GlobalStore {
     resetStore();
     cookies.remove('nh');
     cookies.remove('nu');
-    sessionStorage.removeItem('nebulaVersion');
     this.history.push(`/login${location.search}`);
   };
 
@@ -66,7 +63,7 @@ export class GlobalStore {
     const _host = host.trim().replace(/^https?:\/\//, '');
     const [address, port] = _host.split(':');
     const authorization = Base64.encode(JSON.stringify([username, password]));
-    const { code, data } = (await service.connectDB(
+    const { code } = (await service.connectDB(
       {
         address,
         port: +port,
@@ -85,15 +82,13 @@ export class GlobalStore {
       message.success(intl.get('configServer.success'));
       cookies.set('nh', _host);
       cookies.set('nu', username);
-      sessionStorage.setItem('nebulaVersion', data.version);
-      this.update({ _host, _username: username, nebulaVersion: data.version });
+      this.update({ _host, _username: username });
       return true;
     }
 
     this.update({ _host: '', _username: '' });
     cookies.remove('nh');
     cookies.remove('nu');
-    sessionStorage.removeItem('nebulaVersion');
     return false;
   };
 }

diff --git a/app/stores/types.d.ts b/app/stores/types.d.ts
@@ -1,9 +1,3 @@
-export enum NebulaVersion {
-  V2_5 = 'v2.5',
-  V2_6 = 'v2.6',
-  V3_0 = 'v3.0',
-}
-
 export interface ITransform {
   x: number;
   y: number;

diff --git a/app/utils/constant.ts b/app/utils/constant.ts
@@ -211,6 +211,4 @@ export const EXPLAIN_DATA_TYPE = [
 
 export const MAX_COMMENT_BYTES = 256;
 
-export const NAME_REGEX = /^[a-zA-Z][a-zA-Z0-9_]*$/;
-
 export const POSITIVE_INTEGER_REGEX = /^[1-9]\d*$/g;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -211,6 +211,4 @@ export const EXPLAIN_DATA_TYPE = [

		export const MAX_COMMENT_BYTES = 256;

		export const NAME_REGEX = /^[a-zA-Z][a-zA-Z0-9_]*$/;

		export const POSITIVE_INTEGER_REGEX = /^[1-9]\d*$/g;