@dashadmin/dash-admin 1.3.24 → 1.3.26

package/dist/utils/validators.js

@@ -1 +1,57 @@
-const l=t=>{if(!!t.includes("."))return/^[0-9]{1,2}\.[0-9]{3}\.[0-9]{3}-[0-9kK]$/.test(t);const f=s=>{for(var o=0,i=1;s;s=Math.floor(s/10))i=(i+s%10*(9-o++%6))%11;return i?i-1:"k"};if(!/^[0-9]+[-|‐]{1}[0-9kK]{1}$/.test(t))return!1;typeof process<"u"&&process.env;let e=t.split("-"),n=e[1],r=e[0];return n=="K"&&(n="k"),f(r)==n},a=t=>{if(!t||!/^[0-9]+-[0-9kK]{1}$/.test(t))return!1;const p=r=>{for(var s=0,o=1;r;r=Math.floor(r/10))o=(o+r%10*(9-s++%6))%11;return o?o-1:"k"};if(!/^[0-9]+[-|‐]{1}[0-9kK]{1}$/.test(t))return!1;typeof process<"u"&&process.env;let f=t.split("-"),e=f[1],n=f[0];return e=="K"&&(e="k"),p(n)==e},u=/^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/,c=t=>u.test(t);export{c as EmailValidator,l as RutValidator,a as RutValidatorWithoutDots};
+const RutValidator = (value) => {
+  const hasDot = value.includes(".") ? true : false;
+  if (hasDot) {
+    return /^[0-9]{1,2}\.[0-9]{3}\.[0-9]{3}-[0-9kK]$/.test(value);
+  }
+  const dv = (T) => {
+    var M = 0, S = 1;
+    for (; T; T = Math.floor(T / 10)) S = (S + T % 10 * (9 - M++ % 6)) % 11;
+    return S ? S - 1 : "k";
+  };
+  if (!/^[0-9]+[-|‐]{1}[0-9kK]{1}$/.test(value)) {
+    return false;
+  }
+  if (typeof process !== "undefined" && process.env && process.env.NODE_ENV === "development") {
+    return true;
+  }
+  let tmp = value.split("-");
+  let digv = tmp[1];
+  let rut = tmp[0];
+  if (digv == "K") {
+    digv = "k";
+  }
+  return dv(rut) == digv;
+};
+const RutValidatorWithoutDots = (value) => {
+  if (!value) return false;
+  if (!/^[0-9]+-[0-9kK]{1}$/.test(value)) {
+    return false;
+  }
+  const dv = (T) => {
+    var M = 0, S = 1;
+    for (; T; T = Math.floor(T / 10)) S = (S + T % 10 * (9 - M++ % 6)) % 11;
+    return S ? S - 1 : "k";
+  };
+  if (!/^[0-9]+[-|‐]{1}[0-9kK]{1}$/.test(value)) {
+    return false;
+  }
+  if (typeof process !== "undefined" && process.env && process.env.NODE_ENV === "development") {
+    return true;
+  }
+  let tmp = value.split("-");
+  let digv = tmp[1];
+  let rut = tmp[0];
+  if (digv == "K") {
+    digv = "k";
+  }
+  return dv(rut) == digv;
+};
+const EMAIL_REGEX = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+const EmailValidator = (value) => {
+  return EMAIL_REGEX.test(value);
+};
+export {
+  EmailValidator,
+  RutValidator,
+  RutValidatorWithoutDots
+};

package/package.json

