@esri/hub-common 17.12.0 → 17.13.1

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 (71) hide show
  1. package/dist/esm/content/_internal/ContentUiSchemaEdit.js +46 -33
  2. package/dist/esm/content/_internal/ContentUiSchemaEdit.js.map +1 -1
  3. package/dist/esm/core/schemas/internal/addDynamicSlugValidation.js +10 -1
  4. package/dist/esm/core/schemas/internal/addDynamicSlugValidation.js.map +1 -1
  5. package/dist/esm/core/schemas/internal/fetchCategoriesUiSchemaElement.js +0 -4
  6. package/dist/esm/core/schemas/internal/fetchCategoriesUiSchemaElement.js.map +1 -1
  7. package/dist/esm/core/schemas/internal/getSlugSchemaElement.js +0 -3
  8. package/dist/esm/core/schemas/internal/getSlugSchemaElement.js.map +1 -1
  9. package/dist/esm/core/schemas/internal/getThumbnailUiSchemaElement.js +1 -12
  10. package/dist/esm/core/schemas/internal/getThumbnailUiSchemaElement.js.map +1 -1
  11. package/dist/esm/core/schemas/internal/metrics/editorToEntity.js +5 -0
  12. package/dist/esm/core/schemas/internal/metrics/editorToEntity.js.map +1 -1
  13. package/dist/esm/discussions/_internal/DiscussionUiSchemaEdit.js +59 -46
  14. package/dist/esm/discussions/_internal/DiscussionUiSchemaEdit.js.map +1 -1
  15. package/dist/esm/events/_internal/EventUiSchemaEdit.js +298 -200
  16. package/dist/esm/events/_internal/EventUiSchemaEdit.js.map +1 -1
  17. package/dist/esm/groups/_internal/GroupSchema.js +2 -1
  18. package/dist/esm/groups/_internal/GroupSchema.js.map +1 -1
  19. package/dist/esm/groups/_internal/GroupUiSchemaEdit.js +47 -6
  20. package/dist/esm/groups/_internal/GroupUiSchemaEdit.js.map +1 -1
  21. package/dist/esm/initiative-templates/_internal/InitiativeTemplateUiSchemaEdit.js +74 -36
  22. package/dist/esm/initiative-templates/_internal/InitiativeTemplateUiSchemaEdit.js.map +1 -1
  23. package/dist/esm/initiatives/_internal/InitiativeUiSchemaEdit.js +126 -92
  24. package/dist/esm/initiatives/_internal/InitiativeUiSchemaEdit.js.map +1 -1
  25. package/dist/esm/pages/_internal/PageUiSchemaEdit.js +45 -28
  26. package/dist/esm/pages/_internal/PageUiSchemaEdit.js.map +1 -1
  27. package/dist/esm/projects/_internal/ProjectUiSchemaEdit.js +221 -146
  28. package/dist/esm/projects/_internal/ProjectUiSchemaEdit.js.map +1 -1
  29. package/dist/esm/sites/_internal/SiteUiSchemaEdit.js +43 -28
  30. package/dist/esm/sites/_internal/SiteUiSchemaEdit.js.map +1 -1
  31. package/dist/esm/surveys/_internal/SurveyUiSchemaEdit.js +62 -25
  32. package/dist/esm/surveys/_internal/SurveyUiSchemaEdit.js.map +1 -1
  33. package/dist/esm/templates/_internal/TemplateUiSchemaEdit.js +78 -33
  34. package/dist/esm/templates/_internal/TemplateUiSchemaEdit.js.map +1 -1
  35. package/dist/node/content/_internal/ContentUiSchemaEdit.js +46 -33
  36. package/dist/node/content/_internal/ContentUiSchemaEdit.js.map +1 -1
  37. package/dist/node/core/schemas/internal/addDynamicSlugValidation.js +10 -1
  38. package/dist/node/core/schemas/internal/addDynamicSlugValidation.js.map +1 -1
  39. package/dist/node/core/schemas/internal/fetchCategoriesUiSchemaElement.js +0 -4
  40. package/dist/node/core/schemas/internal/fetchCategoriesUiSchemaElement.js.map +1 -1
  41. package/dist/node/core/schemas/internal/getSlugSchemaElement.js +0 -3
  42. package/dist/node/core/schemas/internal/getSlugSchemaElement.js.map +1 -1
  43. package/dist/node/core/schemas/internal/getThumbnailUiSchemaElement.js +1 -12
  44. package/dist/node/core/schemas/internal/getThumbnailUiSchemaElement.js.map +1 -1
  45. package/dist/node/core/schemas/internal/metrics/editorToEntity.js +5 -0
  46. package/dist/node/core/schemas/internal/metrics/editorToEntity.js.map +1 -1
  47. package/dist/node/discussions/_internal/DiscussionUiSchemaEdit.js +59 -46
  48. package/dist/node/discussions/_internal/DiscussionUiSchemaEdit.js.map +1 -1
  49. package/dist/node/events/_internal/EventUiSchemaEdit.js +298 -200
  50. package/dist/node/events/_internal/EventUiSchemaEdit.js.map +1 -1
  51. package/dist/node/groups/_internal/GroupSchema.js +1 -0
  52. package/dist/node/groups/_internal/GroupSchema.js.map +1 -1
  53. package/dist/node/groups/_internal/GroupUiSchemaEdit.js +47 -6
  54. package/dist/node/groups/_internal/GroupUiSchemaEdit.js.map +1 -1
  55. package/dist/node/initiative-templates/_internal/InitiativeTemplateUiSchemaEdit.js +74 -36
  56. package/dist/node/initiative-templates/_internal/InitiativeTemplateUiSchemaEdit.js.map +1 -1
  57. package/dist/node/initiatives/_internal/InitiativeUiSchemaEdit.js +126 -92
  58. package/dist/node/initiatives/_internal/InitiativeUiSchemaEdit.js.map +1 -1
  59. package/dist/node/pages/_internal/PageUiSchemaEdit.js +45 -28
  60. package/dist/node/pages/_internal/PageUiSchemaEdit.js.map +1 -1
  61. package/dist/node/projects/_internal/ProjectUiSchemaEdit.js +221 -146
  62. package/dist/node/projects/_internal/ProjectUiSchemaEdit.js.map +1 -1
  63. package/dist/node/sites/_internal/SiteUiSchemaEdit.js +43 -28
  64. package/dist/node/sites/_internal/SiteUiSchemaEdit.js.map +1 -1
  65. package/dist/node/surveys/_internal/SurveyUiSchemaEdit.js +62 -25
  66. package/dist/node/surveys/_internal/SurveyUiSchemaEdit.js.map +1 -1
  67. package/dist/node/templates/_internal/TemplateUiSchemaEdit.js +78 -33
  68. package/dist/node/templates/_internal/TemplateUiSchemaEdit.js.map +1 -1
  69. package/dist/types/initiative-templates/_internal/InitiativeTemplateUiSchemaEdit.d.ts +2 -2
  70. package/dist/types/templates/_internal/TemplateUiSchemaEdit.d.ts +2 -2
  71. package/package.json +1 -1
