@strapi/content-type-builder 5.61.1 → 5.62.0
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/dist/admin/components/AIChat/FeedbackModal.js +3 -3
- package/dist/admin/components/AIChat/FeedbackModal.js.map +1 -1
- package/dist/admin/components/AIChat/FeedbackModal.mjs +5 -5
- package/dist/admin/components/AIChat/FeedbackModal.mjs.map +1 -1
- package/dist/admin/components/AIChat/UploadCodeModal.js +1 -0
- package/dist/admin/components/AIChat/UploadCodeModal.js.map +1 -1
- package/dist/admin/components/AIChat/UploadCodeModal.mjs +1 -0
- package/dist/admin/components/AIChat/UploadCodeModal.mjs.map +1 -1
- package/dist/admin/components/AIChat/UploadFigmaModal.js +2 -0
- package/dist/admin/components/AIChat/UploadFigmaModal.js.map +1 -1
- package/dist/admin/components/AIChat/UploadFigmaModal.mjs +2 -0
- package/dist/admin/components/AIChat/UploadFigmaModal.mjs.map +1 -1
- package/dist/admin/components/AIChat/components/StepModal.js +11 -8
- package/dist/admin/components/AIChat/components/StepModal.js.map +1 -1
- package/dist/admin/components/AIChat/components/StepModal.mjs +12 -9
- package/dist/admin/components/AIChat/components/StepModal.mjs.map +1 -1
- package/dist/admin/components/DataManager/useServerRestartWatcher.js +36 -25
- package/dist/admin/components/DataManager/useServerRestartWatcher.js.map +1 -1
- package/dist/admin/components/DataManager/useServerRestartWatcher.mjs +16 -25
- package/dist/admin/components/DataManager/useServerRestartWatcher.mjs.map +1 -1
- package/dist/admin/components/DataManager/watchServerRestart.js +52 -0
- package/dist/admin/components/DataManager/watchServerRestart.js.map +1 -0
- package/dist/admin/components/DataManager/watchServerRestart.mjs +50 -0
- package/dist/admin/components/DataManager/watchServerRestart.mjs.map +1 -0
- package/dist/admin/components/FormModal/FormModal.js +40 -50
- package/dist/admin/components/FormModal/FormModal.js.map +1 -1
- package/dist/admin/components/FormModal/FormModal.mjs +41 -51
- package/dist/admin/components/FormModal/FormModal.mjs.map +1 -1
- package/dist/admin/components/FormModal/reducer.js +18 -6
- package/dist/admin/components/FormModal/reducer.js.map +1 -1
- package/dist/admin/components/FormModal/reducer.mjs +18 -6
- package/dist/admin/components/FormModal/reducer.mjs.map +1 -1
- package/dist/admin/components/GenericInputs.js +26 -1
- package/dist/admin/components/GenericInputs.js.map +1 -1
- package/dist/admin/components/GenericInputs.mjs +26 -2
- package/dist/admin/components/GenericInputs.mjs.map +1 -1
- package/dist/admin/src/components/AIChat/components/StepModal.d.ts +6 -1
- package/dist/admin/src/components/DataManager/useServerRestartWatcher.d.ts +1 -1
- package/dist/admin/src/components/DataManager/watchServerRestart.d.ts +20 -0
- package/dist/admin/src/components/FormModal/reducer.d.ts +53 -1
- package/dist/admin/src/components/GenericInputs.d.ts +12 -2
- package/dist/server/controllers/component-categories.js +24 -11
- package/dist/server/controllers/component-categories.js.map +1 -1
- package/dist/server/controllers/component-categories.mjs +24 -11
- package/dist/server/controllers/component-categories.mjs.map +1 -1
- package/dist/server/controllers/components.js +9 -2
- package/dist/server/controllers/components.js.map +1 -1
- package/dist/server/controllers/components.mjs +9 -2
- package/dist/server/controllers/components.mjs.map +1 -1
- package/dist/server/controllers/content-types.js +10 -3
- package/dist/server/controllers/content-types.js.map +1 -1
- package/dist/server/controllers/content-types.mjs +10 -3
- package/dist/server/controllers/content-types.mjs.map +1 -1
- package/dist/server/controllers/schema.js +4 -0
- package/dist/server/controllers/schema.js.map +1 -1
- package/dist/server/controllers/schema.mjs +4 -0
- package/dist/server/controllers/schema.mjs.map +1 -1
- package/dist/server/services/component-categories.js.map +1 -1
- package/dist/server/services/component-categories.mjs.map +1 -1
- package/dist/server/services/components.js.map +1 -1
- package/dist/server/services/components.mjs.map +1 -1
- package/dist/server/services/content-types.js +17 -5
- package/dist/server/services/content-types.js.map +1 -1
- package/dist/server/services/content-types.mjs +17 -5
- package/dist/server/services/content-types.mjs.map +1 -1
- package/dist/server/services/schema-builder/component-builder.js +3 -1
- package/dist/server/services/schema-builder/component-builder.js.map +1 -1
- package/dist/server/services/schema-builder/component-builder.mjs +3 -1
- package/dist/server/services/schema-builder/component-builder.mjs.map +1 -1
- package/dist/server/services/schema-builder/content-type-builder.js +3 -1
- package/dist/server/services/schema-builder/content-type-builder.js.map +1 -1
- package/dist/server/services/schema-builder/content-type-builder.mjs +3 -1
- package/dist/server/services/schema-builder/content-type-builder.mjs.map +1 -1
- package/dist/server/services/schema-builder/index.js +57 -5
- package/dist/server/services/schema-builder/index.js.map +1 -1
- package/dist/server/services/schema-builder/index.mjs +57 -5
- package/dist/server/services/schema-builder/index.mjs.map +1 -1
- package/dist/server/services/schema-builder/rename-component-uids.js +70 -0
- package/dist/server/services/schema-builder/rename-component-uids.js.map +1 -0
- package/dist/server/services/schema-builder/rename-component-uids.mjs +68 -0
- package/dist/server/services/schema-builder/rename-component-uids.mjs.map +1 -0
- package/dist/server/services/schema-builder/schema-handler.js +10 -3
- package/dist/server/services/schema-builder/schema-handler.js.map +1 -1
- package/dist/server/services/schema-builder/schema-handler.mjs +10 -3
- package/dist/server/services/schema-builder/schema-handler.mjs.map +1 -1
- package/dist/server/services/schema.js +19 -5
- package/dist/server/services/schema.js.map +1 -1
- package/dist/server/services/schema.mjs +19 -5
- package/dist/server/services/schema.mjs.map +1 -1
- package/dist/server/src/controllers/component-categories.d.ts.map +1 -1
- package/dist/server/src/controllers/components.d.ts.map +1 -1
- package/dist/server/src/controllers/content-types.d.ts.map +1 -1
- package/dist/server/src/controllers/schema.d.ts.map +1 -1
- package/dist/server/src/services/component-categories.d.ts.map +1 -1
- package/dist/server/src/services/components.d.ts +2 -2
- package/dist/server/src/services/components.d.ts.map +1 -1
- package/dist/server/src/services/content-types.d.ts.map +1 -1
- package/dist/server/src/services/schema-builder/component-builder.d.ts +3 -2
- package/dist/server/src/services/schema-builder/component-builder.d.ts.map +1 -1
- package/dist/server/src/services/schema-builder/content-type-builder.d.ts +3 -2
- package/dist/server/src/services/schema-builder/content-type-builder.d.ts.map +1 -1
- package/dist/server/src/services/schema-builder/index.d.ts +48 -16
- package/dist/server/src/services/schema-builder/index.d.ts.map +1 -1
- package/dist/server/src/services/schema-builder/rename-component-uids.d.ts +34 -0
- package/dist/server/src/services/schema-builder/rename-component-uids.d.ts.map +1 -0
- package/dist/server/src/services/schema-builder/schema-handler.d.ts +21 -6
- package/dist/server/src/services/schema-builder/schema-handler.d.ts.map +1 -1
- package/dist/server/src/services/schema.d.ts.map +1 -1
- package/dist/server/src/utils/errors.d.ts +9 -0
- package/dist/server/src/utils/errors.d.ts.map +1 -0
- package/dist/server/src/utils/uid-target.d.ts.map +1 -1
- package/dist/server/utils/errors.js +26 -0
- package/dist/server/utils/errors.js.map +1 -0
- package/dist/server/utils/errors.mjs +24 -0
- package/dist/server/utils/errors.mjs.map +1 -0
- package/dist/server/utils/uid-target.js +2 -1
- package/dist/server/utils/uid-target.js.map +1 -1
- package/dist/server/utils/uid-target.mjs +2 -1
- package/dist/server/utils/uid-target.mjs.map +1 -1
- package/package.json +11 -13
|
@@ -1,34 +1,45 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
+
var React = require('react');
|
|
3
4
|
var strapiAdmin = require('@strapi/admin/strapi-admin');
|
|
5
|
+
var watchServerRestart = require('./watchServerRestart.js');
|
|
6
|
+
|
|
7
|
+
function _interopNamespace(e) {
|
|
8
|
+
if (e && e.__esModule) return e;
|
|
9
|
+
var n = Object.create(null);
|
|
10
|
+
if (e) {
|
|
11
|
+
Object.keys(e).forEach(function (k) {
|
|
12
|
+
if (k !== 'default') {
|
|
13
|
+
var d = Object.getOwnPropertyDescriptor(e, k);
|
|
14
|
+
Object.defineProperty(n, k, d.get ? d : {
|
|
15
|
+
enumerable: true,
|
|
16
|
+
get: function () { return e[k]; }
|
|
17
|
+
});
|
|
18
|
+
}
|
|
19
|
+
});
|
|
20
|
+
}
|
|
21
|
+
n.default = e;
|
|
22
|
+
return Object.freeze(n);
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
var React__namespace = /*#__PURE__*/_interopNamespace(React);
|
|
4
26
|
|
|
5
|
-
const TIMEOUT = 'timeout';
|
|
6
|
-
const timeout = 30 * 1000;
|
|
7
27
|
const useServerRestartWatcher = ()=>{
|
|
8
28
|
const { get } = strapiAdmin.useFetchClient();
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
} catch {
|
|
24
|
-
return new Promise((resolve)=>{
|
|
25
|
-
setTimeout(()=>{
|
|
26
|
-
return serverRestartWatcher(startTime).then(resolve);
|
|
27
|
-
}, 200);
|
|
28
|
-
});
|
|
29
|
-
}
|
|
30
|
-
};
|
|
31
|
-
return serverRestartWatcher;
|
|
29
|
+
// Aborts the request in flight when the component unmounts, as useFetchClient's own signal did.
|
|
30
|
+
// watchServerRestart passes each request a signal of its own, which replaces that one.
|
|
31
|
+
const unmount = React__namespace.useRef(null);
|
|
32
|
+
React__namespace.useEffect(()=>{
|
|
33
|
+
const controller = new AbortController();
|
|
34
|
+
unmount.current = controller;
|
|
35
|
+
return ()=>controller.abort();
|
|
36
|
+
}, []);
|
|
37
|
+
return React__namespace.useCallback((initTime)=>watchServerRestart.watchServerRestart(get, {
|
|
38
|
+
initTime,
|
|
39
|
+
signal: unmount.current?.signal ?? undefined
|
|
40
|
+
}), [
|
|
41
|
+
get
|
|
42
|
+
]);
|
|
32
43
|
};
|
|
33
44
|
|
|
34
45
|
exports.useServerRestartWatcher = useServerRestartWatcher;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useServerRestartWatcher.js","sources":["../../../../admin/src/components/DataManager/useServerRestartWatcher.ts"],"sourcesContent":["import { useFetchClient } from '@strapi/admin/strapi-admin';\n\
|
|
1
|
+
{"version":3,"file":"useServerRestartWatcher.js","sources":["../../../../admin/src/components/DataManager/useServerRestartWatcher.ts"],"sourcesContent":["import * as React from 'react';\n\nimport { useFetchClient } from '@strapi/admin/strapi-admin';\n\nimport { watchServerRestart } from './watchServerRestart';\n\nexport const useServerRestartWatcher = () => {\n const { get } = useFetchClient();\n // Aborts the request in flight when the component unmounts, as useFetchClient's own signal did.\n // watchServerRestart passes each request a signal of its own, which replaces that one.\n const unmount = React.useRef<AbortController | null>(null);\n\n React.useEffect(() => {\n const controller = new AbortController();\n unmount.current = controller;\n\n return () => controller.abort();\n }, []);\n\n return React.useCallback(\n (initTime?: number) =>\n watchServerRestart(get, { initTime, signal: unmount.current?.signal ?? undefined }),\n [get]\n );\n};\n"],"names":["useServerRestartWatcher","get","useFetchClient","unmount","React","useRef","useEffect","controller","AbortController","current","abort","useCallback","initTime","watchServerRestart","signal","undefined"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;MAMaA,uBAAAA,GAA0B,IAAA;IACrC,MAAM,EAAEC,GAAG,EAAE,GAAGC,0BAAAA,EAAAA;;;IAGhB,MAAMC,OAAAA,GAAUC,gBAAAA,CAAMC,MAAM,CAAyB,IAAA,CAAA;AAErDD,IAAAA,gBAAAA,CAAME,SAAS,CAAC,IAAA;AACd,QAAA,MAAMC,aAAa,IAAIC,eAAAA,EAAAA;AACvBL,QAAAA,OAAAA,CAAQM,OAAO,GAAGF,UAAAA;QAElB,OAAO,IAAMA,WAAWG,KAAK,EAAA;AAC/B,IAAA,CAAA,EAAG,EAAE,CAAA;AAEL,IAAA,OAAON,iBAAMO,WAAW,CACtB,CAACC,QAAAA,GACCC,sCAAmBZ,GAAAA,EAAK;AAAEW,YAAAA,QAAAA;YAAUE,MAAAA,EAAQX,OAAAA,CAAQM,OAAO,EAAEK,MAAAA,IAAUC;SAAU,CAAA,EACnF;AAACd,QAAAA;AAAI,KAAA,CAAA;AAET;;;;"}
|
|
@@ -1,32 +1,23 @@
|
|
|
1
|
+
import * as React from 'react';
|
|
1
2
|
import { useFetchClient } from '@strapi/admin/strapi-admin';
|
|
3
|
+
import { watchServerRestart } from './watchServerRestart.mjs';
|
|
2
4
|
|
|
3
|
-
const TIMEOUT = 'timeout';
|
|
4
|
-
const timeout = 30 * 1000;
|
|
5
5
|
const useServerRestartWatcher = ()=>{
|
|
6
6
|
const { get } = useFetchClient();
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
} catch {
|
|
22
|
-
return new Promise((resolve)=>{
|
|
23
|
-
setTimeout(()=>{
|
|
24
|
-
return serverRestartWatcher(startTime).then(resolve);
|
|
25
|
-
}, 200);
|
|
26
|
-
});
|
|
27
|
-
}
|
|
28
|
-
};
|
|
29
|
-
return serverRestartWatcher;
|
|
7
|
+
// Aborts the request in flight when the component unmounts, as useFetchClient's own signal did.
|
|
8
|
+
// watchServerRestart passes each request a signal of its own, which replaces that one.
|
|
9
|
+
const unmount = React.useRef(null);
|
|
10
|
+
React.useEffect(()=>{
|
|
11
|
+
const controller = new AbortController();
|
|
12
|
+
unmount.current = controller;
|
|
13
|
+
return ()=>controller.abort();
|
|
14
|
+
}, []);
|
|
15
|
+
return React.useCallback((initTime)=>watchServerRestart(get, {
|
|
16
|
+
initTime,
|
|
17
|
+
signal: unmount.current?.signal ?? undefined
|
|
18
|
+
}), [
|
|
19
|
+
get
|
|
20
|
+
]);
|
|
30
21
|
};
|
|
31
22
|
|
|
32
23
|
export { useServerRestartWatcher };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useServerRestartWatcher.mjs","sources":["../../../../admin/src/components/DataManager/useServerRestartWatcher.ts"],"sourcesContent":["import { useFetchClient } from '@strapi/admin/strapi-admin';\n\
|
|
1
|
+
{"version":3,"file":"useServerRestartWatcher.mjs","sources":["../../../../admin/src/components/DataManager/useServerRestartWatcher.ts"],"sourcesContent":["import * as React from 'react';\n\nimport { useFetchClient } from '@strapi/admin/strapi-admin';\n\nimport { watchServerRestart } from './watchServerRestart';\n\nexport const useServerRestartWatcher = () => {\n const { get } = useFetchClient();\n // Aborts the request in flight when the component unmounts, as useFetchClient's own signal did.\n // watchServerRestart passes each request a signal of its own, which replaces that one.\n const unmount = React.useRef<AbortController | null>(null);\n\n React.useEffect(() => {\n const controller = new AbortController();\n unmount.current = controller;\n\n return () => controller.abort();\n }, []);\n\n return React.useCallback(\n (initTime?: number) =>\n watchServerRestart(get, { initTime, signal: unmount.current?.signal ?? undefined }),\n [get]\n );\n};\n"],"names":["useServerRestartWatcher","get","useFetchClient","unmount","React","useRef","useEffect","controller","AbortController","current","abort","useCallback","initTime","watchServerRestart","signal","undefined"],"mappings":";;;;MAMaA,uBAAAA,GAA0B,IAAA;IACrC,MAAM,EAAEC,GAAG,EAAE,GAAGC,cAAAA,EAAAA;;;IAGhB,MAAMC,OAAAA,GAAUC,KAAAA,CAAMC,MAAM,CAAyB,IAAA,CAAA;AAErDD,IAAAA,KAAAA,CAAME,SAAS,CAAC,IAAA;AACd,QAAA,MAAMC,aAAa,IAAIC,eAAAA,EAAAA;AACvBL,QAAAA,OAAAA,CAAQM,OAAO,GAAGF,UAAAA;QAElB,OAAO,IAAMA,WAAWG,KAAK,EAAA;AAC/B,IAAA,CAAA,EAAG,EAAE,CAAA;AAEL,IAAA,OAAON,MAAMO,WAAW,CACtB,CAACC,QAAAA,GACCC,mBAAmBZ,GAAAA,EAAK;AAAEW,YAAAA,QAAAA;YAAUE,MAAAA,EAAQX,OAAAA,CAAQM,OAAO,EAAEK,MAAAA,IAAUC;SAAU,CAAA,EACnF;AAACd,QAAAA;AAAI,KAAA,CAAA;AAET;;;;"}
|
|
@@ -0,0 +1,52 @@
|
|
|
1
|
+
'use strict';
|
|
2
|
+
|
|
3
|
+
const TIMEOUT = 'timeout';
|
|
4
|
+
const timeout = 30 * 1000;
|
|
5
|
+
/**
|
|
6
|
+
* How long one status request may take. `strapi develop` restarts by replacing its cluster worker,
|
|
7
|
+
* and a request that reaches the server during the swap can be accepted and never answered. The
|
|
8
|
+
* browser then waits minutes for it, and the overall timeout above is only checked between
|
|
9
|
+
* requests. A request that takes longer than this is aborted and the next one is sent.
|
|
10
|
+
*/ const requestTimeout = 5 * 1000;
|
|
11
|
+
const retryDelay = 200;
|
|
12
|
+
/**
|
|
13
|
+
* Resolves once the server reports that it is no longer updating its schema. Throws
|
|
14
|
+
* `Error('timeout')` when that takes longer than 30 s. A failed or unanswered request counts as
|
|
15
|
+
* "still updating".
|
|
16
|
+
*/ const watchServerRestart = async (get, { initTime, signal } = {})=>{
|
|
17
|
+
const startTime = initTime ?? Date.now();
|
|
18
|
+
const isUpdating = async ()=>{
|
|
19
|
+
// The caller unmounted: send no more requests. Each request gets a signal of its own, so an
|
|
20
|
+
// aborted caller signal would not stop the next one.
|
|
21
|
+
if (signal?.aborted) {
|
|
22
|
+
return true;
|
|
23
|
+
}
|
|
24
|
+
const request = new AbortController();
|
|
25
|
+
const abort = ()=>request.abort();
|
|
26
|
+
const timer = setTimeout(abort, requestTimeout);
|
|
27
|
+
signal?.addEventListener('abort', abort);
|
|
28
|
+
try {
|
|
29
|
+
const res = await get(`/content-type-builder/update-schema-status`, {
|
|
30
|
+
signal: request.signal
|
|
31
|
+
});
|
|
32
|
+
return res?.data?.data?.isUpdating === true;
|
|
33
|
+
} catch {
|
|
34
|
+
return true;
|
|
35
|
+
} finally{
|
|
36
|
+
clearTimeout(timer);
|
|
37
|
+
signal?.removeEventListener('abort', abort);
|
|
38
|
+
}
|
|
39
|
+
};
|
|
40
|
+
for(;;){
|
|
41
|
+
if (Date.now() - startTime > timeout) {
|
|
42
|
+
throw new Error(TIMEOUT);
|
|
43
|
+
}
|
|
44
|
+
if (!await isUpdating()) {
|
|
45
|
+
return;
|
|
46
|
+
}
|
|
47
|
+
await new Promise((resolve)=>setTimeout(resolve, retryDelay));
|
|
48
|
+
}
|
|
49
|
+
};
|
|
50
|
+
|
|
51
|
+
exports.watchServerRestart = watchServerRestart;
|
|
52
|
+
//# sourceMappingURL=watchServerRestart.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"watchServerRestart.js","sources":["../../../../admin/src/components/DataManager/watchServerRestart.ts"],"sourcesContent":["const TIMEOUT = 'timeout';\n\nconst timeout = 30 * 1000;\n\n/**\n * How long one status request may take. `strapi develop` restarts by replacing its cluster worker,\n * and a request that reaches the server during the swap can be accepted and never answered. The\n * browser then waits minutes for it, and the overall timeout above is only checked between\n * requests. A request that takes longer than this is aborted and the next one is sent.\n */\nconst requestTimeout = 5 * 1000;\n\nconst retryDelay = 200;\n\ntype UpdateSchemaStatusResponse = {\n data?: {\n isUpdating?: boolean;\n };\n};\n\ntype GetUpdateSchemaStatus = (\n url: string,\n options: { signal: AbortSignal }\n) => Promise<{ data?: UpdateSchemaStatusResponse } | undefined>;\n\n/**\n * Resolves once the server reports that it is no longer updating its schema. Throws\n * `Error('timeout')` when that takes longer than 30 s. A failed or unanswered request counts as\n * \"still updating\".\n */\nexport const watchServerRestart = async (\n get: GetUpdateSchemaStatus,\n { initTime, signal }: { initTime?: number; signal?: AbortSignal } = {}\n) => {\n const startTime = initTime ?? Date.now();\n\n const isUpdating = async () => {\n // The caller unmounted: send no more requests. Each request gets a signal of its own, so an\n // aborted caller signal would not stop the next one.\n if (signal?.aborted) {\n return true;\n }\n\n const request = new AbortController();\n const abort = () => request.abort();\n const timer = setTimeout(abort, requestTimeout);\n signal?.addEventListener('abort', abort);\n\n try {\n const res = await get(`/content-type-builder/update-schema-status`, {\n signal: request.signal,\n });\n\n return res?.data?.data?.isUpdating === true;\n } catch {\n return true;\n } finally {\n clearTimeout(timer);\n signal?.removeEventListener('abort', abort);\n }\n };\n\n for (;;) {\n if (Date.now() - startTime > timeout) {\n throw new Error(TIMEOUT);\n }\n\n if (!(await isUpdating())) {\n return;\n }\n\n await new Promise((resolve) => setTimeout(resolve, retryDelay));\n }\n};\n"],"names":["TIMEOUT","timeout","requestTimeout","retryDelay","watchServerRestart","get","initTime","signal","startTime","Date","now","isUpdating","aborted","request","AbortController","abort","timer","setTimeout","addEventListener","res","data","clearTimeout","removeEventListener","Error","Promise","resolve"],"mappings":";;AAAA,MAAMA,OAAAA,GAAU,SAAA;AAEhB,MAAMC,UAAU,EAAA,GAAK,IAAA;AAErB;;;;;IAMA,MAAMC,iBAAiB,CAAA,GAAI,IAAA;AAE3B,MAAMC,UAAAA,GAAa,GAAA;AAanB;;;;AAIC,IACM,MAAMC,kBAAAA,GAAqB,OAChCC,GAAAA,EACA,EAAEC,QAAQ,EAAEC,MAAM,EAA+C,GAAG,EAAE,GAAA;IAEtE,MAAMC,SAAAA,GAAYF,QAAAA,IAAYG,IAAAA,CAAKC,GAAG,EAAA;AAEtC,IAAA,MAAMC,UAAAA,GAAa,UAAA;;;AAGjB,QAAA,IAAIJ,QAAQK,OAAAA,EAAS;YACnB,OAAO,IAAA;AACT,QAAA;AAEA,QAAA,MAAMC,UAAU,IAAIC,eAAAA,EAAAA;QACpB,MAAMC,KAAAA,GAAQ,IAAMF,OAAAA,CAAQE,KAAK,EAAA;QACjC,MAAMC,KAAAA,GAAQC,WAAWF,KAAAA,EAAOb,cAAAA,CAAAA;AAChCK,QAAAA,MAAAA,EAAQW,iBAAiB,OAAA,EAASH,KAAAA,CAAAA;QAElC,IAAI;AACF,YAAA,MAAMI,MAAM,MAAMd,GAAAA,CAAI,CAAC,0CAA0C,CAAC,EAAE;AAClEE,gBAAAA,MAAAA,EAAQM,QAAQN;AAClB,aAAA,CAAA;YAEA,OAAOY,GAAAA,EAAKC,IAAAA,EAAMA,IAAAA,EAAMT,UAAAA,KAAe,IAAA;AACzC,QAAA,CAAA,CAAE,OAAM;YACN,OAAO,IAAA;QACT,CAAA,QAAU;YACRU,YAAAA,CAAaL,KAAAA,CAAAA;AACbT,YAAAA,MAAAA,EAAQe,oBAAoB,OAAA,EAASP,KAAAA,CAAAA;AACvC,QAAA;AACF,IAAA,CAAA;IAEA,OAAS;AACP,QAAA,IAAIN,IAAAA,CAAKC,GAAG,EAAA,GAAKF,SAAAA,GAAYP,OAAAA,EAAS;AACpC,YAAA,MAAM,IAAIsB,KAAAA,CAAMvB,OAAAA,CAAAA;AAClB,QAAA;QAEA,IAAI,CAAE,MAAMW,UAAAA,EAAAA,EAAe;AACzB,YAAA;AACF,QAAA;AAEA,QAAA,MAAM,IAAIa,OAAAA,CAAQ,CAACC,OAAAA,GAAYR,WAAWQ,OAAAA,EAAStB,UAAAA,CAAAA,CAAAA;AACrD,IAAA;AACF;;;;"}
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
const TIMEOUT = 'timeout';
|
|
2
|
+
const timeout = 30 * 1000;
|
|
3
|
+
/**
|
|
4
|
+
* How long one status request may take. `strapi develop` restarts by replacing its cluster worker,
|
|
5
|
+
* and a request that reaches the server during the swap can be accepted and never answered. The
|
|
6
|
+
* browser then waits minutes for it, and the overall timeout above is only checked between
|
|
7
|
+
* requests. A request that takes longer than this is aborted and the next one is sent.
|
|
8
|
+
*/ const requestTimeout = 5 * 1000;
|
|
9
|
+
const retryDelay = 200;
|
|
10
|
+
/**
|
|
11
|
+
* Resolves once the server reports that it is no longer updating its schema. Throws
|
|
12
|
+
* `Error('timeout')` when that takes longer than 30 s. A failed or unanswered request counts as
|
|
13
|
+
* "still updating".
|
|
14
|
+
*/ const watchServerRestart = async (get, { initTime, signal } = {})=>{
|
|
15
|
+
const startTime = initTime ?? Date.now();
|
|
16
|
+
const isUpdating = async ()=>{
|
|
17
|
+
// The caller unmounted: send no more requests. Each request gets a signal of its own, so an
|
|
18
|
+
// aborted caller signal would not stop the next one.
|
|
19
|
+
if (signal?.aborted) {
|
|
20
|
+
return true;
|
|
21
|
+
}
|
|
22
|
+
const request = new AbortController();
|
|
23
|
+
const abort = ()=>request.abort();
|
|
24
|
+
const timer = setTimeout(abort, requestTimeout);
|
|
25
|
+
signal?.addEventListener('abort', abort);
|
|
26
|
+
try {
|
|
27
|
+
const res = await get(`/content-type-builder/update-schema-status`, {
|
|
28
|
+
signal: request.signal
|
|
29
|
+
});
|
|
30
|
+
return res?.data?.data?.isUpdating === true;
|
|
31
|
+
} catch {
|
|
32
|
+
return true;
|
|
33
|
+
} finally{
|
|
34
|
+
clearTimeout(timer);
|
|
35
|
+
signal?.removeEventListener('abort', abort);
|
|
36
|
+
}
|
|
37
|
+
};
|
|
38
|
+
for(;;){
|
|
39
|
+
if (Date.now() - startTime > timeout) {
|
|
40
|
+
throw new Error(TIMEOUT);
|
|
41
|
+
}
|
|
42
|
+
if (!await isUpdating()) {
|
|
43
|
+
return;
|
|
44
|
+
}
|
|
45
|
+
await new Promise((resolve)=>setTimeout(resolve, retryDelay));
|
|
46
|
+
}
|
|
47
|
+
};
|
|
48
|
+
|
|
49
|
+
export { watchServerRestart };
|
|
50
|
+
//# sourceMappingURL=watchServerRestart.mjs.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"watchServerRestart.mjs","sources":["../../../../admin/src/components/DataManager/watchServerRestart.ts"],"sourcesContent":["const TIMEOUT = 'timeout';\n\nconst timeout = 30 * 1000;\n\n/**\n * How long one status request may take. `strapi develop` restarts by replacing its cluster worker,\n * and a request that reaches the server during the swap can be accepted and never answered. The\n * browser then waits minutes for it, and the overall timeout above is only checked between\n * requests. A request that takes longer than this is aborted and the next one is sent.\n */\nconst requestTimeout = 5 * 1000;\n\nconst retryDelay = 200;\n\ntype UpdateSchemaStatusResponse = {\n data?: {\n isUpdating?: boolean;\n };\n};\n\ntype GetUpdateSchemaStatus = (\n url: string,\n options: { signal: AbortSignal }\n) => Promise<{ data?: UpdateSchemaStatusResponse } | undefined>;\n\n/**\n * Resolves once the server reports that it is no longer updating its schema. Throws\n * `Error('timeout')` when that takes longer than 30 s. A failed or unanswered request counts as\n * \"still updating\".\n */\nexport const watchServerRestart = async (\n get: GetUpdateSchemaStatus,\n { initTime, signal }: { initTime?: number; signal?: AbortSignal } = {}\n) => {\n const startTime = initTime ?? Date.now();\n\n const isUpdating = async () => {\n // The caller unmounted: send no more requests. Each request gets a signal of its own, so an\n // aborted caller signal would not stop the next one.\n if (signal?.aborted) {\n return true;\n }\n\n const request = new AbortController();\n const abort = () => request.abort();\n const timer = setTimeout(abort, requestTimeout);\n signal?.addEventListener('abort', abort);\n\n try {\n const res = await get(`/content-type-builder/update-schema-status`, {\n signal: request.signal,\n });\n\n return res?.data?.data?.isUpdating === true;\n } catch {\n return true;\n } finally {\n clearTimeout(timer);\n signal?.removeEventListener('abort', abort);\n }\n };\n\n for (;;) {\n if (Date.now() - startTime > timeout) {\n throw new Error(TIMEOUT);\n }\n\n if (!(await isUpdating())) {\n return;\n }\n\n await new Promise((resolve) => setTimeout(resolve, retryDelay));\n }\n};\n"],"names":["TIMEOUT","timeout","requestTimeout","retryDelay","watchServerRestart","get","initTime","signal","startTime","Date","now","isUpdating","aborted","request","AbortController","abort","timer","setTimeout","addEventListener","res","data","clearTimeout","removeEventListener","Error","Promise","resolve"],"mappings":"AAAA,MAAMA,OAAAA,GAAU,SAAA;AAEhB,MAAMC,UAAU,EAAA,GAAK,IAAA;AAErB;;;;;IAMA,MAAMC,iBAAiB,CAAA,GAAI,IAAA;AAE3B,MAAMC,UAAAA,GAAa,GAAA;AAanB;;;;AAIC,IACM,MAAMC,kBAAAA,GAAqB,OAChCC,GAAAA,EACA,EAAEC,QAAQ,EAAEC,MAAM,EAA+C,GAAG,EAAE,GAAA;IAEtE,MAAMC,SAAAA,GAAYF,QAAAA,IAAYG,IAAAA,CAAKC,GAAG,EAAA;AAEtC,IAAA,MAAMC,UAAAA,GAAa,UAAA;;;AAGjB,QAAA,IAAIJ,QAAQK,OAAAA,EAAS;YACnB,OAAO,IAAA;AACT,QAAA;AAEA,QAAA,MAAMC,UAAU,IAAIC,eAAAA,EAAAA;QACpB,MAAMC,KAAAA,GAAQ,IAAMF,OAAAA,CAAQE,KAAK,EAAA;QACjC,MAAMC,KAAAA,GAAQC,WAAWF,KAAAA,EAAOb,cAAAA,CAAAA;AAChCK,QAAAA,MAAAA,EAAQW,iBAAiB,OAAA,EAASH,KAAAA,CAAAA;QAElC,IAAI;AACF,YAAA,MAAMI,MAAM,MAAMd,GAAAA,CAAI,CAAC,0CAA0C,CAAC,EAAE;AAClEE,gBAAAA,MAAAA,EAAQM,QAAQN;AAClB,aAAA,CAAA;YAEA,OAAOY,GAAAA,EAAKC,IAAAA,EAAMA,IAAAA,EAAMT,UAAAA,KAAe,IAAA;AACzC,QAAA,CAAA,CAAE,OAAM;YACN,OAAO,IAAA;QACT,CAAA,QAAU;YACRU,YAAAA,CAAaL,KAAAA,CAAAA;AACbT,YAAAA,MAAAA,EAAQe,oBAAoB,OAAA,EAASP,KAAAA,CAAAA;AACvC,QAAA;AACF,IAAA,CAAA;IAEA,OAAS;AACP,QAAA,IAAIN,IAAAA,CAAKC,GAAG,EAAA,GAAKF,SAAAA,GAAYP,OAAAA,EAAS;AACpC,YAAA,MAAM,IAAIsB,KAAAA,CAAMvB,OAAAA,CAAAA;AAClB,QAAA;QAEA,IAAI,CAAE,MAAMW,UAAAA,EAAAA,EAAe;AACzB,YAAA;AACF,QAAA;AAEA,QAAA,MAAM,IAAIa,OAAAA,CAAQ,CAACC,OAAAA,GAAYR,WAAWQ,OAAAA,EAAStB,UAAAA,CAAAA,CAAAA;AACrD,IAAA;AACF;;;;"}
|
|
@@ -83,6 +83,30 @@ var isEqual__default = /*#__PURE__*/_interopDefault(isEqual);
|
|
|
83
83
|
var set__default = /*#__PURE__*/_interopDefault(set);
|
|
84
84
|
var yup__namespace = /*#__PURE__*/_interopNamespace(yup);
|
|
85
85
|
|
|
86
|
+
/**
|
|
87
|
+
* Input renderers the Content-Type Builder form passes to `GenericInput` as `customInputs`,
|
|
88
|
+
* keyed by the input `type` they render. Plugins add theirs on top.
|
|
89
|
+
*/ const CUSTOM_INPUTS = {
|
|
90
|
+
'allowed-types-select': AllowedTypesSelect.AllowedTypesSelect,
|
|
91
|
+
'boolean-radio-group': BooleanRadioGroup.BooleanRadioGroup,
|
|
92
|
+
'checkbox-with-number-field': CheckboxWithNumberField.CheckboxWithNumberField,
|
|
93
|
+
'icon-picker': IconPicker.IconPicker,
|
|
94
|
+
'content-type-radio-group': ContentTypeRadioGroup.ContentTypeRadioGroup,
|
|
95
|
+
'content-type-folder-select': FolderSelect.FolderSelect,
|
|
96
|
+
'radio-group': CustomRadioGroup.CustomRadioGroup,
|
|
97
|
+
relation: Relation.Relation,
|
|
98
|
+
'select-category': SelectCategory.SelectCategory,
|
|
99
|
+
'select-component': SelectComponent.SelectComponent,
|
|
100
|
+
'select-components': SelectComponents.SelectComponents,
|
|
101
|
+
'select-default-boolean': BooleanDefaultValueSelect.BooleanDefaultValueSelect,
|
|
102
|
+
'select-number': SelectNumber.SelectNumber,
|
|
103
|
+
'select-date': SelectDateType.SelectDateType,
|
|
104
|
+
'toggle-draft-publish': DraftAndPublishToggle.DraftAndPublishToggle,
|
|
105
|
+
'text-plural': PluralName.PluralName,
|
|
106
|
+
'text-singular': SingularName.SingularName,
|
|
107
|
+
'textarea-enum': TextareaEnum.TextareaEnum,
|
|
108
|
+
'condition-form': ConditionForm.ConditionForm
|
|
109
|
+
};
|
|
86
110
|
const FormComponent = styledComponents.styled.form`
|
|
87
111
|
overflow: auto;
|
|
88
112
|
`;
|
|
@@ -118,7 +142,7 @@ const FormModal = ()=>{
|
|
|
118
142
|
const inputsFromPlugins = ctbFormsAPI.components.inputs;
|
|
119
143
|
const dispatchGuidedTour = strapiAdmin.useGuidedTour('FormModal', (s)=>s.dispatch);
|
|
120
144
|
const { addAttribute, editAttribute, addCustomFieldAttribute, addCreatedComponentToDynamicZone, changeDynamicZoneComponents, contentTypes, components, createSchema, createComponentSchema, deleteComponent, deleteContentType, editCustomFieldAttribute, updateSchema, nestedComponents, sortedContentTypesList, updateComponentSchema, updateComponentUid, reservedNames, confirmAttributeRenameMigration, attributeRenameMigrationMode } = useDataManager.useDataManager();
|
|
121
|
-
const { componentToCreate, formErrors, initialData, isCreatingComponentWhileAddingAField, modifiedData } = reducerState;
|
|
145
|
+
const { componentToCreate, formErrors, initialData, isCreatingComponentWhileAddingAField, modifiedData, pristineData } = reducerState;
|
|
122
146
|
const type = forTarget === 'component' ? components[targetUid] : contentTypes[targetUid];
|
|
123
147
|
const [showWarningDialog, setShowWarningDialog] = React.useState(false);
|
|
124
148
|
const [pendingSubmit, setPendingSubmit] = React.useState(null);
|
|
@@ -867,26 +891,11 @@ const FormModal = ()=>{
|
|
|
867
891
|
}
|
|
868
892
|
await continueSubmit(e, shouldContinue);
|
|
869
893
|
};
|
|
870
|
-
|
|
871
|
-
// eslint-disable-next-line no-alert
|
|
872
|
-
const confirm = window.confirm(formatMessage({
|
|
873
|
-
id: 'window.confirm.close-modal.file',
|
|
874
|
-
defaultMessage: 'Are you sure? Your changes will be lost.'
|
|
875
|
-
}));
|
|
876
|
-
if (confirm) {
|
|
877
|
-
onCloseModal();
|
|
878
|
-
dispatch(reducer.actions.resetProps());
|
|
879
|
-
}
|
|
880
|
-
};
|
|
894
|
+
// Runs once UnsavedChangesModal has confirmed the close when there are unsaved changes.
|
|
881
895
|
const handleClosed = ()=>{
|
|
882
|
-
|
|
883
|
-
|
|
884
|
-
|
|
885
|
-
} else {
|
|
886
|
-
onCloseModal();
|
|
887
|
-
// Reset the reducer
|
|
888
|
-
dispatch(reducer.actions.resetProps());
|
|
889
|
-
}
|
|
896
|
+
onCloseModal();
|
|
897
|
+
// Reset the reducer
|
|
898
|
+
dispatch(reducer.actions.resetProps());
|
|
890
899
|
};
|
|
891
900
|
const sendAdvancedTabEvent = (tab)=>{
|
|
892
901
|
if (tab !== 'advanced') {
|
|
@@ -934,25 +943,7 @@ const FormModal = ()=>{
|
|
|
934
943
|
const isAddingAComponentToAnotherComponent = forTarget === 'component';
|
|
935
944
|
const genericInputProps = {
|
|
936
945
|
customInputs: {
|
|
937
|
-
|
|
938
|
-
'boolean-radio-group': BooleanRadioGroup.BooleanRadioGroup,
|
|
939
|
-
'checkbox-with-number-field': CheckboxWithNumberField.CheckboxWithNumberField,
|
|
940
|
-
'icon-picker': IconPicker.IconPicker,
|
|
941
|
-
'content-type-radio-group': ContentTypeRadioGroup.ContentTypeRadioGroup,
|
|
942
|
-
'content-type-folder-select': FolderSelect.FolderSelect,
|
|
943
|
-
'radio-group': CustomRadioGroup.CustomRadioGroup,
|
|
944
|
-
relation: Relation.Relation,
|
|
945
|
-
'select-category': SelectCategory.SelectCategory,
|
|
946
|
-
'select-component': SelectComponent.SelectComponent,
|
|
947
|
-
'select-components': SelectComponents.SelectComponents,
|
|
948
|
-
'select-default-boolean': BooleanDefaultValueSelect.BooleanDefaultValueSelect,
|
|
949
|
-
'select-number': SelectNumber.SelectNumber,
|
|
950
|
-
'select-date': SelectDateType.SelectDateType,
|
|
951
|
-
'toggle-draft-publish': DraftAndPublishToggle.DraftAndPublishToggle,
|
|
952
|
-
'text-plural': PluralName.PluralName,
|
|
953
|
-
'text-singular': SingularName.SingularName,
|
|
954
|
-
'textarea-enum': TextareaEnum.TextareaEnum,
|
|
955
|
-
'condition-form': ConditionForm.ConditionForm,
|
|
946
|
+
...CUSTOM_INPUTS,
|
|
956
947
|
...inputsFromPlugins
|
|
957
948
|
},
|
|
958
949
|
componentToCreate,
|
|
@@ -1013,9 +1004,10 @@ const FormModal = ()=>{
|
|
|
1013
1004
|
]
|
|
1014
1005
|
});
|
|
1015
1006
|
};
|
|
1016
|
-
return /*#__PURE__*/ jsxRuntime.jsx(
|
|
1007
|
+
return /*#__PURE__*/ jsxRuntime.jsx(strapiAdmin.UnsavedChangesModal, {
|
|
1017
1008
|
open: isOpen,
|
|
1018
1009
|
onOpenChange: handleClosed,
|
|
1010
|
+
hasUnsavedChanges: !isEqual__default.default(modifiedData, pristineData),
|
|
1019
1011
|
children: /*#__PURE__*/ jsxRuntime.jsxs(designSystem.Modal.Content, {
|
|
1020
1012
|
children: [
|
|
1021
1013
|
/*#__PURE__*/ jsxRuntime.jsxs(designSystem.Dialog.Root, {
|
|
@@ -1222,16 +1214,14 @@ const FormModal = ()=>{
|
|
|
1222
1214
|
}),
|
|
1223
1215
|
/*#__PURE__*/ jsxRuntime.jsxs(designSystem.Modal.Footer, {
|
|
1224
1216
|
children: [
|
|
1225
|
-
/*#__PURE__*/ jsxRuntime.jsx(designSystem.
|
|
1226
|
-
|
|
1227
|
-
|
|
1228
|
-
|
|
1229
|
-
|
|
1230
|
-
|
|
1231
|
-
|
|
1232
|
-
|
|
1233
|
-
id: 'app.components.Button.cancel',
|
|
1234
|
-
defaultMessage: 'Cancel'
|
|
1217
|
+
/*#__PURE__*/ jsxRuntime.jsx(designSystem.Modal.Close, {
|
|
1218
|
+
children: /*#__PURE__*/ jsxRuntime.jsx(designSystem.Button, {
|
|
1219
|
+
type: "button",
|
|
1220
|
+
variant: "tertiary",
|
|
1221
|
+
children: formatMessage({
|
|
1222
|
+
id: 'app.components.Button.cancel',
|
|
1223
|
+
defaultMessage: 'Cancel'
|
|
1224
|
+
})
|
|
1235
1225
|
})
|
|
1236
1226
|
}),
|
|
1237
1227
|
/*#__PURE__*/ jsxRuntime.jsx(FormModalEndActions.FormModalEndActions, {
|