@ytsaurus/ui 0.0.4 → 0.2.0

package/build/cjs/ui/pages/query-tracker/module/query/actions.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.UPDATE_QUERY = exports.SET_QUERY_PATCH = exports.SET_QUERY_LOAD_ERROR = exports.SET_QUERY = exports.REQUEST_QUERY = void 0;
 exports.abortCurrentQuery = abortCurrentQuery;
 exports.createEmptyQuery = createEmptyQuery;
+exports.createQueryFromTablePath = createQueryFromTablePath;
 exports.goToQuery = goToQuery;
 exports.loadQuery = loadQuery;
 exports.runQuery = runQuery;
@@ -71,9 +72,65 @@ function loadQuery(queryId) {
     };
   }();
 }
+function createQueryFromTablePath(engine, cluster, path) {
+  return /*#__PURE__*/function () {
+    var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(dispatch) {
+      var draft;
+      return _regenerator["default"].wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            dispatch({
+              type: SET_QUERY,
+              data: {
+                initialQuery: undefined
+              }
+            });
+            dispatch({
+              type: REQUEST_QUERY
+            });
+            _context2.prev = 2;
+            _context2.next = 5;
+            return (0, _utils.wrapApiPromiseByToaster)((0, _api.generateQueryFromTable)(engine, {
+              cluster: cluster,
+              path: path
+            }), {
+              toasterName: 'load_query',
+              skipSuccessToast: true,
+              errorTitle: 'Failed to load query'
+            });
+          case 5:
+            draft = _context2.sent;
+            if (draft) {
+              dispatch({
+                type: SET_QUERY,
+                data: {
+                  initialQuery: draft
+                }
+              });
+            } else {
+              dispatch(createEmptyQuery(engine));
+            }
+            _context2.next = 12;
+            break;
+          case 9:
+            _context2.prev = 9;
+            _context2.t0 = _context2["catch"](2);
+            dispatch(createEmptyQuery(engine));
+          case 12:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2, null, [[2, 9]]);
+    }));
+    return function (_x2) {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+}
 function createEmptyQuery() {
   var engine = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : _api.QueryEngine.YQL;
   var query = arguments.length > 1 ? arguments[1] : undefined;
+  var settings = arguments.length > 2 ? arguments[2] : undefined;
   return function (dispatch) {
     dispatch({
       type: SET_QUERY,
@@ -81,57 +138,60 @@ function createEmptyQuery() {
         initialQuery: {
           query: query || '',
           engine: engine,
-          settings: {}
+          settings: settings || {}
         }
       }
     });
   };
 }
-function runQuery() {
+function runQuery(afterCreate) {
   return /*#__PURE__*/function () {
-    var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(dispatch, getState) {
-      var state, query, _yield$wrapApiPromise, query_id;
-      return _regenerator["default"].wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
+    var _ref3 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(dispatch, getState) {
+      var state, query, _yield$wrapApiPromise, query_id, handled;
+      return _regenerator["default"].wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
           case 0:
             state = getState();
             query = (0, _selectors.getQueryDraft)(state);
-            _context2.next = 4;
+            _context3.next = 4;
             return (0, _utils.wrapApiPromiseByToaster)((0, _api.startQuery)(query), {
               toasterName: 'start_query',
               skipSuccessToast: true,
               errorTitle: 'Failed to start query'
             });
           case 4:
-            _yield$wrapApiPromise = _context2.sent;
+            _yield$wrapApiPromise = _context3.sent;
             query_id = _yield$wrapApiPromise.query_id;
-            dispatch(goToQuery(query_id));
+            handled = afterCreate === null || afterCreate === void 0 ? void 0 : afterCreate(query_id);
+            if (!handled) {
+              dispatch(loadQuery(query_id));
+            }
             dispatch((0, _actions.requestQueriesList)());
-          case 8:
+          case 9:
           case "end":
-            return _context2.stop();
+            return _context3.stop();
         }
-      }, _callee2);
+      }, _callee3);
     }));
-    return function (_x2, _x3) {
-      return _ref2.apply(this, arguments);
+    return function (_x3, _x4) {
+      return _ref3.apply(this, arguments);
     };
   }();
 }
 function abortCurrentQuery() {
   return /*#__PURE__*/function () {
-    var _ref3 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(dispatch, getState) {
+    var _ref4 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(dispatch, getState) {
       var state, currentQuery;
-      return _regenerator["default"].wrap(function _callee3$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
+      return _regenerator["default"].wrap(function _callee4$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
           case 0:
             state = getState();
             currentQuery = (0, _selectors.getCurrentQuery)(state);
             if (!currentQuery) {
-              _context3.next = 7;
+              _context4.next = 7;
               break;
             }
-            _context3.next = 5;
+            _context4.next = 5;
             return (0, _utils.wrapApiPromiseByToaster)((0, _api.abortQuery)(currentQuery === null || currentQuery === void 0 ? void 0 : currentQuery.id), {
               toasterName: 'abort_query',
               skipSuccessToast: true,
@@ -142,12 +202,12 @@ function abortCurrentQuery() {
             dispatch((0, _actions.requestQueriesList)());
           case 7:
           case "end":
-            return _context3.stop();
+            return _context4.stop();
         }
-      }, _callee3);
+      }, _callee4);
     }));
-    return function (_x4, _x5) {
-      return _ref3.apply(this, arguments);
+    return function (_x5, _x6) {
+      return _ref4.apply(this, arguments);
     };
   }();
 }

package/build/cjs/ui/pages/query-tracker/module/query/actions.js.map

