@strapi/content-type-builder 5.61.0 → 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.
Files changed (120) hide show
  1. package/dist/admin/components/AIChat/FeedbackModal.js +3 -3
  2. package/dist/admin/components/AIChat/FeedbackModal.js.map +1 -1
  3. package/dist/admin/components/AIChat/FeedbackModal.mjs +5 -5
  4. package/dist/admin/components/AIChat/FeedbackModal.mjs.map +1 -1
  5. package/dist/admin/components/AIChat/UploadCodeModal.js +1 -0
  6. package/dist/admin/components/AIChat/UploadCodeModal.js.map +1 -1
  7. package/dist/admin/components/AIChat/UploadCodeModal.mjs +1 -0
  8. package/dist/admin/components/AIChat/UploadCodeModal.mjs.map +1 -1
  9. package/dist/admin/components/AIChat/UploadFigmaModal.js +2 -0
  10. package/dist/admin/components/AIChat/UploadFigmaModal.js.map +1 -1
  11. package/dist/admin/components/AIChat/UploadFigmaModal.mjs +2 -0
  12. package/dist/admin/components/AIChat/UploadFigmaModal.mjs.map +1 -1
  13. package/dist/admin/components/AIChat/components/StepModal.js +11 -8
  14. package/dist/admin/components/AIChat/components/StepModal.js.map +1 -1
  15. package/dist/admin/components/AIChat/components/StepModal.mjs +12 -9
  16. package/dist/admin/components/AIChat/components/StepModal.mjs.map +1 -1
  17. package/dist/admin/components/DataManager/useServerRestartWatcher.js +36 -25
  18. package/dist/admin/components/DataManager/useServerRestartWatcher.js.map +1 -1
  19. package/dist/admin/components/DataManager/useServerRestartWatcher.mjs +16 -25
  20. package/dist/admin/components/DataManager/useServerRestartWatcher.mjs.map +1 -1
  21. package/dist/admin/components/DataManager/watchServerRestart.js +52 -0
  22. package/dist/admin/components/DataManager/watchServerRestart.js.map +1 -0
  23. package/dist/admin/components/DataManager/watchServerRestart.mjs +50 -0
  24. package/dist/admin/components/DataManager/watchServerRestart.mjs.map +1 -0
  25. package/dist/admin/components/FormModal/FormModal.js +40 -50
  26. package/dist/admin/components/FormModal/FormModal.js.map +1 -1
  27. package/dist/admin/components/FormModal/FormModal.mjs +41 -51
  28. package/dist/admin/components/FormModal/FormModal.mjs.map +1 -1
  29. package/dist/admin/components/FormModal/reducer.js +18 -6
  30. package/dist/admin/components/FormModal/reducer.js.map +1 -1
  31. package/dist/admin/components/FormModal/reducer.mjs +18 -6
  32. package/dist/admin/components/FormModal/reducer.mjs.map +1 -1
  33. package/dist/admin/components/GenericInputs.js +26 -1
  34. package/dist/admin/components/GenericInputs.js.map +1 -1
  35. package/dist/admin/components/GenericInputs.mjs +26 -2
  36. package/dist/admin/components/GenericInputs.mjs.map +1 -1
  37. package/dist/admin/src/components/AIChat/components/StepModal.d.ts +6 -1
  38. package/dist/admin/src/components/DataManager/useServerRestartWatcher.d.ts +1 -1
  39. package/dist/admin/src/components/DataManager/watchServerRestart.d.ts +20 -0
  40. package/dist/admin/src/components/FormModal/reducer.d.ts +53 -1
  41. package/dist/admin/src/components/GenericInputs.d.ts +12 -2
  42. package/dist/server/controllers/component-categories.js +24 -11
  43. package/dist/server/controllers/component-categories.js.map +1 -1
  44. package/dist/server/controllers/component-categories.mjs +24 -11
  45. package/dist/server/controllers/component-categories.mjs.map +1 -1
  46. package/dist/server/controllers/components.js +9 -2
  47. package/dist/server/controllers/components.js.map +1 -1
  48. package/dist/server/controllers/components.mjs +9 -2
  49. package/dist/server/controllers/components.mjs.map +1 -1
  50. package/dist/server/controllers/content-types.js +10 -3
  51. package/dist/server/controllers/content-types.js.map +1 -1
  52. package/dist/server/controllers/content-types.mjs +10 -3
  53. package/dist/server/controllers/content-types.mjs.map +1 -1
  54. package/dist/server/controllers/schema.js +4 -0
  55. package/dist/server/controllers/schema.js.map +1 -1
  56. package/dist/server/controllers/schema.mjs +4 -0
  57. package/dist/server/controllers/schema.mjs.map +1 -1
  58. package/dist/server/services/component-categories.js.map +1 -1
  59. package/dist/server/services/component-categories.mjs.map +1 -1
  60. package/dist/server/services/components.js.map +1 -1
  61. package/dist/server/services/components.mjs.map +1 -1
  62. package/dist/server/services/content-types.js +17 -5
  63. package/dist/server/services/content-types.js.map +1 -1
  64. package/dist/server/services/content-types.mjs +17 -5
  65. package/dist/server/services/content-types.mjs.map +1 -1
  66. package/dist/server/services/schema-builder/component-builder.js +3 -1
  67. package/dist/server/services/schema-builder/component-builder.js.map +1 -1
  68. package/dist/server/services/schema-builder/component-builder.mjs +3 -1
  69. package/dist/server/services/schema-builder/component-builder.mjs.map +1 -1
  70. package/dist/server/services/schema-builder/content-type-builder.js +3 -1
  71. package/dist/server/services/schema-builder/content-type-builder.js.map +1 -1
  72. package/dist/server/services/schema-builder/content-type-builder.mjs +3 -1
  73. package/dist/server/services/schema-builder/content-type-builder.mjs.map +1 -1
  74. package/dist/server/services/schema-builder/index.js +57 -5
  75. package/dist/server/services/schema-builder/index.js.map +1 -1
  76. package/dist/server/services/schema-builder/index.mjs +57 -5
  77. package/dist/server/services/schema-builder/index.mjs.map +1 -1
  78. package/dist/server/services/schema-builder/rename-component-uids.js +70 -0
  79. package/dist/server/services/schema-builder/rename-component-uids.js.map +1 -0
  80. package/dist/server/services/schema-builder/rename-component-uids.mjs +68 -0
  81. package/dist/server/services/schema-builder/rename-component-uids.mjs.map +1 -0
  82. package/dist/server/services/schema-builder/schema-handler.js +10 -3
  83. package/dist/server/services/schema-builder/schema-handler.js.map +1 -1
  84. package/dist/server/services/schema-builder/schema-handler.mjs +10 -3
  85. package/dist/server/services/schema-builder/schema-handler.mjs.map +1 -1
  86. package/dist/server/services/schema.js +19 -5
  87. package/dist/server/services/schema.js.map +1 -1
  88. package/dist/server/services/schema.mjs +19 -5
  89. package/dist/server/services/schema.mjs.map +1 -1
  90. package/dist/server/src/controllers/component-categories.d.ts.map +1 -1
  91. package/dist/server/src/controllers/components.d.ts.map +1 -1
  92. package/dist/server/src/controllers/content-types.d.ts.map +1 -1
  93. package/dist/server/src/controllers/schema.d.ts.map +1 -1
  94. package/dist/server/src/services/component-categories.d.ts.map +1 -1
  95. package/dist/server/src/services/components.d.ts +2 -2
  96. package/dist/server/src/services/components.d.ts.map +1 -1
  97. package/dist/server/src/services/content-types.d.ts.map +1 -1
  98. package/dist/server/src/services/schema-builder/component-builder.d.ts +3 -2
  99. package/dist/server/src/services/schema-builder/component-builder.d.ts.map +1 -1
  100. package/dist/server/src/services/schema-builder/content-type-builder.d.ts +3 -2
  101. package/dist/server/src/services/schema-builder/content-type-builder.d.ts.map +1 -1
  102. package/dist/server/src/services/schema-builder/index.d.ts +48 -16
  103. package/dist/server/src/services/schema-builder/index.d.ts.map +1 -1
  104. package/dist/server/src/services/schema-builder/rename-component-uids.d.ts +34 -0
  105. package/dist/server/src/services/schema-builder/rename-component-uids.d.ts.map +1 -0
  106. package/dist/server/src/services/schema-builder/schema-handler.d.ts +21 -6
  107. package/dist/server/src/services/schema-builder/schema-handler.d.ts.map +1 -1
  108. package/dist/server/src/services/schema.d.ts.map +1 -1
  109. package/dist/server/src/utils/errors.d.ts +9 -0
  110. package/dist/server/src/utils/errors.d.ts.map +1 -0
  111. package/dist/server/src/utils/uid-target.d.ts.map +1 -1
  112. package/dist/server/utils/errors.js +26 -0
  113. package/dist/server/utils/errors.js.map +1 -0
  114. package/dist/server/utils/errors.mjs +24 -0
  115. package/dist/server/utils/errors.mjs.map +1 -0
  116. package/dist/server/utils/uid-target.js +2 -1
  117. package/dist/server/utils/uid-target.js.map +1 -1
  118. package/dist/server/utils/uid-target.mjs +2 -1
  119. package/dist/server/utils/uid-target.mjs.map +1 -1
  120. package/package.json +11 -13