@@ -3,6 +3,7 @@ import { getLocationExtent } from "../../core/schemas/internal/getLocationExtent
3
3
  import { getLocationOptions } from "../../core/schemas/internal/getLocationOptions";
4
4
  import { getThumbnailUiSchemaElement } from "../../core/schemas/internal/getThumbnailUiSchemaElement";
5
5
  import { fetchCategoriesUiSchemaElement } from "../../core/schemas/internal/fetchCategoriesUiSchemaElement";
6
+ // import { getSlugSchemaElement } from "../../core/schemas/internal/getSlugSchemaElement";
6
7
  /**
7
8
  * @private
8
9
  * constructs the complete edit uiSchema for Hub Content.
@@ -16,6 +17,11 @@ export const buildUiSchema = async (i18nScope, options, context) => {
16
17
  {
17
18
  type: "Section",
18
19
  labelKey: `${i18nScope}.sections.basic.title`,
20
+ options: {
21
+ helperText: {
22
+ labelKey: `${i18nScope}.sections.basic.helperText`,
23
+ },
24
+ },
19
25
  elements: [
20
26
  // title
21
27
  {
@@ -42,6 +48,7 @@ export const buildUiSchema = async (i18nScope, options, context) => {
42
48
  ],
43
49
  },
44
50
  },
51
+ // getSlugSchemaElement(i18nScope),
45
52
  // summary
46
53
  {
47
54
  labelKey: `${i18nScope}.fields.summary.label`,
@@ -51,9 +58,6 @@ export const buildUiSchema = async (i18nScope, options, context) => {
51
58
  control: "hub-field-input-input",
52
59
  type: "textarea",
53
60
  rows: 4,
54
- helperText: {
55
- labelKey: `${i18nScope}.fields.summary.hint`,
56
- },
57
61
  messages: [
58
62
  {
59
63
  type: "ERROR",
@@ -64,36 +68,53 @@ export const buildUiSchema = async (i18nScope, options, context) => {
64
68
  ],
65
69
  },
66
70
  },
67
- // description
71
+ ...getThumbnailUiSchemaElement(i18nScope, options.thumbnail, options.thumbnailUrl, "content", context.requestOptions),
68
72
  {
69
- labelKey: `${i18nScope}.fields.description.label`,
70
- scope: "/properties/description",
71
- type: "Control",
73
+ type: "Section",
74
+ labelKey: `${i18nScope}.sections.description.label`,
72
75
  options: {
73
- control: "hub-field-input-rich-text",
74
- type: "textarea",
75
- helperText: {
76
- labelKey: `${i18nScope}.fields.description.hint`,
77
- },
76
+ section: "block",
78
77
  },
78
+ elements: [
79
+ // description
80
+ {
81
+ labelKey: `${i18nScope}.fields.description.label`,
82
+ scope: "/properties/description",
83
+ type: "Control",
84
+ options: {
85
+ control: "hub-field-input-rich-text",
86
+ type: "textarea",
87
+ },
88
+ },
89
+ ],
79
90
  },
80
- ...getThumbnailUiSchemaElement(i18nScope, options.thumbnail, options.thumbnailUrl, "content", context.requestOptions),
81
- // tags
82
91
  {
83
- labelKey: `${i18nScope}.fields.tags.label`,
84
- scope: "/properties/tags",
85
- type: "Control",
92
+ type: "Section",
93
+ labelKey: `${i18nScope}.sections.discoverability.label`,
86
94
  options: {
87
- control: "hub-field-input-combobox",
88
- items: await getTagItems(options.tags, context.portal.id, context.hubRequestOptions),
89
- allowCustomValues: true,
90
- selectionMode: "multiple",
91
- placeholderIcon: "label",
92
- helperText: { labelKey: `${i18nScope}.fields.tags.hint` },
95
+ section: "block",
96
+ helperText: {
97
+ labelKey: `${i18nScope}.sections.discoverability.helperText`,
98
+ },
93
99
  },
100
+ elements: [
101
+ // tags
102
+ {
103
+ labelKey: `${i18nScope}.fields.tags.label`,
104
+ scope: "/properties/tags",
105
+ type: "Control",
106
+ options: {
107
+ control: "hub-field-input-combobox",
108
+ items: await getTagItems(options.tags, context.portal.id, context.hubRequestOptions),
109
+ allowCustomValues: true,
110
+ selectionMode: "multiple",
111
+ placeholderIcon: "label",
112
+ },
113
+ },
114
+ // categories
115
+ ...(await fetchCategoriesUiSchemaElement(i18nScope, context)),
116
+ ],
94
117
  },
95
- // categories
96
- ...(await fetchCategoriesUiSchemaElement(i18nScope, context)),
97
118
  // license
98
119
  {
99
120
  labelKey: `${i18nScope}.fields.license.label`,
@@ -101,9 +122,6 @@ export const buildUiSchema = async (i18nScope, options, context) => {
101
122
  type: "Control",
102
123
  options: {
103
124
  control: "arcgis-hub-license-picker",
104
- helperText: {
105
- labelKey: `${i18nScope}.fields.license.helperText`,
106
- },
107
125
  },
108
126
  },
109
127
  ],
@@ -112,11 +130,6 @@ export const buildUiSchema = async (i18nScope, options, context) => {
112
130
  {
113
131
  type: "Section",
114
132
  labelKey: `${i18nScope}.sections.location.label`,
115
- options: {
116
- helperText: {
117
- labelKey: `${i18nScope}.sections.location.helperText`,
118
- },
119
- },
120
133
  elements: [
121
134
  {
122
135
  scope: "/properties/location",
@@ -1 +1 @@
1
- {"version":3,"file":"ContentUiSchemaEdit.js","sourceRoot":"","sources":["../../../../src/content/_internal/ContentUiSchemaEdit.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ContentUiSchemaEdit.js","sourceRoot":"","sources":["../../../../src/content/_internal/ContentUiSchemaEdit.ts"],"names":[],"mappings":"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"}
@@ -19,11 +19,20 @@ export const addDynamicSlugValidation = (schema, options) => {
19
19
  // add conditional validation to ensure slug is unique
20
20
  const allOf = cloneObject(schema.allOf) || [];
21
21
  const { pattern } = _slug;
22
+ // remove pattern from base schema so the form doesn't always apply the pattern
23
+ // validation. We will add it back to the allOf conditionally
24
+ delete _slug.pattern;
22
25
  const { id } = options;
23
26
  allOf.push({
27
+ // only enforce the pattern if slug has been entered
28
+ if: { properties: { _slug: { minLength: 1 } } },
29
+ then: { properties: { _slug: { pattern } } },
30
+ }, {
24
31
  // only do async isUniqueSlug check if the slug is valid
25
32
  if: { properties: { _slug: { pattern } } },
26
- then: { properties: { _slug: { isUniqueSlug: { id, orgUrlKey } } } },
33
+ then: {
34
+ properties: { _slug: { isUniqueSlug: { id, orgUrlKey } } },
35
+ },
27
36
  });
28
37
  const clone = cloneObject(schema);
29
38
  clone.properties._slug = _slug;
@@ -1 +1 @@
1
- {"version":3,"file":"addDynamicSlugValidation.js","sourceRoot":"","sources":["../../../../../src/core/schemas/internal/addDynamicSlugValidation.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAM5C;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAG,CACtC,MAA4B,EAC5B,OAAsB,EACA,EAAE;;IACxB,MAAM,KAAK,GAAG,WAAW,OAAC,MAAM,CAAC,UAAU,0CAAE,KAAK,CAAe,CAAC;IAClE,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,MAAM,CAAC;KACf;IACD,yBAAyB;IACzB,MAAM,EAAE,SAAS,EAAE,GAAG,OAAoB,CAAC;IAC3C,KAAK,CAAC,SAAS,GAAG,gBAAgB,CAAC,SAAS,CAAC,CAAC;IAC9C,sDAAsD;IACtD,MAAM,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;IAC9C,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IAC1B,MAAM,EAAE,EAAE,EAAE,GAAG,OAAoB,CAAC;IACpC,KAAK,CAAC,IAAI,CAAC;QACT,wDAAwD;QACxD,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QAC1C,IAAI,EAAE,EAAE,UAAU,EAAE,EAAE,KAAK,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,EAAS,EAAE,EAAE;KAC5E,CAAC,CAAC;IACH,MAAM,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;IAClC,KAAK,CAAC,UAAU,CAAC,KAAK,GAAG,KAAK,CAAC;IAC/B,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC;IACpB,OAAO,KAAK,CAAC;AACf,CAAC,CAAC"}
1
+ {"version":3,"file":"addDynamicSlugValidation.js","sourceRoot":"","sources":["../../../../../src/core/schemas/internal/addDynamicSlugValidation.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAM5C;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAG,CACtC,MAA4B,EAC5B,OAAsB,EACA,EAAE;;IACxB,MAAM,KAAK,GAAG,WAAW,OAAC,MAAM,CAAC,UAAU,0CAAE,KAAK,CAAe,CAAC;IAClE,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,MAAM,CAAC;KACf;IACD,yBAAyB;IACzB,MAAM,EAAE,SAAS,EAAE,GAAG,OAAoB,CAAC;IAC3C,KAAK,CAAC,SAAS,GAAG,gBAAgB,CAAC,SAAS,CAAC,CAAC;IAC9C,sDAAsD;IACtD,MAAM,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;IAE9C,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IAC1B,+EAA+E;IAC/E,6DAA6D;IAC7D,OAAO,KAAK,CAAC,OAAO,CAAC;IAErB,MAAM,EAAE,EAAE,EAAE,GAAG,OAAoB,CAAC;IAEpC,KAAK,CAAC,IAAI,CACR;QACE,oDAAoD;QACpD,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE,EAAE,EAAE;QAC/C,IAAI,EAAE,EAAE,UAAU,EAAE,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;KAC7C,EACD;QACE,wDAAwD;QACxD,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QAC1C,IAAI,EAAE;YACJ,UAAU,EAAE,EAAE,KAAK,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,EAAS,EAAE;SAClE;KACF,CACF,CAAC;IAEF,MAAM,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;IAClC,KAAK,CAAC,UAAU,CAAC,KAAK,GAAG,KAAK,CAAC;IAC/B,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC;IACpB,OAAO,KAAK,CAAC;AACf,CAAC,CAAC"}
@@ -21,10 +21,6 @@ export async function fetchCategoriesUiSchemaElement(i18nScope, context) {
21
21
  allowCustomValues: false,
22
22
  selectionMode: "ancestors",
23
23
  placeholderIcon: "select-category",
24
- helperText: {
25
- // helper text varies between entity types
26
- labelKey: `${i18nScope}.fields.categories.helperText`,
27
- },
28
24
  },
29
25
  rules: [
30
26
  {
@@ -1 +1 @@
1
- {"version":3,"file":"fetchCategoriesUiSchemaElement.js","sourceRoot":"","sources":["../../../../../src/core/schemas/internal/fetchCategoriesUiSchemaElement.ts"],"names":[],"mappings":"AACA,OAAO,EAAoB,mBAAmB,EAAE,MAAM,UAAU,CAAC;AACjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,8BAA8B,CAClD,SAAiB,EACjB,OAAuB;IAEvB,MAAM,aAAa,GAAG,MAAM,kBAAkB,CAC5C,OAAO,CAAC,MAAM,CAAC,EAAE,EACjB,OAAO,CAAC,iBAAiB,CAC1B,CAAC;IAEF,OAAO;QACL;YACE,QAAQ,EAAE,gCAAgC;YAC1C,KAAK,EAAE,wBAAwB;YAC/B,IAAI,EAAE,SAAS;YACf,OAAO,EAAE;gBACP,OAAO,EAAE,0BAA0B;gBACnC,KAAK,EAAE,aAAa;gBACpB,iBAAiB,EAAE,KAAK;gBACxB,aAAa,EAAE,WAAW;gBAC1B,eAAe,EAAE,iBAAiB;gBAClC,UAAU,EAAE;oBACV,0CAA0C;oBAC1C,QAAQ,EAAE,GAAG,SAAS,+BAA+B;iBACtD;aACF;YACD,KAAK,EAAE;gBACL;oBACE,MAAM,EAAE,mBAAmB,CAAC,OAAO;oBACnC,UAAU,EAAE,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC;iBACpC;aACF;SACF;QACD;YACE,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE;gBACP,MAAM,EAAE;oBACN,aAAa,EAAE;wBACb,EAAE,EAAE,sBAAsB;wBAC1B,UAAU,EAAE,QAAQ;wBACpB,QAAQ,EAAE,KAAK;wBACf,IAAI,EAAE,2BAA2B;wBACjC,IAAI,EAAE,SAAS;wBACf,KAAK,EAAE,GAAG;qBACX;oBACD,OAAO,EACL,gEAAgE;oBAClE,QAAQ,EAAE,IAAI;oBACd,OAAO,EAAE;wBACP;4BACE,KAAK,EACH,gEAAgE;4BAClE,IAAI,EAAE,QAAQ;4BACd,IAAI,EAAE,0EAA0E;4BAChF,MAAM,EAAE,QAAQ;yBACjB;qBACF;iBACF;aACF;YACD,KAAK,EAAE;gBACL;oBACE,MAAM,EAAE,mBAAmB,CAAC,IAAI;oBAChC,UAAU,EAAE,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC;iBACpC;aACF;SACF;KACF,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"fetchCategoriesUiSchemaElement.js","sourceRoot":"","sources":["../../../../../src/core/schemas/internal/fetchCategoriesUiSchemaElement.ts"],"names":[],"mappings":"AACA,OAAO,EAAoB,mBAAmB,EAAE,MAAM,UAAU,CAAC;AACjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,8BAA8B,CAClD,SAAiB,EACjB,OAAuB;IAEvB,MAAM,aAAa,GAAG,MAAM,kBAAkB,CAC5C,OAAO,CAAC,MAAM,CAAC,EAAE,EACjB,OAAO,CAAC,iBAAiB,CAC1B,CAAC;IAEF,OAAO;QACL;YACE,QAAQ,EAAE,gCAAgC;YAC1C,KAAK,EAAE,wBAAwB;YAC/B,IAAI,EAAE,SAAS;YACf,OAAO,EAAE;gBACP,OAAO,EAAE,0BAA0B;gBACnC,KAAK,EAAE,aAAa;gBACpB,iBAAiB,EAAE,KAAK;gBACxB,aAAa,EAAE,WAAW;gBAC1B,eAAe,EAAE,iBAAiB;aACnC;YACD,KAAK,EAAE;gBACL;oBACE,MAAM,EAAE,mBAAmB,CAAC,OAAO;oBACnC,UAAU,EAAE,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC;iBACpC;aACF;SACF;QACD;YACE,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE;gBACP,MAAM,EAAE;oBACN,aAAa,EAAE;wBACb,EAAE,EAAE,sBAAsB;wBAC1B,UAAU,EAAE,QAAQ;wBACpB,QAAQ,EAAE,KAAK;wBACf,IAAI,EAAE,2BAA2B;wBACjC,IAAI,EAAE,SAAS;wBACf,KAAK,EAAE,GAAG;qBACX;oBACD,OAAO,EACL,gEAAgE;oBAClE,QAAQ,EAAE,IAAI;oBACd,OAAO,EAAE;wBACP;4BACE,KAAK,EACH,gEAAgE;4BAClE,IAAI,EAAE,QAAQ;4BACd,IAAI,EAAE,0EAA0E;4BAChF,MAAM,EAAE,QAAQ;yBACjB;qBACF;iBACF;aACF;YACD,KAAK,EAAE;gBACL;oBACE,MAAM,EAAE,mBAAmB,CAAC,IAAI;oBAChC,UAAU,EAAE,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC;iBACpC;aACF;SACF;KACF,CAAC;AACJ,CAAC"}
@@ -5,9 +5,6 @@ export const getSlugSchemaElement = (i18nScope) => {
5
5
  type: "Control",
6
6
  options: {
7
7
  control: "hub-field-input-input",
8
- helperText: {
9
- labelKey: `${i18nScope}.fields.slug.helperText`,
10
- },
11
8
  messages: [
12
9
  {
13
10
  type: "ERROR",
@@ -1 +1 @@
1
- {"version":3,"file":"getSlugSchemaElement.js","sourceRoot":"","sources":["../../../../../src/core/schemas/internal/getSlugSchemaElement.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,SAAiB,EAAoB,EAAE;IAC1E,OAAO;QACL,QAAQ,EAAE,GAAG,SAAS,oBAAoB;QAC1C,KAAK,EAAE,mBAAmB;QAC1B,IAAI,EAAE,SAAS;QACf,OAAO,EAAE;YACP,OAAO,EAAE,uBAAuB;YAChC,UAAU,EAAE;gBACV,QAAQ,EAAE,GAAG,SAAS,yBAAyB;aAChD;YACD,QAAQ,EAAE;gBACR;oBACE,IAAI,EAAE,OAAO;oBACb,OAAO,EAAE,SAAS;oBAClB,IAAI,EAAE,IAAI;oBACV,QAAQ,EAAE,GAAG,SAAS,2BAA2B;iBAClD;gBACD;oBACE,IAAI,EAAE,OAAO;oBACb,OAAO,EAAE,cAAc;oBACvB,IAAI,EAAE,IAAI;oBACV,QAAQ,EAAE,GAAG,SAAS,4BAA4B;iBACnD;aACF;SACF;KACF,CAAC;AACJ,CAAC,CAAC"}
1
+ {"version":3,"file":"getSlugSchemaElement.js","sourceRoot":"","sources":["../../../../../src/core/schemas/internal/getSlugSchemaElement.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,SAAiB,EAAoB,EAAE;IAC1E,OAAO;QACL,QAAQ,EAAE,GAAG,SAAS,oBAAoB;QAC1C,KAAK,EAAE,mBAAmB;QAC1B,IAAI,EAAE,SAAS;QACf,OAAO,EAAE;YACP,OAAO,EAAE,uBAAuB;YAChC,QAAQ,EAAE;gBACR;oBACE,IAAI,EAAE,OAAO;oBACb,OAAO,EAAE,SAAS;oBAClB,IAAI,EAAE,IAAI;oBACV,QAAQ,EAAE,GAAG,SAAS,2BAA2B;iBAClD;gBACD;oBACE,IAAI,EAAE,OAAO;oBACb,OAAO,EAAE,cAAc;oBACvB,IAAI,EAAE,IAAI;oBACV,QAAQ,EAAE,GAAG,SAAS,4BAA4B;iBACnD;aACF;SACF;KACF,CAAC;AACJ,CAAC,CAAC"}
@@ -43,11 +43,6 @@ export function getThumbnailUiSchemaElement(i18nScope, thumbnail, thumbnailUrl,
43
43
  },
44
44
  };
45
45
  }
46
- // We want the notice to appear in the image picker rather than below it
47
- // this is a design requirement for proper element indexing
48
- const notice = !thumbnail || thumbnail === "thumbnail/ago_downloaded.png"
49
- ? "20250425-image-picker-notice"
50
- : null;
51
46
  return [
52
47
  {
53
48
  labelKey: entityType === "group"
@@ -55,13 +50,7 @@ export function getThumbnailUiSchemaElement(i18nScope, thumbnail, thumbnailUrl,
55
50
  : "shared.fields._thumbnail.label",
56
51
  scope: "/properties/_thumbnail",
57
52
  type: "Control",
58
- options: Object.assign({ control: "hub-field-input-image-picker", imgSrc: thumbnailUrl, defaultImgUrl, maxWidth: 727, maxHeight: 484, helperText: {
59
- // helper text varies between entity types
60
- labelKey: `${i18nScope}.fields._thumbnail.helperText`,
61
- },
62
- // Advise the user if the entity's thumbnail is either of the default values,
63
- // and this notice will appear above the image picker but below the helper text
64
- notice }, options),
53
+ options: Object.assign({ control: "hub-field-input-image-picker", imgSrc: thumbnailUrl, defaultImgUrl, maxWidth: 727, maxHeight: 484 }, options),
65
54
  },
66
55
  ];
67
56
  }
@@ -1 +1 @@
1
- {"version":3,"file":"getThumbnailUiSchemaElement.js","sourceRoot":"","sources":["../../../../../src/core/schemas/internal/getThumbnailUiSchemaElement.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAI/C,MAAM,yBAAyB,GAA2C;IACxE,UAAU,EACR,6EAA6E;IAC/E,KAAK,EACH,wEAAwE;IAC1E,KAAK,EACH,wEAAwE;IAC1E,OAAO,EACL,0EAA0E;CAC7E,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,UAAU,2BAA2B,CACzC,SAAiB,EACjB,SAAiB,EACjB,YAAoB,EACpB,UAAyB,EACzB,cAA+B;;IAE/B,MAAM,sBAAsB,SAC1B,yBAAyB,CAAC,UAAU,CAAC,mCAAI,yBAAyB,CAAC,OAAO,CAAC;IAC7E,MAAM,aAAa,GAAG,cAAc,CAAC,sBAAsB,EAAE,cAAc,CAAC,CAAC;IAE7E,IAAI,OAAO,CAAC;IACZ,IAAI,UAAU,KAAK,OAAO,EAAE;QAC1B,OAAO,GAAG;YACR,WAAW,EAAE,CAAC;YACd,eAAe,EAAE;gBACf,QAAQ,EAAE,GAAG,SAAS,oCAAoC;aAC3D;SACF,CAAC;KACH;SAAM,IAAI,UAAU,KAAK,OAAO,EAAE;QACjC,OAAO,GAAG;YACR,WAAW,EAAE,GAAG;YAChB,eAAe,EAAE;gBACf,QAAQ,EAAE,0CAA0C;aACrD;YACD,OAAO,EAAE,CAAC,KAAK,CAAC;SACjB,CAAC;KACH;SAAM;QACL,OAAO,GAAG;YACR,WAAW,EAAE,GAAG;YAChB,eAAe,EAAE;gBACf,QAAQ,EAAE,0CAA0C;aACrD;SACF,CAAC;KACH;IAED,wEAAwE;IACxE,2DAA2D;IAC3D,MAAM,MAAM,GACV,CAAC,SAAS,IAAI,SAAS,KAAK,8BAA8B;QACxD,CAAC,CAAC,8BAA8B;QAChC,CAAC,CAAC,IAAI,CAAC;IAEX,OAAO;QACL;YACE,QAAQ,EACN,UAAU,KAAK,OAAO;gBACpB,CAAC,CAAC,GAAG,SAAS,0BAA0B;gBACxC,CAAC,CAAC,gCAAgC;YACtC,KAAK,EAAE,wBAAwB;YAC/B,IAAI,EAAE,SAAS;YACf,OAAO,kBACL,OAAO,EAAE,8BAA8B,EACvC,MAAM,EAAE,YAAY,EACpB,aAAa,EACb,QAAQ,EAAE,GAAG,EACb,SAAS,EAAE,GAAG,EACd,UAAU,EAAE;oBACV,0CAA0C;oBAC1C,QAAQ,EAAE,GAAG,SAAS,+BAA+B;iBACtD;gBACD,6EAA6E;gBAC7E,+EAA+E;gBAC/E,MAAM,IACH,OAAO,CACX;SACF;KACF,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"getThumbnailUiSchemaElement.js","sourceRoot":"","sources":["../../../../../src/core/schemas/internal/getThumbnailUiSchemaElement.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAI/C,MAAM,yBAAyB,GAA2C;IACxE,UAAU,EACR,6EAA6E;IAC/E,KAAK,EACH,wEAAwE;IAC1E,KAAK,EACH,wEAAwE;IAC1E,OAAO,EACL,0EAA0E;CAC7E,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,UAAU,2BAA2B,CACzC,SAAiB,EACjB,SAAiB,EACjB,YAAoB,EACpB,UAAyB,EACzB,cAA+B;;IAE/B,MAAM,sBAAsB,SAC1B,yBAAyB,CAAC,UAAU,CAAC,mCAAI,yBAAyB,CAAC,OAAO,CAAC;IAC7E,MAAM,aAAa,GAAG,cAAc,CAAC,sBAAsB,EAAE,cAAc,CAAC,CAAC;IAE7E,IAAI,OAAO,CAAC;IACZ,IAAI,UAAU,KAAK,OAAO,EAAE;QAC1B,OAAO,GAAG;YACR,WAAW,EAAE,CAAC;YACd,eAAe,EAAE;gBACf,QAAQ,EAAE,GAAG,SAAS,oCAAoC;aAC3D;SACF,CAAC;KACH;SAAM,IAAI,UAAU,KAAK,OAAO,EAAE;QACjC,OAAO,GAAG;YACR,WAAW,EAAE,GAAG;YAChB,eAAe,EAAE;gBACf,QAAQ,EAAE,0CAA0C;aACrD;YACD,OAAO,EAAE,CAAC,KAAK,CAAC;SACjB,CAAC;KACH;SAAM;QACL,OAAO,GAAG;YACR,WAAW,EAAE,GAAG;YAChB,eAAe,EAAE;gBACf,QAAQ,EAAE,0CAA0C;aACrD;SACF,CAAC;KACH;IAED,OAAO;QACL;YACE,QAAQ,EACN,UAAU,KAAK,OAAO;gBACpB,CAAC,CAAC,GAAG,SAAS,0BAA0B;gBACxC,CAAC,CAAC,gCAAgC;YACtC,KAAK,EAAE,wBAAwB;YAC/B,IAAI,EAAE,SAAS;YACf,OAAO,kBACL,OAAO,EAAE,8BAA8B,EACvC,MAAM,EAAE,YAAY,EACpB,aAAa,EACb,QAAQ,EAAE,GAAG,EACb,SAAS,EAAE,GAAG,IACX,OAAO,CACX;SACF;KACF,CAAC;AACJ,CAAC"}
@@ -23,6 +23,11 @@ export function editorToEntity(editor, portal) {
23
23
  // ensure the slug is truncated
24
24
  entity.slug = truncateSlug(_slug, entity.orgUrlKey);
25
25
  }
26
+ else {
27
+ // if no slug is passed in, save an empty string as the slug, so that
28
+ // it is not saved as the orgUrlKey truncated with an empty string
29
+ entity.slug = "";
30
+ }
26
31
  return entity;
27
32
  }
28
33
  //# sourceMappingURL=editorToEntity.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"editorToEntity.js","sourceRoot":"","sources":["../../../../../../src/core/schemas/internal/metrics/editorToEntity.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AAEjE,oEAAoE;AACpE;;;;;;GAMG;AACH,MAAM,UAAU,cAAc,CAC5B,MAA4C,EAC5C,MAAe;;IAEf,yDAAyD;IACzD,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;IAC3B,OAAO,MAAM,CAAC,KAAK,CAAC;IAEpB,kEAAkE;IAClE,yBAAyB;IACzB,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,CAAmB,CAAC;IACrD,MAAM,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC;IAEvE,wCAAwC;IACxC,MAAM,CAAC,MAAM,SAAG,MAAM,CAAC,QAAQ,0CAAE,MAAM,CAAC;IAExC,IAAI,KAAK,EAAE;QACT,+BAA+B;QAC/B,MAAM,CAAC,IAAI,GAAG,YAAY,CAAC,KAAK,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC;KACrD;IAED,OAAO,MAAM,CAAC;AAChB,CAAC"}
1
+ {"version":3,"file":"editorToEntity.js","sourceRoot":"","sources":["../../../../../../src/core/schemas/internal/metrics/editorToEntity.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AAEjE,oEAAoE;AACpE;;;;;;GAMG;AACH,MAAM,UAAU,cAAc,CAC5B,MAA4C,EAC5C,MAAe;;IAEf,yDAAyD;IACzD,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;IAC3B,OAAO,MAAM,CAAC,KAAK,CAAC;IAEpB,kEAAkE;IAClE,yBAAyB;IACzB,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,CAAmB,CAAC;IACrD,MAAM,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC;IAEvE,wCAAwC;IACxC,MAAM,CAAC,MAAM,SAAG,MAAM,CAAC,QAAQ,0CAAE,MAAM,CAAC;IAExC,IAAI,KAAK,EAAE;QACT,+BAA+B;QAC/B,MAAM,CAAC,IAAI,GAAG,YAAY,CAAC,KAAK,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC;KACrD;SAAM;QACL,qEAAqE;QACrE,kEAAkE;QAClE,MAAM,CAAC,IAAI,GAAG,EAAE,CAAC;KAClB;IAED,OAAO,MAAM,CAAC;AAChB,CAAC"}
@@ -3,7 +3,6 @@ import { getLocationExtent } from "../../core/schemas/internal/getLocationExtent
3
3
  import { getLocationOptions } from "../../core/schemas/internal/getLocationOptions";
4
4
  import { getThumbnailUiSchemaElement } from "../../core/schemas/internal/getThumbnailUiSchemaElement";
5
5
  import { fetchCategoriesUiSchemaElement } from "../../core/schemas/internal/fetchCategoriesUiSchemaElement";
6
- import { getSlugSchemaElement } from "../../core/schemas/internal/getSlugSchemaElement";
7
6
  /**
8
7
  * @private
9
8
  * constructs the complete edit uiSchema for Hub Discussions.
@@ -17,6 +16,11 @@ export const buildUiSchema = async (i18nScope, options, context) => {
17
16
  {
18
17
  type: "Section",
19
18
  labelKey: `${i18nScope}.sections.basicInfo.label`,
19
+ options: {
20
+ helperText: {
21
+ labelKey: `${i18nScope}.sections.basicInfo.helperText`,
22
+ },
23
+ },
20
24
  elements: [
21
25
  {
22
26
  labelKey: `${i18nScope}.fields.name.label`,
@@ -45,35 +49,74 @@ export const buildUiSchema = async (i18nScope, options, context) => {
45
49
  ],
46
50
  },
47
51
  },
52
+ // getSlugSchemaElement(i18nScope),
48
53
  {
49
- labelKey: `${i18nScope}.fields.prompt.label`,
50
- scope: "/properties/prompt",
54
+ labelKey: `${i18nScope}.fields.summary.label`,
55
+ scope: "/properties/summary",
51
56
  type: "Control",
52
57
  options: {
53
- helperText: {
54
- labelKey: `${i18nScope}.fields.prompt.helperText`,
55
- },
58
+ control: "hub-field-input-input",
59
+ type: "textarea",
60
+ rows: 4,
56
61
  messages: [
57
62
  {
58
63
  type: "ERROR",
59
64
  keyword: "maxLength",
60
65
  icon: true,
61
- labelKey: `${i18nScope}.fields.prompt.maxLengthError`,
66
+ labelKey: `shared.fields.purpose.maxLengthError`,
62
67
  },
63
68
  ],
64
69
  },
65
70
  },
66
71
  ...getThumbnailUiSchemaElement(i18nScope, options.thumbnail, options.thumbnailUrl, "discussion", context.requestOptions),
72
+ {
73
+ type: "Section",
74
+ labelKey: `${i18nScope}.sections.description.label`,
75
+ options: {
76
+ section: "block",
77
+ },
78
+ elements: [
79
+ {
80
+ labelKey: `${i18nScope}.fields.description.label`,
81
+ scope: "/properties/description",
82
+ type: "Control",
83
+ options: {
84
+ control: "hub-field-input-rich-text",
85
+ type: "textarea",
86
+ },
87
+ },
88
+ ],
89
+ },
90
+ {
91
+ type: "Section",
92
+ labelKey: `${i18nScope}.sections.discoverability.label`,
93
+ options: {
94
+ section: "block",
95
+ helperText: {
96
+ labelKey: `${i18nScope}.sections.discoverability.helperText`,
97
+ },
98
+ },
99
+ elements: [
100
+ {
101
+ labelKey: `${i18nScope}.fields.tags.label`,
102
+ scope: "/properties/tags",
103
+ type: "Control",
104
+ options: {
105
+ control: "hub-field-input-combobox",
106
+ items: await getTagItems(options.tags, context.portal.id, context.hubRequestOptions),
107
+ allowCustomValues: true,
108
+ selectionMode: "multiple",
109
+ placeholderIcon: "label",
110
+ },
111
+ },
112
+ ...(await fetchCategoriesUiSchemaElement(i18nScope, context)),
113
+ ],
114
+ },
67
115
  ],
68
116
  },
69
117
  {
70
118
  type: "Section",
71
119
  labelKey: `${i18nScope}.sections.location.label`,
72
- options: {
73
- helperText: {
74
- labelKey: `${i18nScope}.sections.location.helperText`,
75
- },
76
- },
77
120
  elements: [
78
121
  {
79
122
  scope: "/properties/location",
@@ -90,55 +133,25 @@ export const buildUiSchema = async (i18nScope, options, context) => {
90
133
  },
91
134
  {
92
135
  type: "Section",
93
- labelKey: `${i18nScope}.sections.searchDiscoverability.label`,
136
+ labelKey: `${i18nScope}.sections.details.label`,
94
137
  elements: [
95
- getSlugSchemaElement(i18nScope),
96
- {
97
- labelKey: `${i18nScope}.fields.tags.label`,
98
- scope: "/properties/tags",
99
- type: "Control",
100
- options: {
101
- control: "hub-field-input-combobox",
102
- items: await getTagItems(options.tags, context.portal.id, context.hubRequestOptions),
103
- allowCustomValues: true,
104
- selectionMode: "multiple",
105
- placeholderIcon: "label",
106
- },
107
- },
108
- ...(await fetchCategoriesUiSchemaElement(i18nScope, context)),
109
138
  {
110
- labelKey: `${i18nScope}.fields.summary.label`,
111
- scope: "/properties/summary",
139
+ labelKey: `${i18nScope}.fields.prompt.label`,
140
+ scope: "/properties/prompt",
112
141
  type: "Control",
113
142
  options: {
114
143
  control: "hub-field-input-input",
115
144
  type: "textarea",
116
- rows: 4,
117
- helperText: {
118
- labelKey: `${i18nScope}.fields.summary.helperText`,
119
- },
120
145
  messages: [
121
146
  {
122
147
  type: "ERROR",
123
148
  keyword: "maxLength",
124
149
  icon: true,
125
- labelKey: `shared.fields.purpose.maxLengthError`,
150
+ labelKey: `${i18nScope}.fields.prompt.maxLengthError`,
126
151
  },
127
152
  ],
128
153
  },
129
154
  },
130
- {
131
- labelKey: `${i18nScope}.fields.description.label`,
132
- scope: "/properties/description",
133
- type: "Control",
134
- options: {
135
- control: "hub-field-input-rich-text",
136
- type: "textarea",
137
- helperText: {
138
- labelKey: `${i18nScope}.fields.description.helperText`,
139
- },
140
- },
141
- },
142
155
  ],
143
156
  },
144
157
  ],
@@ -1 +1 @@
1
- {"version":3,"file":"DiscussionUiSchemaEdit.js","sourceRoot":"","sources":["../../../../src/discussions/_internal/DiscussionUiSchemaEdit.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"DiscussionUiSchemaEdit.js","sourceRoot":"","sources":["../../../../src/discussions/_internal/DiscussionUiSchemaEdit.ts"],"names":[],"mappings":"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"}