@@ -1 +1 @@
-{"version":3,"names":["_navigation","require","_global","_api","_actions","_selectors","_windowStore","_utils","REQUEST_QUERY","exports","SET_QUERY","UPDATE_QUERY","SET_QUERY_LOAD_ERROR","SET_QUERY_PATCH","loadQuery","queryId","_ref","_asyncToGenerator","_regeneratorRuntime","mark","_callee","dispatch","query","wrap","_callee$","_context","prev","next","type","wrapApiPromiseByToaster","getQuery","toasterName","skipSuccessToast","errorTitle","sent","data","initialQuery","t0","createEmptyQuery","stop","_x","apply","arguments","engine","length","undefined","QueryEngine","YQL","settings","runQuery","_ref2","_callee2","getState","state","_yield$wrapApiPromise","query_id","_callee2$","_context2","getQueryDraft","startQuery","goToQuery","requestQueriesList","_x2","_x3","abortCurrentQuery","_ref3","_callee3","currentQuery","_callee3$","_context3","getCurrentQuery","abortQuery","id","_x4","_x5","_","cluster","getCluster","history","getAppBrowserHistory","push","createQueryUrl"],"sources":["actions.ts"],"sourcesContent":["import {createQueryUrl} from '../../utils/navigation';\nimport {Action} from 'redux';\nimport {ThunkAction} from 'redux-thunk';\nimport {RootState} from '../../../../store/reducers';\nimport {getCluster} from '../../../../store/selectors/global';\nimport {ActionD} from '../../../../types';\nimport {getQuery, QueryItem, abortQuery, QueryEngine, startQuery} from '../api';\nimport {requestQueriesList} from '../queries_list/actions';\nimport {getCurrentQuery, getQueryDraft} from './selectors';\nimport {getAppBrowserHistory} from '../../../../store/window-store';\nimport {QueryState} from './reducer';\nimport {wrapApiPromiseByToaster} from '../../../../utils/utils';\n\nexport const REQUEST_QUERY = 'query-tracker/REQUEST_QUERY';\nexport type RequestQueryAction = Action<typeof REQUEST_QUERY>;\n\nexport const SET_QUERY = 'query-tracker/SET_QUERY';\nexport type SetQueryAction = ActionD<\n    typeof SET_QUERY,\n    {\n        initialQuery?: QueryItem;\n    }\n>;\n\nexport const UPDATE_QUERY = 'query-tracker/UPDATE_QUERY';\nexport type UpdateQueryAction = ActionD<typeof UPDATE_QUERY, QueryItem>;\n\nexport const SET_QUERY_LOAD_ERROR = 'query-tracker/SET_QUERY_LOAD_ERROR';\nexport type SetQueryErrorLoadAction = ActionD<typeof SET_QUERY_LOAD_ERROR, Error | string>;\n\nexport const SET_QUERY_PATCH = 'query-tracker/SET_QUERY_PATCH';\nexport type SetQueryPatchAction = ActionD<typeof SET_QUERY_PATCH, Pick<QueryState, 'draft'>>;\n\nexport function loadQuery(\n    queryId: string,\n): ThunkAction<any, RootState, any, SetQueryAction | RequestQueryAction | SetQueryErrorLoadAction> {\n    return async (dispatch) => {\n        dispatch({type: REQUEST_QUERY});\n        try {\n            const query = await wrapApiPromiseByToaster(getQuery(queryId), {\n                toasterName: 'load_query',\n                skipSuccessToast: true,\n                errorTitle: 'Failed to load query',\n            });\n            dispatch({\n                type: SET_QUERY,\n                data: {\n                    initialQuery: query,\n                },\n            });\n        } catch (e: unknown) {\n            dispatch(createEmptyQuery());\n        }\n    };\n}\n\nexport function createEmptyQuery(\n    engine = QueryEngine.YQL,\n    query?: string,\n): ThunkAction<any, RootState, any, SetQueryAction> {\n    return (dispatch) => {\n        dispatch({\n            type: SET_QUERY,\n            data: {\n                initialQuery: {\n                    query: query || '',\n                    engine,\n                    settings: {},\n                } as QueryItem,\n            },\n        });\n    };\n}\n\nexport function runQuery(): ThunkAction<any, RootState, any, SetQueryAction> {\n    return async (dispatch, getState) => {\n        const state = getState();\n        const query = getQueryDraft(state);\n        const {query_id} = await wrapApiPromiseByToaster(startQuery(query), {\n            toasterName: 'start_query',\n            skipSuccessToast: true,\n            errorTitle: 'Failed to start query',\n        });\n        dispatch(goToQuery(query_id));\n        dispatch(requestQueriesList());\n    };\n}\n\nexport function abortCurrentQuery(): ThunkAction<any, RootState, any, SetQueryAction> {\n    return async (dispatch, getState) => {\n        const state = getState();\n        const currentQuery = getCurrentQuery(state);\n        if (currentQuery) {\n            await wrapApiPromiseByToaster(abortQuery(currentQuery?.id), {\n                toasterName: 'abort_query',\n                skipSuccessToast: true,\n                errorTitle: 'Failed to abort query',\n            });\n            dispatch(loadQuery(currentQuery?.id));\n            dispatch(requestQueriesList());\n        }\n    };\n}\n\nexport function goToQuery(query_id: string): ThunkAction<any, RootState, any, never> {\n    return (_, getState) => {\n        const state = getState();\n        const cluster = getCluster(state);\n        const history = getAppBrowserHistory();\n        history.push(createQueryUrl(cluster, query_id));\n    };\n}\n"],"mappings":"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"}
+{"version":3,"names":["_navigation","require","_global","_api","_actions","_selectors","_windowStore","_utils","REQUEST_QUERY","exports","SET_QUERY","UPDATE_QUERY","SET_QUERY_LOAD_ERROR","SET_QUERY_PATCH","loadQuery","queryId","_ref","_asyncToGenerator","_regeneratorRuntime","mark","_callee","dispatch","query","wrap","_callee$","_context","prev","next","type","wrapApiPromiseByToaster","getQuery","toasterName","skipSuccessToast","errorTitle","sent","data","initialQuery","t0","createEmptyQuery","stop","_x","apply","arguments","createQueryFromTablePath","engine","cluster","path","_ref2","_callee2","draft","_callee2$","_context2","undefined","generateQueryFromTable","_x2","length","QueryEngine","YQL","settings","runQuery","afterCreate","_ref3","_callee3","getState","state","_yield$wrapApiPromise","query_id","handled","_callee3$","_context3","getQueryDraft","startQuery","requestQueriesList","_x3","_x4","abortCurrentQuery","_ref4","_callee4","currentQuery","_callee4$","_context4","getCurrentQuery","abortQuery","id","_x5","_x6","goToQuery","_","getCluster","history","getAppBrowserHistory","push","createQueryUrl"],"sources":["actions.ts"],"sourcesContent":["import {createQueryUrl} from '../../utils/navigation';\nimport {Action} from 'redux';\nimport {ThunkAction} from 'redux-thunk';\nimport {RootState} from '../../../../store/reducers';\nimport {getCluster} from '../../../../store/selectors/global';\nimport {ActionD} from '../../../../types';\nimport {\n    getQuery,\n    QueryItem,\n    abortQuery,\n    QueryEngine,\n    startQuery,\n    generateQueryFromTable,\n} from '../api';\nimport {requestQueriesList} from '../queries_list/actions';\nimport {getCurrentQuery, getQueryDraft} from './selectors';\nimport {getAppBrowserHistory} from '../../../../store/window-store';\nimport {QueryState} from './reducer';\nimport {wrapApiPromiseByToaster} from '../../../../utils/utils';\n\nexport const REQUEST_QUERY = 'query-tracker/REQUEST_QUERY';\nexport type RequestQueryAction = Action<typeof REQUEST_QUERY>;\n\nexport const SET_QUERY = 'query-tracker/SET_QUERY';\nexport type SetQueryAction = ActionD<\n    typeof SET_QUERY,\n    {\n        initialQuery?: QueryItem;\n    }\n>;\n\nexport const UPDATE_QUERY = 'query-tracker/UPDATE_QUERY';\nexport type UpdateQueryAction = ActionD<typeof UPDATE_QUERY, QueryItem>;\n\nexport const SET_QUERY_LOAD_ERROR = 'query-tracker/SET_QUERY_LOAD_ERROR';\nexport type SetQueryErrorLoadAction = ActionD<typeof SET_QUERY_LOAD_ERROR, Error | string>;\n\nexport const SET_QUERY_PATCH = 'query-tracker/SET_QUERY_PATCH';\nexport type SetQueryPatchAction = ActionD<typeof SET_QUERY_PATCH, Pick<QueryState, 'draft'>>;\n\nexport function loadQuery(\n    queryId: string,\n): ThunkAction<any, RootState, any, SetQueryAction | RequestQueryAction | SetQueryErrorLoadAction> {\n    return async (dispatch) => {\n        dispatch({type: REQUEST_QUERY});\n        try {\n            const query = await wrapApiPromiseByToaster(getQuery(queryId), {\n                toasterName: 'load_query',\n                skipSuccessToast: true,\n                errorTitle: 'Failed to load query',\n            });\n            dispatch({\n                type: SET_QUERY,\n                data: {\n                    initialQuery: query,\n                },\n            });\n        } catch (e: unknown) {\n            dispatch(createEmptyQuery());\n        }\n    };\n}\n\nexport function createQueryFromTablePath(\n    engine: QueryEngine,\n    cluster: string,\n    path: string,\n): ThunkAction<any, RootState, any, SetQueryAction | RequestQueryAction | SetQueryErrorLoadAction> {\n    return async (dispatch) => {\n        dispatch({\n            type: SET_QUERY,\n            data: {\n                initialQuery: undefined,\n            },\n        });\n        dispatch({type: REQUEST_QUERY});\n        try {\n            const draft = await wrapApiPromiseByToaster(\n                generateQueryFromTable(engine, {cluster, path}),\n                {\n                    toasterName: 'load_query',\n                    skipSuccessToast: true,\n                    errorTitle: 'Failed to load query',\n                },\n            );\n            if (draft) {\n                dispatch({\n                    type: SET_QUERY,\n                    data: {\n                        initialQuery: draft as QueryItem,\n                    },\n                });\n            } else {\n                dispatch(createEmptyQuery(engine));\n            }\n        } catch (e) {\n            dispatch(createEmptyQuery(engine));\n        }\n    };\n}\n\nexport function createEmptyQuery(\n    engine = QueryEngine.YQL,\n    query?: string,\n    settings?: Record<string, string>,\n): ThunkAction<any, RootState, any, SetQueryAction> {\n    return (dispatch) => {\n        dispatch({\n            type: SET_QUERY,\n            data: {\n                initialQuery: {\n                    query: query || '',\n                    engine,\n                    settings: settings || {},\n                } as QueryItem,\n            },\n        });\n    };\n}\n\nexport function runQuery(\n    afterCreate?: (query_id: string) => boolean | void,\n): ThunkAction<any, RootState, any, SetQueryAction> {\n    return async (dispatch, getState) => {\n        const state = getState();\n        const query = getQueryDraft(state);\n        const {query_id} = await wrapApiPromiseByToaster(startQuery(query), {\n            toasterName: 'start_query',\n            skipSuccessToast: true,\n            errorTitle: 'Failed to start query',\n        });\n        const handled = afterCreate?.(query_id);\n        if (!handled) {\n            dispatch(loadQuery(query_id));\n        }\n        dispatch(requestQueriesList());\n    };\n}\n\nexport function abortCurrentQuery(): ThunkAction<any, RootState, any, SetQueryAction> {\n    return async (dispatch, getState) => {\n        const state = getState();\n        const currentQuery = getCurrentQuery(state);\n        if (currentQuery) {\n            await wrapApiPromiseByToaster(abortQuery(currentQuery?.id), {\n                toasterName: 'abort_query',\n                skipSuccessToast: true,\n                errorTitle: 'Failed to abort query',\n            });\n            dispatch(loadQuery(currentQuery?.id));\n            dispatch(requestQueriesList());\n        }\n    };\n}\n\nexport function goToQuery(query_id: string): ThunkAction<any, RootState, any, never> {\n    return (_, getState) => {\n        const state = getState();\n        const cluster = getCluster(state);\n        const history = getAppBrowserHistory();\n        history.push(createQueryUrl(cluster, query_id));\n    };\n}\n"],"mappings":"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"}