@@ -1,7 +1,7 @@
1
1
  import { jsx, jsxs } from 'react/jsx-runtime';
2
2
  import * as React from 'react';
3
3
  import { useState } from 'react';
4
- import { useStrapiApp, useNotification, useGuidedTour, ConfirmDialog, GUIDED_TOUR_REQUIRED_ACTIONS } from '@strapi/admin/strapi-admin';
4
+ import { useStrapiApp, useNotification, useGuidedTour, UnsavedChangesModal, ConfirmDialog, GUIDED_TOUR_REQUIRED_ACTIONS } from '@strapi/admin/strapi-admin';
5
5
  import { Modal, Dialog, Box, Typography, Button, Tabs, Flex, Divider } from '@strapi/design-system';
6
6
  import get from 'lodash/get';
7
7
  import has from 'lodash/has';
@@ -55,6 +55,30 @@ import { getAttributesToDisplay } from './utils/getAttributesToDisplay.mjs';
55
55
  import { getFormInputNames } from './utils/getFormInputNames.mjs';
56
56
  import { getRenameStorageChange } from './utils/getRenameStorageChange.mjs';
57
57
 
58
+ /**
59
+ * Input renderers the Content-Type Builder form passes to `GenericInput` as `customInputs`,
60
+ * keyed by the input `type` they render. Plugins add theirs on top.
61
+ */ const CUSTOM_INPUTS = {
62
+ 'allowed-types-select': AllowedTypesSelect,
63
+ 'boolean-radio-group': BooleanRadioGroup,
64
+ 'checkbox-with-number-field': CheckboxWithNumberField,
65
+ 'icon-picker': IconPicker,
66
+ 'content-type-radio-group': ContentTypeRadioGroup,
67
+ 'content-type-folder-select': FolderSelect,
68
+ 'radio-group': CustomRadioGroup,
69
+ relation: Relation,
70
+ 'select-category': SelectCategory,
71
+ 'select-component': SelectComponent,
72
+ 'select-components': SelectComponents,
73
+ 'select-default-boolean': BooleanDefaultValueSelect,
74
+ 'select-number': SelectNumber,
75
+ 'select-date': SelectDateType,
76
+ 'toggle-draft-publish': DraftAndPublishToggle,
77
+ 'text-plural': PluralName,
78
+ 'text-singular': SingularName,
79
+ 'textarea-enum': TextareaEnum,
80
+ 'condition-form': ConditionForm
81
+ };
58
82
  const FormComponent = styled.form`
59
83
  overflow: auto;
60
84
  `;
