namirasoft-site-react 1.4.68 → 1.4.70

package/src/components/NSHeader.tsx

@@ -9,243 +9,244 @@ import { IHeaderProps } from "../props/IHeaderProps";
 import { IStorageLocal, CacheService } from "namirasoft-core";
 import { EnvService } from 'namirasoft-core'
 import { INSRouterProps } from "../routing/INSRouterProps";
+import { generateUniqId } from "../utils/generateUniqId";
 export interface INSHeaderProps extends IBaseComponentProps, INSRouterProps
 {
-    scope: string;
-    name: string;
-    logo: string;
-    nav?: IBaseComponentProps;
-    header: IHeaderProps;
-    isLoggedIn: () => boolean;
+	scope: string;
+	name: string;
+	logo: string;
+	nav?: IBaseComponentProps;
+	header: IHeaderProps;
+	isLoggedIn: () => boolean;
 }
 
 export interface NSHeaderState
 {
-    filters: FilterLinkFullRow[];
-    selected: FilterLinkFullRow | null;
-    showNavbar: boolean;
+	filters: FilterLinkFullRow[];
+	selected: FilterLinkFullRow | null;
+	showNavbar: boolean;
 }
 
 export class NSHeader extends React.Component<INSHeaderProps, NSHeaderState>
 {
-    private cache: CacheService<{
-        rows: FilterLinkFullRow[];
-        count: number;
-    }>;
+	private cache: CacheService<{
+		rows: FilterLinkFullRow[];
+		count: number;
+	}>;
 
-    constructor(props: INSHeaderProps)
-    {
-        super(props);
-        this.state = {
-            filters: [],
-            selected: null,
-            showNavbar: false
-        };
-        this.hasChild = this.hasChild.bind(this);
-        this.onMenuItemToggled = this.onMenuItemToggled.bind(this);
-        this.render_menu = this.render_menu.bind(this);
-        this.render_menuItem = this.render_menuItem.bind(this);
-        this.handleShowNavbar = this.handleShowNavbar.bind(this);
-        this.cache = new CacheService<{
-            rows: FilterLinkFullRow[];
-            count: number;
-        }>("ns-header", 720, new IStorageLocal(), async () =>
-        {
-            let REACT_APP_BASE_URL_API_LINK = new EnvService("REACT_APP_BASE_URL_API_LINK", true).getString();
-            let server = new NamirasoftAPILinkServer(REACT_APP_BASE_URL_API_LINK, props.notifier.onError);
-            return server.filter.ListFilterLinks(this.props.scope, this.props.name, null, null, null);
-        }, () => { });
-    }
-    override componentDidMount(): void
-    {
-        this.cache.get().then(filters =>
-        {
-            this.setState({ filters: filters.rows });
-        }).catch(() => { });
-    }
-    private onMenuItemToggled(checked: boolean, selected: FilterLinkFullRow)
-    {
-        if (checked)
-            this.setState({ selected });
-    }
-    private getFilters(): FilterLinkFullRow[]
-    {
-        let loggedin = this.props.isLoggedIn();
-        let ans = this.state.filters?.filter(f =>
-        {
-            if (f.link)
-            {
-                if (loggedin)
-                    return f.link.private;
-                return f.link.public;
-            }
-            return true;
-        }) ?? [];
+	constructor(props: INSHeaderProps)
+	{
+		super(props);
+		this.state = {
+			filters: [],
+			selected: null,
+			showNavbar: false
+		};
+		this.hasChild = this.hasChild.bind(this);
+		this.onMenuItemToggled = this.onMenuItemToggled.bind(this);
+		this.render_menu = this.render_menu.bind(this);
+		this.render_menuItem = this.render_menuItem.bind(this);
+		this.handleShowNavbar = this.handleShowNavbar.bind(this);
+		this.cache = new CacheService<{
+			rows: FilterLinkFullRow[];
+			count: number;
+		}>("ns-header", 720, new IStorageLocal(), async () =>
+		{
+			let REACT_APP_BASE_URL_API_LINK = new EnvService("REACT_APP_BASE_URL_API_LINK", true).getString();
+			let server = new NamirasoftAPILinkServer(REACT_APP_BASE_URL_API_LINK, props.notifier.onError);
+			return server.filter.ListFilterLinks(this.props.scope, this.props.name, null, null, null);
+		}, () => { });
+	}
+	override componentDidMount(): void
+	{
+		this.cache.get().then(filters =>
+		{
+			this.setState({ filters: filters.rows });
+		}).catch(() => { });
+	}
+	private onMenuItemToggled(checked: boolean, selected: FilterLinkFullRow)
+	{
+		if (checked)
+			this.setState({ selected });
+	}
+	private getFilters(): FilterLinkFullRow[]
+	{
+		let loggedin = this.props.isLoggedIn();
+		let ans = this.state.filters?.filter(f =>
+		{
+			if (f.link)
+			{
+				if (loggedin)
+					return f.link.private;
+				return f.link.public;
+			}
+			return true;
+		}) ?? [];
 
-        while (true)
-        {
-            let old_length = ans.length;
-            let old = ans;
-            ans = ans.filter(f =>
-            {
-                if (f.link?.url)
-                    return true;
-                return old.filter(x => x.parent_id === f.id).length > 0;
-            });
-            let new_length = ans.length;
-            if (old_length === new_length)
-                break;
-        }
+		while (true)
+		{
+			let old_length = ans.length;
+			let old = ans;
+			ans = ans.filter(f =>
+			{
+				if (f.link?.url)
+					return true;
+				return old.filter(x => x.parent_id === f.id).length > 0;
+			});
+			let new_length = ans.length;
+			if (old_length === new_length)
+				break;
+		}
 
-        return ans;
-    }
-    private hasChild(id: number): boolean
-    {
-        return this.getFilters().filter(f => f.parent_id === id).length > 0;
-    }
-    handleShowNavbar(): void
-    {
-        this.setState({ showNavbar: !this.state.showNavbar });
-    }
-    override render()
-    {
-        let nav: IBaseComponentProps | undefined = this.props.nav;
-        if (!nav)
-            nav = { style: {} };
-        if (!nav.style)
-            nav.style = {};
-        if (!nav.style?.backgroundColor)
-            nav.style.backgroundColor = "rgba(20, 27, 92, 1)";
-        return (
-            <header id={this.props.id}
-                className={`${Styles.ns_header} ${this.props.classList?.join(" ")}`}
-                style={this.props.style}
-            >
-                <nav
-                    id={this.props.nav?.id}
-                    className={`${Styles.ns_navbar} ${this.props.nav?.classList?.join(" ")}`}
-                    style={nav?.style}
-                >
-                    <div className={`${Styles.ns_navbar_parent_content} container`}>
-                        <a className="me-2" href="/">
-                            <img
-                                src={this.props.logo}
-                                alt="Logo"
-                                width={48}
-                                height={48}
-                            />
+		return ans;
+	}
+	private hasChild(id: number): boolean
+	{
+		return this.getFilters().filter(f => f.parent_id === id).length > 0;
+	}
+	handleShowNavbar(): void
+	{
+		this.setState({ showNavbar: !this.state.showNavbar });
+	}
+	override render()
+	{
+		let nav: IBaseComponentProps | undefined = this.props.nav;
+		if (!nav)
+			nav = { style: {} };
+		if (!nav.style)
+			nav.style = {};
+		if (!nav.style?.backgroundColor)
+			nav.style.backgroundColor = "rgba(20, 27, 92, 1)";
+		return (
+			<header id={this.props.id}
+				className={`${Styles.ns_header} ${this.props.classList?.join(" ")}`}
+				style={this.props.style}
+			>
+				<nav
+					id={this.props.nav?.id}
+					className={`${Styles.ns_navbar} ${this.props.nav?.classList?.join(" ")}`}
+					style={nav?.style}
+				>
+					<div className={`${Styles.ns_navbar_parent_content} container`}>
+						<a className="me-2" href="/">
+							<img
+								src={this.props.logo}
+								alt="Logo"
+								width={48}
+								height={48}
+							/>
 						</a>
-						{ this.props.header.logo_title &&
+						{this.props.header.logo_title &&
 							<h2 className={`${Styles.ns_navbar_title} mb-0 flex-shrink-0`}>
 								{this.props.header.logo_title}
-							</h2> 
+							</h2>
 						}
 						<div className={`${Styles.ns_navbar_content} `} >
-                            <div className={`${Styles.ns_navbar_elements} ${this.state.showNavbar && Styles.ns_navbar_active}`}>
-                                {this.render_menu(0, null)}
-                            </div>
-                            {
-                                this.props.header &&
-                                <div className="d-flex gap-3 align-items-center">
-                                    <span className={Styles.ns_navbar_title}>{this.props.header?.title}</span>
-                                    {
-                                        this.props.header.icons.map((icon, index) =>
+							<div className={`${Styles.ns_navbar_elements} ${this.state.showNavbar && Styles.ns_navbar_active}`}>
+								{this.render_menu(0, null)}
+							</div>
+							{
+								this.props.header &&
+								<div className="d-flex gap-3 align-items-center">
+									<span className={Styles.ns_navbar_title}>{this.props.header?.title}</span>
+									{
+										this.props.header.icons.map((icon) =>
 											<div
-												key={index}
+												key={generateUniqId()}
 												title={icon.tooltip}
-												className={Styles.ns_header_icon} 
+												className={Styles.ns_header_icon}
 											>
-                                                <img
-                                                    src={icon.src}
-                                                    alt={icon.alt}
-                                                    width={20}
-                                                    height={20}
+												<img
+													src={icon.src}
+													alt={icon.alt}
+													width={20}
+													height={20}
 													onClick={() => icon.onClicked(icon)}
-                                                />
-                                                {
-                                                    icon.count !== 0 && icon.count &&
+												/>
+												{
+													icon.count !== 0 && icon.count &&
 													<div
 														className={Styles.ns_navbar_notification_count}
 														onClick={() => icon.onClicked(icon)}
-														>
-                                                        {
-                                                            icon.count < 100 ? icon.count : "+99"
-                                                        }
-                                                    </div>
-                                                }
-                                                {
-                                                    icon.children
-                                                }
-                                            </div>
-                                        )
-                                    }
-                                </div>
-                            }
-                            <div className={Styles.ns_navbar_menu_icon} onClick={this.handleShowNavbar}>
-                                <img
-                                    src=
-                                    {
-                                        this.state.showNavbar ?
-                                            "https://static.namirasoft.com/image/concept/close/white.svg"
-                                            : "https://static.namirasoft.com/image/concept/menu/burger-white.svg"
-                                    }
-                                    alt="Menu Icon"
-                                    width={24}
-                                    height={24}
-                                />
-                            </div>
-                        </div>
-                    </div>
-                </nav>
-            </header>
-        );
-    }
-    private render_menu(level: number, parent_id: number | null)
-    {
-        let fs: FilterLinkFullRow[] = this.getFilters().filter(f => f.parent_id === parent_id);
-        return (
-            <div className={`me-auto nav ${Styles.ns_navbar_items_container}`} >
-                {(fs?.map(f => this.render_menuItem(level, f)))}
-            </div>
-        );
-    }
-    private render_menuItem(level: number, filter: FilterLinkFullRow)
-    {
-        if (this.hasChild(filter.id))
-        {
-            let sub_menus = <></>;
-            if (level === 0)
-                if (this.state.selected)
-                {
-                    sub_menus =
-                        <div
-                            id={`dropdown_items${filter.id}`}>
-                            {this.render_menu(1, this.state.selected.id)}
-                        </div >
-                }
-            return <NavDropdown
-                onToggle={(checked) => this.onMenuItemToggled(checked, filter)}
-                className={level === 0 ? Styles.ns_navbar_first_level_item : Styles.ns_navbar_second_level_item}
-                title={filter.name}
-                key={filter.id}
-                id={`dropdown_parent${filter.id}`}>
-                {sub_menus}
-            </NavDropdown >;
-        }
-        else
-        {
-            let href = filter.link?.url;
-            if (process.env.REACT_APP_STANDALONE)
-                if (href)
-                {
-                    let url = new URL(href);
-                    url.host = window.location.host;
-                    url.protocol = window.location.protocol;
-                    href = url.toString();
-                }
-            return (
-                <a key={filter.id} className={`${Styles.ns_navbar_items_link} ${level === 0 ? Styles.ns_navbar_first_level_item : Styles.ns_navbar_second_level_item}`} href={href}>{filter.name}</a>
-            );
-        }
-    }
+													>
+														{
+															icon.count < 100 ? icon.count : "+99"
+														}
+													</div>
+												}
+												{
+													icon.children
+												}
+											</div>
+										)
+									}
+								</div>
+							}
+							<div className={Styles.ns_navbar_menu_icon} onClick={this.handleShowNavbar}>
+								<img
+									src=
+									{
+										this.state.showNavbar ?
+											"https://static.namirasoft.com/image/concept/close/white.svg"
+											: "https://static.namirasoft.com/image/concept/menu/burger-white.svg"
+									}
+									alt="Menu Icon"
+									width={24}
+									height={24}
+								/>
+							</div>
+						</div>
+					</div>
+				</nav>
+			</header>
+		);
+	}
+	private render_menu(level: number, parent_id: number | null)
+	{
+		let fs: FilterLinkFullRow[] = this.getFilters().filter(f => f.parent_id === parent_id);
+		return (
+			<div className={`me-auto nav ${Styles.ns_navbar_items_container}`} >
+				{(fs?.map(f => this.render_menuItem(level, f)))}
+			</div>
+		);
+	}
+	private render_menuItem(level: number, filter: FilterLinkFullRow)
+	{
+		if (this.hasChild(filter.id))
+		{
+			let sub_menus = <></>;
+			if (level === 0)
+				if (this.state.selected)
+				{
+					sub_menus =
+						<div
+							id={`dropdown_items${filter.id}`}>
+							{this.render_menu(1, this.state.selected.id)}
+						</div >
+				}
+			return <NavDropdown
+				onToggle={(checked) => this.onMenuItemToggled(checked, filter)}
+				className={level === 0 ? Styles.ns_navbar_first_level_item : Styles.ns_navbar_second_level_item}
+				title={filter.name}
+				key={filter.id}
+				id={`dropdown_parent${filter.id}`}>
+				{sub_menus}
+			</NavDropdown >;
+		}
+		else
+		{
+			let href = filter.link?.url;
+			if (process.env.REACT_APP_STANDALONE)
+				if (href)
+				{
+					let url = new URL(href);
+					url.host = window.location.host;
+					url.protocol = window.location.protocol;
+					href = url.toString();
+				}
+			return (
+				<a key={filter.id} className={`${Styles.ns_navbar_items_link} ${level === 0 ? Styles.ns_navbar_first_level_item : Styles.ns_navbar_second_level_item}`} href={href}>{filter.name}</a>
+			);
+		}
+	}
 }

package/src/components/NSLayout.tsx

@@ -11,6 +11,7 @@ import { INSBarTitleProps, NSBarTitle } from './NSBarTitle';
 import { NSSpace, NSSpaceSizeType } from './NSSpace';
 import { INSRouterProps } from '../routing/INSRouterProps';
 import { INSBarAlertProps, NSBarAlert } from './NSBarAlert';
+import { generateUniqId } from '../utils/generateUniqId';
 
 export interface INSLayoutProps extends IBaseComponentProps, INSRouterProps
 {
@@ -70,8 +71,8 @@ export function NSLayout(props: INSLayoutProps)
 				props.notifications.length !== 0 &&
 				<>
 					{
-						props.notifications.map((notification, index) =>
-							<Fragment key={index}>
+						props.notifications.map((notification) =>
+							<Fragment key={generateUniqId()}>
 								<NSBarNotification {...notification} />
 							</Fragment>
 						)
@@ -79,7 +80,7 @@ export function NSLayout(props: INSLayoutProps)
 				</>
 			}
 			{
-				alerts.length !== 0 && alerts.map((alert, index) => <NSBarAlert key={index} {...alert} />)
+				alerts.length !== 0 && alerts.map((alert) => <NSBarAlert key={generateUniqId()} {...alert} />)
 			}
 			{
 				isValidAction(props.action) && <NSBarAction {...props.action} />

package/src/components/NSLoading.module.css

@@ -22,6 +22,8 @@
 		radial-gradient(farthest-side, #0000 calc(100% - 9px), #000 calc(100% - 8px));
 	-webkit-mask-composite: destination-in;
 	mask-composite: intersect;
+	mask: repeating-conic-gradient(#0000 0deg, #000 1deg 20deg, #0000 21deg 36deg),
+		radial-gradient(farthest-side, #0000 calc(100% - 9px), #000 calc(100% - 8px));
 	animation: s4 1s infinite steps(10);
 }
 

package/src/components/NSLoading.tsx

@@ -1,5 +1,4 @@
 import Styles from './NSLoading.module.css';
-import { NSSection } from './NSSection';
 import { IBaseComponentProps } from "../props/IBaseComponentProps";
 
 export interface INSLoadingProps extends IBaseComponentProps
@@ -9,12 +8,14 @@ export interface INSLoadingProps extends IBaseComponentProps
 export function NSLoading(props: INSLoadingProps)
 {
 	return (
-		<NSSection {...props}>
-			<div className={Styles.ns_loading_parent}>
-				<h5>Loading</h5>
-				<div className={Styles.ns_loader}></div>
-				<p>Please wait ...</p>
-			</div>
-		</NSSection>
+		<div
+			id={props.id}
+			className={`${Styles.ns_loading_parent} ${props.classList?.join(" ")} `}
+			style={props.style}
+		>
+			<h5>Loading</h5>
+			<span className={Styles.ns_loader}></span>
+			<p>Please wait ...</p>
+		</div>
 	);
 }

package/src/components/NSRange.tsx

@@ -3,6 +3,7 @@ import Styles from './NSRange.module.css';
 import { IBaseComponentProps } from '../props/IBaseComponentProps';
 
 import { Color } from "../Color";
+import { generateUniqId } from '../utils/generateUniqId';
 
 export interface NSRangeRow
 {
@@ -60,7 +61,7 @@ export function NSRange(props: INSRangeProps)
 						{
 							props.data?.map((data, index) =>
 								<span
-									key={index}
+									key={generateUniqId()}
 									className={Styles.ns_range_time_line}
 									style={{
 										background: Color.getColor(data?.percentage),

package/src/components/NSRepeater.tsx

@@ -1,4 +1,5 @@
 import { Component, createRef, Fragment, ReactNode } from 'react';
+import { generateUniqId } from '../utils/generateUniqId';
 
 export interface NSRepeaterProps<ItemType, ValueType>
 {
@@ -166,7 +167,7 @@ export class NSRepeater<ItemType, ValueType> extends Component<NSRepeaterProps<I
 					{
 						if (this.state.items[index])
 							return this.props.createItem(i++, ref, this.onChange, this.onDelete);
-						return <Fragment key={index}></Fragment>;
+						return <Fragment key={generateUniqId()}></Fragment>;
 					}
 					)
 				}

package/src/components/NSTabPage.tsx

@@ -1,7 +1,8 @@
 "use client";
-import Styles from './NSTabPage.module.css';
-import { IBaseComponentProps } from "../props/IBaseComponentProps";
 import { Component } from "react";
+import { IBaseComponentProps } from "../props/IBaseComponentProps";
+import { generateUniqId } from '../utils/generateUniqId';
+import Styles from './NSTabPage.module.css';
 
 export interface NSTabPageTab
 {
@@ -46,7 +47,7 @@ export class NSTabPage extends Component<NSTabPageProps, NSTabPageState>
 					{
 						this.props.tabs.map((tab, index) => (
 							<li
-								key={index}
+								key={generateUniqId()}
 								className={this.state.activeTabIndex === index ? Styles.active : ''}
 								onClick={() =>
 								{
@@ -63,7 +64,7 @@ export class NSTabPage extends Component<NSTabPageProps, NSTabPageState>
 				{
 					this.props.tabs.map((tab, index) => (
 						<div
-							key={index}
+							key={generateUniqId()}
 							className={this.props.grid ? Styles.ns_tab_content_grid : Styles.ns_tab_content_column}
 							style={{ display: index === this.state.activeTabIndex ? "flex" : "none" }}
 						>

package/src/components/NSTable.tsx

@@ -265,13 +265,21 @@ export class NSTable<RowType> extends Component<INSTableProps<RowType>, NSTableS
 		if (this.state.rows === null)
 		{
 			content = (
-				<NSLoading />
+				<tr>
+					<td>
+						<NSLoading />
+					</td>
+				</tr>
 			);
 		}
 		else if (this.state.rows.length === 0)
 		{
 			content = (
-				<NSNoData lable='No Data' />
+				<tr>
+					<td>
+						<NSNoData lable='No Data' />
+					</td>
+				</tr>
 			);
 		}
 		else
@@ -282,7 +290,8 @@ export class NSTable<RowType> extends Component<INSTableProps<RowType>, NSTableS
 				return <tr
 					key={this.props.getRowKey(row)} onClick={(e) => { onRowClick(e, row); }}>
 					{
-						this.props.checkbox && <td >
+						this.props.checkbox &&
+						<td >
 							<label htmlFor={`checkbox_device_${this.props.getRowKey(row)}`} className={Styles.ns_checkbox_label}>
 								<input className={Styles.ns_td_input} id={`checkbox_device_${this.props.getRowKey(row)}`} type="checkbox" checked={this.state.selectedIDs.includes(this.props.getRowKey(row))} onChange={(e) =>
 								{

package/src/components/NSTimelineMonthly.tsx

@@ -1,6 +1,7 @@
-import Styles from './NSTimelineMonthly.module.css';
 import { IBaseComponentProps } from "../props/IBaseComponentProps";
 import { Color } from "../Color"
+import { generateUniqId } from '../utils/generateUniqId';
+import Styles from './NSTimelineMonthly.module.css';
 export interface NSdata
 {
 	title: string;
@@ -26,8 +27,8 @@ export function NSTimelineMonthly(props: INSNSTimelineMonthlyProps)
 				<h5 className={Styles.ns_time_line_title}>{props.title}</h5>
 				<div className={Styles.ns_time_line_monthly}>
 					{
-						props.data.map((card, index) => (
-							<div className={Styles.ns_time_line_monthly_card} key={index}>
+						props.data.map((card) => (
+							<div className={Styles.ns_time_line_monthly_card} key={generateUniqId()}>
 								<h5 className={Styles.ns_time_line_monthly_card_week_day}>{card.title}</h5>
 								<span className={Styles.ns_time_line_cards_hour}>{card.value}</span>
 								<div className={Styles.ns_time_line_monthly_card_parent_chart}>

package/src/main.ts

@@ -102,6 +102,7 @@ export * from "./formatter/StringFormatter";
 export * from "./formatter/TimeFormatter";
 export * from "./formatter/UnknowFormatter";
 export * from "./pages/NSNotFoundPage";
+export * from "./pages/NSUpdating";
 export * from "./props/IBaseComponentProps";
 export * from "./props/IHeaderIconProps";
 export * from "./props/IHeaderProps";
@@ -116,4 +117,4 @@ export * from "./routing/INSRouterProps";
 export * from "./routing/INSRouterState";
 export * from "./routing/Notifier";
 export * from "./routing/NSRouterMaker";
-export * from "./pages/NSUpdating";
+export * from "./utils/generateUniqId";