Revert "Revert "fix: issue with key""

This reverts commit c2070d6.

Author: astandrik

src/containers/Tenant/Query/QueryEditor/QueryEditor.tsx

@@ -148,7 +148,6 @@ export default function QueryEditor(props: QueryEditorProps) {
                 database: tenantName,
                 querySettings,
                 enableTracingLevel,
-                queryId,
             });
         } else {
             runningQueryRef.current = sendQuery({
@@ -262,6 +261,7 @@ export default function QueryEditor(props: QueryEditorProps) {
                         onCollapseResultHandler={onCollapseResultHandler}
                         type={type}
                         theme={theme}
+                        key={result?.queryId}
                         result={result}
                         tenantName={tenantName}
                         path={path}

src/store/reducers/query/query.ts

@@ -72,7 +72,7 @@ const slice = createSlice({
         },
         updateQueryInHistory: (
             state,
-            action: PayloadAction<{queryId: string; stats: QueryStats}>,
+            action: PayloadAction<{queryId?: string; stats: QueryStats}>,
         ) => {
             const {queryId, stats} = action.payload;
 
@@ -171,7 +171,7 @@ export const {
 
 interface SendQueryParams extends QueryRequestParams {
     actionType?: QueryAction;
-    queryId: string;
+    queryId?: string;
     querySettings?: Partial<QuerySettings>;
     // flag whether to send new tracing header or not
     // default: not send
@@ -190,10 +190,10 @@ export const queryApi = api.injectEndpoints({
     endpoints: (build) => ({
         useStreamQuery: build.mutation<null, SendQueryParams>({
             queryFn: async (
-                {query, database, querySettings = {}, enableTracingLevel, queryId},
+                {query, database, querySettings = {}, enableTracingLevel},
                 {signal, dispatch, getState},
             ) => {
-                dispatch(setQueryResult({type: 'execute', queryId, isLoading: true}));
+                dispatch(setQueryResult({type: 'execute', isLoading: true}));
 
                 const {action, syntax} = getActionAndSyntaxFromQueryMode(
                     'execute',
@@ -268,7 +268,6 @@ export const queryApi = api.injectEndpoints({
                             type: 'execute',
                             error,
                             isLoading: false,
-                            queryId,
                         }),
                     );
                     return {error};

src/store/reducers/query/types.ts

@@ -52,7 +52,7 @@ export interface QueryResult {
     type: QueryAction;
     data?: PreparedQueryData;
     error?: unknown;
-    queryId: string;
+    queryId?: string;
     isLoading: boolean;
 }