@minimaltech/ra-core-infra 0.0.3-6 → 0.0.3-8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (10) hide show
  1. package/dist/ui/hooks/index.d.ts +1 -0
  2. package/dist/ui/hooks/index.js +1 -0
  3. package/dist/ui/hooks/index.js.map +1 -1
  4. package/dist/ui/hooks/use-logout.d.ts +3 -0
  5. package/dist/ui/hooks/use-logout.js +74 -0
  6. package/dist/ui/hooks/use-logout.js.map +1 -0
  7. package/dist/utilities/error.utility.d.ts +6 -0
  8. package/dist/utilities/error.utility.js +8 -1
  9. package/dist/utilities/error.utility.js.map +1 -1
  10. package/package.json +2 -1
package/dist/ui/hooks/index.d.ts CHANGED
@@ -7,6 +7,7 @@ export * from './use-copy-to-clipboard';
7
7
  export * from './use-debounce';
8
8
  export * from './use-document-title';
9
9
  export * from './use-injectable';
10
+ export * from './use-logout';
10
11
  export * from './use-sizer';
11
12
  export * from './use-translate';
12
13
  export * from './use-window-dimensions';
package/dist/ui/hooks/index.js CHANGED
@@ -7,6 +7,7 @@ export * from './use-copy-to-clipboard';
7
7
  export * from './use-debounce';
8
8
  export * from './use-document-title';
9
9
  export * from './use-injectable';
10
+ export * from './use-logout';
10
11
  export * from './use-sizer';
11
12
  export * from './use-translate';
12
13
  export * from './use-window-dimensions';
package/dist/ui/hooks/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/ui/hooks/index.tsx"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AAExB,cAAc,2BAA2B,CAAC;AAC1C,cAAc,gBAAgB,CAAC;AAC/B,cAAc,qBAAqB,CAAC;AACpC,cAAc,eAAe,CAAC;AAC9B,cAAc,yBAAyB,CAAC;AACxC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,sBAAsB,CAAC;AACrC,cAAc,kBAAkB,CAAC;AACjC,cAAc,aAAa,CAAC;AAC5B,cAAc,iBAAiB,CAAC;AAChC,cAAc,yBAAyB,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/ui/hooks/index.tsx"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AAExB,cAAc,2BAA2B,CAAC;AAC1C,cAAc,gBAAgB,CAAC;AAC/B,cAAc,qBAAqB,CAAC;AACpC,cAAc,eAAe,CAAC;AAC9B,cAAc,yBAAyB,CAAC;AACxC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,sBAAsB,CAAC;AACrC,cAAc,kBAAkB,CAAC;AACjC,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,iBAAiB,CAAC;AAChC,cAAc,yBAAyB,CAAC"}
package/dist/ui/hooks/use-logout.d.ts ADDED
@@ -0,0 +1,3 @@
1
+ export declare const useLogout: () => TLogout;
2
+ type TLogout = (params?: any, redirectTo?: string | false, redirectToCurrentLocationAfterLogin?: boolean) => Promise<any>;
3
+ export {};
package/dist/ui/hooks/use-logout.js ADDED
@@ -0,0 +1,74 @@
1
+ import React from 'react';
2
+ import { useQueryClient } from '@tanstack/react-query';
3
+ import { removeDoubleSlashes, useAuthProvider, useBasename } from 'ra-core';
4
+ import { useLocation, useNavigate } from 'react-router-dom';
5
+ const defaultAuthParams = {
6
+ loginUrl: '/login',
7
+ afterLoginUrl: '/',
8
+ };
9
+ export const useLogout = () => {
10
+ const authProvider = useAuthProvider();
11
+ const queryClient = useQueryClient();
12
+ const navigate = useNavigate();
13
+ const navigateRef = React.useRef(navigate);
14
+ const location = useLocation();
15
+ const locationRef = React.useRef(location);
16
+ const basename = useBasename();
17
+ const loginUrl = removeDoubleSlashes(`${basename}/${defaultAuthParams.loginUrl}`);
18
+ React.useEffect(() => {
19
+ locationRef.current = location;
20
+ navigateRef.current = navigate;
21
+ }, [location, navigate]);
22
+ const logout = React.useCallback((params = {}, redirectFromCaller, redirectToCurrentLocationAfterLogin = true) => {
23
+ if (authProvider) {
24
+ return authProvider.logout(params).then(redirectFromLogout => {
25
+ if (redirectFromLogout === false || redirectFromCaller === false) {
26
+ queryClient.clear();
27
+ return;
28
+ }
29
+ const finalRedirectTo = redirectFromCaller || redirectFromLogout || loginUrl;
30
+ if (finalRedirectTo?.startsWith('http')) {
31
+ queryClient.clear();
32
+ window.location.href = finalRedirectTo;
33
+ return finalRedirectTo;
34
+ }
35
+ const redirectToParts = finalRedirectTo.split('?');
36
+ const newLocation = {
37
+ pathname: redirectToParts[0],
38
+ };
39
+ let newLocationOptions = {};
40
+ if (redirectToCurrentLocationAfterLogin &&
41
+ locationRef.current &&
42
+ locationRef.current.pathname) {
43
+ newLocationOptions = {
44
+ state: {
45
+ nextPathname: locationRef.current.pathname,
46
+ nextSearch: locationRef.current.search,
47
+ },
48
+ };
49
+ }
50
+ if (redirectToParts[1]) {
51
+ newLocation.search = redirectToParts[1];
52
+ }
53
+ setTimeout(() => {
54
+ navigateRef.current(newLocation, newLocationOptions);
55
+ queryClient.clear();
56
+ }, 0);
57
+ return redirectFromLogout;
58
+ });
59
+ }
60
+ else {
61
+ navigateRef.current({
62
+ pathname: loginUrl,
63
+ }, {
64
+ state: {
65
+ nextPathname: locationRef.current && locationRef.current.pathname,
66
+ },
67
+ });
68
+ queryClient.clear();
69
+ return Promise.resolve();
70
+ }
71
+ }, [authProvider, loginUrl, queryClient]);
72
+ return logout;
73
+ };
74
+ //# sourceMappingURL=use-logout.js.map
package/dist/ui/hooks/use-logout.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"use-logout.js","sourceRoot":"","sources":["../../../src/ui/hooks/use-logout.ts"],"names":[],"mappings":"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"}
package/dist/utilities/error.utility.d.ts CHANGED
@@ -2,11 +2,15 @@ export declare class ApplicationError extends Error {
2
2
  statusCode: number;
3
3
  messageCode?: string;
4
4
  payload?: any;
5
+ messageArgs?: any;
6
+ extra?: any;
5
7
  constructor(opts: {
6
8
  statusCode?: number;
7
9
  messageCode?: string;
8
10
  message: string;
9
11
  payload?: any;
12
+ messageArgs?: any;
13
+ extra?: any;
10
14
  });
11
15
  }
