slick-table 1.2.2 → 1.2.3

package/src/entities/drawer-run-query/ui/QueryHistory/QueryHistory.tsx

@@ -0,0 +1,62 @@
+import { IconButton, Tooltip } from "@mui/material";
+import { Dispatch, FC, Fragment, SetStateAction, useState } from "react";
+
+import { localStore } from "shared/lib/localStrore";
+import { eventRunQuery } from "shared/lib/slickgrid";
+
+import { groupQueriesByDate } from "../../lib";
+
+import Styled from "./QueryHistory.style";
+
+export const QueryHistory: FC<Props> = ({ executeQuery, query, setQuery }) => {
+	const [count, setCount] = useState(0);
+	const tableId = eventRunQuery.table?.id || "";
+	const history = localStore.queries.get(tableId);
+	const groups = groupQueriesByDate(history ?? []);
+
+	function useQuery(recentQuery: string) {
+		setQuery(recentQuery);
+		executeQuery(recentQuery);
+	}
+
+	return (
+		<Styled.Wrapper>
+			{groups.map(({ label, queries }) => (
+				<Fragment key={label}>
+					<Styled.GroupLabel>{label}</Styled.GroupLabel>
+					{queries.map((recentQuery) => (
+						<Styled.Item
+							key={recentQuery.time}
+							className={recentQuery.query === query ? "active" : ""}
+							onClick={() => {
+								if (recentQuery.query === query) return;
+								useQuery(recentQuery.query);
+							}}
+							title={recentQuery.query}
+						>
+							<Styled.Title>{recentQuery.query}</Styled.Title>
+							<Tooltip title={"Delete from history"}>
+								<IconButton
+									onClick={(event) => {
+										event.stopPropagation();
+										localStore.queries.reset(tableId, recentQuery.query);
+										// refresh history
+										setCount(count + 1);
+									}}
+								>
+									<span className="sgi sgi-close"></span>
+								</IconButton>
+							</Tooltip>
+						</Styled.Item>
+					))}
+				</Fragment>
+			))}
+		</Styled.Wrapper>
+	);
+};
+
+interface Props {
+	executeQuery(query: string): void;
+	query: string;
+	setQuery: Dispatch<SetStateAction<string>>;
+}

package/src/entities/drawer-run-query/ui/QueryHistory/index.ts

@@ -0,0 +1 @@
+export { QueryHistory } from "./QueryHistory";

package/src/entities/drawer-run-query/ui/index.ts

@@ -0,0 +1 @@
+export { DrawerRunQuery } from "./DrawerRunQuery";

package/src/features/context-menu/ui/ButtonQuery/ui/ButtonQuery.tsx

@@ -1,6 +1,6 @@
 import { Dispatch, FC, SetStateAction } from "react";
 
-import { eventContextMenu, eventQuery } from "shared/lib/slickgrid";
+import { eventContextMenu, eventRunQuery } from "shared/lib/slickgrid";
 
 import Styled from "../../ContextMenu.style";
 
