namirasoft-account-react 1.5.21 → 1.5.22

package/src/components/quickfilter/NSAFilterBoxTime.tsx

@@ -1,107 +1,107 @@
-import { FilterItem, FilterItemOperator, SortItem } from "namirasoft-core";
-import { NSBoxEntity, NSBoxTime, NSBoxTimeRange } from "namirasoft-site-react";
-import { NSAFilterBoxBase, NSAFilterBoxBaseProps } from "./NSAFilterBoxBase";
-import { NSAFilterBoxBoolean } from "./NSAFilterBoxBoolean";
-
-export interface NSAFilterBoxTimeProps extends NSAFilterBoxBaseProps
-{
-    getValues: (search: string) => Promise<{ value: string; title: string }[]>;
-}
-
-type ValueItem = { value: string; title: string };
-
-const ENTITY_OPERATORS = ["equals"];
-
-export class NSAFilterBoxTime extends NSAFilterBoxBase<NSAFilterBoxTimeProps>
-{
-    private betweenActive = this.getInitialBetween() !== undefined;
-
-    private list = async (
-        filters: FilterItem[] | null,
-        _page: number | null,
-        _size: number | null,
-        _sorts: SortItem[]
-    ): Promise<{ count: number; rows: ValueItem[] }> =>
-    {
-        const searchFilter = filters?.find(f => f.values.length > 0);
-        const search = searchFilter?.values[0] ?? "";
-        const rows = await this.props.getValues(search);
-        return { count: rows.length, rows };
-    };
-
-    override render(): JSX.Element | null
-    {
-        const { config, onChanged } = this.props;
-        const op = config.operatorName
-            ? FilterItemOperator.getByName(config.operatorName)
-            : null;
-
-        if (op && op.count === 0)
-            return <NSAFilterBoxBoolean config={config} initial={this.props.initial} onChanged={onChanged} />;
-
-        const between = this.getInitialBetween();
-
-        if (config.operatorName === "between")
-            return (
-                <NSBoxTimeRange
-                    title={this.getLabel()}
-                    placeholder={this.getLabel()}
-                    required={false}
-                    hideHeader={true}
-                    preset={true}
-                    defaultValue={between ? { from: between.from, to: between.to } : undefined}
-                    onChanged={e =>
-                    {
-                        const val = e.getValue();
-                        if (val)
-                        {
-                            this.betweenActive = true;
-                            onChanged(this.buildBetweenFilterItems(val.from, val.to));
-                        }
-                        else if (this.betweenActive)
-                        {
-                            this.betweenActive = false;
-                            onChanged(null);
-                        }
-                    }}
-                />
-            );
-
-        if (config.operatorName && ENTITY_OPERATORS.includes(config.operatorName))
-            return (
-                <NSBoxEntity<ValueItem>
-                    title={this.getLabel()}
-                    placeholder={this.getLabel()}
-                    required={false}
-                    hideHeader={true}
-                    multiple={false}
-                    defaultValue={this.getInitialValue()}
-                    list={this.list}
-                    table_name={config.column.table.name}
-                    getValue={item => item.value}
-                    getTitle={item => item.title}
-                    getSort={() => null}
-                    onChanged={e =>
-                    {
-                        const val = e.getValueOne();
-                        onChanged(val ? this.buildFilterItem(val) : null);
-                    }}
-                />
-            );
-
-        return (
-            <NSBoxTime
-                title={this.getLabel()}
-                placeholder={this.getLabel()}
-                required={false}
-                hideHeader={true}
-                defaultValue={this.getInitialValue()}
-                onChanged={e =>
-                {
-                    const val = e.getValue();
-                    onChanged(val ? this.buildFilterItem(val) : null);
-                }}
-            />
-        );
-    }
+import { FilterItem, FilterItemOperator, SortItem } from "namirasoft-core";
+import { NSBoxEntity, NSBoxTime, NSBoxTimeRange } from "namirasoft-site-react";
+import { NSAFilterBoxBase, NSAFilterBoxBaseProps } from "./NSAFilterBoxBase";
+import { NSAFilterBoxBoolean } from "./NSAFilterBoxBoolean";
+
+export interface NSAFilterBoxTimeProps extends NSAFilterBoxBaseProps
+{
+    getValues: (search: string) => Promise<{ value: string; title: string }[]>;
+}
+
+type ValueItem = { value: string; title: string };
+
+const ENTITY_OPERATORS = ["equals"];
+
+export class NSAFilterBoxTime extends NSAFilterBoxBase<NSAFilterBoxTimeProps>
+{
+    private betweenActive = this.getInitialBetween() !== undefined;
+
+    private list = async (
+        filters: FilterItem[] | null,
+        _page: number | null,
+        _size: number | null,
+        _sorts: SortItem[]
+    ): Promise<{ count: number; rows: ValueItem[] }> =>
+    {
+        const searchFilter = filters?.find(f => f.values.length > 0);
+        const search = searchFilter?.values[0] ?? "";
+        const rows = await this.props.getValues(search);
+        return { count: rows.length, rows };
+    };
+
+    override render(): JSX.Element | null
+    {
+        const { config, onChanged } = this.props;
+        const op = config.operatorName
+            ? FilterItemOperator.getByName(config.operatorName)
+            : null;
+
+        if (op && op.count === 0)
+            return <NSAFilterBoxBoolean config={config} initial={this.props.initial} onChanged={onChanged} />;
+
+        const between = this.getInitialBetween();
+
+        if (config.operatorName === "between")
+            return (
+                <NSBoxTimeRange
+                    title={this.getLabel()}
+                    placeholder={this.getLabel()}
+                    required={false}
+                    hideHeader={true}
+                    preset={true}
+                    defaultValue={between ? { from: between.from, to: between.to } : undefined}
+                    onChanged={e =>
+                    {
+                        const val = e.getValue();
+                        if (val)
+                        {
+                            this.betweenActive = true;
+                            onChanged(this.buildBetweenFilterItems(val.from, val.to));
+                        }
+                        else if (this.betweenActive)
+                        {
+                            this.betweenActive = false;
+                            onChanged(null);
+                        }
+                    }}
+                />
+            );
+
+        if (config.operatorName && ENTITY_OPERATORS.includes(config.operatorName))
+            return (
+                <NSBoxEntity<ValueItem>
+                    title={this.getLabel()}
+                    placeholder={this.getLabel()}
+                    required={false}
+                    hideHeader={true}
+                    multiple={false}
+                    defaultValue={this.getInitialValue()}
+                    list={this.list}
+                    table_name={config.column.table.name}
+                    getValue={item => item.value}
+                    getTitle={item => item.title}
+                    getSort={() => null}
+                    onChanged={e =>
+                    {
+                        const val = e.getValueOne();
+                        onChanged(val ? this.buildFilterItem(val) : null);
+                    }}
+                />
+            );
+
+        return (
+            <NSBoxTime
+                title={this.getLabel()}
+                placeholder={this.getLabel()}
+                required={false}
+                hideHeader={true}
+                defaultValue={this.getInitialValue()}
+                onChanged={e =>
+                {
+                    const val = e.getValue();
+                    onChanged(val ? this.buildFilterItem(val) : null);
+                }}
+            />
+        );
+    }
 }

package/src/components/quickfilter/NSAQuickFilterBar.module.css

@@ -1,20 +1,20 @@
-.qf_bar {
-    display: flex;
-    flex-wrap: wrap;
-    flex-direction: column;
-    align-items: center;
-    gap: 8px;
-}
-
-.qf_card {
-    display: flex;
-    flex-direction: column;
-    min-width: 288px;
-}
-
-@media screen and (min-width: 480px) {
-    .qf_bar {
-        flex-direction: row;
-        align-items: normal;
-    }
+.qf_bar {
+    display: flex;
+    flex-wrap: wrap;
+    flex-direction: column;
+    align-items: center;
+    gap: 8px;
+}
+
+.qf_card {
+    display: flex;
+    flex-direction: column;
+    min-width: 288px;
+}
+
+@media screen and (min-width: 480px) {
+    .qf_bar {
+        flex-direction: row;
+        align-items: normal;
+    }
 }

package/src/components/quickfilter/NSAQuickFilterBar.tsx

@@ -1,143 +1,143 @@
-import { Component } from "react";
-import { FilterItem } from "namirasoft-core";
-import { VariableType } from "namirasoft-schema";
-import { QuickFilterConfig } from "./NSAQuickFilterDialog";
-import { NSAFilterBoxBoolean } from "./NSAFilterBoxBoolean";
-import { NSAFilterBoxDate } from "./NSAFilterBoxDate";
-import { NSAFilterBoxDateTime } from "./NSAFilterBoxDateTime";
-import { NSAFilterBoxEnum } from "./NSAFilterBoxEnum";
-import { NSAFilterBoxNumber } from "./NSAFilterBoxNumber";
-import { NSAFilterBoxString } from "./NSAFilterBoxString";
-import { NSAFilterBoxTime } from "./NSAFilterBoxTime";
-import Styles from "./NSAQuickFilterBar.module.css";
-
-interface NSAQuickFilterBarProps
-{
-    configs: QuickFilterConfig[];
-    getValues: (tableName: string, columnName: string, search: string) => Promise<{ value: string; title: string }[]>;
-    initialItems?: FilterItem[];
-    onChanged?: () => void;
-}
-
-interface NSAQuickFilterBarState
-{
-    filterValues: { [id: string]: FilterItem | FilterItem[] | null };
-    clearKeys: { [id: string]: number };
-}
-
-const NUMERIC_TYPES = new Set<VariableType>([
-    VariableType.TinyInt, VariableType.SmallInt, VariableType.MediumInt,
-    VariableType.Integer, VariableType.BigInt, VariableType.Float,
-    VariableType.Double, VariableType.Decimal, VariableType.Real, VariableType.Money,
-]);
-
-const STRING_TYPES = new Set<VariableType>([
-    VariableType.String, VariableType.Email, VariableType.Phone, VariableType.URL,
-    VariableType.Color, VariableType.Font, VariableType.FilePath, VariableType.Version,
-    VariableType.IPV4, VariableType.IPV6, VariableType.IPV4Range, VariableType.IPV6Range,
-]);
-
-export class NSAQuickFilterBar extends Component<NSAQuickFilterBarProps, NSAQuickFilterBarState>
-{
-    constructor(props: NSAQuickFilterBarProps)
-    {
-        super(props);
-        this.state = { filterValues: this.buildInitialValues(props), clearKeys: {} };
-    }
-
-    private buildInitialValues(props: NSAQuickFilterBarProps): { [id: string]: FilterItem | FilterItem[] | null }
-    {
-        const values: { [id: string]: FilterItem | FilterItem[] | null } = {};
-        const items = props.initialItems ?? [];
-        const consumed = new Set<number>();
-        for (const config of props.configs)
-        {
-            const matched: FilterItem[] = [];
-            items.forEach((item, index) =>
-            {
-                if (consumed.has(index))
-                    return;
-                if (item.table.name === config.column.table.name && item.column.name === config.column.name)
-                {
-                    matched.push(item);
-                    consumed.add(index);
-                }
-            });
-            if (matched.length === 1)
-                values[config.id] = matched[0];
-            else if (matched.length > 1)
-                values[config.id] = matched;
-        }
-        return values;
-    }
-
-    getFilterItems(): FilterItem[]
-    {
-        return Object.values(this.state.filterValues).flatMap(v =>
-        {
-            if (!v) return [];
-            return Array.isArray(v) ? v : [v];
-        });
-    }
-
-    private handleFilterChange = (configId: string, items: FilterItem | FilterItem[] | null) =>
-    {
-        this.setState(
-            prev => ({ filterValues: { ...prev.filterValues, [configId]: items } }),
-            this.props.onChanged
-        );
-    };
-
-    private renderFilterBox(config: QuickFilterConfig, clearKey: number, colGetValues: (s: string) => Promise<{ value: string; title: string }[]>): JSX.Element | null
-    {
-        const { columnType } = config.column;
-        const onChanged = (items: FilterItem | FilterItem[] | null) => this.handleFilterChange(config.id, items);
-        const initial = this.state.filterValues[config.id] ?? null;
-        const commonProps = { key: clearKey, config, initial, onChanged };
-
-        if (columnType === VariableType.Boolean)
-            return <NSAFilterBoxBoolean {...commonProps} />;
-        if (NUMERIC_TYPES.has(columnType))
-            return <NSAFilterBoxNumber {...commonProps} getValues={colGetValues} />;
-        if (columnType === VariableType.Date)
-            return <NSAFilterBoxDate {...commonProps} getValues={colGetValues} />;
-        if (columnType === VariableType.DateTime)
-            return <NSAFilterBoxDateTime {...commonProps} getValues={colGetValues} />;
-        if (columnType === VariableType.Time)
-            return <NSAFilterBoxTime {...commonProps} getValues={colGetValues} />;
-        if (STRING_TYPES.has(columnType))
-            return <NSAFilterBoxString {...commonProps} getValues={colGetValues} />;
-        if (columnType === VariableType.Enum || columnType === VariableType.Entity)
-            return <NSAFilterBoxEnum {...commonProps} getValues={colGetValues} />;
-
-        return null;
-    }
-
-    private renderCard(config: QuickFilterConfig): JSX.Element | null
-    {
-        const { getValues } = this.props;
-        const clearKey = this.state.clearKeys[config.id] ?? 0;
-        const colGetValues = (s: string) => getValues(config.column.table.name, config.column.name, s);
-        const box = this.renderFilterBox(config, clearKey, colGetValues);
-        if (!box) return null;
-
-        return (
-            <div key={config.id} className={Styles.qf_card}>
-                {box}
-            </div>
-        );
-    }
-
-    override render()
-    {
-        const { configs } = this.props;
-        if (configs.length === 0)
-            return null;
-
-        return (
-            <div className={Styles.qf_bar}>
-                {configs.map(config => this.renderCard(config))}
-            </div>
-        );
-    }
+import { Component } from "react";
+import { FilterItem } from "namirasoft-core";
+import { VariableType } from "namirasoft-schema";
+import { QuickFilterConfig } from "./NSAQuickFilterDialog";
+import { NSAFilterBoxBoolean } from "./NSAFilterBoxBoolean";
+import { NSAFilterBoxDate } from "./NSAFilterBoxDate";
+import { NSAFilterBoxDateTime } from "./NSAFilterBoxDateTime";
+import { NSAFilterBoxEnum } from "./NSAFilterBoxEnum";
+import { NSAFilterBoxNumber } from "./NSAFilterBoxNumber";
+import { NSAFilterBoxString } from "./NSAFilterBoxString";
+import { NSAFilterBoxTime } from "./NSAFilterBoxTime";
+import Styles from "./NSAQuickFilterBar.module.css";
+
+interface NSAQuickFilterBarProps
+{
+    configs: QuickFilterConfig[];
+    getValues: (tableName: string, columnName: string, search: string) => Promise<{ value: string; title: string }[]>;
+    initialItems?: FilterItem[];
+    onChanged?: () => void;
+}
+
+interface NSAQuickFilterBarState
+{
+    filterValues: { [id: string]: FilterItem | FilterItem[] | null };
+    clearKeys: { [id: string]: number };
+}
+
+const NUMERIC_TYPES = new Set<VariableType>([
+    VariableType.TinyInt, VariableType.SmallInt, VariableType.MediumInt,
+    VariableType.Integer, VariableType.BigInt, VariableType.Float,
+    VariableType.Double, VariableType.Decimal, VariableType.Real, VariableType.Money,
+]);
+
+const STRING_TYPES = new Set<VariableType>([
+    VariableType.String, VariableType.Email, VariableType.Phone, VariableType.URL,
+    VariableType.Color, VariableType.Font, VariableType.FilePath, VariableType.Version,
+    VariableType.IPV4, VariableType.IPV6, VariableType.IPV4Range, VariableType.IPV6Range,
+]);
+
+export class NSAQuickFilterBar extends Component<NSAQuickFilterBarProps, NSAQuickFilterBarState>
+{
+    constructor(props: NSAQuickFilterBarProps)
+    {
+        super(props);
+        this.state = { filterValues: this.buildInitialValues(props), clearKeys: {} };
+    }
+
+    private buildInitialValues(props: NSAQuickFilterBarProps): { [id: string]: FilterItem | FilterItem[] | null }
+    {
+        const values: { [id: string]: FilterItem | FilterItem[] | null } = {};
+        const items = props.initialItems ?? [];
+        const consumed = new Set<number>();
+        for (const config of props.configs)
+        {
+            const matched: FilterItem[] = [];
+            items.forEach((item, index) =>
+            {
+                if (consumed.has(index))
+                    return;
+                if (item.table.name === config.column.table.name && item.column.name === config.column.name)
+                {
+                    matched.push(item);
+                    consumed.add(index);
+                }
+            });
+            if (matched.length === 1)
+                values[config.id] = matched[0];
+            else if (matched.length > 1)
+                values[config.id] = matched;
+        }
+        return values;
+    }
+
+    getFilterItems(): FilterItem[]
+    {
+        return Object.values(this.state.filterValues).flatMap(v =>
+        {
+            if (!v) return [];
+            return Array.isArray(v) ? v : [v];
+        });
+    }
+
+    private handleFilterChange = (configId: string, items: FilterItem | FilterItem[] | null) =>
+    {
+        this.setState(
+            prev => ({ filterValues: { ...prev.filterValues, [configId]: items } }),
+            this.props.onChanged
+        );
+    };
+
+    private renderFilterBox(config: QuickFilterConfig, clearKey: number, colGetValues: (s: string) => Promise<{ value: string; title: string }[]>): JSX.Element | null
+    {
+        const { columnType } = config.column;
+        const onChanged = (items: FilterItem | FilterItem[] | null) => this.handleFilterChange(config.id, items);
+        const initial = this.state.filterValues[config.id] ?? null;
+        const commonProps = { key: clearKey, config, initial, onChanged };
+
+        if (columnType === VariableType.Boolean)
+            return <NSAFilterBoxBoolean {...commonProps} />;
+        if (NUMERIC_TYPES.has(columnType))
+            return <NSAFilterBoxNumber {...commonProps} getValues={colGetValues} />;
+        if (columnType === VariableType.Date)
+            return <NSAFilterBoxDate {...commonProps} getValues={colGetValues} />;
+        if (columnType === VariableType.DateTime)
+            return <NSAFilterBoxDateTime {...commonProps} getValues={colGetValues} />;
+        if (columnType === VariableType.Time)
+            return <NSAFilterBoxTime {...commonProps} getValues={colGetValues} />;
+        if (STRING_TYPES.has(columnType))
+            return <NSAFilterBoxString {...commonProps} getValues={colGetValues} />;
+        if (columnType === VariableType.Enum || columnType === VariableType.Entity)
+            return <NSAFilterBoxEnum {...commonProps} getValues={colGetValues} />;
+
+        return null;
+    }
+
+    private renderCard(config: QuickFilterConfig): JSX.Element | null
+    {
+        const { getValues } = this.props;
+        const clearKey = this.state.clearKeys[config.id] ?? 0;
+        const colGetValues = (s: string) => getValues(config.column.table.name, config.column.name, s);
+        const box = this.renderFilterBox(config, clearKey, colGetValues);
+        if (!box) return null;
+
+        return (
+            <div key={config.id} className={Styles.qf_card}>
+                {box}
+            </div>
+        );
+    }
+
+    override render()
+    {
+        const { configs } = this.props;
+        if (configs.length === 0)
+            return null;
+
+        return (
+            <div className={Styles.qf_bar}>
+                {configs.map(config => this.renderCard(config))}
+            </div>
+        );
+    }
 }