@@ -90,7 +114,7 @@ const FormModal = ()=>{
90
114
  const inputsFromPlugins = ctbFormsAPI.components.inputs;
91
115
  const dispatchGuidedTour = useGuidedTour('FormModal', (s)=>s.dispatch);
92
116
  const { addAttribute, editAttribute, addCustomFieldAttribute, addCreatedComponentToDynamicZone, changeDynamicZoneComponents, contentTypes, components, createSchema, createComponentSchema, deleteComponent, deleteContentType, editCustomFieldAttribute, updateSchema, nestedComponents, sortedContentTypesList, updateComponentSchema, updateComponentUid, reservedNames, confirmAttributeRenameMigration, attributeRenameMigrationMode } = useDataManager();
93
- const { componentToCreate, formErrors, initialData, isCreatingComponentWhileAddingAField, modifiedData } = reducerState;
117
+ const { componentToCreate, formErrors, initialData, isCreatingComponentWhileAddingAField, modifiedData, pristineData } = reducerState;
94
118
  const type = forTarget === 'component' ? components[targetUid] : contentTypes[targetUid];
95
119
  const [showWarningDialog, setShowWarningDialog] = useState(false);
96
120
  const [pendingSubmit, setPendingSubmit] = useState(null);
@@ -839,26 +863,11 @@ const FormModal = ()=>{
839
863
  }
840
864
  await continueSubmit(e, shouldContinue);
841
865
  };