12
16
  export declare const getError: (opts: {
@@ -14,5 +18,7 @@ export declare const getError: (opts: {
14
18
  messageCode?: string;
15
19
  message: string;
16
20
  payload?: any;
21
+ messageArgs?: any;
22
+ extra?: any;
17
23
  }) => ApplicationError;
18
24
  export declare const getClientError: (e: unknown) => ApplicationError;
package/dist/utilities/error.utility.js CHANGED
@@ -2,12 +2,16 @@ export class ApplicationError extends Error {
2
2
  statusCode;
3
3
  messageCode;
4
4
  payload;
5
+ messageArgs;
6
+ extra;
5
7
  constructor(opts) {
6
- const { message, messageCode, statusCode = 400, payload } = opts;
8
+ const { message, messageCode, statusCode = 400, payload, messageArgs, extra } = opts;
7
9
  super(message);
8
10
  this.statusCode = statusCode;
9
11
  this.messageCode = messageCode;
10
12
  this.payload = payload;
13
+ this.messageArgs = messageArgs;
14
+ this.extra = extra;
11
15
  }
12
16
  }
13
17
  export const getError = (opts) => {
@@ -17,8 +21,11 @@ export const getError = (opts) => {
17
21
  export const getClientError = (e) => {
18
22
  if (e instanceof ApplicationError) {
19
23
  return new ApplicationError({
24
+ statusCode: e.statusCode,
20
25
  messageCode: e?.messageCode ?? e.message,
21
26
  message: e.message,
27
+ messageArgs: e.messageArgs,
28
+ extra: e.extra,
22
29
  });
23
30
  }
24
31
  if (e instanceof Error) {
package/dist/utilities/error.utility.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"error.utility.js","sourceRoot":"","sources":["../../src/utilities/error.utility.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,gBAAiB,SAAQ,KAAK;IACzC,UAAU,CAAS;IACnB,WAAW,CAAU;IACrB,OAAO,CAAO;IAEd,YAAY,IAAmF;QAC7F,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,UAAU,GAAG,GAAG,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;QACjE,KAAK,CAAC,OAAO,CAAC,CAAC;QAEf,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;CACF;AAED,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,IAKxB,EAAE,EAAE;IACH,MAAM,KAAK,GAAG,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACzC,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,CAAU,EAAE,EAAE;IAC3C,IAAI,CAAC,YAAY,gBAAgB,EAAE,CAAC;QAClC,OAAO,IAAI,gBAAgB,CAAC;YAC1B,WAAW,EAAE,CAAC,EAAE,WAAW,IAAI,CAAC,CAAC,OAAO;YACxC,OAAO,EAAE,CAAC,CAAC,OAAO;SACnB,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC,YAAY,KAAK,EAAE,CAAC;QACvB,OAAO,IAAI,gBAAgB,CAAC;YAC1B,WAAW,EAAE,CAAC,CAAC,OAAO;YACtB,OAAO,EAAE,CAAC,CAAC,OAAO;SACnB,CAAC,CAAC;IACL,CAAC;IAED,OAAO,IAAI,gBAAgB,CAAC;QAC1B,WAAW,EAAE,GAAG,CAAC,EAAE;QACnB,OAAO,EAAE,GAAG,CAAC,EAAE;KAChB,CAAC,CAAC;AACL,CAAC,CAAC"}
1
+ {"version":3,"file":"error.utility.js","sourceRoot":"","sources":["../../src/utilities/error.utility.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,gBAAiB,SAAQ,KAAK;IACzC,UAAU,CAAS;IACnB,WAAW,CAAU;IACrB,OAAO,CAAO;IAId,WAAW,CAAO;IAElB,KAAK,CAAO;IAEZ,YAAY,IAOX;QACC,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,UAAU,GAAG,GAAG,EAAE,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;QACrF,KAAK,CAAC,OAAO,CAAC,CAAC;QAEf,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;CACF;AAED,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,IAOxB,EAAE,EAAE;IACH,MAAM,KAAK,GAAG,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACzC,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,CAAU,EAAE,EAAE;IAC3C,IAAI,CAAC,YAAY,gBAAgB,EAAE,CAAC;QAClC,OAAO,IAAI,gBAAgB,CAAC;YAC1B,UAAU,EAAE,CAAC,CAAC,UAAU;YACxB,WAAW,EAAE,CAAC,EAAE,WAAW,IAAI,CAAC,CAAC,OAAO;YACxC,OAAO,EAAE,CAAC,CAAC,OAAO;YAClB,WAAW,EAAE,CAAC,CAAC,WAAW;YAC1B,KAAK,EAAE,CAAC,CAAC,KAAK;SACf,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC,YAAY,KAAK,EAAE,CAAC;QACvB,OAAO,IAAI,gBAAgB,CAAC;YAC1B,WAAW,EAAE,CAAC,CAAC,OAAO;YACtB,OAAO,EAAE,CAAC,CAAC,OAAO;SACnB,CAAC,CAAC;IACL,CAAC;IAED,OAAO,IAAI,gBAAgB,CAAC;QAC1B,WAAW,EAAE,GAAG,CAAC,EAAE;QACnB,OAAO,EAAE,GAAG,CAAC,EAAE;KAChB,CAAC,CAAC;AACL,CAAC,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@minimaltech/ra-core-infra",
3
- "version": "0.0.3-6",
3
+ "version": "0.0.3-8",
4
4
  "description": "Minimal Technology - ReactJS Core Infrastructure",
5
5
  "keywords": [
6
6
  "web",
@@ -78,6 +78,7 @@
78
78
  },
79
79
  "dependencies": {
80
80
  "@reduxjs/toolkit": "^2.9.1",
81
+ "@tanstack/react-query": "^5.99.0",
81
82
  "ra-i18n-polyglot": "^5.12.1",
82
83
  "react-router-dom": "^7.9.4"
83
84
  },