fix: #5 when stream is null page error

slowrookie · slowrookie · commit 53e6c96eed76 · 2022-06-07T23:50:07.000+08:00
diff --git a/api/connection_test.go b/api/connection_test.go
@@ -30,6 +30,23 @@ func (sut *ConnectionSuite) TestOpen() {
 	sut.NotEqual(connection._client, nil)
 }
 
+func (sut *ConnectionSuite) TestConnection() {
+	id := strconv.FormatInt(time.Now().UnixNano(), 10)
+	connection := &Connection{
+		ID:   id,
+		Host: "localhost",
+		Port: 6379,
+	}
+	err := connection.Open()
+	sut.ErrorIs(err, nil)
+	commands := [][]interface{}{
+		{"SELECT", "1"},
+		{"HSET", "hash1", "name3", nil},
+	}
+	_, err = connection.Command(commands)
+	sut.ErrorIs(err, nil)
+}
+
 func (sut *ConnectionSuite) TestScripting() {
 	id := strconv.FormatInt(time.Now().UnixNano(), 10)
 	connection := &Connection{
diff --git a/web/src/components/HashKey.tsx b/web/src/components/HashKey.tsx
@@ -71,7 +71,7 @@ export const HashKey = (props: IHashKeyProps) => {
         });
       });
       setKeyProps(kp => {
-        var scanned = vs.length > search.count ? vs.length : search.count * 1;
+        let scanned = vs.length > search.count ? vs.length : search.count * 1;
         if (search.cursor !== 0) {
           scanned += kp.scanned * 1;
         }
diff --git a/web/src/components/SetKey.tsx b/web/src/components/SetKey.tsx
@@ -86,7 +86,7 @@ export const SetKey = (props: ISetKeyProps) => {
         });
       });
       setKeyProps(kp => {
-        var scanned = vs.length > search.count ? vs.length : search.count * 1;
+        let scanned = vs.length > search.count ? vs.length : search.count * 1;
         if (search.cursor !== 0) {
           scanned += kp.scanned * 1;
         }
diff --git a/web/src/components/StreamKey.tsx b/web/src/components/StreamKey.tsx
@@ -38,8 +38,8 @@ export interface IStreamKey {
   length: number
   values: Array<IStreamKeyItem>
   memoryUsage: number
-  firstTimestamp: number
-  lastTimestamp: number
+  firstTimestamp: number | null
+  lastTimestamp: number | null
 }
 
 const defaultStreamKey: IStreamKey = {
@@ -95,9 +95,13 @@ export const StreamKey = (props: IStreamKeyProps) => {
       const streamInfo = parseArrayToObject(ret[2]);
       setKeyProps(kp => {
         return {
-          ...kp, keyName: keyProps.keyName, TTL: ret[1], length: streamInfo.length, values: vs,
-          firstTimestamp: Number(Object.keys(streamInfo['first-entry'])[0].split("-")[0]),
-          lastTimestamp: Number(Object.keys(streamInfo['last-entry'])[0].split("-")[0])
+          ...kp,
+          keyName: keyProps.keyName,
+          TTL: ret[1],
+          length: streamInfo.length,
+          values: vs,
+          firstTimestamp: streamInfo['first-entry'] ? Number(Object.keys(streamInfo['first-entry'])[0].split("-")[0]) : null,
+          lastTimestamp: streamInfo['last-entry'] ? Number(Object.keys(streamInfo['last-entry'])[0].split("-")[0]) : null
         };
       })
     })
diff --git a/web/src/components/StreamKeySearch.tsx b/web/src/components/StreamKeySearch.tsx
@@ -7,17 +7,17 @@ export interface IStreamKeySearch {
   id: string
   onSearch: (start: string | number, end: string | number, count: number) => void
   length: number
-  firstTimestamp: number
-  lastTimestamp: number
-  defaultCount: number
+  firstTimestamp: number | null
+  lastTimestamp: number | null
+  defaultCount: number | null
 }
 
 export interface IStreamKeySearchCondition {
   start: string | number
   end: string | number
   count: number
-  firstTimestamp: number
-  lastTimestamp: number
+  firstTimestamp: number | null
+  lastTimestamp: number | null
   length: number
 }
 
@@ -32,7 +32,7 @@ export const StreamKeySearch = (props: IStreamKeySearch) => {
   };
 
   const [searchVisible, setSearchVisible] = useState(false),
-    [condition, setCondition] = useState<IStreamKeySearchCondition>({ start: '-', end: '+', count: defaultCount, length, firstTimestamp, lastTimestamp });
+    [condition, setCondition] = useState<IStreamKeySearchCondition>({ start: '-', end: '+', count: defaultCount || 0, length, firstTimestamp, lastTimestamp });
 
   useEffect(() => {
     setCondition(condition => {
@@ -60,11 +60,11 @@ export const StreamKeySearch = (props: IStreamKeySearch) => {
       <Stack tokens={{ childrenGap: 10, padding: 10 }} style={{ minWidth: 300 }}>
 
         <Slider ranged
-          min={condition.firstTimestamp}
-          max={condition.lastTimestamp}
-          defaultLowerValue={condition.firstTimestamp}
-          lowerValue={condition.start === '-' ? condition.firstTimestamp : Number(condition.start)}
-          value={condition.end === '+' ? condition.lastTimestamp : Number(condition.end)}
+          min={condition.firstTimestamp || 0}
+          max={condition.lastTimestamp || 0}
+          defaultLowerValue={condition.firstTimestamp || 0}
+          lowerValue={condition.start === '-' ? (condition.firstTimestamp || 0) : Number(condition.start)}
+          value={condition.end === '+' ? (condition.lastTimestamp || 0) : Number(condition.end)}
           onChange={handleRangeChange}
           showValue={false}
           step={100} />
diff --git a/web/src/components/panel/StreamKeyPanel.tsx b/web/src/components/panel/StreamKeyPanel.tsx
@@ -50,8 +50,7 @@ export const StreamKeyPanel = (props: IStreamKeyPanelProps) => {
   const handleSave = (refresh = false) => {
     setError(undefined);
     setLoading(true);
-
-    const values = JSON.parse(keyItem.value);
+    const values = JSON.parse(keyItem.value);;
     const kvs = Object.keys(values).map(k => { return [k, values[k]]; }).reduce((p, c) => p.concat(c))
     const commands = [['SELECT', db]];
     commands.push(['XADD', keyItem.name, keyItem.id, ...kvs]);
@@ -65,6 +64,27 @@ export const StreamKeyPanel = (props: IStreamKeyPanelProps) => {
       .finally(() => setLoading(false));
   }
 
+  const validValue = () => {
+    if (!keyItem.value) {
+      setValueError(t('Incorrect format'))
+      return;
+    }
+    try {
+      const v = JSON.parse(keyItem.value);
+      if (Array.isArray(v) || typeof v !== 'object') {
+        setValueError(t('Incorrect format'));
+        return;
+      }
+      if (Object.keys(v).length <= 0) {
+        setValueError(t('Incorrect format'));
+        return;
+      }
+    } catch (error) {
+      setValueError(t('Incorrect format'));
+      return;
+    }
+  }
+
   return (
     <Panel
       styles={{ content: { paddingBottom: 0, height: '100%' } }}
@@ -76,7 +96,7 @@ export const StreamKeyPanel = (props: IStreamKeyPanelProps) => {
       onRenderFooterContent={() => {
         if (onlyView) return (<></>);
 
-        var disabled: boolean = !!!keyItem.name || !keyItem.id || !!valueError;
+        let disabled: boolean = !keyItem.name || !keyItem.id || !!valueError;
         return (
           <Stack tokens={{ childrenGap: 10 }} horizontal horizontalAlign="space-evenly">
             <Stack.Item grow={1}><span></span></Stack.Item>
@@ -109,19 +129,10 @@ export const StreamKeyPanel = (props: IStreamKeyPanelProps) => {
           }} />
 
         <Stack.Item grow={1}>
-          <FormatTextField label={t('Value (JSON object)')} multiline rows={10} value={keyItem.value} errorMessage={valueError} onChange={(e, v) => {
-            if (!v) return;
-            setKeyItem({ ...keyItem, value: v });
+          <FormatTextField autoFocus onFocus={validValue} label={t('Value (JSON object)')} multiline rows={10} value={keyItem.value} errorMessage={valueError} onChange={(e, v) => {
+            setKeyItem({ ...keyItem, value: v || '' });
             setValueError("");
-            try {
-              if (Array.isArray(JSON.parse(v))) {
-                setValueError(t('Incorrect format'));
-                return;
-              }
-            } catch (error) {
-              setValueError(t('Incorrect format'));
-              return;
-            }
+            validValue();
           }} />
         </Stack.Item>
 
diff --git a/web/src/components/settings/AppSettings.tsx b/web/src/components/settings/AppSettings.tsx
@@ -47,7 +47,7 @@ export const AppSettings = (props: IAppSettings) => {
             },
           },
           {
-            key: 'localeLanguage', text: t('Lanaguage'), iconProps: { iconName: 'LocaleLanguage', style: { lineHeight: '14px' } }, subMenuProps: {
+            key: 'localeLanguage', text: t('Language'), iconProps: { iconName: 'LocaleLanguage', style: { lineHeight: '14px' } }, subMenuProps: {
               items: Object.keys(supportedLanguages).map(v => {
                 return { key: v, text: supportedLanguages[v], onClick: () => handleChangeLanguage(v) }
               }),
diff --git a/web/src/locales/en_US.json b/web/src/locales/en_US.json
@@ -10,7 +10,7 @@
     "Theme-Light": "Default",
     "Theme-Word": "Word",
     "Theme-Teams": "Teams",
-    "Lanaguage": "Lanaguage",
+    "Language": "Language",
     "About": "About",
     "The test connection to the Redis server is successful!": "The test connection to the Redis server is successful!",
     "The connection to the Redis server is successful!": "The connection to the Redis server is successful!",
@@ -49,6 +49,7 @@
     "Refresh": "Refresh",
     "Disconnect": "Disconnect",
     "Add key": "Add key",
+    "Remove keys": "Remove keys",
     "Delete this key?": "Delete this key?",
     "Filter": "Filter",
     "Size": "Size",
diff --git a/web/src/locales/zh-Hans.json b/web/src/locales/zh-Hans.json
@@ -10,7 +10,7 @@
     "Theme-Light": "默认",
     "Theme-Word": "Word",
     "Theme-Teams": "Teams",
-    "Lanaguage": "语言",
+    "Language": "语言",
     "About": "关于",
     "The test connection to the Redis server is successful!": "测试连接 Redis 服务成功！",
     "The connection to the Redis server is successful!": "连接 Reids 服务器成功！",
@@ -49,6 +49,7 @@
     "Refresh": "刷新",
     "Disconnect": "断开连接",
     "Add key": "添加键",
+    "Remove keys": "删除选中键",
     "Delete this key?": "删除该键？",
     "Filter": "过滤",
     "Size": "大小",
diff --git a/web/src/locales/zh-Hant.json b/web/src/locales/zh-Hant.json
@@ -10,7 +10,7 @@
     "Theme-Light": "亮色主題",
     "Theme-Word": "Word",
     "Theme-Teams": "Teams",
-    "Lanaguage": "語言",
+    "Language": "語言",
     "About": "關於",
     "The test connection to the Redis server is successful!": "與Redis服務器的測試連接成功！",
     "The connection to the Redis server is successful!": "與Redis服務器的連接成功！",
@@ -49,6 +49,7 @@
     "Refresh": "刷新",
     "Disconnect": "斷開連接",
     "Add key": "添加鍵",
+    "Remove keys": "删除選中鍵",
     "Delete this key?": "刪除此鍵嗎?",
     "Filter": "過濾",
     "Size": "大小",

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ export const HashKey = (props: IHashKeyProps) => {`
`71`	`71`	`});`
`72`	`72`	`});`
`73`	`73`	`setKeyProps(kp => {`
`74`		`- var scanned = vs.length > search.count ? vs.length : search.count * 1;`
	`74`	`+ let scanned = vs.length > search.count ? vs.length : search.count * 1;`
`75`	`75`	`if (search.cursor !== 0) {`
`76`	`76`	`scanned += kp.scanned * 1;`
`77`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ export const SetKey = (props: ISetKeyProps) => {`
`86`	`86`	`});`
`87`	`87`	`});`
`88`	`88`	`setKeyProps(kp => {`
`89`		`- var scanned = vs.length > search.count ? vs.length : search.count * 1;`
	`89`	`+ let scanned = vs.length > search.count ? vs.length : search.count * 1;`
`90`	`90`	`if (search.cursor !== 0) {`
`91`	`91`	`scanned += kp.scanned * 1;`
`92`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ export const AppSettings = (props: IAppSettings) => {`
`47`	`47`	`},`
`48`	`48`	`},`
`49`	`49`	`{`
`50`		`- key: 'localeLanguage', text: t('Lanaguage'), iconProps: { iconName: 'LocaleLanguage', style: { lineHeight: '14px' } }, subMenuProps: {`
	`50`	`+ key: 'localeLanguage', text: t('Language'), iconProps: { iconName: 'LocaleLanguage', style: { lineHeight: '14px' } }, subMenuProps: {`
`51`	`51`	`items: Object.keys(supportedLanguages).map(v => {`
`52`	`52`	`return { key: v, text: supportedLanguages[v], onClick: () => handleChangeLanguage(v) }`
`53`	`53`	`}),`