payload 1.11.1 → 1.11.3
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.
- package/components/index.js +1 -1
- package/components/styles.css +1 -1
- package/dist/admin/components/elements/Button/index.scss +1 -0
- package/dist/admin/components/elements/Collapsible/index.js +5 -4
- package/dist/admin/components/elements/Collapsible/index.js.map +1 -1
- package/dist/admin/components/elements/Collapsible/index.scss +76 -16
- package/dist/admin/components/elements/Collapsible/types.d.ts +1 -0
- package/dist/admin/components/elements/DatePicker/DatePicker.js +2 -2
- package/dist/admin/components/elements/DatePicker/DatePicker.js.map +1 -1
- package/dist/admin/components/elements/DatePicker/index.scss +57 -2
- package/dist/admin/components/elements/ErrorPill/index.d.ts +4 -0
- package/dist/admin/components/elements/ErrorPill/index.js +28 -0
- package/dist/admin/components/elements/ErrorPill/index.js.map +1 -0
- package/dist/admin/components/elements/ErrorPill/index.scss +43 -0
- package/dist/admin/components/elements/ErrorPill/types.d.ts +5 -0
- package/dist/admin/components/elements/ErrorPill/types.js +3 -0
- package/dist/admin/components/elements/ErrorPill/types.js.map +1 -0
- package/dist/admin/components/elements/Pill/index.js +2 -1
- package/dist/admin/components/elements/Pill/index.js.map +1 -1
- package/dist/admin/components/elements/Pill/index.scss +26 -0
- package/dist/admin/components/elements/Pill/types.d.ts +2 -1
- package/dist/admin/components/elements/ReactSelect/index.scss +1 -1
- package/dist/admin/components/elements/Tooltip/index.scss +16 -0
- package/dist/admin/components/forms/Form/WatchFormErrors.d.ts +6 -0
- package/dist/admin/components/forms/Form/WatchFormErrors.js +15 -0
- package/dist/admin/components/forms/Form/WatchFormErrors.js.map +1 -0
- package/dist/admin/components/forms/Form/buildStateFromSchema/addFieldStatePromise.js +2 -0
- package/dist/admin/components/forms/Form/buildStateFromSchema/addFieldStatePromise.js.map +1 -1
- package/dist/admin/components/forms/Form/fieldReducer.js +9 -4
- package/dist/admin/components/forms/Form/fieldReducer.js.map +1 -1
- package/dist/admin/components/forms/Form/index.js +56 -2
- package/dist/admin/components/forms/Form/index.js.map +1 -1
- package/dist/admin/components/forms/Form/initContextState.js +1 -0
- package/dist/admin/components/forms/Form/initContextState.js.map +1 -1
- package/dist/admin/components/forms/Form/rows.js +2 -2
- package/dist/admin/components/forms/Form/rows.js.map +1 -1
- package/dist/admin/components/forms/Form/types.d.ts +6 -4
- package/dist/admin/components/forms/WatchChildErrors/index.d.ts +12 -0
- package/dist/admin/components/forms/WatchChildErrors/index.js +70 -0
- package/dist/admin/components/forms/WatchChildErrors/index.js.map +1 -0
- package/dist/admin/components/forms/field-types/Array/ArrayRow.d.ts +20 -0
- package/dist/admin/components/forms/field-types/Array/ArrayRow.js +49 -0
- package/dist/admin/components/forms/field-types/Array/ArrayRow.js.map +1 -0
- package/dist/admin/components/forms/field-types/Array/index.js +30 -44
- package/dist/admin/components/forms/field-types/Array/index.js.map +1 -1
- package/dist/admin/components/forms/field-types/Array/index.scss +43 -0
- package/dist/admin/components/forms/field-types/Blocks/BlockRow.d.ts +19 -0
- package/dist/admin/components/forms/field-types/Blocks/BlockRow.js +50 -0
- package/dist/admin/components/forms/field-types/Blocks/BlockRow.js.map +1 -0
- package/dist/admin/components/forms/field-types/Blocks/RowActions.d.ts +1 -2
- package/dist/admin/components/forms/field-types/Blocks/RowActions.js +2 -2
- package/dist/admin/components/forms/field-types/Blocks/RowActions.js.map +1 -1
- package/dist/admin/components/forms/field-types/Blocks/SectionTitle/index.scss +2 -3
- package/dist/admin/components/forms/field-types/Blocks/index.js +28 -46
- package/dist/admin/components/forms/field-types/Blocks/index.js.map +1 -1
- package/dist/admin/components/forms/field-types/Blocks/index.scss +40 -1
- package/dist/admin/components/forms/field-types/Checkbox/index.scss +22 -2
- package/dist/admin/components/forms/field-types/Code/index.scss +23 -0
- package/dist/admin/components/forms/field-types/Collapsible/index.js +16 -5
- package/dist/admin/components/forms/field-types/Collapsible/index.js.map +1 -1
- package/dist/admin/components/forms/field-types/Collapsible/index.scss +8 -1
- package/dist/admin/components/forms/field-types/ConfirmPassword/index.js.map +1 -1
- package/dist/admin/components/forms/field-types/ConfirmPassword/index.scss +17 -3
- package/dist/admin/components/forms/field-types/DateTime/index.scss +17 -3
- package/dist/admin/components/forms/field-types/Email/index.scss +21 -0
- package/dist/admin/components/forms/field-types/Group/index.js +13 -3
- package/dist/admin/components/forms/field-types/Group/index.js.map +1 -1
- package/dist/admin/components/forms/field-types/Group/index.scss +26 -0
- package/dist/admin/components/forms/field-types/JSON/index.scss +26 -3
- package/dist/admin/components/forms/field-types/Number/index.scss +17 -3
- package/dist/admin/components/forms/field-types/Password/index.scss +17 -3
- package/dist/admin/components/forms/field-types/Point/index.scss +17 -3
- package/dist/admin/components/forms/field-types/RadioGroup/index.scss +20 -0
- package/dist/admin/components/forms/field-types/Relationship/index.scss +32 -0
- package/dist/admin/components/forms/field-types/RichText/elements/link/LinkDrawer/baseFields.js +1 -3
- package/dist/admin/components/forms/field-types/RichText/elements/link/LinkDrawer/baseFields.js.map +1 -1
- package/dist/admin/components/forms/field-types/RichText/index.scss +20 -0
- package/dist/admin/components/forms/field-types/Select/index.scss +21 -1
- package/dist/admin/components/forms/field-types/Tabs/index.js +43 -22
- package/dist/admin/components/forms/field-types/Tabs/index.js.map +1 -1
- package/dist/admin/components/forms/field-types/Tabs/index.scss +25 -1
- package/dist/admin/components/forms/field-types/Text/index.js +1 -2
- package/dist/admin/components/forms/field-types/Text/index.js.map +1 -1
- package/dist/admin/components/forms/field-types/Text/index.scss +17 -3
- package/dist/admin/components/forms/field-types/Textarea/index.scss +20 -6
- package/dist/admin/components/forms/field-types/Upload/index.scss +30 -0
- package/dist/admin/components/forms/useField/index.js +13 -2
- package/dist/admin/components/forms/useField/index.js.map +1 -1
- package/dist/admin/components/forms/useField/types.d.ts +1 -0
- package/dist/admin/components/utilities/Auth/index.js +104 -35
- package/dist/admin/components/utilities/Auth/index.js.map +1 -1
- package/dist/admin/components/utilities/Auth/types.d.ts +3 -1
- package/dist/admin/components/views/Account/Default.js +33 -2
- package/dist/admin/components/views/Account/Default.js.map +1 -1
- package/dist/admin/components/views/Account/index.js +10 -9
- package/dist/admin/components/views/Account/index.js.map +1 -1
- package/dist/admin/components/views/collections/Edit/Auth/index.js.map +1 -1
- package/dist/admin/components/views/collections/Edit/Default.js +7 -2
- package/dist/admin/components/views/collections/Edit/Default.js.map +1 -1
- package/dist/admin/components/views/collections/Edit/index.js +32 -16
- package/dist/admin/components/views/collections/Edit/index.js.map +1 -1
- package/dist/admin/hooks/useTitle.d.ts +2 -2
- package/dist/admin/hooks/useTitle.js.map +1 -1
- package/dist/admin/scss/app.scss +4 -0
- package/dist/admin/scss/vars.scss +15 -0
- package/dist/auth/operations/getFieldsToSign.d.ts +7 -0
- package/dist/auth/operations/getFieldsToSign.js +29 -0
- package/dist/auth/operations/getFieldsToSign.js.map +1 -0
- package/dist/auth/operations/login.js +4 -19
- package/dist/auth/operations/login.js.map +1 -1
- package/dist/auth/operations/refresh.js +27 -14
- package/dist/auth/operations/refresh.js.map +1 -1
- package/dist/config/schema.js +5 -0
- package/dist/config/schema.js.map +1 -1
- package/dist/config/types.d.ts +14 -1
- package/dist/payload.js +1 -1
- package/dist/payload.js.map +1 -1
- package/dist/translations/en.json +3 -1
- package/dist/translations/index.d.ts +2 -0
- package/dist/translations/ua.json +5 -5
- package/dist/utilities/deepCopyObject.js +4 -0
- package/dist/utilities/deepCopyObject.js.map +1 -1
- package/dist/utilities/isNumber.d.ts +1 -1
- package/dist/utilities/isNumber.js.map +1 -1
- package/dist/utilities/logger.d.ts +1 -1
- package/dist/utilities/logger.js +2 -2
- package/dist/utilities/logger.js.map +1 -1
- package/dist/utilities/setsAreEqual.d.ts +1 -0
- package/dist/utilities/setsAreEqual.js +7 -0
- package/dist/utilities/setsAreEqual.js.map +1 -0
- package/dist/utilities/splitPathByArrayFields.d.ts +6 -0
- package/dist/utilities/splitPathByArrayFields.js +14 -0
- package/dist/utilities/splitPathByArrayFields.js.map +1 -0
- package/docs/authentication/config.mdx +16 -0
- package/docs/getting-started/installation.mdx +4 -0
- package/package.json +2 -2
|
@@ -32,6 +32,7 @@ const jwt_decode_1 = __importDefault(require("jwt-decode"));
|
|
|
32
32
|
const react_router_dom_1 = require("react-router-dom");
|
|
33
33
|
const modal_1 = require("@faceless-ui/modal");
|
|
34
34
|
const react_i18next_1 = require("react-i18next");
|
|
35
|
+
const react_toastify_1 = require("react-toastify");
|
|
35
36
|
const Config_1 = require("../Config");
|
|
36
37
|
const api_1 = require("../../../api");
|
|
37
38
|
const useDebounce_1 = __importDefault(require("../../../hooks/useDebounce"));
|
|
@@ -43,7 +44,7 @@ const AuthProvider = ({ children }) => {
|
|
|
43
44
|
const { pathname } = (0, react_router_dom_1.useLocation)();
|
|
44
45
|
const { push } = (0, react_router_dom_1.useHistory)();
|
|
45
46
|
const config = (0, Config_1.useConfig)();
|
|
46
|
-
const { admin: { user: userSlug, inactivityRoute: logoutInactivityRoute, }, serverURL, routes: { admin, api, }, } = config;
|
|
47
|
+
const { admin: { user: userSlug, inactivityRoute: logoutInactivityRoute, autoLogin, }, serverURL, routes: { admin, api, }, } = config;
|
|
47
48
|
const exp = user === null || user === void 0 ? void 0 : user.exp;
|
|
48
49
|
const [permissions, setPermissions] = (0, react_1.useState)();
|
|
49
50
|
const { i18n } = (0, react_i18next_1.useTranslation)();
|
|
@@ -51,27 +52,54 @@ const AuthProvider = ({ children }) => {
|
|
|
51
52
|
const [lastLocationChange, setLastLocationChange] = (0, react_1.useState)(0);
|
|
52
53
|
const debouncedLocationChange = (0, useDebounce_1.default)(lastLocationChange, 10000);
|
|
53
54
|
const id = user === null || user === void 0 ? void 0 : user.id;
|
|
54
|
-
const refreshCookie = (0, react_1.useCallback)(() => {
|
|
55
|
+
const refreshCookie = (0, react_1.useCallback)((forceRefresh) => {
|
|
55
56
|
const now = Math.round((new Date()).getTime() / 1000);
|
|
56
57
|
const remainingTime = (exp || 0) - now;
|
|
57
|
-
if (exp && remainingTime < 120) {
|
|
58
|
+
if (forceRefresh || (exp && remainingTime < 120)) {
|
|
58
59
|
setTimeout(async () => {
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
60
|
+
try {
|
|
61
|
+
const request = await api_1.requests.post(`${serverURL}${api}/${userSlug}/refresh-token`, {
|
|
62
|
+
headers: {
|
|
63
|
+
'Accept-Language': i18n.language,
|
|
64
|
+
},
|
|
65
|
+
});
|
|
66
|
+
if (request.status === 200) {
|
|
67
|
+
const json = await request.json();
|
|
68
|
+
setUser(json.user);
|
|
69
|
+
}
|
|
70
|
+
else {
|
|
71
|
+
setUser(null);
|
|
72
|
+
push(`${admin}${logoutInactivityRoute}?redirect=${encodeURIComponent(window.location.pathname)}`);
|
|
73
|
+
}
|
|
67
74
|
}
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
push(`${admin}${logoutInactivityRoute}?redirect=${encodeURIComponent(window.location.pathname)}`);
|
|
75
|
+
catch (e) {
|
|
76
|
+
react_toastify_1.toast.error(e.message);
|
|
71
77
|
}
|
|
72
78
|
}, 1000);
|
|
73
79
|
}
|
|
74
80
|
}, [exp, serverURL, api, userSlug, push, admin, logoutInactivityRoute, i18n]);
|
|
81
|
+
const refreshCookieAsync = (0, react_1.useCallback)(async (skipSetUser) => {
|
|
82
|
+
try {
|
|
83
|
+
const request = await api_1.requests.post(`${serverURL}${api}/${userSlug}/refresh-token`, {
|
|
84
|
+
headers: {
|
|
85
|
+
'Accept-Language': i18n.language,
|
|
86
|
+
},
|
|
87
|
+
});
|
|
88
|
+
if (request.status === 200) {
|
|
89
|
+
const json = await request.json();
|
|
90
|
+
if (!skipSetUser)
|
|
91
|
+
setUser(json.user);
|
|
92
|
+
return json.user;
|
|
93
|
+
}
|
|
94
|
+
setUser(null);
|
|
95
|
+
push(`${admin}${logoutInactivityRoute}`);
|
|
96
|
+
return null;
|
|
97
|
+
}
|
|
98
|
+
catch (e) {
|
|
99
|
+
react_toastify_1.toast.error(`Refreshing token failed: ${e.message}`);
|
|
100
|
+
return null;
|
|
101
|
+
}
|
|
102
|
+
}, [serverURL, api, userSlug, push, admin, logoutInactivityRoute, i18n]);
|
|
75
103
|
const setToken = (0, react_1.useCallback)((token) => {
|
|
76
104
|
const decoded = (0, jwt_decode_1.default)(token);
|
|
77
105
|
setUser(decoded);
|
|
@@ -83,37 +111,76 @@ const AuthProvider = ({ children }) => {
|
|
|
83
111
|
api_1.requests.post(`${serverURL}${api}/${userSlug}/logout`);
|
|
84
112
|
}, [serverURL, api, userSlug]);
|
|
85
113
|
const refreshPermissions = (0, react_1.useCallback)(async () => {
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
'Accept-Language': i18n.language,
|
|
89
|
-
},
|
|
90
|
-
});
|
|
91
|
-
if (request.status === 200) {
|
|
92
|
-
const json = await request.json();
|
|
93
|
-
setPermissions(json);
|
|
94
|
-
}
|
|
95
|
-
else {
|
|
96
|
-
throw new Error(`Fetching permissions failed with status code ${request.status}`);
|
|
97
|
-
}
|
|
98
|
-
}, [serverURL, api, i18n]);
|
|
99
|
-
// On mount, get user and set
|
|
100
|
-
(0, react_1.useEffect)(() => {
|
|
101
|
-
const fetchMe = async () => {
|
|
102
|
-
const request = await api_1.requests.get(`${serverURL}${api}/${userSlug}/me`, {
|
|
114
|
+
try {
|
|
115
|
+
const request = await api_1.requests.get(`${serverURL}${api}/access`, {
|
|
103
116
|
headers: {
|
|
104
117
|
'Accept-Language': i18n.language,
|
|
105
118
|
},
|
|
106
119
|
});
|
|
107
120
|
if (request.status === 200) {
|
|
108
121
|
const json = await request.json();
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
122
|
+
setPermissions(json);
|
|
123
|
+
}
|
|
124
|
+
else {
|
|
125
|
+
throw new Error(`Fetching permissions failed with status code ${request.status}`);
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
catch (e) {
|
|
129
|
+
react_toastify_1.toast.error(`Refreshing permissions failed: ${e.message}`);
|
|
130
|
+
}
|
|
131
|
+
}, [serverURL, api, i18n]);
|
|
132
|
+
// On mount, get user and set
|
|
133
|
+
(0, react_1.useEffect)(() => {
|
|
134
|
+
const fetchMe = async () => {
|
|
135
|
+
try {
|
|
136
|
+
const request = await api_1.requests.get(`${serverURL}${api}/${userSlug}/me`, {
|
|
137
|
+
headers: {
|
|
138
|
+
'Accept-Language': i18n.language,
|
|
139
|
+
},
|
|
140
|
+
});
|
|
141
|
+
if (request.status === 200) {
|
|
142
|
+
const json = await request.json();
|
|
143
|
+
if (json === null || json === void 0 ? void 0 : json.user) {
|
|
144
|
+
setUser(json.user);
|
|
145
|
+
}
|
|
146
|
+
else if (json === null || json === void 0 ? void 0 : json.token) {
|
|
147
|
+
setToken(json.token);
|
|
148
|
+
}
|
|
149
|
+
else if (autoLogin) {
|
|
150
|
+
// auto log-in with the provided autoLogin credentials. This is used in dev mode
|
|
151
|
+
// so you don't have to log in over and over again
|
|
152
|
+
const autoLoginResult = await api_1.requests.post(`${serverURL}${api}/${userSlug}/login`, {
|
|
153
|
+
body: JSON.stringify({
|
|
154
|
+
email: autoLogin.email,
|
|
155
|
+
password: autoLogin.password,
|
|
156
|
+
}),
|
|
157
|
+
headers: {
|
|
158
|
+
'Accept-Language': i18n.language,
|
|
159
|
+
'Content-Type': 'application/json',
|
|
160
|
+
},
|
|
161
|
+
});
|
|
162
|
+
if (autoLoginResult.status === 200) {
|
|
163
|
+
const autoLoginJson = await autoLoginResult.json();
|
|
164
|
+
setUser(autoLoginJson.user);
|
|
165
|
+
if (autoLoginJson === null || autoLoginJson === void 0 ? void 0 : autoLoginJson.token) {
|
|
166
|
+
setToken(autoLoginJson.token);
|
|
167
|
+
}
|
|
168
|
+
}
|
|
169
|
+
else {
|
|
170
|
+
setUser(null);
|
|
171
|
+
}
|
|
172
|
+
}
|
|
173
|
+
else {
|
|
174
|
+
setUser(null);
|
|
175
|
+
}
|
|
112
176
|
}
|
|
113
177
|
}
|
|
178
|
+
catch (e) {
|
|
179
|
+
react_toastify_1.toast.error(`Fetching user failed: ${e.message}`);
|
|
180
|
+
}
|
|
114
181
|
};
|
|
115
182
|
fetchMe();
|
|
116
|
-
}, [i18n, setToken, api, serverURL, userSlug]);
|
|
183
|
+
}, [i18n, setToken, api, serverURL, userSlug, autoLogin]);
|
|
117
184
|
// When location changes, refresh cookie
|
|
118
185
|
(0, react_1.useEffect)(() => {
|
|
119
186
|
if (id) {
|
|
@@ -161,8 +228,10 @@ const AuthProvider = ({ children }) => {
|
|
|
161
228
|
}, [exp, push, closeAllModals, admin, i18n, logoutInactivityRoute]);
|
|
162
229
|
return (react_1.default.createElement(Context.Provider, { value: {
|
|
163
230
|
user,
|
|
231
|
+
setUser,
|
|
164
232
|
logOut,
|
|
165
233
|
refreshCookie,
|
|
234
|
+
refreshCookieAsync,
|
|
166
235
|
refreshPermissions,
|
|
167
236
|
permissions,
|
|
168
237
|
setToken,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/admin/components/utilities/Auth/index.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAA2F;AAC3F,4DAAmC;AACnC,uDAA2D;AAC3D,8CAA8C;AAC9C,iDAA+C;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/admin/components/utilities/Auth/index.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
import { User, Permissions } from '../../../../auth/types';
|
|
2
2
|
export type AuthContext<T = User> = {
|
|
3
3
|
user?: T | null;
|
|
4
|
+
setUser: (user: T) => void;
|
|
4
5
|
logOut: () => void;
|
|
5
|
-
refreshCookie: () => void;
|
|
6
|
+
refreshCookie: (forceRefresh?: boolean) => void;
|
|
7
|
+
refreshCookieAsync: () => Promise<User>;
|
|
6
8
|
setToken: (token: string) => void;
|
|
7
9
|
token?: string;
|
|
8
10
|
refreshPermissions: () => Promise<void>;
|
|
@@ -1,9 +1,32 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
2
25
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
27
|
};
|
|
5
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
const react_1 =
|
|
29
|
+
const react_1 = __importStar(require("react"));
|
|
7
30
|
const react_router_dom_1 = require("react-router-dom");
|
|
8
31
|
const react_i18next_1 = require("react-i18next");
|
|
9
32
|
const Config_1 = require("../../utilities/Config");
|
|
@@ -25,15 +48,23 @@ const ReactSelect_1 = __importDefault(require("../../elements/ReactSelect"));
|
|
|
25
48
|
const Label_1 = __importDefault(require("../../forms/Label"));
|
|
26
49
|
const Loading_1 = require("../../elements/Loading");
|
|
27
50
|
const formatDate_1 = require("../../../utilities/formatDate");
|
|
51
|
+
const Auth_2 = require("../../utilities/Auth");
|
|
28
52
|
require("./index.scss");
|
|
29
53
|
const baseClass = 'account';
|
|
30
54
|
const DefaultAccount = (props) => {
|
|
31
55
|
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
|
|
32
|
-
const { collection, data, permissions, hasSavePermission, apiURL, initialState, isLoading, action, onSave, } = props;
|
|
56
|
+
const { collection, data, permissions, hasSavePermission, apiURL, initialState, isLoading, action, onSave: onSaveFromProps, } = props;
|
|
33
57
|
const { slug, fields, admin: { useAsTitle, preview, }, timestamps, auth, } = collection;
|
|
58
|
+
const { refreshCookieAsync } = (0, Auth_2.useAuth)();
|
|
34
59
|
const { admin: { dateFormat }, routes: { admin } } = (0, Config_1.useConfig)();
|
|
35
60
|
const { t, i18n } = (0, react_i18next_1.useTranslation)('authentication');
|
|
36
61
|
const languageOptions = Object.entries(i18n.options.resources).map(([language, resource]) => ({ label: resource.general.thisLanguage, value: language }));
|
|
62
|
+
const onSave = (0, react_1.useCallback)(async () => {
|
|
63
|
+
await refreshCookieAsync();
|
|
64
|
+
if (typeof onSaveFromProps === 'function') {
|
|
65
|
+
onSaveFromProps();
|
|
66
|
+
}
|
|
67
|
+
}, [onSaveFromProps, refreshCookieAsync]);
|
|
37
68
|
const classes = [
|
|
38
69
|
baseClass,
|
|
39
70
|
].filter(Boolean).join(' ');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Default.js","sourceRoot":"","sources":["../../../../../src/admin/components/views/Account/Default.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Default.js","sourceRoot":"","sources":["../../../../../src/admin/components/views/Account/Default.tsx"],"names":[],"mappings":"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"}
|
|
@@ -45,7 +45,8 @@ const AccountView = () => {
|
|
|
45
45
|
const locale = (0, Locale_1.useLocale)();
|
|
46
46
|
const { setStepNav } = (0, StepNav_1.useStepNav)();
|
|
47
47
|
const { user } = (0, Auth_1.useAuth)();
|
|
48
|
-
const
|
|
48
|
+
const userRef = (0, react_1.useRef)(user);
|
|
49
|
+
const [internalState, setInternalState] = (0, react_1.useState)();
|
|
49
50
|
const { id, preferencesKey, docPermissions, getDocPermissions, slug, getDocPreferences } = (0, DocumentInfo_1.useDocumentInfo)();
|
|
50
51
|
const { getPreference } = (0, Preferences_1.usePreferences)();
|
|
51
52
|
const { serverURL, routes: { api }, collections, admin: { components: { views: { Account: CustomAccount, } = {
|
|
@@ -69,7 +70,7 @@ const AccountView = () => {
|
|
|
69
70
|
getDocPermissions();
|
|
70
71
|
const preferences = await getDocPreferences();
|
|
71
72
|
const state = await (0, buildStateFromSchema_1.default)({ fieldSchema: collection.fields, preferences, data: json.doc, user, id, operation: 'update', locale, t });
|
|
72
|
-
|
|
73
|
+
setInternalState(state);
|
|
73
74
|
}, [collection, user, id, t, locale, getDocPermissions, getDocPreferences]);
|
|
74
75
|
(0, react_1.useEffect)(() => {
|
|
75
76
|
const nav = [{
|
|
@@ -78,7 +79,7 @@ const AccountView = () => {
|
|
|
78
79
|
setStepNav(nav);
|
|
79
80
|
}, [setStepNav, t]);
|
|
80
81
|
(0, react_1.useEffect)(() => {
|
|
81
|
-
const
|
|
82
|
+
const awaitInternalState = async () => {
|
|
82
83
|
const preferences = await getDocPreferences();
|
|
83
84
|
const state = await (0, buildStateFromSchema_1.default)({
|
|
84
85
|
fieldSchema: fields,
|
|
@@ -86,24 +87,24 @@ const AccountView = () => {
|
|
|
86
87
|
data: dataToRender,
|
|
87
88
|
operation: 'update',
|
|
88
89
|
id,
|
|
89
|
-
user,
|
|
90
|
+
user: userRef.current,
|
|
90
91
|
locale,
|
|
91
92
|
t,
|
|
92
93
|
});
|
|
93
94
|
await getPreference(preferencesKey);
|
|
94
|
-
|
|
95
|
+
setInternalState(state);
|
|
95
96
|
};
|
|
96
97
|
if (dataToRender)
|
|
97
|
-
|
|
98
|
-
}, [dataToRender, fields, id,
|
|
99
|
-
const isLoading = !
|
|
98
|
+
awaitInternalState();
|
|
99
|
+
}, [dataToRender, fields, id, locale, preferencesKey, getPreference, t, getDocPreferences]);
|
|
100
|
+
const isLoading = !internalState || !docPermissions || isLoadingData;
|
|
100
101
|
return (react_1.default.createElement(RenderCustomComponent_1.default, { DefaultComponent: Default_1.default, CustomComponent: CustomAccount, componentProps: {
|
|
101
102
|
action,
|
|
102
103
|
data,
|
|
103
104
|
collection,
|
|
104
105
|
permissions: docPermissions,
|
|
105
106
|
hasSavePermission,
|
|
106
|
-
initialState,
|
|
107
|
+
initialState: internalState,
|
|
107
108
|
apiURL,
|
|
108
109
|
isLoading,
|
|
109
110
|
onSave,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/admin/components/views/Account/index.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/admin/components/views/Account/index.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../src/admin/components/views/collections/Edit/Auth/index.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../src/admin/components/views/collections/Edit/Auth/index.tsx"],"names":[],"mappings":"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"}
|
|
@@ -56,6 +56,7 @@ const getTranslation_1 = require("../../../../../utilities/getTranslation");
|
|
|
56
56
|
const SetStepNav_1 = require("./SetStepNav");
|
|
57
57
|
const Loading_1 = require("../../../elements/Loading");
|
|
58
58
|
const formatDate_1 = require("../../../../utilities/formatDate");
|
|
59
|
+
const Auth_2 = require("../../../utilities/Auth");
|
|
59
60
|
require("./index.scss");
|
|
60
61
|
const baseClass = 'collection-edit';
|
|
61
62
|
const DefaultEditView = (props) => {
|
|
@@ -63,20 +64,24 @@ const DefaultEditView = (props) => {
|
|
|
63
64
|
const { admin: { dateFormat }, routes: { admin } } = (0, Config_1.useConfig)();
|
|
64
65
|
const { publishedDoc } = (0, DocumentInfo_1.useDocumentInfo)();
|
|
65
66
|
const { t, i18n } = (0, react_i18next_1.useTranslation)('general');
|
|
67
|
+
const { user, refreshCookieAsync } = (0, Auth_2.useAuth)();
|
|
66
68
|
const { collection, isEditing, data, onSave: onSaveFromProps, permissions, isLoading, internalState, apiURL, action, hasSavePermission, disableEyebrow, disableActions, disableLeaveWithoutSaving, customHeader, id, updatedAt, } = props;
|
|
67
69
|
const { slug, fields, admin: { useAsTitle, disableDuplicate, preview, hideAPIURL, }, versions, timestamps, auth, upload, } = collection;
|
|
68
70
|
const classes = [
|
|
69
71
|
baseClass,
|
|
70
72
|
isEditing && `${baseClass}--is-editing`,
|
|
71
73
|
].filter(Boolean).join(' ');
|
|
72
|
-
const onSave = (0, react_1.useCallback)((json) => {
|
|
74
|
+
const onSave = (0, react_1.useCallback)(async (json) => {
|
|
75
|
+
if (auth && id === user.id) {
|
|
76
|
+
await refreshCookieAsync();
|
|
77
|
+
}
|
|
73
78
|
if (typeof onSaveFromProps === 'function') {
|
|
74
79
|
onSaveFromProps({
|
|
75
80
|
...json,
|
|
76
81
|
operation: id ? 'update' : 'create',
|
|
77
82
|
});
|
|
78
83
|
}
|
|
79
|
-
}, [id, onSaveFromProps]);
|
|
84
|
+
}, [id, onSaveFromProps, auth, user, refreshCookieAsync]);
|
|
80
85
|
const operation = isEditing ? 'update' : 'create';
|
|
81
86
|
return (react_1.default.createElement(react_1.default.Fragment, null,
|
|
82
87
|
react_1.default.createElement("div", { className: classes },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Default.js","sourceRoot":"","sources":["../../../../../../src/admin/components/views/collections/Edit/Default.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAA2C;AAC3C,uDAAwC;AACxC,iDAA+C;AAC/C,sDAAsD;AACtD,wEAAgD;AAChD,+DAAuC;AACvC,oFAA4D;AAC5D,+EAAuD;AACvD,wFAAgE;AAChE,4FAAoE;AACpE,sFAA8D;AAC9D,mEAA2C;AAC3C,6EAAoD;AACpD,gFAAwD;AACxD,4FAAoE;AACpE,kDAA0B;AAC1B,oFAA4D;AAC5D,sDAA8B;AAE9B,0EAAkD;AAClD,sEAA8C;AAC9C,uDAAoD;AACpD,2DAAwD;AACxD,iDAA8C;AAC9C,kEAAkE;AAClE,4EAAwE;AACxE,qDAAkD;AAClD,4EAAyE;AACzE,6CAA0C;AAC1C,uDAAqE;AACrE,iEAA8D;
|
|
1
|
+
{"version":3,"file":"Default.js","sourceRoot":"","sources":["../../../../../../src/admin/components/views/collections/Edit/Default.tsx"],"names":[],"mappings":"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"}
|
|
@@ -49,14 +49,29 @@ const EditView = (props) => {
|
|
|
49
49
|
const locale = (0, Locale_1.useLocale)();
|
|
50
50
|
const { serverURL, routes: { admin, api } } = (0, Config_1.useConfig)();
|
|
51
51
|
const { params: { id } = {} } = (0, react_router_dom_1.useRouteMatch)();
|
|
52
|
-
const { state: locationState } = (0, react_router_dom_1.useLocation)();
|
|
53
52
|
const history = (0, react_router_dom_1.useHistory)();
|
|
54
53
|
const [internalState, setInternalState] = (0, react_1.useState)();
|
|
55
54
|
const [updatedAt, setUpdatedAt] = (0, react_1.useState)();
|
|
56
55
|
const { user } = (0, Auth_1.useAuth)();
|
|
56
|
+
const userRef = (0, react_1.useRef)(user);
|
|
57
57
|
const { getVersions, getDocPermissions, docPermissions, getDocPreferences } = (0, DocumentInfo_1.useDocumentInfo)();
|
|
58
58
|
const { t } = (0, react_i18next_1.useTranslation)('general');
|
|
59
59
|
const [{ data, isLoading: isLoadingData, isError }] = (0, usePayloadAPI_1.default)((isEditing ? `${serverURL}${api}/${slug}/${id}` : null), { initialParams: { 'fallback-locale': 'null', depth: 0, draft: 'true' }, initialData: null });
|
|
60
|
+
const buildState = (0, react_1.useCallback)(async (doc, overrides) => {
|
|
61
|
+
const preferences = await getDocPreferences();
|
|
62
|
+
const state = await (0, buildStateFromSchema_1.default)({
|
|
63
|
+
fieldSchema: overrides.fieldSchema,
|
|
64
|
+
preferences,
|
|
65
|
+
data: doc || {},
|
|
66
|
+
user: userRef.current,
|
|
67
|
+
id,
|
|
68
|
+
operation: 'update',
|
|
69
|
+
locale,
|
|
70
|
+
t,
|
|
71
|
+
...overrides,
|
|
72
|
+
});
|
|
73
|
+
setInternalState(state);
|
|
74
|
+
}, [getDocPreferences, id, locale, t]);
|
|
60
75
|
const onSave = (0, react_1.useCallback)(async (json) => {
|
|
61
76
|
var _a, _b;
|
|
62
77
|
getVersions();
|
|
@@ -66,22 +81,23 @@ const EditView = (props) => {
|
|
|
66
81
|
setRedirect(`${admin}/collections/${collection.slug}/${(_b = json === null || json === void 0 ? void 0 : json.doc) === null || _b === void 0 ? void 0 : _b.id}`);
|
|
67
82
|
}
|
|
68
83
|
else {
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
84
|
+
buildState(json.doc, {
|
|
85
|
+
fieldSchema: collection.fields,
|
|
86
|
+
});
|
|
72
87
|
}
|
|
73
|
-
}, [admin,
|
|
74
|
-
const dataToRender = (locationState === null || locationState === void 0 ? void 0 : locationState.data) || data;
|
|
88
|
+
}, [admin, getVersions, isEditing, buildState, getDocPermissions, collection]);
|
|
75
89
|
(0, react_1.useEffect)(() => {
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
90
|
+
if (fields && (isEditing ? data : true)) {
|
|
91
|
+
const awaitInternalState = async () => {
|
|
92
|
+
setUpdatedAt(data === null || data === void 0 ? void 0 : data.updatedAt);
|
|
93
|
+
buildState(data, {
|
|
94
|
+
operation: isEditing ? 'update' : 'create',
|
|
95
|
+
fieldSchema: fields,
|
|
96
|
+
});
|
|
97
|
+
};
|
|
83
98
|
awaitInternalState();
|
|
84
|
-
|
|
99
|
+
}
|
|
100
|
+
}, [isEditing, data, buildState, fields]);
|
|
85
101
|
(0, react_1.useEffect)(() => {
|
|
86
102
|
if (redirect) {
|
|
87
103
|
history.push(redirect);
|
|
@@ -98,7 +114,7 @@ const EditView = (props) => {
|
|
|
98
114
|
react_1.default.createElement(RenderCustomComponent_1.default, { DefaultComponent: Default_1.default, CustomComponent: CustomEdit, componentProps: {
|
|
99
115
|
id,
|
|
100
116
|
isLoading,
|
|
101
|
-
data
|
|
117
|
+
data,
|
|
102
118
|
collection,
|
|
103
119
|
permissions: docPermissions,
|
|
104
120
|
isEditing,
|
|
@@ -107,7 +123,7 @@ const EditView = (props) => {
|
|
|
107
123
|
hasSavePermission,
|
|
108
124
|
apiURL,
|
|
109
125
|
action,
|
|
110
|
-
updatedAt: updatedAt || (
|
|
126
|
+
updatedAt: updatedAt || (data === null || data === void 0 ? void 0 : data.updatedAt),
|
|
111
127
|
} })));
|
|
112
128
|
};
|
|
113
129
|
exports.default = EditView;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/admin/components/views/collections/Edit/index.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/admin/components/views/collections/Edit/index.tsx"],"names":[],"mappings":"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"}
|