namirasoft-account-react 1.4.19 → 1.4.21

package/src/layouts/NSASectionEdit.tsx

@@ -1,141 +1,145 @@
-import { IBaseComponentProps } from "namirasoft-site-react";
-import { NSSection, NSPanel, NSButtonBlue, NSLine, NSSpace, NSSpaceSizeType } from 'namirasoft-site-react';
-import { INSARouterProps } from "../INSARouterProps";
-import { forwardRef, ReactNode, useEffect, useImperativeHandle, useRef } from "react";
-import { useParams } from "react-router-dom";
-import { IEntityInfo } from "../IEntityInfo";
-import { NamingConvention } from "namirasoft-core";
-import { NSASectionTabs, NSASectionTabsRef } from "./NSASectionTabs";
-
-export interface NSASectionEditProps<EntityType extends { id: string }, EntityTypeInput = EntityType> extends IBaseComponentProps, INSARouterProps
-{
-	isEdit: boolean;
-	ui: {
-		getEntity: (entity: EntityType | null) => EntityTypeInput;
-		setEntity: (entity: EntityType) => void;
-		action?: {
-			menus: {
-				apply?: boolean,
-			}
-		},
-		tabs?: boolean;
-		panel?: boolean;
-	}
-}
-
-export interface NSASectionEditRef
-{
-	NSASectionTabs: NSASectionTabsRef | null;
-	onApply: () => void;
-}
-
-export function onApply<EntityType extends { id: string }, EntityTypeInput = EntityType>(props: NSASectionEditProps<EntityType, EntityTypeInput>, entity: IEntityInfo<EntityType, EntityTypeInput>, id: string | undefined): void
-{
-	try
-	{
-		let Name_Pascal_Space = NamingConvention.lower_case_underscore.convert(entity.name, NamingConvention.Pascal_Case_Space);
-
-		let onSuccess = (new_entity: EntityType, message: string) =>
-		{
-			props.notifier.onSuccess(message);
-			if (entity.client.onSuccess)
-				entity.client.onSuccess(new_entity);
-			else
-			{
-				let url = entity.client.getViewURL(new_entity.id);
-				if (!url)
-					url = entity.client.getListURL();
-				props.url.redirect(url, {});
-			}
-		};
-		let old_entity: EntityType | null = null;
-		let cur_entity = props.ui.getEntity(old_entity);
-		if (props.isEdit)
-		{
-			if (id)
-			{
-				if (entity.client.onUpdate)
-					entity.client.onUpdate(id, cur_entity).then(new_entity =>
-					{
-						if (new_entity)
-							onSuccess(new_entity, Name_Pascal_Space + " has been updated successfully");
-					}).catch(() => { });
-				else
-					entity.server.update(id, cur_entity).then((new_entity) =>
-					{
-						onSuccess(new_entity, Name_Pascal_Space + " has been updated successfully");
-					}).catch(() => { });
-			}
-			else
-				throw new Error("ID was not provided.");
-		}
-		else
-		{
-			if (entity.client.onCreate)
-				entity.client.onCreate(cur_entity).then(new_entity =>
-				{
-					if (new_entity)
-						onSuccess(new_entity, Name_Pascal_Space + " has been created successfully");
-				}).catch(() => { });
-			else
-				entity.server.create(cur_entity).then((new_entity) =>
-				{
-					onSuccess(new_entity, Name_Pascal_Space + " has been created successfully");
-				}).catch(() => { });
-		}
-	} catch (error: any)
-	{
-		props.notifier.onError(error);
-	}
-}
-
-export const NSASectionEdit = forwardRef<any, any>(<EntityType extends { id: string }, EntityTypeInput = EntityType>(
-	props: Omit<NSASectionEditProps<EntityType, EntityTypeInput> & { entity: IEntityInfo<EntityType, EntityTypeInput>, children: ReactNode; } & INSARouterProps, "ref">,
-	ref: React.Ref<NSASectionEditRef>
-) =>
-{
-	let { id } = useParams();
-	let NSASectionTabs_Ref = useRef<NSASectionTabsRef>(null);
-
-	useEffect(() =>
-	{
-		if (id)
-			props.entity.server.get(id).then((entity) =>
-			{
-				props.ui.setEntity(entity);
-			}).catch(() => { });
-
-	}, [id]);   // eslint-disable-line react-hooks/exhaustive-deps
-
-	useImperativeHandle(ref, () => ({
-		NSASectionTabs: NSASectionTabs_Ref.current,
-		onApply: () =>
-		{
-			onApply(props, props.entity, id);
-		}
-	}));
-
-	let panel = props.ui.panel;
-	if (panel !== false)
-		panel = true;
-
-	return (
-		<NSSection
-			id={props.id}
-			classList={[`${props.classList?.join(" ")}`]}
-			center_items={true}
-		>
-			{
-				panel ? <NSPanel grid={false}>
-					{props.children}
-				</NSPanel> : props.children
-			}
-			<NSSpace size={NSSpaceSizeType.NORMAL}></NSSpace>
-			<NSButtonBlue title="Apply" onClick={() => { onApply(props, props.entity, id); }} />
-			<NSSpace size={NSSpaceSizeType.NORMAL}></NSSpace>
-			{props.isEdit && <NSLine />}
-			{props.isEdit && <NSSpace size={NSSpaceSizeType.NORMAL}></NSSpace>}
-			{props.isEdit && (props.ui.tabs ?? true) && <NSASectionTabs ref={NSASectionTabs_Ref} id={id ?? ""} {...props} />}
-		</NSSection>
-	);
+import { IBaseComponentProps } from "namirasoft-site-react";
+import { NSSection, NSPanel, NSButtonBlue, NSLine, NSSpace, NSSpaceSizeType } from 'namirasoft-site-react';
+import { INSARouterProps } from "../INSARouterProps";
+import { forwardRef, ReactNode, useEffect, useImperativeHandle, useRef } from "react";
+import { useParams } from "react-router-dom";
+import { IEntityInfo } from "../IEntityInfo";
+import { NamingConvention } from "namirasoft-core";
+import { NSASectionTabs, NSASectionTabsRef } from "./NSASectionTabs";
+
+export interface NSASectionEditProps<EntityType extends { id: string }, EntityTypeInput = EntityType> extends IBaseComponentProps, INSARouterProps
+{
+	isEdit: boolean;
+	ui: {
+		getEntity: (entity: EntityType | null) => EntityTypeInput;
+		setEntity: (entity: EntityType) => void;
+		action?: {
+			menus: {
+				apply?: boolean,
+			}
+		},
+		tabs?: boolean;
+		panel?: boolean;
+	}
+}
+
+export interface NSASectionEditRef
+{
+	NSASectionTabs: NSASectionTabsRef | null;
+	onApply: () => void;
+}
+
+export function onApply<EntityType extends { id: string }, EntityTypeInput = EntityType>(props: NSASectionEditProps<EntityType, EntityTypeInput>, entity: IEntityInfo<EntityType, EntityTypeInput>, id: string | undefined): void
+{
+	try
+	{
+		let Name_Pascal_Space = NamingConvention.lower_case_underscore.convert(entity.name, NamingConvention.Pascal_Case_Space);
+
+		let onSuccess = (new_entity: EntityType, message: string) =>
+		{
+			props.notifier.onSuccess(message);
+			if (entity.client.onSuccess)
+				entity.client.onSuccess(new_entity);
+			else
+			{
+				let url = null;
+				if (entity.client.getViewURL)
+					url = entity.client.getViewURL(new_entity.id);
+				else if (entity.client.getListURL)
+					url = entity.client.getListURL();
+				if (url)
+					props.url.redirect(url, {});
+			}
+		};
+		let old_entity: EntityType | null = null;
+		let cur_entity = props.ui.getEntity(old_entity);
+		if (props.isEdit)
+		{
+			if (id)
+			{
+				if (entity.client.onUpdate)
+					entity.client.onUpdate(id, cur_entity).then(new_entity =>
+					{
+						if (new_entity)
+							onSuccess(new_entity, Name_Pascal_Space + " has been updated successfully");
+					}).catch(() => { });
+				else if (entity.server.update)
+					entity.server.update(id, cur_entity).then((new_entity) =>
+					{
+						onSuccess(new_entity, Name_Pascal_Space + " has been updated successfully");
+					}).catch(() => { });
+			}
+			else
+				throw new Error("ID was not provided.");
+		}
+		else
+		{
+			if (entity.client.onCreate)
+				entity.client.onCreate(cur_entity).then(new_entity =>
+				{
+					if (new_entity)
+						onSuccess(new_entity, Name_Pascal_Space + " has been created successfully");
+				}).catch(() => { });
+			else if (entity.server.create)
+				entity.server.create(cur_entity).then((new_entity) =>
+				{
+					onSuccess(new_entity, Name_Pascal_Space + " has been created successfully");
+				}).catch(() => { });
+		}
+	} catch (error: any)
+	{
+		props.notifier.onError(error);
+	}
+}
+
+export const NSASectionEdit = forwardRef<any, any>(<EntityType extends { id: string }, EntityTypeInput = EntityType>(
+	props: Omit<NSASectionEditProps<EntityType, EntityTypeInput> & { entity: IEntityInfo<EntityType, EntityTypeInput>, children: ReactNode; } & INSARouterProps, "ref">,
+	ref: React.Ref<NSASectionEditRef>
+) =>
+{
+	let { id } = useParams();
+	let NSASectionTabs_Ref = useRef<NSASectionTabsRef>(null);
+
+	useEffect(() =>
+	{
+		if (id)
+			if (props.entity.server.get)
+				props.entity.server.get(id).then((entity) =>
+				{
+					props.ui.setEntity(entity);
+				}).catch(() => { });
+
+	}, [id]);   // eslint-disable-line react-hooks/exhaustive-deps
+
+	useImperativeHandle(ref, () => ({
+		NSASectionTabs: NSASectionTabs_Ref.current,
+		onApply: () =>
+		{
+			onApply(props, props.entity, id);
+		}
+	}));
+
+	let panel = props.ui.panel;
+	if (panel !== false)
+		panel = true;
+
+	return (
+		<NSSection
+			id={props.id}
+			classList={[`${props.classList?.join(" ")}`]}
+			center_items={true}
+		>
+			{
+				panel ? <NSPanel grid={false}>
+					{props.children}
+				</NSPanel> : props.children
+			}
+			<NSSpace size={NSSpaceSizeType.NORMAL}></NSSpace>
+			<NSButtonBlue title="Apply" onClick={() => { onApply(props, props.entity, id); }} />
+			<NSSpace size={NSSpaceSizeType.NORMAL}></NSSpace>
+			{props.isEdit && <NSLine />}
+			{props.isEdit && <NSSpace size={NSSpaceSizeType.NORMAL}></NSSpace>}
+			{props.isEdit && (props.ui.tabs ?? true) && <NSASectionTabs ref={NSASectionTabs_Ref} id={id ?? ""} {...props} />}
+		</NSSection>
+	);
 });

package/src/layouts/NSASectionList.tsx

@@ -1,159 +1,162 @@
-import { Component, ReactNode, createRef } from "react";
-import { EnvService, FilterItem, FilterItemColumnType, FilterItemOperator, ObjectService } from "namirasoft-core";
-import { NSLine, NSSection, NSSpace, NSSpaceSizeType, NSTable, NSFilterBox, INSFilterBoxProps_Table, INSFilterBoxProps_Column, TableColumnInfo, TableRowInfo } from "namirasoft-site-react";
-import { MetaDatabase, NamirasoftFieldServer } from "namirasoft-field";
-import { IEntityInfo } from "../IEntityInfo";
-import { INSARouterProps } from "../INSARouterProps";
-import { NSASectionTabs } from "./NSASectionTabs";
-
-export interface NSASectionListProps<EntityType extends { id: string }>
-{
-	ui: {
-		getColumnAttributes?: () => { [key: string]: string };
-		getCellFormattedValue?: (value: any, column: TableColumnInfo, row: TableRowInfo<EntityType>) => any;
-		tabs?: boolean;
-	}
-}
-
-export interface NSASectionListState
-{
-}
-
-export class NSASectionList<EntityType extends { id: string }, EntityTypeInput = EntityType> extends Component<NSASectionListProps<EntityType> & INSARouterProps & { entity: IEntityInfo<EntityType, EntityTypeInput> } & INSARouterProps, NSASectionListState>
-{
-	public NSFilterBox_Top = createRef<NSFilterBox>();
-	public NSTable_Main = createRef<NSTable<EntityType>>();
-	constructor(props: NSASectionListProps<EntityType> & INSARouterProps & { entity: IEntityInfo<EntityType, EntityTypeInput>, children: ReactNode })
-	{
-		super(props);
-		this.state = { totalItems: 0 };
-	}
-	getSelectedIDs(): string[]
-	{
-		return this.NSTable_Main.current?.getSelectedIDs() ?? [];
-	}
-	override componentDidMount()
-	{
-		let filters;
-		try
-		{
-			let encoded = this.props.url.getQuery("filters");
-			filters = FilterItem.decode(encoded);
-		} catch (error)
-		{
-		}
-		if (filters)
-			this.NSFilterBox_Top.current?.setFilterItems(filters);
-		else
-			this.NSTable_Main.current?.reload(null, null);
-	}
-	override render()
-	{
-		const getColumns = (): TableColumnInfo[] =>
-		{
-			return this.props.entity.client.getColumns();
-		};
-		const getRowKey = (row: TableRowInfo<EntityType>): string => 
-		{
-			return row.value.id.toString();
-		};
-		let ids = this.getSelectedIDs();
-		let id = "";
-		if (ids.length === 1)
-			id = ids[0];
-
-		return (
-			<NSSection center_items={false}>
-				<NSFilterBox ref={this.NSFilterBox_Top}
-					getTables={() =>
-					{
-						return this.props.entity.tables.map(table =>
-						{
-							let columns = table.table.getColumns().map(c => { return { ...c, type: new ObjectService(c.type).getEnum(FilterItemColumnType, FilterItemColumnType.Any) }; });
-							return { table: { name: table.table.name, text: table.table.text, columns }, required: table.required };
-						})
-					}}
-					getMoreTables={async () =>
-					{
-						let REACT_APP_BASE_URL_FIELD = new EnvService("REACT_APP_BASE_URL_FIELD", true).getString();
-						let server = new NamirasoftFieldServer(REACT_APP_BASE_URL_FIELD, this.props.account.token_manager, this.props.notifier.onError);
-						let f_items = [
-							new FilterItem(MetaDatabase.main.field, MetaDatabase.main.field.columns.product_id, false, FilterItemOperator.all.equals, this.props.entity.product_id),
-							new FilterItem(MetaDatabase.main.field, MetaDatabase.main.field.columns.entity, false, FilterItemOperator.all.equals, this.props.entity.name)
-						];
-						let c_items = [
-							new FilterItem(MetaDatabase.main.category, MetaDatabase.main.category.columns.product_id, false, FilterItemOperator.all.equals, this.props.entity.product_id),
-							new FilterItem(MetaDatabase.main.category, MetaDatabase.main.category.columns.entity, false, FilterItemOperator.all.equals, this.props.entity.name)
-						];
-						let ans: { table: INSFilterBoxProps_Table, required: boolean }[] = [];
-						try
-						{
-							let f = server.field.List(f_items, null, null);
-							let c = server.category.List(c_items, null, null);
-							let r = await Promise.all([f, c]);
-
-							if (r[0].rows.length > 0)
-								ans.push({
-									table: {
-										name: "fields",
-										text: "Fields",
-										columns: r[0].rows.map(f => { return { name: f.name, text: f.name, type: new ObjectService(f.type).getEnum(FilterItemColumnType, FilterItemColumnType.Number) } })
-									},
-									required: false
-								});
-							if (r[1].rows.length > 0)
-								ans.push({
-									table: {
-										name: "categories",
-										text: "Categories",
-										columns: r[1].rows.map(c => { return { name: c.name, text: c.name, type: FilterItemColumnType.Number } })
-									},
-									required: false
-								});
-
-						} catch (error)
-						{
-						}
-						// todo add tags
-						return ans;
-					}}
-					getData={async (table: INSFilterBoxProps_Table, column: INSFilterBoxProps_Column) =>
-					{
-						return await this.props.entity.server.value_list(table.name, column.name);
-					}}
-					onChanged={() =>
-					{
-						this.NSTable_Main.current?.setSelectedIDs([]);
-						this.NSTable_Main.current?.reload(null, null);
-					}} />
-				<NSTable<EntityType>
-					ref={this.NSTable_Main}
-					checkbox={true}
-					columns={getColumns()}
-					getRows={async () =>
-					{
-						if (this.NSTable_Main.current)
-						{
-							let items = this.NSFilterBox_Top.current?.getFilterItems() ?? [];
-							let NSPagination = this.NSTable_Main.current.NSPagination.current;
-							if (NSPagination)
-							{
-								let res = await this.props.entity.server.list(items, NSPagination.getCurrentPage(), NSPagination.getPageSize());
-								return res;
-							}
-						}
-						return { rows: [], count: 0 };
-					}}
-					getRowKey={getRowKey}
-					getColumnAttributes={this.props.ui.getColumnAttributes}
-					getCellFormattedValue={this.props.ui.getCellFormattedValue}
-					onSelectedIDsChanged={() => this.setState({})}
-				/>
-				<NSSpace size={NSSpaceSizeType.NORMAL}></NSSpace>
-				<NSLine></NSLine>
-				<NSSpace size={NSSpaceSizeType.NORMAL}></NSSpace>
-				{(this.props.ui.tabs ?? true) && <NSASectionTabs id={id} {...this.props} />}
-			</NSSection>
-		);
-	}
+import { Component, ReactNode, createRef } from "react";
+import { EnvService, FilterItem, FilterItemColumnType, FilterItemOperator, ObjectService } from "namirasoft-core";
+import { NSLine, NSSection, NSSpace, NSSpaceSizeType, NSTable, NSFilterBox, INSFilterBoxProps_Table, INSFilterBoxProps_Column, TableColumnInfo, TableRowInfo } from "namirasoft-site-react";
+import { MetaDatabase, NamirasoftFieldServer } from "namirasoft-field";
+import { IEntityInfo } from "../IEntityInfo";
+import { INSARouterProps } from "../INSARouterProps";
+import { NSASectionTabs } from "./NSASectionTabs";
+
+export interface NSASectionListProps<EntityType extends { id: string }>
+{
+	ui: {
+		getColumnAttributes?: () => { [key: string]: string };
+		getCellFormattedValue?: (value: any, column: TableColumnInfo, row: TableRowInfo<EntityType>) => any;
+		tabs?: boolean;
+	}
+}
+
+export interface NSASectionListState
+{
+}
+
+export class NSASectionList<EntityType extends { id: string }, EntityTypeInput = EntityType> extends Component<NSASectionListProps<EntityType> & INSARouterProps & { entity: IEntityInfo<EntityType, EntityTypeInput> } & INSARouterProps, NSASectionListState>
+{
+	public NSFilterBox_Top = createRef<NSFilterBox>();
+	public NSTable_Main = createRef<NSTable<EntityType>>();
+	constructor(props: NSASectionListProps<EntityType> & INSARouterProps & { entity: IEntityInfo<EntityType, EntityTypeInput>, children: ReactNode })
+	{
+		super(props);
+		this.state = { totalItems: 0 };
+	}
+	getSelectedIDs(): string[]
+	{
+		return this.NSTable_Main.current?.getSelectedIDs() ?? [];
+	}
+	override componentDidMount()
+	{
+		let filters;
+		try
+		{
+			let encoded = this.props.url.getQuery("filters");
+			filters = FilterItem.decode(encoded);
+		} catch (error)
+		{
+		}
+		if (filters)
+			this.NSFilterBox_Top.current?.setFilterItems(filters);
+		else
+			this.NSTable_Main.current?.reload(null, null);
+	}
+	override render()
+	{
+		const getColumns = (): TableColumnInfo[] =>
+		{
+			return this.props.entity.client.getColumns();
+		};
+		const getRowKey = (row: TableRowInfo<EntityType>): string => 
+		{
+			return row.value.id.toString();
+		};
+		let ids = this.getSelectedIDs();
+		let id = "";
+		if (ids.length === 1)
+			id = ids[0];
+
+		return (
+			<NSSection center_items={false}>
+				<NSFilterBox ref={this.NSFilterBox_Top}
+					getTables={() =>
+					{
+						return this.props.entity.tables.map(table =>
+						{
+							let columns = table.table.getColumns().map(c => { return { ...c, type: new ObjectService(c.type).getEnum(FilterItemColumnType, FilterItemColumnType.Any) }; });
+							return { table: { name: table.table.name, text: table.table.text, columns }, required: table.required };
+						})
+					}}
+					getMoreTables={async () =>
+					{
+						let REACT_APP_BASE_URL_FIELD = new EnvService("REACT_APP_BASE_URL_FIELD", true).getString();
+						let server = new NamirasoftFieldServer(REACT_APP_BASE_URL_FIELD, this.props.account.token_manager, this.props.notifier.onError);
+						let f_items = [
+							new FilterItem(MetaDatabase.main.field, MetaDatabase.main.field.columns.product_id, false, FilterItemOperator.all.equals, this.props.entity.product_id),
+							new FilterItem(MetaDatabase.main.field, MetaDatabase.main.field.columns.entity, false, FilterItemOperator.all.equals, this.props.entity.name)
+						];
+						let c_items = [
+							new FilterItem(MetaDatabase.main.category, MetaDatabase.main.category.columns.product_id, false, FilterItemOperator.all.equals, this.props.entity.product_id),
+							new FilterItem(MetaDatabase.main.category, MetaDatabase.main.category.columns.entity, false, FilterItemOperator.all.equals, this.props.entity.name)
+						];
+						let ans: { table: INSFilterBoxProps_Table, required: boolean }[] = [];
+						try
+						{
+							let f = server.field.List(f_items, null, null);
+							let c = server.category.List(c_items, null, null);
+							let r = await Promise.all([f, c]);
+
+							if (r[0].rows.length > 0)
+								ans.push({
+									table: {
+										name: "fields",
+										text: "Fields",
+										columns: r[0].rows.map(f => { return { name: f.name, text: f.name, type: new ObjectService(f.type).getEnum(FilterItemColumnType, FilterItemColumnType.Number) } })
+									},
+									required: false
+								});
+							if (r[1].rows.length > 0)
+								ans.push({
+									table: {
+										name: "categories",
+										text: "Categories",
+										columns: r[1].rows.map(c => { return { name: c.name, text: c.name, type: FilterItemColumnType.Number } })
+									},
+									required: false
+								});
+
+						} catch (error)
+						{
+						}
+						// todo add tags
+						return ans;
+					}}
+					getData={async (table: INSFilterBoxProps_Table, column: INSFilterBoxProps_Column) =>
+					{
+						return await this.props.entity.server.value_list(table.name, column.name);
+					}}
+					onChanged={() =>
+					{
+						this.NSTable_Main.current?.setSelectedIDs([]);
+						this.NSTable_Main.current?.reload(null, null);
+					}} />
+				<NSTable<EntityType>
+					ref={this.NSTable_Main}
+					checkbox={true}
+					columns={getColumns()}
+					getRows={async () =>
+					{
+						if (this.NSTable_Main.current)
+						{
+							let items = this.NSFilterBox_Top.current?.getFilterItems() ?? [];
+							let NSPagination = this.NSTable_Main.current.NSPagination.current;
+							if (NSPagination)
+							{
+								if (this.props.entity.server.list)
+								{
+									let res = await this.props.entity.server.list(items, NSPagination.getCurrentPage(), NSPagination.getPageSize());
+									return res;
+								}
+							}
+						}
+						return { rows: [], count: 0 };
+					}}
+					getRowKey={getRowKey}
+					getColumnAttributes={this.props.ui.getColumnAttributes}
+					getCellFormattedValue={this.props.ui.getCellFormattedValue}
+					onSelectedIDsChanged={() => this.setState({})}
+				/>
+				<NSSpace size={NSSpaceSizeType.NORMAL}></NSSpace>
+				<NSLine></NSLine>
+				<NSSpace size={NSSpaceSizeType.NORMAL}></NSSpace>
+				{(this.props.ui.tabs ?? true) && <NSASectionTabs id={id} {...this.props} />}
+			</NSSection>
+		);
+	}
 }