@@ -9,10 +9,8 @@ export const ButtonQuery: FC<Props> = ({ setIsOpened }) => {
 
 	function openModalWindow() {
 		setIsOpened(false);
-		eventQuery.table = table;
-		eventQuery.open = true;
-		eventQuery.x = eventContextMenu.x;
-		eventQuery.y = eventContextMenu.y;
+		eventRunQuery.table = table;
+		eventRunQuery.open = true;
 	}
 
 	return (

package/src/features/header-context-menu/lib/visibility/getHidableColumnIds.ts

@@ -1,8 +1,9 @@
+import { IS_EDITED } from "shared/model/consts";
 import { IColumn, ISlickTable } from "shared/model/types";
 
 export function getHideableColumns(table: ISlickTable): IColumn[] {
 	if (!table?.columnPicker) return [];
 	return table.columnPicker
 		.getInitialColumns()
-		.filter(({ id }) => id !== "_checkbox_selector" && id !== "isEdited");
+		.filter(({ id }) => id !== "_checkbox_selector" && id !== IS_EDITED);
 }

package/src/shared/lib/localStrore/model/classes/Queries.ts

@@ -0,0 +1,40 @@
+import { IRecentQuery } from "shared/model/types";
+
+import { getFromStorage, updateStorage } from "../../lib";
+import { EStorageKey } from "../enums";
+
+const MAX_QUERIES = 10;
+
+export class Queries {
+	get(tableId: string): IRecentQuery[] {
+		const queries = getFromStorage(EStorageKey.queries);
+		return queries[tableId];
+	}
+	reset(tableId: string, query: string): void {
+		const queries = getFromStorage(EStorageKey.queries);
+		const recentQueries = queries[tableId];
+		if (!recentQueries) return;
+		queries[tableId] = recentQueries.filter(
+			(recent: IRecentQuery) => recent.query !== query,
+		);
+		updateStorage(EStorageKey.queries, queries);
+	}
+	set(tableId: string, query: string): void {
+		const queryTrimed = query.trim();
+		if (!queryTrimed) return;
+		const queries: Record<string, IRecentQuery[]> =
+			getFromStorage(EStorageKey.queries) || {};
+		const otherQueries = (queries[tableId] || []).filter(
+			(item) => item.query !== queryTrimed,
+		);
+		const recentQuery: IRecentQuery = {
+			query: queryTrimed,
+			time: new Date().toISOString(),
+		};
+		const updatedQueries = [recentQuery, ...otherQueries].slice(0, MAX_QUERIES);
+		updateStorage(EStorageKey.queries, {
+			...queries,
+			[tableId]: updatedQueries,
+		});
+	}
+}

package/src/shared/lib/localStrore/model/classes/index.ts

@@ -1,4 +1,5 @@
 export { ColumnFilters } from "./ColumnFilters";
 export { ColumnWidths } from "./ColumnWidths";
 export { HiddenColumns } from "./HiddenColumns";
+export { Queries } from "./Queries";
 export { Sorting } from "./Sorting";

package/src/shared/lib/localStrore/model/enums/EStorageKey.ts

@@ -4,4 +4,5 @@ export enum EStorageKey {
 	hiddenColumnIds = "hidden-column-ids",
 	slickTable = "slick-table",
 	sorting = "sorting",
+	queries = "queries",
 }

package/src/shared/lib/localStrore/model/localStore.ts

@@ -1,9 +1,16 @@
-import { ColumnFilters, ColumnWidths, HiddenColumns, Sorting } from "./classes";
+import {
+	ColumnFilters,
+	ColumnWidths,
+	HiddenColumns,
+	Queries,
+	Sorting,
+} from "./classes";
 
 class LocalStore {
 	columnFilters = new ColumnFilters();
 	columnWidths = new ColumnWidths();
 	hiddenColumns = new HiddenColumns();
+	queries = new Queries();
 	sorting = new Sorting();
 }
 

package/src/shared/lib/slickgrid/index.ts

@@ -66,7 +66,7 @@ export {
 	WithoutHotKeys,
 	eventContextMenu,
 	eventHeaderContextMenu,
-	eventQuery,
+	eventRunQuery,
 	eventSummary,
 	printStyles,
 } from "./model";

package/src/shared/lib/slickgrid/model/events/{eventQuery.ts → eventRunQuery.ts}

@@ -1,11 +1,9 @@
 import { AnEvent } from "shared/lib/an-event";
 import { ISlickTable } from "shared/model/types";
 
-class EventQuery extends AnEvent {
+class EventRunQuery extends AnEvent {
 	private _open = false;
 	private _table: ISlickTable | undefined;
-	x = 0;
-	y = 0;
 
 	get open() {
 		return this._open;
@@ -23,4 +21,4 @@ class EventQuery extends AnEvent {
 	}
 }
 
-export const eventQuery = new EventQuery();
+export const eventRunQuery = new EventRunQuery();

package/src/shared/lib/slickgrid/model/events/index.ts

@@ -1,4 +1,4 @@
 export { eventContextMenu } from "./eventContextMenu";
 export { eventHeaderContextMenu } from "./eventHeaderContextMenu";
-export { eventQuery } from "./eventQuery";
+export { eventRunQuery } from "./eventRunQuery";
 export { eventSummary } from "./eventSummary";

package/src/shared/lib/slickgrid/model/index.ts

@@ -21,6 +21,6 @@ export {
 export {
 	eventContextMenu,
 	eventHeaderContextMenu,
-	eventQuery,
+	eventRunQuery,
 	eventSummary,
 } from "./events";

package/src/shared/lib/slickgrid/ui/SlickgridTable/ui/SlickgridTable.tsx

@@ -1,6 +1,6 @@
 import { FC } from "react";
 
-import { PopupQuery } from "entities/popup-query";
+import { DrawerRunQuery } from "entities/drawer-run-query";
 import { PopupSummary } from "entities/popup-summary";
 
 import { ColumnFilters } from "features/column-filters";
@@ -68,7 +68,7 @@ export const SlickgridTable: FC<Props> = ({
 			<ColumnFilters tableId={table.id} />
 			<ContextMenu tableId={table.id} />
 			<PopupSummary tableId={table.id} />
-			<PopupQuery tableId={table.id} />
+			<DrawerRunQuery tableId={table.id} />
 		</Styled.Wrapper>
 	);
 };

package/src/shared/lib/slickgrid/ui/columns/columnIsEdited/ui/columnIsEdited.ts

@@ -1,3 +1,4 @@
+import { IS_EDITED } from "shared/model/consts";
 import { ESortType } from "shared/model/enums";
 import { IColumn } from "shared/model/types";
 
@@ -5,9 +6,9 @@ import { setEditedMark } from "../lib";
 import { ICON_IS_EDITED } from "./iconIsEdited";
 
 export const columnIsEdited: IColumn = {
-	id: "isEdited",
+	id: IS_EDITED,
 	name: ICON_IS_EDITED,
-	field: "isEdited",
+	field: IS_EDITED,
 	formatter: setEditedMark,
 	focusable: false,
 	sortable: true,

package/src/shared/model/consts/columnId.ts

@@ -1 +1,2 @@
 export const CHECKBOX_SELECTOR = "checkboxSelector";
+export const IS_EDITED = "isEdited";

package/src/shared/model/consts/index.ts

@@ -1,4 +1,4 @@
-export { CHECKBOX_SELECTOR } from "./columnId";
+export { CHECKBOX_SELECTOR, IS_EDITED } from "./columnId";
 export { BOLD, WINK } from "./cssClasses";
 export { dateFormats } from "./dateFormats";
 export { INVALID_DATE } from "./invalidDate";

package/src/shared/model/types/IRecentQuery.ts

@@ -0,0 +1,4 @@
+export interface IRecentQuery {
+	time: string;
+	query: string;
+}

package/src/shared/model/types/index.ts

@@ -12,6 +12,7 @@ export type { IHotKeysBehavior } from "./IHotKeysBehavior";
 export type { IHtmlDocElements } from "./IHtmlDocElements";
 export type { IObserver } from "./IObserver";
 export type { IPrinter } from "./IPrinter";
+export type { IRecentQuery } from "./IRecentQuery";
 export type { ISlickTable } from "./ISlickTable";
 export type { ISlickRow } from "./ISlickRow";
 export type { ITotalCalculator } from "./ITotalCalculator";

package/dist/types/entities/popup-query/index.d.ts

@@ -1,2 +0,0 @@
-export { PopupQuery } from './ui';
-//# sourceMappingURL=index.d.ts.map

package/dist/types/entities/popup-query/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/entities/popup-query/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC"}

package/dist/types/entities/popup-query/lib/hooks/index.d.ts

@@ -1,2 +0,0 @@
-export { useSubscribeToEvent } from './useSubscribeToEvent';
-//# sourceMappingURL=index.d.ts.map

package/dist/types/entities/popup-query/lib/hooks/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/entities/popup-query/lib/hooks/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC"}

package/dist/types/entities/popup-query/lib/hooks/useSubscribeToEvent.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"useSubscribeToEvent.d.ts","sourceRoot":"","sources":["../../../../../../src/entities/popup-query/lib/hooks/useSubscribeToEvent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAa,MAAM,OAAO,CAAC;AAI5D,wBAAgB,mBAAmB,CAClC,WAAW,EAAE,QAAQ,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,EAC9C,OAAO,EAAE,MAAM,QAiBf"}

package/dist/types/entities/popup-query/lib/index.d.ts

@@ -1,3 +0,0 @@
-export { useSubscribeToEvent } from './hooks';
-export { tableQuery } from './table';
-//# sourceMappingURL=index.d.ts.map

package/dist/types/entities/popup-query/lib/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/entities/popup-query/lib/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC"}

package/dist/types/entities/popup-query/lib/table/index.d.ts

@@ -1,2 +0,0 @@
-export { tableQuery } from './tableQuery';
-//# sourceMappingURL=index.d.ts.map

package/dist/types/entities/popup-query/lib/table/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/entities/popup-query/lib/table/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC"}

package/dist/types/entities/popup-query/lib/table/tableQuery.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"tableQuery.d.ts","sourceRoot":"","sources":["../../../../../../src/entities/popup-query/lib/table/tableQuery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,wDAAwD,CAAC;AAEpF,eAAO,MAAM,UAAU,YAAwC,CAAC"}

package/dist/types/entities/popup-query/model/consts/id.d.ts

@@ -1,2 +0,0 @@
-export declare const QUERY_LANGUAGE = "QUERY_LANGUAGE";
-//# sourceMappingURL=id.d.ts.map

package/dist/types/entities/popup-query/model/consts/id.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"id.d.ts","sourceRoot":"","sources":["../../../../../../src/entities/popup-query/model/consts/id.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,cAAc,mBAAmB,CAAC"}

package/dist/types/entities/popup-query/model/consts/index.d.ts

@@ -1,2 +0,0 @@
-export { QUERY_LANGUAGE } from './id';
-//# sourceMappingURL=index.d.ts.map

package/dist/types/entities/popup-query/model/consts/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/entities/popup-query/model/consts/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,MAAM,CAAC"}

package/dist/types/entities/popup-query/model/index.d.ts

@@ -1,3 +0,0 @@
-export { QUERY_LANGUAGE } from './consts';
-export type { ITotal } from './types';
-//# sourceMappingURL=index.d.ts.map

package/dist/types/entities/popup-query/model/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/entities/popup-query/model/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAC1C,YAAY,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC"}

package/dist/types/entities/popup-query/model/types/ITotal.d.ts

@@ -1,10 +0,0 @@
-import { Column, Formatter, FormatterResultWithHtml, FormatterResultWithText } from 'slickgrid';
-export type ITotal = Record<string, {
-    cell: number;
-    column: Column;
-    formatter?: Formatter<any>;
-    label: string;
-    total: number;
-    totalFormatted: string | HTMLElement | DocumentFragment | FormatterResultWithHtml | FormatterResultWithText;
-}>;
-//# sourceMappingURL=ITotal.d.ts.map

package/dist/types/entities/popup-query/model/types/ITotal.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ITotal.d.ts","sourceRoot":"","sources":["../../../../../../src/entities/popup-query/model/types/ITotal.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,MAAM,EACN,SAAS,EACT,uBAAuB,EACvB,uBAAuB,EACvB,MAAM,WAAW,CAAC;AAEnB,MAAM,MAAM,MAAM,GAAG,MAAM,CAC1B,MAAM,EACN;IACC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,cAAc,EACX,MAAM,GACN,WAAW,GACX,gBAAgB,GAChB,uBAAuB,GACvB,uBAAuB,CAAC;CAC3B,CACD,CAAC"}

package/dist/types/entities/popup-query/model/types/index.d.ts

@@ -1,2 +0,0 @@
-export type { ITotal } from './ITotal';
-//# sourceMappingURL=index.d.ts.map

package/dist/types/entities/popup-query/model/types/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/entities/popup-query/model/types/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC"}

package/dist/types/entities/popup-query/ui/PopupQuery.d.ts

@@ -1,7 +0,0 @@
-import { FC } from 'react';
-export declare const PopupQuery: FC<Props>;
-interface Props {
-    tableId: string;
-}
-export {};
-//# sourceMappingURL=PopupQuery.d.ts.map

package/dist/types/entities/popup-query/ui/PopupQuery.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"PopupQuery.d.ts","sourceRoot":"","sources":["../../../../../src/entities/popup-query/ui/PopupQuery.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAe,EAAE,EAAgC,MAAM,OAAO,CAAC;AAWtE,eAAO,MAAM,UAAU,EAAE,EAAE,CAAC,KAAK,CA8IhC,CAAC;AAEF,UAAU,KAAK;IACd,OAAO,EAAE,MAAM,CAAC;CAChB"}

package/dist/types/entities/popup-query/ui/PopupQuery.style.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"PopupQuery.style.d.ts","sourceRoot":"","sources":["../../../../../src/entities/popup-query/ui/PopupQuery.style.ts"],"names":[],"mappings":";;;;;;;;;;;oBAqEiB,OAAO;;;;;;;;;;;;;;;;AAexB,wBAUE"}

package/dist/types/entities/popup-query/ui/index.d.ts

@@ -1,2 +0,0 @@
-export { PopupQuery } from './PopupQuery';
-//# sourceMappingURL=index.d.ts.map

package/dist/types/entities/popup-query/ui/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/entities/popup-query/ui/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC"}

package/dist/types/shared/lib/slickgrid/model/events/eventQuery.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"eventQuery.d.ts","sourceRoot":"","sources":["../../../../../../../src/shared/lib/slickgrid/model/events/eventQuery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,cAAM,UAAW,SAAQ,OAAO;IAC/B,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,MAAM,CAA0B;IACxC,CAAC,SAAK;IACN,CAAC,SAAK;IAEN,IAAI,IAAI,YAEP;IACD,IAAI,IAAI,CAAC,IAAI,SAAA,EAGZ;IAED,IAAI,KAAK,4BAER;IACD,IAAI,KAAK,CAAC,KAAK,yBAAA,EAEd;CACD;AAED,eAAO,MAAM,UAAU,YAAmB,CAAC"}

package/src/entities/popup-query/index.ts

@@ -1 +0,0 @@
-export { PopupQuery } from "./ui";

package/src/entities/popup-query/lib/index.ts

@@ -1,2 +0,0 @@
-export { useSubscribeToEvent } from "./hooks";
-export { tableQuery } from "./table";

package/src/entities/popup-query/lib/table/index.ts

@@ -1 +0,0 @@
-export { tableQuery } from "./tableQuery";

package/src/entities/popup-query/model/consts/index.ts

@@ -1 +0,0 @@
-export { QUERY_LANGUAGE } from "./id";

package/src/entities/popup-query/model/index.ts

@@ -1,2 +0,0 @@
-export { QUERY_LANGUAGE } from "./consts";
-export type { ITotal } from "./types";

package/src/entities/popup-query/model/types/ITotal.ts

@@ -1,23 +0,0 @@
-import {
-	Column,
-	Formatter,
-	FormatterResultWithHtml,
-	FormatterResultWithText,
-} from "slickgrid";
-
-export type ITotal = Record<
-	string,
-	{
-		cell: number;
-		column: Column;
-		formatter?: Formatter<any>;
-		label: string;
-		total: number;
-		totalFormatted:
-			| string
-			| HTMLElement
-			| DocumentFragment
-			| FormatterResultWithHtml
-			| FormatterResultWithText;
-	}
->;

package/src/entities/popup-query/model/types/index.ts

@@ -1 +0,0 @@
-export type { ITotal } from "./ITotal";

package/src/entities/popup-query/ui/index.ts

@@ -1 +0,0 @@
-export { PopupQuery } from "./PopupQuery";