Merge pull request #1050 from RedisInsight/main

a new release candidate

Author: egor-zalenski

redisinsight/ui/src/assets/img/icons/raw_mode.svg

@@ -239,15 +239,15 @@ const QueryCardHeader = (props: Props) => {
                   position="bottom"
                 >
                   <EuiTextColor className={cx(styles.timeText, styles.mode)}>
-                    -R
+                    -r
                   </EuiTextColor>
                 </EuiToolTip>
               )}
             </EuiTextColor>
           )}
           {!!summaryText && !isOpen && (
             <EuiTextColor className={styles.summaryText} component="div">
-              {truncateText(summaryText, 17)}
+              {truncateText(summaryText, 13)}
             </EuiTextColor>
           )}
         </EuiFlexItem>

redisinsight/ui/src/components/query-card/QueryCardHeader/QueryCardHeader.tsx

@@ -73,7 +73,7 @@ $marginIcon: 12px;
 }
 
 .time {
-  max-width: 115px;
+  max-width: 117px;
   position: relative;
   height: 18px;
 }
@@ -86,13 +86,13 @@ $marginIcon: 12px;
   font: normal normal normal 12px/16px Graphik, sans-serif;
   letter-spacing: -0.12px;
   color: var(--euiColorMediumShade) !important;
-  min-width: 109px;
+  min-width: 126px;
   text-align: left;
 }
 
 .summaryText {
   position: absolute;
-  right: -120px;
+  right: -142px;
 }
 
 .extraInfo {

redisinsight/ui/src/components/query-card/QueryCardHeader/styles.module.scss

@@ -347,7 +347,7 @@ const HashDetails = (props: Props) => {
                   }}
                   disabled={updateLoading}
                   inputRef={textAreaRef}
-                  className={styles.textArea}
+                  className={cx(styles.textArea, { [styles.areaWarning]: disabled })}
                   data-testid="hash-value-editor"
                 />
               </InlineItemEditor>

redisinsight/ui/src/pages/browser/components/hash-details/HashDetails.tsx

@@ -18,5 +18,13 @@
     margin: -8px -6px -8px -20px !important;
     height: calc(100% + 16px) !important;
     min-width: calc(100% + 120px) !important;
+
+    &:focus {
+      background-image: none !important;
+    }
+
+    &.areaWarning {
+      border-color: var(--euiColorWarningLight) !important;
+    }
   }
 }

redisinsight/ui/src/pages/browser/components/hash-details/styles.module.scss

@@ -457,7 +457,7 @@ const KeyDetailsHeader = ({
                                 inputRef={keyNameRef}
                                 className={cx(
                                   styles.keyInput,
-                                  { [styles.keyInputEditing]: keyIsEditing }
+                                  { [styles.keyInputEditing]: keyIsEditing, 'input-warning': !keyIsEditable }
                                 )}
                                 placeholder={AddCommonFieldsFormConfig?.keyName?.placeholder}
                                 value={key}

redisinsight/ui/src/pages/browser/components/key-details-header/KeyDetailsHeader.tsx

@@ -295,7 +295,7 @@ const ListDetails = (props: Props) => {
                     }}
                     disabled={updateLoading}
                     inputRef={textAreaRef}
-                    className={styles.textArea}
+                    className={cx(styles.textArea, { [styles.areaWarning]: disabled })}
                     data-testid="element-value-editor"
                   />
                 </InlineItemEditor>

redisinsight/ui/src/pages/browser/components/list-details/ListDetails.tsx

@@ -18,6 +18,14 @@
     margin: -8px -6px -8px -20px !important;
     height: calc(100% + 16px) !important;
     min-width: calc(100% + 106px) !important;
+
+    &:focus {
+      background-image: none !important;
+    }
+
+    &.areaWarning {
+      border-color: var(--euiColorWarningLight) !important;
+    }
   }
 }
 

redisinsight/ui/src/pages/browser/components/list-details/styles.module.scss

@@ -99,3 +99,13 @@
 .color-green {
   color: var(--defaultGreenColor) !important;
 }
+
+.input-warning {
+  background-image: linear-gradient(
+    to top,
+    var(--euiColorWarningLight),
+    var(--euiColorWarningLight) 2px,
+    #0000 2px,
+    #0000 100%
+  ) !important;
+}