@@ -1,70 +1,154 @@
 {
-  "name": "@dashadmin/dash-admin",
-  "version": "1.3.24",
-  "private": false,
-  "main": "dist/index.js",
-  "types": "src/index.tsx",
-  "files": [
-    "dist"
-  ],
-  "type": "module",
-  "peerDependencies": {
-    "@mui/icons-material": "^7.3.10",
-    "@mui/material": "^7.3.10",
-    "react": "^18.0.0",
-    "react-admin": "5.14.7",
-    "react-dom": "^18.0.0",
-    "socket.io-client": "^4.7.0"
-  },
-  "dependencies": {
-    "framer-motion": "^11.0.0",
-    "query-string": "^8.1.0",
-    "react-hook-form": "^7.78.0",
-    "ra-input-rich-text": "5.14.7",
-    "react-toastify": "^10.0.0",
-    "@tanstack/react-query-persist-client": "^5.84.2",
-    "@dashadmin/dash-admin-state": "1.3.24",
-    "@dashadmin/dash-components": "1.3.24",
-    "@dashadmin/dash-auth": "1.3.24",
-    "@dashadmin/dash-auto-admin": "1.3.24",
-    "@dashadmin/dash-dialog": "1.3.24",
-    "@dashadmin/dash-modal": "1.3.24",
-    "@dashadmin/dash-constants": "1.3.24",
-    "@dashadmin/dash-utils": "1.3.24",
-    "@dashadmin/dash-styles": "1.3.24",
-    "@dashadmin/dash-axios-hook": "1.3.24"
-  },
-  "devDependencies": {
-    "@types/node": "^20.19.42",
-    "@types/web": "^0.0.350",
-    "eslint": "^9.0.0",
-    "laravel-echo": "^2.3.7",
-    "prettier": "^3.2.0",
-    "pusher-js": "^8.5.0",
-    "rollup": "^4.0.0",
-    "socket.io-client": "^4.8.3",
-    "typescript": "^5.5.0",
-    "vite": "^5.2.0"
-  },
-  "publishConfig": {
-    "access": "public",
-    "name": "@dashadmin/dash-admin"
-  },
-  "engines": {
-    "node": ">=18"
-  },
-  "exports": {
-    ".": {
-      "import": "./dist/index.js"
-    },
-    "./src/*": {
-      "import": "./dist/*.js"
-    }
-  },
-  "scripts": {
-    "build": "rm -rf dist && node ../dash-build/compile.mjs && vite build",
-    "typecheck": "tsc --noEmit --skipLibCheck",
-    "lint": "eslint --ext .ts,.tsx src",
-    "format": "prettier --write src"
-  }
-}
+	"name": "@dashadmin/dash-admin",
+	"version": "1.3.26",
+	"main": "dist/index.js",
+	"type": "module",
+	"scripts": {
+		"lint": "eslint --ext .ts,.tsx .",
+		"format": "pnpm prettier --write . && pnpm format-check && pnpm lint",
+		"lint:check": "pnpm prettier --check .",
+		"lint:fix": "pnpm prettier --write .",
+		"check-updates": "pnpm npm-check-updates",
+		"updates-packages": "pnpm npm-check-updates -u",
+		"build": "tsup"
+	},
+	"browserslist": {
+		"production": [
+			">0.2%",
+			"not dead",
+			"not op_mini all"
+		],
+		"development": [
+			"last 1 chrome version",
+			"last 1 firefox version",
+			"last 1 safari version"
+		]
+	},
+	"dependencies": {
+		"@capacitor/core": "^7.4.2",
+		"@capacitor/push-notifications": "^7.0.1",
+		"@emotion/react": "latest",
+		"@emotion/styled": "latest",
+		"@mui/material": "^7.3.10",
+		"@rollup/plugin-alias": "latest",
+		"@rollup/plugin-commonjs": "latest",
+		"@rollup/plugin-node-resolve": "latest",
+		"@rollup/plugin-replace": "latest",
+		"@rollup/plugin-typescript": "latest",
+		"framer-motion": "latest",
+		"prop-types": "latest",
+		"query-string": "latest",
+		"ra-input-rich-text": "5.14.6",
+		"react": "latest",
+		"react-admin": "5.14.6",
+		"react-custom-scrollbars-2": "latest",
+		"react-hook-form": "^7.54.0",
+		"react-loading-overlay-ts": "latest",
+		"react-query": "latest",
+		"react-redux": "latest",
+		"react-router": "^7.10.0",
+		"react-router-dom": "^7.10.0",
+		"react-spinners": "latest",
+		"react-toastify": "latest",
+		"rollup-plugin-cleaner": "latest",
+		"rollup-plugin-dts": "latest",
+		"rollup-plugin-peer-deps-external": "latest",
+		"rollup-plugin-svg": "latest",
+		"@dashadmin/dash-admin-state": "workspace:*",
+		"@dashadmin/dash-auto-admin": "workspace:*",
+		"@dashadmin/dash-constants": "workspace:*",
+		"@dashadmin/dash-dialog": "workspace:*",
+		"@dashadmin/dash-styles": "workspace:*",
+		"@dashadmin/dash-modal": "workspace:*",
+		"@dashadmin/dash-components": "workspace:*",
+		"@dashadmin/dash-axios-hook": "workspace:*",
+		"@dashadmin/dash-utils": "workspace:*",
+		"@dashadmin/dash-auth": "workspace:*"
+	},
+	"devDependencies": {
+		"@babel/core": "latest",
+		"@babel/preset-env": "latest",
+		"@babel/preset-react": "latest",
+		"@babel/preset-typescript": "latest",
+		"@commitlint/config-conventional": "latest",
+		"@types/node": "latest",
+		"@types/react": "latest",
+		"@types/react-dom": "latest",
+		"@zerollup/ts-transform-paths": "latest",
+		"babel-loader": "latest",
+		"eslint": "latest",
+		"eslint-config-airbnb": "latest",
+		"eslint-config-airbnb-typescript": "latest",
+		"eslint-config-prettier": "latest",
+		"eslint-import-resolver-typescript": "latest",
+		"eslint-plugin-html": "latest",
+		"eslint-plugin-import": "latest",
+		"eslint-plugin-jsdoc": "latest",
+		"eslint-plugin-json": "latest",
+		"eslint-plugin-jsx-a11y": "latest",
+		"eslint-plugin-prettier": "latest",
+		"eslint-plugin-react": "latest",
+		"eslint-plugin-react-hooks": "latest",
+		"query-string": "latest",
+		"react-dom": "latest",
+		"rollup": "latest",
+		"rollup-plugin-copy-assets": "latest",
+		"rollup-plugin-external-globals": "latest",
+		"rollup-plugin-includepaths": "latest",
+		"rollup-plugin-less": "latest",
+		"rollup-plugin-node-resolve": "latest",
+		"rollup-plugin-postcss": "latest",
+		"rollup-plugin-sourcemaps": "latest",
+		"rollup-plugin-typescript2": "latest",
+		"tsc": "latest",
+		"tsc-alias": "latest",
+		"ttypescript": "latest",
+		"typescript": "latest",
+		"@dashadmin/dash-eslint": "workspace:*",
+		"@dashadmin/dash-tsconfig": "workspace:*",
+		"@dashadmin/dash-prettier": "workspace:*"
+	},
+	"eslintConfig": {
+		"extends": "react-app"
+	},
+	"todo_storybook": {
+		"eslint-plugin-storybook": "latest"
+	},
+	"module": "dist/index.js",
+	"types": "./src/index.tsx",
+	"exports": {
+		".": "./dist/index.js",
+		"./components/navigation": "./dist/components/navigation/index.js",
+		"./src/components/navigation": "./dist/components/navigation/index.js",
+		"./components/subscription": "./dist/components/subscription/index.js",
+		"./src/components/subscription": "./dist/components/subscription/index.js",
+		"./contexts/auth": "./dist/contexts/auth/index.js",
+		"./src/contexts/auth": "./dist/contexts/auth/index.js",
+		"./default-theme": "./dist/default-theme/index.js",
+		"./src/default-theme": "./dist/default-theme/index.js",
+		"./utils": "./dist/utils/index.js",
+		"./src/utils": "./dist/utils/index.js",
+		"./*": "./dist/*.js",
+		"./src/*": "./dist/*.js"
+	},
+	"publishConfig": {
+		"access": "public",
+		"registry": "https://registry.npmjs.org"
+	},
+	"files": [
+		"dist",
+		"src"
+	],
+	"typesVersions": {
+		"*": {
+			"src/*": [
+				"src/*",
+				"src/*/index"
+			],
+			"*": [
+				"src/*",
+				"src/*/index"
+			]
+		}
+	}
+}