package/build/cjs/ui/pages/query-tracker/module/query/reducer.d.ts

@@ -5,7 +5,8 @@ export interface QueryState {
     draft: DraftQuery;
     params: {
         engine?: string;
-        query?: string;
+        path?: string;
+        cluster?: string;
     };
     state: 'init' | 'loading' | 'ready' | 'error';
 }

package/build/cjs/ui/pages/query-tracker/module/query/reducer.js

@@ -8,6 +8,7 @@ exports.reducer = reducer;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _api = require("../api");
 var _actions = require("./actions");
+var _utills = require("./utills");
 var initialQueryDraftState = {
   engine: _api.QueryEngine.YQL,
   query: '',
@@ -27,7 +28,7 @@ function reducer() {
       {
         return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, state), {}, {
           queryItem: action.data.initialQuery,
-          draft: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, initialQueryDraftState), action.data.initialQuery),
+          draft: (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, initialQueryDraftState), action.data.initialQuery ? (0, _utills.cleanupQueryForDraft)(action.data.initialQuery) : {}),
           state: 'ready'
         });
       }

package/build/cjs/ui/pages/query-tracker/module/query/reducer.js.map

@@ -1 +1 @@
-{"version":3,"names":["_api","require","_actions","initialQueryDraftState","engine","QueryEngine","YQL","query","settings","initState","queryItem","undefined","draft","_objectSpread","params","state","reducer","arguments","length","action","type","SET_QUERY","data","initialQuery","UPDATE_QUERY","REQUEST_QUERY","SET_QUERY_LOAD_ERROR","SET_QUERY_PATCH"],"sources":["reducer.ts"],"sourcesContent":["import {DraftQuery, QueryEngine, QueryItem} from '../api';\nimport {\n    RequestQueryAction,\n    REQUEST_QUERY,\n    SetQueryAction,\n    SetQueryErrorLoadAction,\n    SetQueryPatchAction,\n    SET_QUERY,\n    SET_QUERY_LOAD_ERROR,\n    SET_QUERY_PATCH,\n    UPDATE_QUERY,\n    UpdateQueryAction,\n} from './actions';\n\nexport interface QueryState {\n    queryItem?: QueryItem;\n    draft: DraftQuery;\n    params: {\n        engine?: string;\n        query?: string;\n    };\n    state: 'init' | 'loading' | 'ready' | 'error';\n}\n\nconst initialQueryDraftState: QueryState['draft'] = {\n    engine: QueryEngine.YQL,\n    query: '',\n    settings: {},\n};\n\nconst initState: QueryState = {\n    queryItem: undefined,\n    draft: {...initialQueryDraftState},\n    params: {},\n    state: 'init',\n};\n\nexport function reducer(state = initState, action: Actions): QueryState {\n    switch (action.type) {\n        case SET_QUERY: {\n            return {\n                ...state,\n                queryItem: action.data.initialQuery,\n                draft: {\n                    ...initialQueryDraftState,\n                    ...action.data.initialQuery,\n                },\n                state: 'ready',\n            };\n        }\n        case UPDATE_QUERY: {\n            return {\n                ...state,\n                queryItem: action.data,\n            };\n        }\n        case REQUEST_QUERY: {\n            return {\n                ...state,\n                state: 'loading',\n            };\n        }\n        case SET_QUERY_LOAD_ERROR: {\n            return {\n                ...state,\n                state: 'error',\n            };\n        }\n        case SET_QUERY_PATCH: {\n            return {\n                ...state,\n                draft: {\n                    ...state.draft,\n                    ...action.data,\n                },\n            };\n        }\n    }\n    return state;\n}\n\ntype Actions =\n    | SetQueryAction\n    | RequestQueryAction\n    | SetQueryErrorLoadAction\n    | SetQueryPatchAction\n    | UpdateQueryAction;\n"],"mappings":";;;;;;;;AAAA,IAAAA,IAAA,GAAAC,OAAA;AACA,IAAAC,QAAA,GAAAD,OAAA;AAuBA,IAAME,sBAA2C,GAAG;EAChDC,MAAM,EAAEC,gBAAW,CAACC,GAAG;EACvBC,KAAK,EAAE,EAAE;EACTC,QAAQ,EAAE,CAAC;AACf,CAAC;AAED,IAAMC,SAAqB,GAAG;EAC1BC,SAAS,EAAEC,SAAS;EACpBC,KAAK,MAAAC,yBAAA,MAAMV,sBAAsB,CAAC;EAClCW,MAAM,EAAE,CAAC,CAAC;EACVC,KAAK,EAAE;AACX,CAAC;AAEM,SAASC,OAAOA,CAAA,EAAiD;EAAA,IAAhDD,KAAK,GAAAE,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAN,SAAA,GAAAM,SAAA,MAAGR,SAAS;EAAA,IAAEU,MAAe,GAAAF,SAAA,CAAAC,MAAA,OAAAD,SAAA,MAAAN,SAAA;EACtD,QAAQQ,MAAM,CAACC,IAAI;IACf,KAAKC,kBAAS;MAAE;QACZ,WAAAR,yBAAA,MAAAA,yBAAA,MACOE,KAAK;UACRL,SAAS,EAAES,MAAM,CAACG,IAAI,CAACC,YAAY;UACnCX,KAAK,MAAAC,yBAAA,MAAAA,yBAAA,MACEV,sBAAsB,GACtBgB,MAAM,CAACG,IAAI,CAACC,YAAY,CAC9B;UACDR,KAAK,EAAE;QAAO;MAEtB;IACA,KAAKS,qBAAY;MAAE;QACf,WAAAX,yBAAA,MAAAA,yBAAA,MACOE,KAAK;UACRL,SAAS,EAAES,MAAM,CAACG;QAAI;MAE9B;IACA,KAAKG,sBAAa;MAAE;QAChB,WAAAZ,yBAAA,MAAAA,yBAAA,MACOE,KAAK;UACRA,KAAK,EAAE;QAAS;MAExB;IACA,KAAKW,6BAAoB;MAAE;QACvB,WAAAb,yBAAA,MAAAA,yBAAA,MACOE,KAAK;UACRA,KAAK,EAAE;QAAO;MAEtB;IACA,KAAKY,wBAAe;MAAE;QAClB,WAAAd,yBAAA,MAAAA,yBAAA,MACOE,KAAK;UACRH,KAAK,MAAAC,yBAAA,MAAAA,yBAAA,MACEE,KAAK,CAACH,KAAK,GACXO,MAAM,CAACG,IAAI;QACjB;MAET;EAAA;EAEJ,OAAOP,KAAK;AAChB"}
+{"version":3,"names":["_api","require","_actions","_utills","initialQueryDraftState","engine","QueryEngine","YQL","query","settings","initState","queryItem","undefined","draft","_objectSpread","params","state","reducer","arguments","length","action","type","SET_QUERY","data","initialQuery","cleanupQueryForDraft","UPDATE_QUERY","REQUEST_QUERY","SET_QUERY_LOAD_ERROR","SET_QUERY_PATCH"],"sources":["reducer.ts"],"sourcesContent":["import {DraftQuery, QueryEngine, QueryItem} from '../api';\nimport {\n    RequestQueryAction,\n    REQUEST_QUERY,\n    SetQueryAction,\n    SetQueryErrorLoadAction,\n    SetQueryPatchAction,\n    SET_QUERY,\n    SET_QUERY_LOAD_ERROR,\n    SET_QUERY_PATCH,\n    UPDATE_QUERY,\n    UpdateQueryAction,\n} from './actions';\nimport {cleanupQueryForDraft} from './utills';\n\nexport interface QueryState {\n    queryItem?: QueryItem;\n    draft: DraftQuery;\n    params: {\n        engine?: string;\n        path?: string;\n        cluster?: string;\n    };\n    state: 'init' | 'loading' | 'ready' | 'error';\n}\n\nconst initialQueryDraftState: QueryState['draft'] = {\n    engine: QueryEngine.YQL,\n    query: '',\n    settings: {},\n};\n\nconst initState: QueryState = {\n    queryItem: undefined,\n    draft: {...initialQueryDraftState},\n    params: {},\n    state: 'init',\n};\n\nexport function reducer(state = initState, action: Actions): QueryState {\n    switch (action.type) {\n        case SET_QUERY: {\n            return {\n                ...state,\n                queryItem: action.data.initialQuery,\n                draft: {\n                    ...initialQueryDraftState,\n                    ...(action.data.initialQuery\n                        ? cleanupQueryForDraft(action.data.initialQuery)\n                        : {}),\n                },\n                state: 'ready',\n            };\n        }\n        case UPDATE_QUERY: {\n            return {\n                ...state,\n                queryItem: action.data,\n            };\n        }\n        case REQUEST_QUERY: {\n            return {\n                ...state,\n                state: 'loading',\n            };\n        }\n        case SET_QUERY_LOAD_ERROR: {\n            return {\n                ...state,\n                state: 'error',\n            };\n        }\n        case SET_QUERY_PATCH: {\n            return {\n                ...state,\n                draft: {\n                    ...state.draft,\n                    ...action.data,\n                },\n            };\n        }\n    }\n    return state;\n}\n\ntype Actions =\n    | SetQueryAction\n    | RequestQueryAction\n    | SetQueryErrorLoadAction\n    | SetQueryPatchAction\n    | UpdateQueryAction;\n"],"mappings":";;;;;;;;AAAA,IAAAA,IAAA,GAAAC,OAAA;AACA,IAAAC,QAAA,GAAAD,OAAA;AAYA,IAAAE,OAAA,GAAAF,OAAA;AAaA,IAAMG,sBAA2C,GAAG;EAChDC,MAAM,EAAEC,gBAAW,CAACC,GAAG;EACvBC,KAAK,EAAE,EAAE;EACTC,QAAQ,EAAE,CAAC;AACf,CAAC;AAED,IAAMC,SAAqB,GAAG;EAC1BC,SAAS,EAAEC,SAAS;EACpBC,KAAK,MAAAC,yBAAA,MAAMV,sBAAsB,CAAC;EAClCW,MAAM,EAAE,CAAC,CAAC;EACVC,KAAK,EAAE;AACX,CAAC;AAEM,SAASC,OAAOA,CAAA,EAAiD;EAAA,IAAhDD,KAAK,GAAAE,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAN,SAAA,GAAAM,SAAA,MAAGR,SAAS;EAAA,IAAEU,MAAe,GAAAF,SAAA,CAAAC,MAAA,OAAAD,SAAA,MAAAN,SAAA;EACtD,QAAQQ,MAAM,CAACC,IAAI;IACf,KAAKC,kBAAS;MAAE;QACZ,WAAAR,yBAAA,MAAAA,yBAAA,MACOE,KAAK;UACRL,SAAS,EAAES,MAAM,CAACG,IAAI,CAACC,YAAY;UACnCX,KAAK,MAAAC,yBAAA,MAAAA,yBAAA,MACEV,sBAAsB,GACrBgB,MAAM,CAACG,IAAI,CAACC,YAAY,GACtB,IAAAC,4BAAoB,EAACL,MAAM,CAACG,IAAI,CAACC,YAAY,CAAC,GAC9C,CAAC,CAAC,CACX;UACDR,KAAK,EAAE;QAAO;MAEtB;IACA,KAAKU,qBAAY;MAAE;QACf,WAAAZ,yBAAA,MAAAA,yBAAA,MACOE,KAAK;UACRL,SAAS,EAAES,MAAM,CAACG;QAAI;MAE9B;IACA,KAAKI,sBAAa;MAAE;QAChB,WAAAb,yBAAA,MAAAA,yBAAA,MACOE,KAAK;UACRA,KAAK,EAAE;QAAS;MAExB;IACA,KAAKY,6BAAoB;MAAE;QACvB,WAAAd,yBAAA,MAAAA,yBAAA,MACOE,KAAK;UACRA,KAAK,EAAE;QAAO;MAEtB;IACA,KAAKa,wBAAe;MAAE;QAClB,WAAAf,yBAAA,MAAAA,yBAAA,MACOE,KAAK;UACRH,KAAK,MAAAC,yBAAA,MAAAA,yBAAA,MACEE,KAAK,CAACH,KAAK,GACXO,MAAM,CAACG,IAAI;QACjB;MAET;EAAA;EAEJ,OAAOP,KAAK;AAChB"}