redisinsight/ui/src/styles/base/_helpers.scss

@@ -54,14 +54,19 @@ export async function addNewOSSClusterDatabaseApi(databaseParameters: OSSCluster
 /**
  * Add a Sentinel database via autodiscover through api
  * @param databaseParameters The database parameters
+ * @param primaryGroupsNumber Number of added primary groups
  */
-export async function discoverSentinelDatabaseApi(databaseParameters: SentinelParameters): Promise<void> {
+export async function discoverSentinelDatabaseApi(databaseParameters: SentinelParameters, primaryGroupsNumber?: number): Promise<void> {
+    let masters = databaseParameters.masters;
+    if (primaryGroupsNumber) {
+        masters = databaseParameters.masters.slice(0, primaryGroupsNumber);
+    }
     const response = await request(endpoint).post('/instance/sentinel-masters')
         .send({
             'host': databaseParameters.sentinelHost,
             'port': databaseParameters.sentinelPort,
             'password': databaseParameters.sentinelPassword,
-            'masters': databaseParameters.masters
+            'masters': masters
         })
         .set('Accept', 'application/json');
 
@@ -95,6 +100,41 @@ export async function getDatabaseByName(databaseName?: string): Promise<string>
     return await response[0].id;
 }
 
+/**
+ * Get database through api using database connection type
+ * @param connectionType The database connection type
+ */
+export async function getDatabaseByConnectionType(connectionType?: string): Promise<string> {
+    if (!connectionType) {
+        throw new Error('Error: Missing connectionType');
+    }
+    const allDataBases = await getAllDatabases();
+    let response: object = {};
+    response = await asyncFilter(allDataBases, async(item: databaseParameters) => {
+        await doAsyncStuff();
+        return await item.connectionType === connectionType;
+    });
+    return await response[0].id;
+}
+
+/**
+ * Delete all databases through api
+ */
+export async function deleteAllDatabasesApi(): Promise<void> {
+    const allDatabases = await getAllDatabases();
+    const databaseIds = [];
+    for (let i = 0; i < allDatabases.length; i++) {
+        const dbData = JSON.parse(JSON.stringify(allDatabases[i]));
+        databaseIds.push(dbData.id);
+    }
+    if (databaseIds.length > 0) {
+        await request(endpoint).delete('/instance')
+            .send({ 'ids': databaseIds })
+            .set('Accept', 'application/json')
+            .expect(200);
+    }
+}
+
 /**
  * Delete Standalone database through api
  * @param databaseParameters The database parameters
@@ -120,14 +160,25 @@ export async function deleteOSSClusterDatabaseApi(databaseParameters: OSSCluster
 }
 
 /**
- * Delete a Sentinel database through api
+ * Delete all primary groups from Sentinel through api
  * @param databaseParameters The database parameters
  */
- export async function deleteSentinelDatabaseApi(databaseParameters: SentinelParameters): Promise<void> {
-    const databaseId = await getDatabaseByName(databaseParameters.name);
-    const response = await request(endpoint).delete('/instance')
-        .send({ 'ids': [`${databaseId}`] }).set('Accept', 'application/json');
+export async function deleteAllSentinelDatabasesApi(databaseParameters: SentinelParameters): Promise<void> {
+    for (let i = 0; i < databaseParameters.name.length; i++) {
+        const databaseId = await getDatabaseByName(databaseParameters.name[i]);
+        const response = await request(endpoint).delete('/instance')
+            .send({ 'ids': [`${databaseId}`] }).set('Accept', 'application/json');
+        await t.expect(response.status).eql(200, 'Delete Sentinel database request failed');
+    }
+}
 
+/**
+ * Delete all databases by connection type
+ */
+export async function deleteAllDatabasesByConnectionTypeApi(connectionType: string): Promise<void> {
+    const databaseIds = await getDatabaseByConnectionType(connectionType);
+    const response = await request(endpoint).delete('/instance')
+        .send({ 'ids': [`${databaseIds}`] }).set('Accept', 'application/json');
     await t.expect(response.status).eql(200, 'Delete Sentinel database request failed');
 }