package/src/AppAsyncWrapper.tsx

@@ -0,0 +1,42 @@
+/* eslint react/jsx-key: off */
+import React, { Suspense } from 'react';
+import GlobalLoader from './components/loader/GlobalLoader';
+import { Loading } from 'react-admin';
+
+import { ErrorBoundary } from 'react-error-boundary';
+
+const ErrorFallback = ({ error, resetErrorBoundary }) => {
+	return <Loading loadingPrimary='Error' loadingSecondary={error.message} />;
+};
+
+const AppComponent = React.lazy(() => {
+	return new Promise((resolve) => setTimeout(resolve, 1 * 1000)).then(
+		// @ts-ignore
+		() => import('@app/DASHApp'), 
+	);
+});
+
+const AppAsyncWrapper: React.FC<any> = () => {
+
+	return (
+		<>
+			<ErrorBoundary
+                FallbackComponent={ErrorFallback}
+                //</>onReset={() => {
+                    // reset the state of your app so the error doesn't happen again
+               //}}
+            >
+                <Suspense fallback={<Loading loadingPrimary='' loadingSecondary='' />}>
+                    <AppComponent />
+                </Suspense>
+            </ErrorBoundary>
+        
+            <GlobalLoader>
+                {/*<SlideInSpinner transitionDuration={0.5}  isSlideIn={true} />*/}
+                ...
+            </GlobalLoader>
+		</>
+	);
+};
+
+export default AppAsyncWrapper;