package/build/cjs/ui/pages/query-tracker/module/query/selectors.d.ts

@@ -2,7 +2,8 @@ import { RootState } from '../../../../store/reducers';
 export declare const getQuery: (state: RootState) => import("../api").QueryItem | undefined;
 export declare const getQueryGetParams: (state: RootState) => {
     engine?: string | undefined;
-    query?: string | undefined;
+    path?: string | undefined;
+    cluster?: string | undefined;
 };
 export declare const getQueryDraft: (state: RootState) => import("../api").DraftQuery;
 export declare const getQueryText: (state: RootState) => string;

package/build/cjs/ui/pages/query-tracker/module/query/selectors.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.isQueryLoading = exports.isQueryExecuted = exports.getQueryText = exports.getQueryGetParams = exports.getQueryEngine = exports.getQueryDraft = exports.getQuery = exports.getCurrentQuery = void 0;
+var _api = require("../api");
 var getState = function getState(state) {
   return state.queryTracker.query;
 };
@@ -34,7 +35,7 @@ exports.isQueryLoading = isQueryLoading;
 var isQueryExecuted = function isQueryExecuted(state) {
   var queryItem = getState(state).queryItem;
   // TODO: Use real query's state
-  return Boolean(queryItem === null || queryItem === void 0 ? void 0 : queryItem.id);
+  return Boolean(queryItem === null || queryItem === void 0 ? void 0 : queryItem.id) && (queryItem === null || queryItem === void 0 ? void 0 : queryItem.state) !== _api.QueryStatus.DRAFT;
 };
 exports.isQueryExecuted = isQueryExecuted;
 var getCurrentQuery = function getCurrentQuery(state) {

package/build/cjs/ui/pages/query-tracker/module/query/selectors.js.map

@@ -1 +1 @@
-{"version":3,"names":["getState","state","queryTracker","query","getQuery","queryItem","exports","getQueryGetParams","params","getQueryDraft","draft","getQueryText","getQueryEngine","engine","isQueryLoading","isQueryExecuted","Boolean","id","getCurrentQuery"],"sources":["selectors.ts"],"sourcesContent":["import {RootState} from '../../../../store/reducers';\n\nconst getState = (state: RootState) => state.queryTracker.query;\n\nexport const getQuery = (state: RootState) => getState(state).queryItem;\nexport const getQueryGetParams = (state: RootState) => getState(state).params;\n\nexport const getQueryDraft = (state: RootState) => getState(state).draft;\n\nexport const getQueryText = (state: RootState) => getState(state).draft.query;\n\nexport const getQueryEngine = (state: RootState) => getState(state).draft.engine;\n\nexport const isQueryLoading = (state: RootState) => getState(state).state === 'loading';\n\nexport const isQueryExecuted = (state: RootState): boolean => {\n    const queryItem = getState(state).queryItem;\n    // TODO: Use real query's state\n    return Boolean(queryItem?.id);\n};\n\nexport const getCurrentQuery = (state: RootState) => getState(state).queryItem;\n"],"mappings":";;;;;;AAEA,IAAMA,QAAQ,GAAG,SAAXA,QAAQA,CAAIC,KAAgB;EAAA,OAAKA,KAAK,CAACC,YAAY,CAACC,KAAK;AAAA;AAExD,IAAMC,QAAQ,GAAG,SAAXA,QAAQA,CAAIH,KAAgB;EAAA,OAAKD,QAAQ,CAACC,KAAK,CAAC,CAACI,SAAS;AAAA;AAAAC,OAAA,CAAAF,QAAA,GAAAA,QAAA;AAChE,IAAMG,iBAAiB,GAAG,SAApBA,iBAAiBA,CAAIN,KAAgB;EAAA,OAAKD,QAAQ,CAACC,KAAK,CAAC,CAACO,MAAM;AAAA;AAAAF,OAAA,CAAAC,iBAAA,GAAAA,iBAAA;AAEtE,IAAME,aAAa,GAAG,SAAhBA,aAAaA,CAAIR,KAAgB;EAAA,OAAKD,QAAQ,CAACC,KAAK,CAAC,CAACS,KAAK;AAAA;AAAAJ,OAAA,CAAAG,aAAA,GAAAA,aAAA;AAEjE,IAAME,YAAY,GAAG,SAAfA,YAAYA,CAAIV,KAAgB;EAAA,OAAKD,QAAQ,CAACC,KAAK,CAAC,CAACS,KAAK,CAACP,KAAK;AAAA;AAAAG,OAAA,CAAAK,YAAA,GAAAA,YAAA;AAEtE,IAAMC,cAAc,GAAG,SAAjBA,cAAcA,CAAIX,KAAgB;EAAA,OAAKD,QAAQ,CAACC,KAAK,CAAC,CAACS,KAAK,CAACG,MAAM;AAAA;AAAAP,OAAA,CAAAM,cAAA,GAAAA,cAAA;AAEzE,IAAME,cAAc,GAAG,SAAjBA,cAAcA,CAAIb,KAAgB;EAAA,OAAKD,QAAQ,CAACC,KAAK,CAAC,CAACA,KAAK,KAAK,SAAS;AAAA;AAAAK,OAAA,CAAAQ,cAAA,GAAAA,cAAA;AAEhF,IAAMC,eAAe,GAAG,SAAlBA,eAAeA,CAAId,KAAgB,EAAc;EAC1D,IAAMI,SAAS,GAAGL,QAAQ,CAACC,KAAK,CAAC,CAACI,SAAS;EAC3C;EACA,OAAOW,OAAO,CAACX,SAAS,aAATA,SAAS,uBAATA,SAAS,CAAEY,EAAE,CAAC;AACjC,CAAC;AAAAX,OAAA,CAAAS,eAAA,GAAAA,eAAA;AAEM,IAAMG,eAAe,GAAG,SAAlBA,eAAeA,CAAIjB,KAAgB;EAAA,OAAKD,QAAQ,CAACC,KAAK,CAAC,CAACI,SAAS;AAAA"}
+{"version":3,"names":["_api","require","getState","state","queryTracker","query","getQuery","queryItem","exports","getQueryGetParams","params","getQueryDraft","draft","getQueryText","getQueryEngine","engine","isQueryLoading","isQueryExecuted","Boolean","id","QueryStatus","DRAFT","getCurrentQuery"],"sources":["selectors.ts"],"sourcesContent":["import {RootState} from '../../../../store/reducers';\nimport {QueryStatus} from '../api';\n\nconst getState = (state: RootState) => state.queryTracker.query;\n\nexport const getQuery = (state: RootState) => getState(state).queryItem;\nexport const getQueryGetParams = (state: RootState) => getState(state).params;\n\nexport const getQueryDraft = (state: RootState) => getState(state).draft;\n\nexport const getQueryText = (state: RootState) => getState(state).draft.query;\n\nexport const getQueryEngine = (state: RootState) => getState(state).draft.engine;\n\nexport const isQueryLoading = (state: RootState) => getState(state).state === 'loading';\n\nexport const isQueryExecuted = (state: RootState): boolean => {\n    const queryItem = getState(state).queryItem;\n    // TODO: Use real query's state\n    return Boolean(queryItem?.id) && queryItem?.state !== QueryStatus.DRAFT;\n};\n\nexport const getCurrentQuery = (state: RootState) => getState(state).queryItem;\n"],"mappings":";;;;;;AACA,IAAAA,IAAA,GAAAC,OAAA;AAEA,IAAMC,QAAQ,GAAG,SAAXA,QAAQA,CAAIC,KAAgB;EAAA,OAAKA,KAAK,CAACC,YAAY,CAACC,KAAK;AAAA;AAExD,IAAMC,QAAQ,GAAG,SAAXA,QAAQA,CAAIH,KAAgB;EAAA,OAAKD,QAAQ,CAACC,KAAK,CAAC,CAACI,SAAS;AAAA;AAAAC,OAAA,CAAAF,QAAA,GAAAA,QAAA;AAChE,IAAMG,iBAAiB,GAAG,SAApBA,iBAAiBA,CAAIN,KAAgB;EAAA,OAAKD,QAAQ,CAACC,KAAK,CAAC,CAACO,MAAM;AAAA;AAAAF,OAAA,CAAAC,iBAAA,GAAAA,iBAAA;AAEtE,IAAME,aAAa,GAAG,SAAhBA,aAAaA,CAAIR,KAAgB;EAAA,OAAKD,QAAQ,CAACC,KAAK,CAAC,CAACS,KAAK;AAAA;AAAAJ,OAAA,CAAAG,aAAA,GAAAA,aAAA;AAEjE,IAAME,YAAY,GAAG,SAAfA,YAAYA,CAAIV,KAAgB;EAAA,OAAKD,QAAQ,CAACC,KAAK,CAAC,CAACS,KAAK,CAACP,KAAK;AAAA;AAAAG,OAAA,CAAAK,YAAA,GAAAA,YAAA;AAEtE,IAAMC,cAAc,GAAG,SAAjBA,cAAcA,CAAIX,KAAgB;EAAA,OAAKD,QAAQ,CAACC,KAAK,CAAC,CAACS,KAAK,CAACG,MAAM;AAAA;AAAAP,OAAA,CAAAM,cAAA,GAAAA,cAAA;AAEzE,IAAME,cAAc,GAAG,SAAjBA,cAAcA,CAAIb,KAAgB;EAAA,OAAKD,QAAQ,CAACC,KAAK,CAAC,CAACA,KAAK,KAAK,SAAS;AAAA;AAAAK,OAAA,CAAAQ,cAAA,GAAAA,cAAA;AAEhF,IAAMC,eAAe,GAAG,SAAlBA,eAAeA,CAAId,KAAgB,EAAc;EAC1D,IAAMI,SAAS,GAAGL,QAAQ,CAACC,KAAK,CAAC,CAACI,SAAS;EAC3C;EACA,OAAOW,OAAO,CAACX,SAAS,aAATA,SAAS,uBAATA,SAAS,CAAEY,EAAE,CAAC,IAAI,CAAAZ,SAAS,aAATA,SAAS,uBAATA,SAAS,CAAEJ,KAAK,MAAKiB,gBAAW,CAACC,KAAK;AAC3E,CAAC;AAAAb,OAAA,CAAAS,eAAA,GAAAA,eAAA;AAEM,IAAMK,eAAe,GAAG,SAAlBA,eAAeA,CAAInB,KAAgB;EAAA,OAAKD,QAAQ,CAACC,KAAK,CAAC,CAACI,SAAS;AAAA"}

package/build/cjs/ui/pages/query-tracker/module/query/url_mapping.js

@@ -12,8 +12,11 @@ var draftQueryParameters = {
   engine: {
     stateKey: 'queryTracker.query.params.engine'
   },
-  query: {
-    stateKey: 'queryTracker.query.params.query'
+  path: {
+    stateKey: 'queryTracker.query.params.path'
+  },
+  cluster: {
+    stateKey: 'queryTracker.query.params.cluster'
   }
 };
 exports.draftQueryParameters = draftQueryParameters;
@@ -21,7 +24,8 @@ function getDraftQueryParameters(state, props) {
   var queryParams = props.query.queryTracker.query.params;
   return (0, _immer["default"])(state, function (draft) {
     (0, _utils.updateIfChanged)(draft.queryTracker.query.params, 'engine', queryParams.engine);
-    (0, _utils.updateIfChanged)(draft.queryTracker.query.params, 'query', queryParams.query);
+    (0, _utils.updateIfChanged)(draft.queryTracker.query.params, 'path', queryParams.path);
+    (0, _utils.updateIfChanged)(draft.queryTracker.query.params, 'cluster', queryParams.cluster);
   });
 }
 // #sourceMappingURL=url_mapping.js.map

package/build/cjs/ui/pages/query-tracker/module/query/url_mapping.js.map

@@ -1 +1 @@
-{"version":3,"names":["_immer","_interopRequireDefault","require","_utils","draftQueryParameters","engine","stateKey","query","exports","getDraftQueryParameters","state","props","queryParams","queryTracker","params","produce","draft","updateIfChanged"],"sources":["url_mapping.ts"],"sourcesContent":["import produce from 'immer';\nimport {updateIfChanged} from '../../../../utils/utils';\nimport {LocationParameters} from '../../../../store/location';\nimport {RootState} from '../../../../store/reducers';\n\nexport const draftQueryParameters: LocationParameters = {\n    engine: {\n        stateKey: 'queryTracker.query.params.engine',\n    },\n    query: {\n        stateKey: 'queryTracker.query.params.query',\n    },\n};\n\nexport function getDraftQueryParameters(state: RootState, props: {query: RootState}): RootState {\n    const queryParams = props.query.queryTracker.query.params;\n    return produce(state, (draft) => {\n        updateIfChanged(draft.queryTracker.query.params, 'engine', queryParams.engine);\n        updateIfChanged(draft.queryTracker.query.params, 'query', queryParams.query);\n    });\n}\n"],"mappings":";;;;;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,MAAA,GAAAD,OAAA;AAIO,IAAME,oBAAwC,GAAG;EACpDC,MAAM,EAAE;IACJC,QAAQ,EAAE;EACd,CAAC;EACDC,KAAK,EAAE;IACHD,QAAQ,EAAE;EACd;AACJ,CAAC;AAAAE,OAAA,CAAAJ,oBAAA,GAAAA,oBAAA;AAEM,SAASK,uBAAuBA,CAACC,KAAgB,EAAEC,KAAyB,EAAa;EAC5F,IAAMC,WAAW,GAAGD,KAAK,CAACJ,KAAK,CAACM,YAAY,CAACN,KAAK,CAACO,MAAM;EACzD,OAAO,IAAAC,iBAAO,EAACL,KAAK,EAAE,UAACM,KAAK,EAAK;IAC7B,IAAAC,sBAAe,EAACD,KAAK,CAACH,YAAY,CAACN,KAAK,CAACO,MAAM,EAAE,QAAQ,EAAEF,WAAW,CAACP,MAAM,CAAC;IAC9E,IAAAY,sBAAe,EAACD,KAAK,CAACH,YAAY,CAACN,KAAK,CAACO,MAAM,EAAE,OAAO,EAAEF,WAAW,CAACL,KAAK,CAAC;EAChF,CAAC,CAAC;AACN"}
+{"version":3,"names":["_immer","_interopRequireDefault","require","_utils","draftQueryParameters","engine","stateKey","path","cluster","exports","getDraftQueryParameters","state","props","queryParams","query","queryTracker","params","produce","draft","updateIfChanged"],"sources":["url_mapping.ts"],"sourcesContent":["import produce from 'immer';\nimport {updateIfChanged} from '../../../../utils/utils';\nimport {LocationParameters} from '../../../../store/location';\nimport {RootState} from '../../../../store/reducers';\n\nexport const draftQueryParameters: LocationParameters = {\n    engine: {\n        stateKey: 'queryTracker.query.params.engine',\n    },\n    path: {\n        stateKey: 'queryTracker.query.params.path',\n    },\n    cluster: {\n        stateKey: 'queryTracker.query.params.cluster',\n    },\n};\n\nexport function getDraftQueryParameters(state: RootState, props: {query: RootState}): RootState {\n    const queryParams = props.query.queryTracker.query.params;\n    return produce(state, (draft) => {\n        updateIfChanged(draft.queryTracker.query.params, 'engine', queryParams.engine);\n        updateIfChanged(draft.queryTracker.query.params, 'path', queryParams.path);\n        updateIfChanged(draft.queryTracker.query.params, 'cluster', queryParams.cluster);\n    });\n}\n"],"mappings":";;;;;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,MAAA,GAAAD,OAAA;AAIO,IAAME,oBAAwC,GAAG;EACpDC,MAAM,EAAE;IACJC,QAAQ,EAAE;EACd,CAAC;EACDC,IAAI,EAAE;IACFD,QAAQ,EAAE;EACd,CAAC;EACDE,OAAO,EAAE;IACLF,QAAQ,EAAE;EACd;AACJ,CAAC;AAAAG,OAAA,CAAAL,oBAAA,GAAAA,oBAAA;AAEM,SAASM,uBAAuBA,CAACC,KAAgB,EAAEC,KAAyB,EAAa;EAC5F,IAAMC,WAAW,GAAGD,KAAK,CAACE,KAAK,CAACC,YAAY,CAACD,KAAK,CAACE,MAAM;EACzD,OAAO,IAAAC,iBAAO,EAACN,KAAK,EAAE,UAACO,KAAK,EAAK;IAC7B,IAAAC,sBAAe,EAACD,KAAK,CAACH,YAAY,CAACD,KAAK,CAACE,MAAM,EAAE,QAAQ,EAAEH,WAAW,CAACR,MAAM,CAAC;IAC9E,IAAAc,sBAAe,EAACD,KAAK,CAACH,YAAY,CAACD,KAAK,CAACE,MAAM,EAAE,MAAM,EAAEH,WAAW,CAACN,IAAI,CAAC;IAC1E,IAAAY,sBAAe,EAACD,KAAK,CAACH,YAAY,CAACD,KAAK,CAACE,MAAM,EAAE,SAAS,EAAEH,WAAW,CAACL,OAAO,CAAC;EACpF,CAAC,CAAC;AACN"}

package/build/cjs/ui/pages/query-tracker/module/query/utills.d.ts

@@ -0,0 +1,2 @@
+import { QueryItem } from '../api';
+export declare const cleanupQueryForDraft: (query: QueryItem) => QueryItem;

package/build/cjs/ui/pages/query-tracker/module/query/utills.js

@@ -0,0 +1,17 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.cleanupQueryForDraft = void 0;
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _omit2 = _interopRequireDefault(require("lodash/omit"));
+var cleanupQueryForDraft = function cleanupQueryForDraft(query) {
+  return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, query), {}, {
+    annotations: (0, _omit2["default"])(query.annotations, 'is_tutorial')
+  });
+};
+// #sourceMappingURL=utills.js.map
+exports.cleanupQueryForDraft = cleanupQueryForDraft;
+// #sourceMappingURL=utills.js.map

