namirasoft-account-react 1.5.20 → 1.5.21

package/src/components/quickfilter/NSAFilterBoxBase.tsx

@@ -1,90 +1,90 @@
-import { Component } from "react";
-import { BaseMetaColumn, BaseMetaTable, FilterItem, FilterItemOperator } from "namirasoft-core";
-import { QuickFilterConfig } from "./NSAQuickFilterDialog";
-
-export interface NSAFilterBoxBaseProps
-{
-    config: QuickFilterConfig;
-    initial?: FilterItem | FilterItem[] | null;
-    onChanged: (items: FilterItem | FilterItem[] | null) => void;
-}
-
-export abstract class NSAFilterBoxBase<P extends NSAFilterBoxBaseProps = NSAFilterBoxBaseProps, S = {}>
-    extends Component<P, S>
-{
-    private static readonly NOT_OPERATOR_MAP: Record<string, string> = {
-        notequals: "equals",
-        notcontains: "contains",
-    };
-
-    private buildMeta()
-    {
-        const { config } = this.props;
-        const table = new BaseMetaTable(null, config.column.table.name, config.column.table.text);
-        const column = new BaseMetaColumn(table, config.column.name, config.column.text, config.column.type, false);
-        return { table, column };
-    }
-
-    protected buildFilterItem(...values: string[]): FilterItem
-    {
-        const { table, column } = this.buildMeta();
-        const key = this.props.config.operatorName ?? "";
-        const isNot = key in NSAFilterBoxBase.NOT_OPERATOR_MAP;
-        const resolvedKey = isNot ? NSAFilterBoxBase.NOT_OPERATOR_MAP[key] : key;
-        const operator = resolvedKey
-            ? FilterItemOperator.getByName(resolvedKey)
-            : FilterItemOperator.all.equals;
-        return new FilterItem(table, column, isNot, operator, ...values);
-    }
-
-    protected buildBetweenFilterItems(from: string, to: string): FilterItem[]
-    {
-        const { table, column } = this.buildMeta();
-        return [
-            new FilterItem(table, column, false, FilterItemOperator.all.morethanequal, from),
-            new FilterItem(table, column, false, FilterItemOperator.all.lessthanequal, to),
-        ];
-    }
-
-    protected getLabel(): string
-    {
-        const { config } = this.props;
-        if (!config.operatorName)
-            return config.column.text;
-        const sign = FilterItemOperator.getByName(config.operatorName).sign;
-        return `${config.column.text} ${sign}`;
-    }
-
-    protected getInitialItems(): FilterItem[]
-    {
-        const initial = this.props.initial;
-        if (!initial)
-            return [];
-        return Array.isArray(initial) ? initial : [initial];
-    }
-
-    protected getInitialValue(): string | undefined
-    {
-        return this.getInitialItems()[0]?.values[0];
-    }
-
-    protected getInitialValues(): string[]
-    {
-        return this.getInitialItems().flatMap(i => i.values);
-    }
-
-    protected getInitialBetween(): { from: string; to: string } | undefined
-    {
-        const items = this.getInitialItems();
-        if (items.length < 2)
-            return undefined;
-        const from = items.find(i => i.operator?.name === "morethanequal")?.values[0] ?? items[0].values[0];
-        const to = items.find(i => i.operator?.name === "lessthanequal")?.values[0] ?? items[1].values[0];
-        return { from, to };
-    }
-
-    protected parseDBDate(value: string): Date
-    {
-        return new Date(value.replace(" ", "T") + "Z");
-    }
+import { Component } from "react";
+import { BaseMetaColumn, BaseMetaTable, FilterItem, FilterItemOperator } from "namirasoft-core";
+import { QuickFilterConfig } from "./NSAQuickFilterDialog";
+
+export interface NSAFilterBoxBaseProps
+{
+    config: QuickFilterConfig;
+    initial?: FilterItem | FilterItem[] | null;
+    onChanged: (items: FilterItem | FilterItem[] | null) => void;
+}
+
+export abstract class NSAFilterBoxBase<P extends NSAFilterBoxBaseProps = NSAFilterBoxBaseProps, S = {}>
+    extends Component<P, S>
+{
+    private static readonly NOT_OPERATOR_MAP: Record<string, string> = {
+        notequals: "equals",
+        notcontains: "contains",
+    };
+
+    private buildMeta()
+    {
+        const { config } = this.props;
+        const table = new BaseMetaTable(null, config.column.table.name, config.column.table.text);
+        const column = new BaseMetaColumn(table, config.column.name, config.column.text, config.column.type, false);
+        return { table, column };
+    }
+
+    protected buildFilterItem(...values: string[]): FilterItem
+    {
+        const { table, column } = this.buildMeta();
+        const key = this.props.config.operatorName ?? "";
+        const isNot = key in NSAFilterBoxBase.NOT_OPERATOR_MAP;
+        const resolvedKey = isNot ? NSAFilterBoxBase.NOT_OPERATOR_MAP[key] : key;
+        const operator = resolvedKey
+            ? FilterItemOperator.getByName(resolvedKey)
+            : FilterItemOperator.all.equals;
+        return new FilterItem(table, column, isNot, operator, ...values);
+    }
+
+    protected buildBetweenFilterItems(from: string, to: string): FilterItem[]
+    {
+        const { table, column } = this.buildMeta();
+        return [
+            new FilterItem(table, column, false, FilterItemOperator.all.morethanequal, from),
+            new FilterItem(table, column, false, FilterItemOperator.all.lessthanequal, to),
+        ];
+    }
+
+    protected getLabel(): string
+    {
+        const { config } = this.props;
+        if (!config.operatorName)
+            return config.column.text;
+        const sign = FilterItemOperator.getByName(config.operatorName).sign;
+        return `${config.column.text} ${sign}`;
+    }
+
+    protected getInitialItems(): FilterItem[]
+    {
+        const initial = this.props.initial;
+        if (!initial)
+            return [];
+        return Array.isArray(initial) ? initial : [initial];
+    }
+
+    protected getInitialValue(): string | undefined
+    {
+        return this.getInitialItems()[0]?.values[0];
+    }
+
+    protected getInitialValues(): string[]
+    {
+        return this.getInitialItems().flatMap(i => i.values);
+    }
+
+    protected getInitialBetween(): { from: string; to: string } | undefined
+    {
+        const items = this.getInitialItems();
+        if (items.length < 2)
+            return undefined;
+        const from = items.find(i => i.operator?.name === "morethanequal")?.values[0] ?? items[0].values[0];
+        const to = items.find(i => i.operator?.name === "lessthanequal")?.values[0] ?? items[1].values[0];
+        return { from, to };
+    }
+
+    protected parseDBDate(value: string): Date
+    {
+        return new Date(value.replace(" ", "T") + "Z");
+    }
 }

package/src/components/quickfilter/NSAFilterBoxBoolean.tsx

@@ -1,67 +1,67 @@
-import { FilterItemOperator } from "namirasoft-core";
-import { NSBoxBoolean } from "namirasoft-site-react";
-import { createRef } from "react";
-import { NSAFilterBoxBase, NSAFilterBoxBaseProps } from "./NSAFilterBoxBase";
-
-interface NSAFilterBoxBooleanState
-{
-    value: boolean | null;
-}
-
-export class NSAFilterBoxBoolean extends NSAFilterBoxBase<NSAFilterBoxBaseProps, NSAFilterBoxBooleanState>
-{
-    private containerRef = createRef<HTMLDivElement>();
-
-    constructor(props: NSAFilterBoxBaseProps)
-    {
-        super(props);
-        this.state = { value: this.resolveInitialValue() };
-        this.handleChange = this.handleChange.bind(this);
-    }
-
-    private resolveInitialValue(): boolean | null
-    {
-        const hasInitial = this.getInitialItems().length > 0;
-        if (this.isValueless())
-            return hasInitial;
-        const value = this.getInitialValue();
-        if (value !== undefined)
-            return value === "1";
-        return null;
-    }
-
-    private isValueless(): boolean
-    {
-        const name = this.props.config.operatorName;
-        return !!name && FilterItemOperator.getByName(name).count === 0;
-    }
-
-
-    private handleChange(value: boolean | null)
-    {
-        this.setState({ value });
-        if (this.isValueless())
-            this.props.onChanged(value === true ? this.buildFilterItem() : null);
-        else if (value !== null)
-            this.props.onChanged(this.buildFilterItem(String(Number(value))));
-        else
-            this.props.onChanged(null);
-    }
-
-    override render(): JSX.Element
-    {
-        return (
-            <div ref={this.containerRef} style={{ width: "100%" }}>
-                <NSBoxBoolean
-                    title={this.getLabel()}
-                    placeholder={this.getLabel()}
-                    required={false}
-                    hideHeader={true}
-                    triState={!this.isValueless()}
-                    defaultValue={this.state.value ?? undefined}
-                    onChanged={e => this.handleChange(e.getValue())}
-                />
-            </div>
-        );
-    }
+import { FilterItemOperator } from "namirasoft-core";
+import { NSBoxBoolean } from "namirasoft-site-react";
+import { createRef } from "react";
+import { NSAFilterBoxBase, NSAFilterBoxBaseProps } from "./NSAFilterBoxBase";
+
+interface NSAFilterBoxBooleanState
+{
+    value: boolean | null;
+}
+
+export class NSAFilterBoxBoolean extends NSAFilterBoxBase<NSAFilterBoxBaseProps, NSAFilterBoxBooleanState>
+{
+    private containerRef = createRef<HTMLDivElement>();
+
+    constructor(props: NSAFilterBoxBaseProps)
+    {
+        super(props);
+        this.state = { value: this.resolveInitialValue() };
+        this.handleChange = this.handleChange.bind(this);
+    }
+
+    private resolveInitialValue(): boolean | null
+    {
+        const hasInitial = this.getInitialItems().length > 0;
+        if (this.isValueless())
+            return hasInitial;
+        const value = this.getInitialValue();
+        if (value !== undefined)
+            return value === "1";
+        return null;
+    }
+
+    private isValueless(): boolean
+    {
+        const name = this.props.config.operatorName;
+        return !!name && FilterItemOperator.getByName(name).count === 0;
+    }
+
+
+    private handleChange(value: boolean | null)
+    {
+        this.setState({ value });
+        if (this.isValueless())
+            this.props.onChanged(value === true ? this.buildFilterItem() : null);
+        else if (value !== null)
+            this.props.onChanged(this.buildFilterItem(String(Number(value))));
+        else
+            this.props.onChanged(null);
+    }
+
+    override render(): JSX.Element
+    {
+        return (
+            <div ref={this.containerRef} style={{ width: "100%" }}>
+                <NSBoxBoolean
+                    title={this.getLabel()}
+                    placeholder={this.getLabel()}
+                    required={false}
+                    hideHeader={true}
+                    triState={!this.isValueless()}
+                    defaultValue={this.state.value ?? undefined}
+                    onChanged={e => this.handleChange(e.getValue())}
+                />
+            </div>
+        );
+    }
 }

package/src/components/quickfilter/NSAFilterBoxDate.tsx

@@ -1,111 +1,111 @@
-import { FilterItem, FilterItemOperator, SortItem, TimeOperation } from "namirasoft-core";
-import { NSBoxDate, NSBoxDateRange, NSBoxEntity } from "namirasoft-site-react";
-import { NSAFilterBoxBase, NSAFilterBoxBaseProps } from "./NSAFilterBoxBase";
-import { NSAFilterBoxBoolean } from "./NSAFilterBoxBoolean";
-
-export interface NSAFilterBoxDateProps extends NSAFilterBoxBaseProps
-{
-    getValues: (search: string) => Promise<{ value: string; title: string }[]>;
-}
-
-type ValueItem = { value: string; title: string };
-
-const ENTITY_OPERATORS = ["equals"];
-
-export class NSAFilterBoxDate extends NSAFilterBoxBase<NSAFilterBoxDateProps>
-{
-    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 (
-                <NSBoxDateRange
-                    title={this.getLabel()}
-                    placeholder={this.getLabel()}
-                    required={false}
-                    hideHeader={true}
-                    preset={true}
-                    defaultValue={between ? { from: this.parseDBDate(between.from), to: this.parseDBDate(between.to) } : undefined}
-                    onChanged={e =>
-                    {
-                        const val = e.getValue();
-                        if (val)
-                        {
-                            this.betweenActive = true;
-                            onChanged(this.buildBetweenFilterItems(
-                                TimeOperation.toDBFormat(val.from),
-                                TimeOperation.toDBFormat(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);
-                    }}
-                />
-            );
-
-        const single = this.getInitialValue();
-        return (
-            <NSBoxDate
-                title={this.getLabel()}
-                placeholder={this.getLabel()}
-                required={false}
-                hideHeader={true}
-                defaultValue={single !== undefined ? this.parseDBDate(single) : undefined}
-                onChanged={e =>
-                {
-                    const val = e.getValue();
-                    onChanged(val ? this.buildFilterItem(TimeOperation.toDBFormat(val)) : null);
-                }}
-            />
-        );
-    }
+import { FilterItem, FilterItemOperator, SortItem, TimeOperation } from "namirasoft-core";
+import { NSBoxDate, NSBoxDateRange, NSBoxEntity } from "namirasoft-site-react";
+import { NSAFilterBoxBase, NSAFilterBoxBaseProps } from "./NSAFilterBoxBase";
+import { NSAFilterBoxBoolean } from "./NSAFilterBoxBoolean";
+
+export interface NSAFilterBoxDateProps extends NSAFilterBoxBaseProps
+{
+    getValues: (search: string) => Promise<{ value: string; title: string }[]>;
+}
+
+type ValueItem = { value: string; title: string };
+
+const ENTITY_OPERATORS = ["equals"];
+
+export class NSAFilterBoxDate extends NSAFilterBoxBase<NSAFilterBoxDateProps>
+{
+    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 (
+                <NSBoxDateRange
+                    title={this.getLabel()}
+                    placeholder={this.getLabel()}
+                    required={false}
+                    hideHeader={true}
+                    preset={true}
+                    defaultValue={between ? { from: this.parseDBDate(between.from), to: this.parseDBDate(between.to) } : undefined}
+                    onChanged={e =>
+                    {
+                        const val = e.getValue();
+                        if (val)
+                        {
+                            this.betweenActive = true;
+                            onChanged(this.buildBetweenFilterItems(
+                                TimeOperation.toDBFormat(val.from),
+                                TimeOperation.toDBFormat(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);
+                    }}
+                />
+            );
+
+        const single = this.getInitialValue();
+        return (
+            <NSBoxDate
+                title={this.getLabel()}
+                placeholder={this.getLabel()}
+                required={false}
+                hideHeader={true}
+                defaultValue={single !== undefined ? this.parseDBDate(single) : undefined}
+                onChanged={e =>
+                {
+                    const val = e.getValue();
+                    onChanged(val ? this.buildFilterItem(TimeOperation.toDBFormat(val)) : null);
+                }}
+            />
+        );
+    }
 }