namirasoft-site-react 1.5.27 → 1.5.28

package/src/ProductCacheService.ts

@@ -1,37 +1,37 @@
-import { NamirasoftAPIProductServer, ProductFullRow } from "namirasoft-api-product";
-import { CacheService, EnvService, IStorageLocal } from "namirasoft-core";
-
-export class ProductCacheService
-{
-    private static pendings: { [key: string]: Promise<ProductFullRow> } = {};
-
-    static get(product_id: string, onError: (error: Error | string, timout?: number) => void)
-    {
-        let key = "ns-product";
-        let cache = new CacheService<ProductFullRow>(
-            key,
-            new IStorageLocal(),
-            24 * 60,
-            async () => "1.0.0",
-            async () =>
-            {
-                let REACT_APP_BASE_URL_API_PRODUCT = new EnvService("REACT_APP_BASE_URL_API_PRODUCT", true).getString();
-                let server = new NamirasoftAPIProductServer(REACT_APP_BASE_URL_API_PRODUCT, onError);
-                let ans = await server.product.Get(product_id);
-                return ans;
-            }
-        );
-
-        let innerGet = cache.get.bind(cache);
-        cache.get = () =>
-        {
-            if (!ProductCacheService.pendings[key])
-                ProductCacheService.pendings[key] = innerGet().finally(() =>
-                {
-                    delete ProductCacheService.pendings[key];
-                });
-            return ProductCacheService.pendings[key];
-        };
-        return cache;
-    }
+import { NamirasoftAPIProductServer, ProductFullRow } from "namirasoft-api-product";
+import { CacheService, EnvService, IStorageLocal } from "namirasoft-core";
+
+export class ProductCacheService
+{
+    private static pendings: { [key: string]: Promise<ProductFullRow> } = {};
+
+    static get(product_id: string, onError: (error: Error | string, timout?: number) => void)
+    {
+        let key = "ns-product";
+        let cache = new CacheService<ProductFullRow>(
+            key,
+            new IStorageLocal(),
+            24 * 60,
+            async () => "1.0.0",
+            async () =>
+            {
+                let REACT_APP_BASE_URL_API_PRODUCT = new EnvService("REACT_APP_BASE_URL_API_PRODUCT", true).getString();
+                let server = new NamirasoftAPIProductServer(REACT_APP_BASE_URL_API_PRODUCT, onError);
+                let ans = await server.product.Get(product_id);
+                return ans;
+            }
+        );
+
+        let innerGet = cache.get.bind(cache);
+        cache.get = () =>
+        {
+            if (!ProductCacheService.pendings[key])
+                ProductCacheService.pendings[key] = innerGet().finally(() =>
+                {
+                    delete ProductCacheService.pendings[key];
+                });
+            return ProductCacheService.pendings[key];
+        };
+        return cache;
+    }
 }

package/src/Validator.ts

@@ -1,200 +1,200 @@
-import { PhoneOperation } from "namirasoft-core";
-import { IValidationNumberProps } from "./props/IValidationNumberProps";
-import { IValidationProps } from "./props/IValidationProps";
-import { IValidationStringProps } from "./props/IValidationStringProps";
-import { DateSchema, DurationSchema, EmailSchema, IPV4Schema, IPV6Schema, TimeSchema } from "namirasoft-schema";
-
-export class Validator
-{
-    static getError(name: string, value: string | number | boolean | null | undefined, validator: IValidationProps): string | null
-    {
-        if (validator.required)
-            if (value == null || value === "")
-                return `${name} is required.`;
-        if (value != null)
-            if (validator.regex)
-            {
-                if (!new RegExp(validator.regex.regex).test(value + ""))
-                    return `${value} does not match regex ${validator.regex.regex} for ${name}.`;
-            }
-        if (value != null)
-            if (validator.validator)
-            {
-                let error = validator.validator(name, value);
-                if (error)
-                    return error;
-            }
-
-        if (value != null)
-        {
-            if (validator.valids)
-                if (validator.valids.length > 0)
-                    if (!validator.valids.includes(value + ""))
-                        return `${value} is not a valid value for ${name}. Valid values are ${validator.valids.join(", ")}.`;
-            if (validator.invalids)
-                if (validator.invalids.length > 0)
-                    if (validator.invalids.includes(value + ""))
-                        return `${value} is an invalid value for ${name}. Invalid values are ${validator.invalids.join(", ")}.`;
-        }
-        return null;
-    }
-    static getErrorString(name: string, value: string | null | undefined, validator: IValidationStringProps): string | null
-    {
-        if (value != null)
-        {
-            if (validator.min_length != null)
-                if (value.length < validator.min_length)
-                    return `The minimum length of ${name} is ${validator.min_length} characters.`;
-            if (validator.max_length != null)
-                if (validator.max_length < value.length)
-                    return `The maximum length of ${name} is ${validator.max_length} characters.`;
-        }
-        return null;
-    }
-    static getErrorNumber(name: string, value: number | null | undefined, validator: IValidationNumberProps): string | null
-    {
-        if (value != null)
-        {
-            if (isNaN(value))
-                return `${name} is not a number.`;
-            // eslint-disable-next-line
-            if (validator.min != null)
-                if (value < validator.min)
-                    return `The minimum value of ${name} is ${validator.max}.`;
-            // eslint-disable-next-line
-            if (validator.max != null)
-                if (validator.max < value)
-                    return `The maximum value of ${name} is ${validator.max}.`;
-        }
-        return null;
-    }
-    static getErrorArray<T>(name: string, value: T[], required: boolean, min?: number, max?: number): string | null 
-    {
-        if (required)
-            // eslint-disable-next-line
-            if (value == null || value.length == 0)
-                return `${name} is required.`;
-        if (value != null)
-        {
-            if (min != null)
-                if (value.length < min)
-                    return `The minimum length of ${name} is ${min} items.`;
-            if (max != null)
-                if (max < value.length)
-                    return `The minimum length of ${name} is ${max} items.`;
-        }
-        return null;
-    }
-    static getErrorEmail(name: string, value: string | null | undefined, validator: IValidationProps): string | null
-    {
-        if (!validator.required)
-            if (!value)
-                return null;
-        return Validator.getError(name, value, {
-            required: true, regex: {
-                name: "Email",
-                regex: EmailSchema.REGEX
-            }
-        });
-    }
-    static getErrorDate(name: string, value: string | null | undefined, required: boolean): string | null
-    {
-        return Validator.getError(
-            name,
-            value,
-            {
-                required,
-                regex: {
-                    name: "Date",
-                    regex: DateSchema.REGEX
-                }
-            });
-    }
-    static getErrorDateRange(name: string, value: { from: string; to: string } | null | undefined, required: boolean, minDate?: string, maxDate?: string): string | null
-    {
-        if (required && (!value || !value.from || !value.to))
-            return `${name} is required.`;
-        if (value?.from)
-        {
-            const fromErr = Validator.getErrorDate(`${name} (from)`, value.from, false);
-            if (fromErr) return fromErr;
-            if (minDate && value.from < minDate)
-                return `${name} (from) must not be before ${minDate}.`;
-            if (maxDate && value.from > maxDate)
-                return `${name} (from) must not be after ${maxDate}.`;
-        }
-        if (value?.to)
-        {
-            const toErr = Validator.getErrorDate(`${name} (to)`, value.to, false);
-            if (toErr) return toErr;
-            if (minDate && value.to < minDate)
-                return `${name} (to) must not be before ${minDate}.`;
-            if (maxDate && value.to > maxDate)
-                return `${name} (to) must not be after ${maxDate}.`;
-        }
-        return null;
-    }
-    static getErrorTime(name: string, value: string | null | undefined, required: boolean): string | null
-    {
-        return Validator.getError(
-            name,
-            value,
-            {
-                required,
-                regex: {
-                    name: "Time",
-                    regex: TimeSchema.REGEX
-                }
-            });
-    }
-    static getErrorDateTime(name: string, value: Date | null | undefined): string | null
-    {
-        if (value != null)
-        {
-            const dateTime = new Date(value);
-            if (isNaN(dateTime.getTime()))
-                return `'${value}' is not a valid DateTime for ${name}.`;
-        }
-        return null;
-    }
-    static getErrorDuration(name: string, value: string | null | undefined): string | null
-    {
-        return Validator.getError(name, value, {
-            required: true,
-            regex: {
-                name: "Duration",
-                regex: DurationSchema.REGEX
-            }
-        });
-    }
-    static getErrorIPV4(name: string, value: string | null | undefined): string | null
-    {
-        return Validator.getError(name, value, {
-            required: true, regex: {
-                name: "IP",
-                regex: IPV4Schema.REGEX
-            }
-        });
-    }
-    static getErrorIPV6(name: string, value: string | null | undefined): string | null
-    {
-        return Validator.getError(name, value, {
-            required: true, regex: {
-                name: "IP",
-                regex: IPV6Schema.REGEX
-            }
-        });
-    }
-    static getErrorPhone(name: string, value: string | null | undefined): string | null
-    {
-        return Validator.getError(name, value, {
-            required: true, validator: () =>
-            {
-                if (value)
-                    if (!PhoneOperation.isValid(value))
-                        return `'${name}' is not a valid phone number for ${name}.`;
-                return null;
-            }
-        });
-    }
+import { PhoneOperation } from "namirasoft-core";
+import { IValidationNumberProps } from "./props/IValidationNumberProps";
+import { IValidationProps } from "./props/IValidationProps";
+import { IValidationStringProps } from "./props/IValidationStringProps";
+import { DateSchema, DurationSchema, EmailSchema, IPV4Schema, IPV6Schema, TimeSchema } from "namirasoft-schema";
+
+export class Validator
+{
+    static getError(name: string, value: string | number | boolean | null | undefined, validator: IValidationProps): string | null
+    {
+        if (validator.required)
+            if (value == null || value === "")
+                return `${name} is required.`;
+        if (value != null)
+            if (validator.regex)
+            {
+                if (!new RegExp(validator.regex.regex).test(value + ""))
+                    return `${value} does not match regex ${validator.regex.regex} for ${name}.`;
+            }
+        if (value != null)
+            if (validator.validator)
+            {
+                let error = validator.validator(name, value);
+                if (error)
+                    return error;
+            }
+
+        if (value != null)
+        {
+            if (validator.valids)
+                if (validator.valids.length > 0)
+                    if (!validator.valids.includes(value + ""))
+                        return `${value} is not a valid value for ${name}. Valid values are ${validator.valids.join(", ")}.`;
+            if (validator.invalids)
+                if (validator.invalids.length > 0)
+                    if (validator.invalids.includes(value + ""))
+                        return `${value} is an invalid value for ${name}. Invalid values are ${validator.invalids.join(", ")}.`;
+        }
+        return null;
+    }
+    static getErrorString(name: string, value: string | null | undefined, validator: IValidationStringProps): string | null
+    {
+        if (value != null)
+        {
+            if (validator.min_length != null)
+                if (value.length < validator.min_length)
+                    return `The minimum length of ${name} is ${validator.min_length} characters.`;
+            if (validator.max_length != null)
+                if (validator.max_length < value.length)
+                    return `The maximum length of ${name} is ${validator.max_length} characters.`;
+        }
+        return null;
+    }
+    static getErrorNumber(name: string, value: number | null | undefined, validator: IValidationNumberProps): string | null
+    {
+        if (value != null)
+        {
+            if (isNaN(value))
+                return `${name} is not a number.`;
+            // eslint-disable-next-line
+            if (validator.min != null)
+                if (value < validator.min)
+                    return `The minimum value of ${name} is ${validator.max}.`;
+            // eslint-disable-next-line
+            if (validator.max != null)
+                if (validator.max < value)
+                    return `The maximum value of ${name} is ${validator.max}.`;
+        }
+        return null;
+    }
+    static getErrorArray<T>(name: string, value: T[], required: boolean, min?: number, max?: number): string | null 
+    {
+        if (required)
+            // eslint-disable-next-line
+            if (value == null || value.length == 0)
+                return `${name} is required.`;
+        if (value != null)
+        {
+            if (min != null)
+                if (value.length < min)
+                    return `The minimum length of ${name} is ${min} items.`;
+            if (max != null)
+                if (max < value.length)
+                    return `The minimum length of ${name} is ${max} items.`;
+        }
+        return null;
+    }
+    static getErrorEmail(name: string, value: string | null | undefined, validator: IValidationProps): string | null
+    {
+        if (!validator.required)
+            if (!value)
+                return null;
+        return Validator.getError(name, value, {
+            required: true, regex: {
+                name: "Email",
+                regex: EmailSchema.REGEX
+            }
+        });
+    }
+    static getErrorDate(name: string, value: string | null | undefined, required: boolean): string | null
+    {
+        return Validator.getError(
+            name,
+            value,
+            {
+                required,
+                regex: {
+                    name: "Date",
+                    regex: DateSchema.REGEX
+                }
+            });
+    }
+    static getErrorDateRange(name: string, value: { from: string; to: string } | null | undefined, required: boolean, minDate?: string, maxDate?: string): string | null
+    {
+        if (required && (!value || !value.from || !value.to))
+            return `${name} is required.`;
+        if (value?.from)
+        {
+            const fromErr = Validator.getErrorDate(`${name} (from)`, value.from, false);
+            if (fromErr) return fromErr;
+            if (minDate && value.from < minDate)
+                return `${name} (from) must not be before ${minDate}.`;
+            if (maxDate && value.from > maxDate)
+                return `${name} (from) must not be after ${maxDate}.`;
+        }
+        if (value?.to)
+        {
+            const toErr = Validator.getErrorDate(`${name} (to)`, value.to, false);
+            if (toErr) return toErr;
+            if (minDate && value.to < minDate)
+                return `${name} (to) must not be before ${minDate}.`;
+            if (maxDate && value.to > maxDate)
+                return `${name} (to) must not be after ${maxDate}.`;
+        }
+        return null;
+    }
+    static getErrorTime(name: string, value: string | null | undefined, required: boolean): string | null
+    {
+        return Validator.getError(
+            name,
+            value,
+            {
+                required,
+                regex: {
+                    name: "Time",
+                    regex: TimeSchema.REGEX
+                }
+            });
+    }
+    static getErrorDateTime(name: string, value: Date | null | undefined): string | null
+    {
+        if (value != null)
+        {
+            const dateTime = new Date(value);
+            if (isNaN(dateTime.getTime()))
+                return `'${value}' is not a valid DateTime for ${name}.`;
+        }
+        return null;
+    }
+    static getErrorDuration(name: string, value: string | null | undefined): string | null
+    {
+        return Validator.getError(name, value, {
+            required: true,
+            regex: {
+                name: "Duration",
+                regex: DurationSchema.REGEX
+            }
+        });
+    }
+    static getErrorIPV4(name: string, value: string | null | undefined): string | null
+    {
+        return Validator.getError(name, value, {
+            required: true, regex: {
+                name: "IP",
+                regex: IPV4Schema.REGEX
+            }
+        });
+    }
+    static getErrorIPV6(name: string, value: string | null | undefined): string | null
+    {
+        return Validator.getError(name, value, {
+            required: true, regex: {
+                name: "IP",
+                regex: IPV6Schema.REGEX
+            }
+        });
+    }
+    static getErrorPhone(name: string, value: string | null | undefined): string | null
+    {
+        return Validator.getError(name, value, {
+            required: true, validator: () =>
+            {
+                if (value)
+                    if (!PhoneOperation.isValid(value))
+                        return `'${name}' is not a valid phone number for ${name}.`;
+                return null;
+            }
+        });
+    }
 }

package/src/components/INSBox.tsx

@@ -1,8 +1,8 @@
-export interface INSBox
-{
-    getError(): string | null;
-    getValue(checkError: boolean): any;
-    setValue(value: any, callback?: () => void): void;
-    isEmpty(value: any): boolean;
-    setDisabled(disabled: boolean): void;
+export interface INSBox
+{
+    getError(): string | null;
+    getValue(checkError: boolean): any;
+    setValue(value: any, callback?: () => void): void;
+    isEmpty(value: any): boolean;
+    setDisabled(disabled: boolean): void;
 }

package/src/components/NSBanner.module.css

@@ -1,48 +1,48 @@
-.ns_banner_container {
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-    gap: 48px;
-}
-
-.ns_banner_image_right {
-    justify-content: center;
-    align-self: center;
-}
-
-.ns_banner_image_left {
-    justify-content: center;
-    align-self: center;
-}
-
-.ns_banner_text_container {
-    display: flex;
-    flex-direction: column;
-}
-
-.ns_banner_headline {
-    font-size: 24px;
-    color: rgba(20, 27, 92, 1);
-}
-
-.ns_banner_title {
-    font-size: 48px;
-    color: rgba(20, 27, 92, 1);
-    text-align: start;
-}
-
-.ns_banner_description {
-    font-size: 16px;
-    color: rgba(20, 27, 92, 1);
-}
-
-@media only screen and (min-width:992px) {
-    .ns_banner_container {
-        flex-direction: row;
-    }
-
-    .ns_banner_text_container {
-        width: 624px;
-    }
+.ns_banner_container {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    gap: 48px;
+}
+
+.ns_banner_image_right {
+    justify-content: center;
+    align-self: center;
+}
+
+.ns_banner_image_left {
+    justify-content: center;
+    align-self: center;
+}
+
+.ns_banner_text_container {
+    display: flex;
+    flex-direction: column;
+}
+
+.ns_banner_headline {
+    font-size: 24px;
+    color: rgba(20, 27, 92, 1);
+}
+
+.ns_banner_title {
+    font-size: 48px;
+    color: rgba(20, 27, 92, 1);
+    text-align: start;
+}
+
+.ns_banner_description {
+    font-size: 16px;
+    color: rgba(20, 27, 92, 1);
+}
+
+@media only screen and (min-width:992px) {
+    .ns_banner_container {
+        flex-direction: row;
+    }
+
+    .ns_banner_text_container {
+        width: 624px;
+    }
 }