package/build/cjs/ui/pages/query-tracker/module/query/utills.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["cleanupQueryForDraft","query","_objectSpread","annotations","_omit"],"sources":["utills.ts"],"sourcesContent":["import {omit} from 'lodash';\nimport {QueryItem} from '../api';\n\nexport const cleanupQueryForDraft = (query: QueryItem): QueryItem => {\n    return {\n        ...query,\n        annotations: omit(query.annotations, 'is_tutorial'),\n    };\n};\n"],"mappings":";;;;;;;;;AAGO,IAAMA,oBAAoB,GAAG,SAAvBA,oBAAoBA,CAAIC,KAAgB,EAAgB;EACjE,WAAAC,yBAAA,MAAAA,yBAAA,MACOD,KAAK;IACRE,WAAW,EAAE,IAAAC,iBAAA,EAAKH,KAAK,CAACE,WAAW,EAAE,aAAa;EAAC;AAE3D,CAAC"}

package/build/cjs/ui/pages/query-tracker/module/query_result/actions.js

@@ -17,6 +17,9 @@ var _dataTypes = require("../../../../components/SchemaDataType/dataTypes");
 var _selectors = require("./selectors");
 var _format = require("./utils/format");
 var _utils = require("../../../../utils/utils");
+var _supportedFeatures = require("../../../../store/selectors/global/supported-features");
+var _dateTypesV = require("../../../../components/SchemaDataType/dateTypesV3");
+var _ypath = _interopRequireDefault(require("../../../../common/thor/ypath"));
 var REQUEST_QUERY_RESULTS = 'query-tracker/REQUEST_QUERY_RESULTS';
 // To create initial result
 exports.REQUEST_QUERY_RESULTS = REQUEST_QUERY_RESULTS;