package/src/AppWrapper.tsx

@@ -0,0 +1,45 @@
+import React, { PropsWithChildren, Suspense, useState, useTransition } from 'react';
+import GlobalLoader from './components/loader/GlobalLoader';
+import { Loading } from 'react-admin';
+import { ErrorBoundary, FallbackProps } from 'react-error-boundary';
+//import LoaderAnimation from 'react-spinners/PuffLoader';
+//import { SlideInSpinner } from './layout/MotionWrapper';
+
+const ErrorFallback: React.FC<FallbackProps> = ({ error, resetErrorBoundary }) => {
+    return <Loading loadingPrimary='Error' loadingSecondary={error?.message || 'Unknown error'} />;
+};
+
+const AppWrapper: React.FC<PropsWithChildren> = (props) => {
+    const { children } = props;
+    const [isPending, startTransition] = useTransition();
+    const [isInitialRender, setIsInitialRender] = useState(true);
+
+    React.useEffect(() => {
+        // Mark this content rendering as a transition
+        startTransition(() => {
+            setIsInitialRender(false);
+        });
+    }, []);
+
+    return (
+        <>
+            <ErrorBoundary
+                FallbackComponent={ErrorFallback}
+                onReset={() => {
+                    // reset the state of your app so the error doesn't happen again
+                }}
+            >
+                <Suspense fallback={<Loading loadingPrimary='' loadingSecondary='' />}>
+                    {children}
+                </Suspense>
+            </ErrorBoundary>
+            <GlobalLoader>
+                {/*<SlideInSpinner transitionDuration={3} />*/}
+                ...
+            </GlobalLoader>
+            <div className={!isPending && !isInitialRender ? 'dash-splash fade-out' : 'dash-splash'}></div>
+        </>
+    );
+};
+
+export default AppWrapper;