842
- const handleConfirmClose = ()=>{
843
- // eslint-disable-next-line no-alert
844
- const confirm = window.confirm(formatMessage({
845
- id: 'window.confirm.close-modal.file',
846
- defaultMessage: 'Are you sure? Your changes will be lost.'
847
- }));
848
- if (confirm) {
849
- onCloseModal();
850
- dispatch(actions.resetProps());
851
- }
852
- };
866
+ // Runs once UnsavedChangesModal has confirmed the close when there are unsaved changes.
853
867
  const handleClosed = ()=>{
854
- // Close the modal
855
- if (!isEqual(modifiedData, initialData)) {
856
- handleConfirmClose();
857
- } else {
858
- onCloseModal();
859
- // Reset the reducer
860
- dispatch(actions.resetProps());
861
- }
868
+ onCloseModal();
869
+ // Reset the reducer
870
+ dispatch(actions.resetProps());
862
871
  };
863
872
  const sendAdvancedTabEvent = (tab)=>{
864
873
  if (tab !== 'advanced') {
@@ -906,25 +915,7 @@ const FormModal = ()=>{
906
915
  const isAddingAComponentToAnotherComponent = forTarget === 'component';
907
916
  const genericInputProps = {
908
917
  customInputs: {
909
- 'allowed-types-select': AllowedTypesSelect,
910
- 'boolean-radio-group': BooleanRadioGroup,
911
- 'checkbox-with-number-field': CheckboxWithNumberField,
912
- 'icon-picker': IconPicker,
913
- 'content-type-radio-group': ContentTypeRadioGroup,
914
- 'content-type-folder-select': FolderSelect,
915
- 'radio-group': CustomRadioGroup,
916
- relation: Relation,
917
- 'select-category': SelectCategory,
918
- 'select-component': SelectComponent,
919
- 'select-components': SelectComponents,
920
- 'select-default-boolean': BooleanDefaultValueSelect,
921
- 'select-number': SelectNumber,
922
- 'select-date': SelectDateType,
923
- 'toggle-draft-publish': DraftAndPublishToggle,
924
- 'text-plural': PluralName,
925
- 'text-singular': SingularName,
926
- 'textarea-enum': TextareaEnum,
927
- 'condition-form': ConditionForm,
918
+ ...CUSTOM_INPUTS,
928
919
  ...inputsFromPlugins
929
920
  },
930
921
  componentToCreate,
@@ -985,9 +976,10 @@ const FormModal = ()=>{
985
976
  ]
986
977
  });
987
978
  };
988
- return /*#__PURE__*/ jsx(Modal.Root, {
979
+ return /*#__PURE__*/ jsx(UnsavedChangesModal, {
989
980
  open: isOpen,
990
981
  onOpenChange: handleClosed,
982
+ hasUnsavedChanges: !isEqual(modifiedData, pristineData),
991
983
  children: /*#__PURE__*/ jsxs(Modal.Content, {
992
984
  children: [
993
985
  /*#__PURE__*/ jsxs(Dialog.Root, {
@@ -1194,16 +1186,14 @@ const FormModal = ()=>{
1194
1186
  }),
1195
1187
  /*#__PURE__*/ jsxs(Modal.Footer, {
1196
1188
  children: [
1197
- /*#__PURE__*/ jsx(Button, {
1198
- type: "button",
1199
- variant: "tertiary",
1200
- onClick: (e)=>{
1201
- e.preventDefault();
1202
- handleClosed();
1203
- },
1204
- children: formatMessage({
1205
- id: 'app.components.Button.cancel',
1206
- defaultMessage: 'Cancel'
1189
+ /*#__PURE__*/ jsx(Modal.Close, {
1190
+ children: /*#__PURE__*/ jsx(Button, {
1191
+ type: "button",
1192
+ variant: "tertiary",
1193
+ children: formatMessage({
1194
+ id: 'app.components.Button.cancel',
1195
+ defaultMessage: 'Cancel'
1196
+ })
1207
1197
  })
1208
1198
  }),
1209
1199
  /*#__PURE__*/ jsx(FormModalEndActions, {