@@ -54,17 +57,18 @@ function loadQueryResult(queryId) {
   var resultIndex = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
   return /*#__PURE__*/function () {
     var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(dispatch, getState) {
-      var meta, settings, result, rows, all_column_names, types, example, columns, formattedResult;
+      var state, meta, typeMap, scheme, columns, settings, result, rows, types, formattedResult;
       return _regenerator["default"].wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            if (!(0, _selectors.hasQueryResult)(getState(), queryId, resultIndex)) {
-              _context.next = 2;
+            state = getState();
+            if (!(0, _selectors.hasQueryResult)(state, queryId, resultIndex)) {
+              _context.next = 3;
               break;
             }
             return _context.abrupt("return");
-          case 2:
-            _context.prev = 2;
+          case 3:
+            _context.prev = 3;
             dispatch({
               type: REQUEST_QUERY_RESULTS,
               data: {
@@ -72,15 +76,26 @@ function loadQueryResult(queryId) {
                 index: resultIndex
               }
             });
-            _context.next = 6;
+            _context.next = 7;
             return preloadTableFont();
-          case 6:
-            _context.next = 8;
+          case 7:
+            _context.next = 9;
             return (0, _api.getQueryResultMeta)(queryId, resultIndex);
-          case 8:
+          case 9:
             meta = _context.sent;
+            typeMap = (0, _supportedFeatures.getPrimitiveTypesMap)(getState());
+            scheme = _ypath["default"].getValue(meta === null || meta === void 0 ? void 0 : meta.schema) || [];
+            columns = scheme.map(function (_ref2) {
+              var name = _ref2.name,
+                type_v3 = _ref2.type_v3;
+              return {
+                name: name,
+                type: (0, _dataTypes.getType)((0, _dateTypesV.parseV3Type)(type_v3, typeMap)),
+                displayName: name
+              };
+            }) || [];
             settings = (0, _selectors.getQueryResultGlobalSettings)();
-            _context.next = 12;
+            _context.next = 16;
             return (0, _utils.wrapApiPromiseByToaster)((0, _api.readQueryResults)(queryId, resultIndex, {
               start: 0,
               end: settings.pageSize
@@ -91,24 +106,16 @@ function loadQueryResult(queryId) {
               skipSuccessToast: true,
               errorTitle: 'Failed to load query result'
             });
-          case 12:
+          case 16:
             result = _context.sent;
-            rows = result.rows, all_column_names = result.all_column_names, types = result.yql_type_registry;
-            example = rows[0];
-            columns = all_column_names.map(function (field) {
-              return {
-                name: field,
-                displayName: field,
-                type: (0, _dataTypes.getType)(types[Number(example[field][1])])
-              };
-            });
-            formattedResult = result.rows.map(function (v) {
-              return Object.entries(v).reduce(function (acc, _ref2) {
-                var _ref3 = (0, _slicedToArray2["default"])(_ref2, 2),
-                  k = _ref3[0],
-                  _ref3$ = (0, _slicedToArray2["default"])(_ref3[1], 2),
-                  value = _ref3$[0],
-                  typeIndex = _ref3$[1];
+            rows = result.rows, types = result.yql_type_registry;
+            formattedResult = rows.map(function (v) {
+              return Object.entries(v).reduce(function (acc, _ref3) {
+                var _ref4 = (0, _slicedToArray2["default"])(_ref3, 2),
+                  k = _ref4[0],
+                  _ref4$ = (0, _slicedToArray2["default"])(_ref4[1], 2),
+                  value = _ref4$[0],
+                  typeIndex = _ref4$[1];
                 acc[k] = (0, _format.prepareFormattedValue)(value, types[Number(typeIndex)]);
                 return acc;
               }, {});
@@ -123,11 +130,11 @@ function loadQueryResult(queryId) {
                 meta: meta
               }
             });
-            _context.next = 23;
+            _context.next = 25;
             break;
-          case 20:
-            _context.prev = 20;
-            _context.t0 = _context["catch"](2);
+          case 22:
+            _context.prev = 22;
+            _context.t0 = _context["catch"](3);
             dispatch({
               type: SET_QUERY_RESULTS_ERROR,
               data: {
@@ -136,11 +143,11 @@ function loadQueryResult(queryId) {
                 error: _context.t0
               }
             });
-          case 23:
+          case 25:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[2, 20]]);
+      }, _callee, null, [[3, 22]]);
     }));
     return function (_x, _x2) {
       return _ref.apply(this, arguments);
@@ -151,7 +158,7 @@ function updateQueryResult(queryId) {
   var resultIndex = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
   var page = arguments.length > 2 ? arguments[2] : undefined;
   return /*#__PURE__*/function () {
-    var _ref4 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(dispatch, getState) {
+    var _ref5 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(dispatch, getState) {
       var settings, startPage, endPage, result, rows, types, formattedResult;
       return _regenerator["default"].wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
@@ -182,12 +189,12 @@ function updateQueryResult(queryId) {
             result = _context2.sent;
             rows = result.rows, types = result.yql_type_registry;
             formattedResult = result.rows.map(function (v) {
-              return Object.entries(v).reduce(function (acc, _ref5) {
-                var _ref6 = (0, _slicedToArray2["default"])(_ref5, 2),
-                  k = _ref6[0],
-                  _ref6$ = (0, _slicedToArray2["default"])(_ref6[1], 2),
-                  value = _ref6$[0],
-                  typeIndex = _ref6$[1];
+              return Object.entries(v).reduce(function (acc, _ref6) {
+                var _ref7 = (0, _slicedToArray2["default"])(_ref6, 2),
+                  k = _ref7[0],
+                  _ref7$ = (0, _slicedToArray2["default"])(_ref7[1], 2),
+                  value = _ref7$[0],
+                  typeIndex = _ref7$[1];
                 acc[k] = (0, _format.prepareFormattedValue)(value, types[Number(typeIndex)]);
                 return acc;
               }, {});
@@ -224,7 +231,7 @@ function updateQueryResult(queryId) {
       }, _callee2, null, [[0, 13]]);
     }));
     return function (_x3, _x4) {
-      return _ref4.apply(this, arguments);
+      return _ref5.apply(this, arguments);
     };
   }();
 }