From a0c694ad6ac5d5db78ccd5aa33a27dc0ee441255 Mon Sep 17 00:00:00 2001 From: vlad-dargel Date: Wed, 1 Mar 2023 11:38:21 +0100 Subject: [PATCH 1/4] update for copyright --- LICENSE | 2 +- electron-builder.json | 2 +- redisinsight/splash.html | 2 +- redisinsight/ui/src/packages/redisinsight-plugin-sdk/LICENSE | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/LICENSE b/LICENSE index 3c1393f656..bd309ff867 100644 --- a/LICENSE +++ b/LICENSE @@ -1,7 +1,7 @@ Server Side Public License VERSION 1, OCTOBER 16, 2018 - Copyright © 2021 Redis, Inc. + Copyright © 2023 Redis, Inc. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. diff --git a/electron-builder.json b/electron-builder.json index 5b58232aed..0c0bd3f578 100644 --- a/electron-builder.json +++ b/electron-builder.json @@ -1,7 +1,7 @@ { "productName": "RedisInsight-v2", "appId": "org.RedisLabs.RedisInsight-V2", - "copyright": "Copyright © 2021 Redis Ltd.", + "copyright": "Copyright © 2023 Redis Ltd.", "files": [ "dist/", "node_modules/", diff --git a/redisinsight/splash.html b/redisinsight/splash.html index c3a817ae80..01d7e391aa 100644 --- a/redisinsight/splash.html +++ b/redisinsight/splash.html @@ -87,7 +87,7 @@ const copyrightEl = document.getElementById('copyright') || null if (copyrightEl) { - copyrightEl.innerHTML = `RedisInsight ${appVersion}  © ${new Date().getFullYear() || '2022'} Redis Ltd.` + copyrightEl.innerHTML = `RedisInsight ${appVersion}  © ${new Date().getFullYear() || '2023'} Redis Ltd.` } } diff --git a/redisinsight/ui/src/packages/redisinsight-plugin-sdk/LICENSE b/redisinsight/ui/src/packages/redisinsight-plugin-sdk/LICENSE index 955e3de356..17ac20b551 100644 --- a/redisinsight/ui/src/packages/redisinsight-plugin-sdk/LICENSE +++ b/redisinsight/ui/src/packages/redisinsight-plugin-sdk/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2022 Redis, Inc. +Copyright (c) 2023 Redis, Inc. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 3ff867eab28491458bba256ecce4e079b51dba5c Mon Sep 17 00:00:00 2001 From: vlad-dargel Date: Wed, 1 Mar 2023 11:41:31 +0100 Subject: [PATCH 2/4] upd --- LICENSE | 2 +- redisinsight/ui/src/packages/redisinsight-plugin-sdk/LICENSE | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index bd309ff867..3c1393f656 100644 --- a/LICENSE +++ b/LICENSE @@ -1,7 +1,7 @@ Server Side Public License VERSION 1, OCTOBER 16, 2018 - Copyright © 2023 Redis, Inc. + Copyright © 2021 Redis, Inc. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. diff --git a/redisinsight/ui/src/packages/redisinsight-plugin-sdk/LICENSE b/redisinsight/ui/src/packages/redisinsight-plugin-sdk/LICENSE index 17ac20b551..402cae62c3 100644 --- a/redisinsight/ui/src/packages/redisinsight-plugin-sdk/LICENSE +++ b/redisinsight/ui/src/packages/redisinsight-plugin-sdk/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2023 Redis, Inc. +Copyright (c) 2021 Redis, Inc. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 8a884d9dfecc58ea4d22b3cd025d5048a67c6458 Mon Sep 17 00:00:00 2001 From: vlad-dargel Date: Wed, 1 Mar 2023 11:44:50 +0100 Subject: [PATCH 3/4] update --- redisinsight/ui/src/packages/redisinsight-plugin-sdk/LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/redisinsight/ui/src/packages/redisinsight-plugin-sdk/LICENSE b/redisinsight/ui/src/packages/redisinsight-plugin-sdk/LICENSE index 402cae62c3..955e3de356 100644 --- a/redisinsight/ui/src/packages/redisinsight-plugin-sdk/LICENSE +++ b/redisinsight/ui/src/packages/redisinsight-plugin-sdk/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2021 Redis, Inc. +Copyright (c) 2022 Redis, Inc. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From f0fbc932283546240516f869d9329905b7077928 Mon Sep 17 00:00:00 2001 From: Amir Allayarov Date: Wed, 1 Mar 2023 15:30:46 +0400 Subject: [PATCH 4/4] #RI-4244 - update query card styles --- .../QueryCardHeader/QueryCardHeader.tsx | 16 ++++++++-------- .../QueryCardHeader/styles.module.scss | 8 ++++---- .../src/components/query-card/styles.module.scss | 4 ++-- redisinsight/ui/src/pages/workbench/constants.ts | 5 +---- 4 files changed, 15 insertions(+), 18 deletions(-) diff --git a/redisinsight/ui/src/components/query-card/QueryCardHeader/QueryCardHeader.tsx b/redisinsight/ui/src/components/query-card/QueryCardHeader/QueryCardHeader.tsx index 09de6cefa7..cd59e4d67a 100644 --- a/redisinsight/ui/src/components/query-card/QueryCardHeader/QueryCardHeader.tsx +++ b/redisinsight/ui/src/components/query-card/QueryCardHeader/QueryCardHeader.tsx @@ -346,12 +346,12 @@ const QueryCardHeader = (props: Props) => { )} - {isOpen && canCommandProfile && !summaryText && ( - + + {isOpen && canCommandProfile && !summaryText && (
{ />
- - )} + )} + [...VIEW_TYPE_OPTIONS] - export const SEARCH_COMMANDS = ['ft.search', 'ft.aggregate'] export const GRAPH_COMMANDS = ['graph.query'] const ALLOWED_PROFILE_COMMANDS = [...SEARCH_COMMANDS, ...GRAPH_COMMANDS] -export const isCommandAllowedForProfile = (query: string) => { - return ALLOWED_PROFILE_COMMANDS.includes(query?.split(' ')?.[0]?.toLowerCase()) -} +export const isCommandAllowedForProfile = (query: string) => ALLOWED_PROFILE_COMMANDS.includes(query?.split(' ')?.[0]?.toLowerCase()) export enum ProfileQueryType { Profile = 'Profile',