Merge branch 'main' into astandrik.component-memory-consumption-1177

astandrik · web-flow · commit d640d1bbdf87 · 2024-11-11T17:26:36.000+03:00
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,6 +1,8 @@
 on:
   push:
-    branches: [main]
+    branches:
+      - main
+      - hotfix/v[0-9]+.[0-9]+.[0-9]+ # match branches in format hotfix/v6.20.10
 
 name: Release
 
@@ -15,7 +17,7 @@ jobs:
           node-version: 18
       - run: npm ci
       - run: npm test
-      - uses: GoogleCloudPlatform/release-please-action@v3
+      - uses: googleapis/release-please-action@v4
         with:
           token: ${{ secrets.YDB_PLATFORM_BOT_TOKEN_REPO }}
-          release-type: node
+          target-branch: ${{ github.ref_name }}
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -0,0 +1,3 @@
+{
+  ".": "6.33.0"
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,35 @@
 # Changelog
 
+## [6.33.0](https://github.com/ydb-platform/ydb-embedded-ui/compare/v6.32.0...v6.33.0) (2024-11-11)
+
+
+### Features
+
+* **autocomplete:** suggest all columns in a row ([#1599](https://github.com/ydb-platform/ydb-embedded-ui/issues/1599)) ([b4d2b7f](https://github.com/ydb-platform/ydb-embedded-ui/commit/b4d2b7f45c35b7eaadf93faf602cca16776093eb))
+
+
+### Bug Fixes
+
+* **Clusters:** controls and aggregations layout ([#1588](https://github.com/ydb-platform/ydb-embedded-ui/issues/1588)) ([ee61273](https://github.com/ydb-platform/ydb-embedded-ui/commit/ee61273c3b67a383a9c0ad8f7b783716cf53f750))
+* **Nodes:** remove redundant group by params ([#1598](https://github.com/ydb-platform/ydb-embedded-ui/issues/1598)) ([d3c5714](https://github.com/ydb-platform/ydb-embedded-ui/commit/d3c571446d5b37dc83e359254d7872c01eca3c31))
+
+## [6.32.0](https://github.com/ydb-platform/ydb-embedded-ui/compare/v6.31.0...v6.32.0) (2024-11-08)
+
+
+### Features
+
+* **Nodes:** add grouping ([#1584](https://github.com/ydb-platform/ydb-embedded-ui/issues/1584)) ([88ec214](https://github.com/ydb-platform/ydb-embedded-ui/commit/88ec214d3f89067a9c55243068c73a5d029a7068))
+
+
+### Bug Fixes
+
+* **Header:** fix developer ui link for embedded UI with proxy ([#1580](https://github.com/ydb-platform/ydb-embedded-ui/issues/1580)) ([b229301](https://github.com/ydb-platform/ydb-embedded-ui/commit/b229301e167c8651550606ee5450f6d7f2409048))
+* if popover has actions increase delayClosing ([#1573](https://github.com/ydb-platform/ydb-embedded-ui/issues/1573)) ([7680e96](https://github.com/ydb-platform/ydb-embedded-ui/commit/7680e96681a9edf6b29589b73189ac72ef48f3d4))
+* **NodeEndpointsTooltipContent:** change fields order ([#1585](https://github.com/ydb-platform/ydb-embedded-ui/issues/1585)) ([949a518](https://github.com/ydb-platform/ydb-embedded-ui/commit/949a518a272e920e36f4c2a94c3b502d37d6e3a4))
+* query templates modification ([#1579](https://github.com/ydb-platform/ydb-embedded-ui/issues/1579)) ([697921a](https://github.com/ydb-platform/ydb-embedded-ui/commit/697921abe30e0b3415c0cd08519b8fecdfaaa03b))
+* refresh schema and autoresresh icons should be similar ([#1572](https://github.com/ydb-platform/ydb-embedded-ui/issues/1572)) ([03bc63d](https://github.com/ydb-platform/ydb-embedded-ui/commit/03bc63dc5d386591a4ef2e73c7051349b37c83ed))
+* use both BSC and Whiteboard for disks ([#1564](https://github.com/ydb-platform/ydb-embedded-ui/issues/1564)) ([da6dfcd](https://github.com/ydb-platform/ydb-embedded-ui/commit/da6dfcd856468ff89b031a2d6bbf710c7033ef5a))
+
 ## [6.31.0](https://github.com/ydb-platform/ydb-embedded-ui/compare/v6.30.0...v6.31.0) (2024-11-02)
 
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ydb-embedded-ui",
-  "version": "6.31.0",
+  "version": "6.33.0",
   "files": [
     "dist"
   ],
@@ -23,7 +23,7 @@
     "@gravity-ui/react-data-table": "^2.1.1",
     "@gravity-ui/table": "^0.5.0",
     "@gravity-ui/uikit": "^6.33.0",
-    "@gravity-ui/websql-autocomplete": "^9.1.0",
+    "@gravity-ui/websql-autocomplete": "^12.1.2",
     "@hookform/resolvers": "^3.9.0",
     "@reduxjs/toolkit": "^2.2.3",
     "@tanstack/react-table": "^8.19.3",
diff --git a/release-please-config.json b/release-please-config.json
@@ -0,0 +1,10 @@
+{
+  "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json",
+  "bootstrap-sha": "a3a39782af968677866b86dc590d4150d4af4211",
+  "release-type": "node",
+  "include-component-in-tag": false,
+  "pull-request-title-pattern": "chore(${branch}): release ${version}",
+  "packages": {
+    ".": {}
+  }
+}
diff --git a/src/components/TooltipsContent/NodeEndpointsTooltipContent/NodeEndpointsTooltipContent.scss b/src/components/TooltipsContent/NodeEndpointsTooltipContent/NodeEndpointsTooltipContent.scss
@@ -7,6 +7,6 @@
     }
     &__definition {
         text-align: right;
-        word-break: break-all;
+        word-break: break-word;
     }
 }
diff --git a/src/containers/Clusters/Clusters.scss b/src/containers/Clusters/Clusters.scss
@@ -7,7 +7,9 @@
 
     @include mixins.body-2-typography();
     @include mixins.flex-container();
-
+    &__autorefresh {
+        margin-left: auto;
+    }
     &__cluster {
         display: flex;
         align-items: center;
@@ -87,6 +89,7 @@
 
     &__aggregation,
     &__controls {
+        margin-right: 15px;
         margin-left: 15px;
     }
 
@@ -108,7 +111,7 @@
         display: flex;
         align-items: center;
 
-        max-width: 200px;
+        max-width: 230px;
 
         font-size: var(--g-text-subheader-3-font-size);
         line-height: var(--g-text-subheader-3-line-height);
diff --git a/src/containers/Clusters/Clusters.tsx b/src/containers/Clusters/Clusters.tsx
@@ -178,7 +178,7 @@ export function Clusters() {
                         sortable={false}
                     />
                 </div>
-                <AutoRefreshControl />
+                <AutoRefreshControl className={b('autorefresh')} />
             </div>
             {query.isError ? <ResponseError error={query.error} className={b('error')} /> : null}
             {query.isLoading ? <Loader size="l" /> : null}
diff --git a/src/containers/Nodes/columns/constants.ts b/src/containers/Nodes/columns/constants.ts
@@ -29,8 +29,6 @@ const ALL_NODES_GROUP_BY_PARAMS = [
     'Database',
     'Version',
     'Uptime',
-    'Missing',
-    'DiskSpaceUsage',
 ] as const satisfies NodesGroupByField[];
 
 function getAvailableNodesGroupByParams(withSystemStateGroupBy?: boolean) {
diff --git a/src/utils/monaco/yql/constants.ts b/src/utils/monaco/yql/constants.ts
@@ -1,4 +1,4 @@
-import type {YQLEntity} from '@gravity-ui/websql-autocomplete';
+import type {YQLEntity} from '@gravity-ui/websql-autocomplete/yql';
 
 export const SimpleTypes = [
     'Text',
diff --git a/src/utils/monaco/yql/generateSuggestions.ts b/src/utils/monaco/yql/generateSuggestions.ts
@@ -1,9 +1,8 @@
 import type {
     ColumnAliasSuggestion,
     KeywordSuggestion,
-    YQLEntity,
-    YqlAutocompleteResult,
-} from '@gravity-ui/websql-autocomplete';
+} from '@gravity-ui/websql-autocomplete/shared';
+import type {YQLEntity, YqlAutocompleteResult} from '@gravity-ui/websql-autocomplete/yql';
 import * as monaco from 'monaco-editor/esm/vs/editor/editor.api';
 
 import type {AutocompleteEntityType, TAutocompleteEntity} from '../../../types/api/autocomplete';
@@ -123,24 +122,27 @@ function normalizeEntityPrefix(value = '', database: string) {
     return removeStartSlash(cleanedValue);
 }
 
-type SuggestionType = keyof Omit<YqlAutocompleteResult, 'errors' | 'suggestDatabases'>;
+type SuggestionType =
+    | keyof Omit<YqlAutocompleteResult, 'errors' | 'suggestDatabases'>
+    | 'suggestAllColumns';
 
 const SuggestionsWeight: Record<SuggestionType, number> = {
     suggestTemplates: 0,
     suggestPragmas: 1,
     suggestEntity: 2,
-    suggestColumns: 3,
-    suggestColumnAliases: 4,
-    suggestTableIndexes: 5,
-    suggestTableHints: 6,
-    suggestEntitySettings: 7,
-    suggestKeywords: 8,
-    suggestAggregateFunctions: 9,
-    suggestTableFunctions: 10,
-    suggestWindowFunctions: 11,
-    suggestFunctions: 12,
-    suggestSimpleTypes: 13,
-    suggestUdfs: 14,
+    suggestAllColumns: 3,
+    suggestColumns: 4,
+    suggestColumnAliases: 5,
+    suggestTableIndexes: 6,
+    suggestTableHints: 7,
+    suggestEntitySettings: 8,
+    suggestKeywords: 9,
+    suggestAggregateFunctions: 10,
+    suggestTableFunctions: 11,
+    suggestWindowFunctions: 12,
+    suggestFunctions: 13,
+    suggestSimpleTypes: 14,
+    suggestUdfs: 15,
 };
 
 function getSuggestionIndex(suggestionType: SuggestionType) {
@@ -181,6 +183,7 @@ export async function generateColumnsSuggestion(
         return [];
     }
     const suggestions: monaco.languages.CompletionItem[] = [];
+    const normalizedColumns = suggestColumns.all ? ([] as string[]) : undefined;
     const multi = suggestColumns.tables.length > 1;
 
     const normalizedTableNames =
@@ -228,6 +231,7 @@ export async function generateColumnsSuggestion(
 
         const normalizedParentName = normalizeEntityPrefix(col.Parent, database);
         const aliases = tableNameToAliasMap[normalizedParentName];
+        const currentSuggestionIndex = suggestions.length;
         if (aliases?.length) {
             aliases.forEach((a) => {
                 const columnNameSuggestion = `${a}.${normalizedName}`;
@@ -237,8 +241,11 @@ export async function generateColumnsSuggestion(
                     kind: CompletionItemKind.Field,
                     detail: 'Column',
                     range: rangeToInsertSuggestion,
-                    sortText: suggestionIndexToWeight(getSuggestionIndex('suggestColumns')),
+                    sortText:
+                        suggestionIndexToWeight(getSuggestionIndex('suggestColumns')) +
+                        suggestionIndexToWeight(currentSuggestionIndex),
                 });
+                normalizedColumns?.push(columnNameSuggestion);
             });
         } else {
             let columnNameSuggestion = normalizedName;
@@ -251,10 +258,24 @@ export async function generateColumnsSuggestion(
                 kind: CompletionItemKind.Field,
                 detail: 'Column',
                 range: rangeToInsertSuggestion,
-                sortText: suggestionIndexToWeight(getSuggestionIndex('suggestColumns')),
+                sortText:
+                    suggestionIndexToWeight(getSuggestionIndex('suggestColumns')) +
+                    suggestionIndexToWeight(currentSuggestionIndex),
             });
+            normalizedColumns?.push(columnNameSuggestion);
         }
     });
+    if (normalizedColumns && normalizedColumns.length > 0) {
+        const allColumsn = normalizedColumns.join(', ');
+        suggestions.push({
+            label: allColumsn,
+            insertText: allColumsn,
+            kind: CompletionItemKind.Field,
+            detail: 'All columns',
+            range: rangeToInsertSuggestion,
+            sortText: suggestionIndexToWeight(getSuggestionIndex('suggestAllColumns')),
+        });
+    }
     return suggestions;
 }
 
@@ -309,6 +330,7 @@ export async function generateEntitiesSuggestion(
             if (isDir && !withBackticks) {
                 labelAsSnippet = `\`${label}$0\``;
             }
+            const suggestionIndex = acc.length;
             acc.push({
                 label,
                 insertText: labelAsSnippet ?? label,
@@ -321,7 +343,10 @@ export async function generateEntitiesSuggestion(
                 command: label.endsWith('/')
                     ? {id: 'editor.action.triggerSuggest', title: ''}
                     : undefined,
-                sortText: suggestionIndexToWeight(getSuggestionIndex('suggestEntity')),
+                // first argument is responsible for sorting groups of suggestions, the second - to preserve suggestions order returned from backend
+                sortText:
+                    suggestionIndexToWeight(getSuggestionIndex('suggestEntity')) +
+                    suggestionIndexToWeight(suggestionIndex),
             });
             return acc;
         }, [] as monaco.languages.CompletionItem[]);
diff --git a/src/utils/monaco/yql/yqlSuggestions.ts b/src/utils/monaco/yql/yqlSuggestions.ts
@@ -1,4 +1,4 @@
-import type {CursorPosition} from '@gravity-ui/websql-autocomplete';
+import type {CursorPosition} from '@gravity-ui/websql-autocomplete/shared';
 import type Monaco from 'monaco-editor';
 
 import {
@@ -56,7 +56,7 @@ async function getSuggestions(
     rangeToInsertSuggestion: Monaco.IRange,
     database: string,
 ): Promise<Monaco.languages.CompletionItem[]> {
-    const {parseYqlQuery} = await import('@gravity-ui/websql-autocomplete');
+    const {parseYqlQuery} = await import('@gravity-ui/websql-autocomplete/yql');
     const cursorForParsing: CursorPosition = {
         line: cursorPosition.lineNumber,
         column: cursorPosition.column,

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,6 @@`
`7`	`7`	`}`
`8`	`8`	`&__definition {`
`9`	`9`	`text-align: right;`
`10`		`- word-break: break-all;`
	`10`	`+ word-break: break-word;`
`11`	`11`	`}`
`12`	`12`	`}`