@esri/hub-common 14.72.2 → 14.74.0

package/dist/esm/content/_internal/ContentBusinessRules.js

@@ -11,8 +11,7 @@ export const ContentDefaultFeatures = {
  */
 export const ContentPermissions = [
     "hub:content:create",
-    // TODO: verify if this is needed:
-    // "hub:content:delete",
+    "hub:content:delete",
     "hub:content:edit",
     "hub:content:view",
     "hub:content:workspace",
@@ -47,13 +46,12 @@ export const ContentPermissionPolicies = [
         services: ["portal"],
         entityEdit: true,
     },
-    // TODO: verify if this is needed
-    // {
-    //   permission: "hub:content:delete",
-    //   authenticated: true,
-    //   entityOwner: true,
-    //   licenses: ["hub-basic", "hub-premium", "enterprise-sites"],
-    // },
+    {
+        permission: "hub:content:delete",
+        authenticated: true,
+        services: ["portal"],
+        entityEdit: true,
+    },
     {
         permission: "hub:content:workspace",
         dependencies: ["hub:feature:workspace"],
@@ -77,7 +75,6 @@ export const ContentPermissionPolicies = [
     {
         permission: "hub:content:workspace:settings",
         dependencies: ["hub:content:workspace", "hub:content:edit"],
-        entityOwner: true,
     },
     {
         permission: "hub:content:workspace:collaborators",

package/dist/esm/content/_internal/ContentBusinessRules.js.map

@@ -1 +1 @@
-{"version":3,"file":"ContentBusinessRules.js","sourceRoot":"","sources":["../../../../src/content/_internal/ContentBusinessRules.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAkB;AACnD,mEAAmE;CACpE,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG;IAChC,oBAAoB;IACpB,kCAAkC;IAClC,wBAAwB;IACxB,kBAAkB;IAClB,kBAAkB;IAClB,uBAAuB;IACvB,gCAAgC;IAChC,iCAAiC;IACjC,+BAA+B;IAC/B,kCAAkC;IAClC,gCAAgC;IAChC,qCAAqC;IACrC,oBAAoB;CACZ,CAAC;AAEX;;;;GAIG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAAwB;IAC5D;QACE,UAAU,EAAE,oBAAoB;QAChC,QAAQ,EAAE,CAAC,QAAQ,CAAC;QACpB,aAAa,EAAE,IAAI;QACnB,UAAU,EAAE,CAAC,wBAAwB,CAAC;KACvC;IACD;QACE,UAAU,EAAE,kBAAkB;QAC9B,QAAQ,EAAE,CAAC,QAAQ,CAAC;QACpB,aAAa,EAAE,KAAK;KACrB;IACD;QACE,UAAU,EAAE,kBAAkB;QAC9B,aAAa,EAAE,IAAI;QACnB,QAAQ,EAAE,CAAC,QAAQ,CAAC;QACpB,UAAU,EAAE,IAAI;KACjB;IACD,iCAAiC;IACjC,IAAI;IACJ,sCAAsC;IACtC,yBAAyB;IACzB,uBAAuB;IACvB,gEAAgE;IAChE,KAAK;IACL;QACE,UAAU,EAAE,uBAAuB;QACnC,YAAY,EAAE,CAAC,uBAAuB,CAAC;KACxC;IACD;QACE,UAAU,EAAE,gCAAgC;QAC5C,YAAY,EAAE,CAAC,uBAAuB,EAAE,kBAAkB,CAAC;KAC5D;IACD;QACE,UAAU,EAAE,iCAAiC;QAC7C,YAAY,EAAE,CAAC,uBAAuB,EAAE,kBAAkB,CAAC;KAC5D;IACD;QACE,UAAU,EAAE,+BAA+B;QAC3C,YAAY,EAAE,CAAC,uBAAuB,EAAE,kBAAkB,CAAC;KAC5D;IACD;QACE,UAAU,EAAE,kCAAkC;QAC9C,YAAY,EAAE,CAAC,uBAAuB,EAAE,kBAAkB,CAAC;KAC5D;IACD;QACE,UAAU,EAAE,gCAAgC;QAC5C,YAAY,EAAE,CAAC,uBAAuB,EAAE,kBAAkB,CAAC;QAC3D,WAAW,EAAE,IAAI;KAClB;IACD;QACE,UAAU,EAAE,qCAAqC;QACjD,YAAY,EAAE,CAAC,uBAAuB,EAAE,kBAAkB,CAAC;KAC5D;IACD;QACE,UAAU,EAAE,oBAAoB;QAChC,YAAY,EAAE,CAAC,kBAAkB,CAAC;KACnC;CACF,CAAC"}
+{"version":3,"file":"ContentBusinessRules.js","sourceRoot":"","sources":["../../../../src/content/_internal/ContentBusinessRules.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAkB;AACnD,mEAAmE;CACpE,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG;IAChC,oBAAoB;IACpB,oBAAoB;IACpB,kBAAkB;IAClB,kBAAkB;IAClB,uBAAuB;IACvB,gCAAgC;IAChC,iCAAiC;IACjC,+BAA+B;IAC/B,kCAAkC;IAClC,gCAAgC;IAChC,qCAAqC;IACrC,oBAAoB;CACZ,CAAC;AAEX;;;;GAIG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAAwB;IAC5D;QACE,UAAU,EAAE,oBAAoB;QAChC,QAAQ,EAAE,CAAC,QAAQ,CAAC;QACpB,aAAa,EAAE,IAAI;QACnB,UAAU,EAAE,CAAC,wBAAwB,CAAC;KACvC;IACD;QACE,UAAU,EAAE,kBAAkB;QAC9B,QAAQ,EAAE,CAAC,QAAQ,CAAC;QACpB,aAAa,EAAE,KAAK;KACrB;IACD;QACE,UAAU,EAAE,kBAAkB;QAC9B,aAAa,EAAE,IAAI;QACnB,QAAQ,EAAE,CAAC,QAAQ,CAAC;QACpB,UAAU,EAAE,IAAI;KACjB;IACD;QACE,UAAU,EAAE,oBAAoB;QAChC,aAAa,EAAE,IAAI;QACnB,QAAQ,EAAE,CAAC,QAAQ,CAAC;QACpB,UAAU,EAAE,IAAI;KACjB;IACD;QACE,UAAU,EAAE,uBAAuB;QACnC,YAAY,EAAE,CAAC,uBAAuB,CAAC;KACxC;IACD;QACE,UAAU,EAAE,gCAAgC;QAC5C,YAAY,EAAE,CAAC,uBAAuB,EAAE,kBAAkB,CAAC;KAC5D;IACD;QACE,UAAU,EAAE,iCAAiC;QAC7C,YAAY,EAAE,CAAC,uBAAuB,EAAE,kBAAkB,CAAC;KAC5D;IACD;QACE,UAAU,EAAE,+BAA+B;QAC3C,YAAY,EAAE,CAAC,uBAAuB,EAAE,kBAAkB,CAAC;KAC5D;IACD;QACE,UAAU,EAAE,kCAAkC;QAC9C,YAAY,EAAE,CAAC,uBAAuB,EAAE,kBAAkB,CAAC;KAC5D;IACD;QACE,UAAU,EAAE,gCAAgC;QAC5C,YAAY,EAAE,CAAC,uBAAuB,EAAE,kBAAkB,CAAC;KAC5D;IACD;QACE,UAAU,EAAE,qCAAqC;QACjD,YAAY,EAAE,CAAC,uBAAuB,EAAE,kBAAkB,CAAC;KAC5D;IACD;QACE,UAAU,EAAE,oBAAoB;QAChC,YAAY,EAAE,CAAC,kBAAkB,CAAC;KACnC;CACF,CAAC"}

package/dist/esm/core/schemas/internal/metrics/ProjectUiSchemaMetrics.js

@@ -1,3 +1,4 @@
+import { SHOW_FOR_STATIC_RULE_ENTITY, SHOW_FOR_DYNAMIC_RULE_ENTITY, SHOW_FOR_SHARING_RULE_ENTITY, } from "./rules";
 /**
  * @private
  * Exports the uiSchema of metrics for projects
@@ -7,12 +8,12 @@
  * @returns
  */
 export const buildUiSchema = (i18nScope, config, context) => {
-    // To be filled out in a later issue
     return {
         type: "Layout",
         elements: [
             {
                 type: "Section",
+                labelKey: `${i18nScope}.sections.metrics.basic.label`,
                 elements: [
                     {
                         labelKey: `${i18nScope}.fields.metrics.cardTitle.label`,
@@ -30,78 +31,147 @@ export const buildUiSchema = (i18nScope, config, context) => {
                             ],
                         },
                     },
+                ],
+            },
+            {
+                type: "Section",
+                labelKey: `${i18nScope}.sections.metrics.source.label`,
+                elements: [
                     {
-                        type: "Section",
-                        labelKey: `${i18nScope}.sections.metrics.source.label`,
+                        labelKey: `${i18nScope}.fields.metrics.type.label`,
+                        scope: "/properties/_metric/properties/type",
+                        type: "Control",
                         options: {
-                            section: "block",
-                            open: true,
+                            control: "hub-field-input-tile-select",
+                            enum: {
+                                i18nScope: `${i18nScope}.fields.metrics.type.enum`,
+                            },
                         },
-                        elements: [
-                            {
-                                labelKey: `${i18nScope}.fields.metrics.value.label`,
-                                scope: "/properties/_metric/properties/value",
-                                type: "Control",
-                                options: {
-                                    messages: [
-                                        {
-                                            type: "ERROR",
-                                            keyword: "minLength",
-                                            labelKey: `${i18nScope}.fields.metrics.value.message.minLength`,
-                                            icon: true,
-                                            allowShowBeforeInteract: true,
-                                        },
-                                    ],
+                    },
+                    {
+                        labelKey: `${i18nScope}.fields.metrics.value.label`,
+                        scope: "/properties/_metric/properties/value",
+                        type: "Control",
+                        rule: SHOW_FOR_STATIC_RULE_ENTITY,
+                        options: {
+                            messages: [
+                                {
+                                    type: "ERROR",
+                                    keyword: "minLength",
+                                    labelKey: `${i18nScope}.fields.metrics.value.message.minLength`,
+                                    icon: true,
+                                    allowShowBeforeInteract: true,
                                 },
-                            },
-                        ],
+                            ],
+                        },
                     },
                     {
-                        type: "Section",
-                        labelKey: `${i18nScope}.sections.metrics.formatting.label`,
+                        scope: "/properties/_metric/properties/dynamicMetric",
+                        type: "Control",
+                        labelKey: `${i18nScope}.fields.metrics.dynamicMetric.label`,
+                        rule: SHOW_FOR_DYNAMIC_RULE_ENTITY,
                         options: {
-                            section: "block",
-                            open: true,
+                            control: "hub-composite-input-service-query-metric",
                         },
-                        elements: [
-                            {
-                                labelKey: `${i18nScope}.fields.metrics.unit.label`,
-                                scope: "/properties/_metric/properties/unit",
-                                type: "Control",
-                                options: {
-                                    helperText: {
-                                        labelKey: `${i18nScope}.fields.metrics.unit.helperText`,
-                                        placement: "bottom",
-                                    },
-                                },
+                    },
+                    {
+                        labelKey: `${i18nScope}.fields.metrics.unit.label`,
+                        scope: "/properties/_metric/properties/unit",
+                        type: "Control",
+                        options: {
+                            helperText: {
+                                labelKey: `${i18nScope}.fields.metrics.unit.helperText`,
+                                placement: "bottom",
                             },
-                            {
-                                labelKey: `${i18nScope}.fields.metrics.unitPosition.label`,
-                                scope: "/properties/_metric/properties/unitPosition",
-                                type: "Control",
-                                options: {
-                                    control: "hub-field-input-select",
-                                    enum: {
-                                        i18nScope: `${i18nScope}.fields.metrics.unitPosition.enum`,
-                                    },
-                                },
+                        },
+                    },
+                    {
+                        labelKey: `${i18nScope}.fields.metrics.unitPosition.label`,
+                        scope: "/properties/_metric/properties/unitPosition",
+                        type: "Control",
+                        options: {
+                            control: "hub-field-input-select",
+                            enum: {
+                                i18nScope: `${i18nScope}.fields.metrics.unitPosition.enum`,
                             },
-                        ],
+                        },
                     },
+                ],
+            },
+            {
+                type: "Section",
+                labelKey: `${i18nScope}.sections.metrics.formatting.label`,
+                elements: [
+                    {
+                        labelKey: `${i18nScope}.fields.metrics.trailingText.label`,
+                        scope: "/properties/_metric/properties/trailingText",
+                        type: "Control",
+                    },
+                    {
+                        labelKey: `${i18nScope}.fields.metrics.sourceLink.label`,
+                        scope: "/properties/_metric/properties/sourceLink",
+                        type: "Control",
+                        rule: SHOW_FOR_STATIC_RULE_ENTITY,
+                        options: {
+                            placeholder: "https://esri.com",
+                            messages: [
+                                {
+                                    /** not in use until conditional required lands */
+                                    type: "ERROR",
+                                    keyword: "required",
+                                    icon: true,
+                                    labelKey: `${i18nScope}.fields.metrics.sourceLink.message.required`,
+                                    allowShowBeforeInteract: true,
+                                },
+                            ],
+                        },
+                    },
+                    {
+                        labelKey: `${i18nScope}.fields.metrics.sourceTitle.label`,
+                        scope: "/properties/_metric/properties/sourceTitle",
+                        type: "Control",
+                        rule: SHOW_FOR_STATIC_RULE_ENTITY,
+                    },
+                    {
+                        type: "Control",
+                        scope: "/properties/_metric/properties/allowDynamicLink",
+                        labelKey: `${i18nScope}.fields.metrics.allowDynamicLink.label`,
+                        rule: SHOW_FOR_DYNAMIC_RULE_ENTITY,
+                        options: {
+                            layout: "inline-space-between",
+                            control: "hub-field-input-switch",
+                        },
+                    },
+                ],
+            },
+            {
+                type: "Section",
+                labelKey: `${i18nScope}.sections.metrics.sharing.label`,
+                elements: [
                     {
-                        type: "Section",
-                        labelKey: `${i18nScope}.sections.metrics.appearance.label`,
+                        labelKey: `${i18nScope}.fields.metrics.showShareIcon.label`,
+                        scope: "/properties/_metric/properties/shareable",
+                        type: "Control",
                         options: {
-                            section: "block",
-                            open: false,
+                            helperText: {
+                                labelKey: `${i18nScope}.fields.metrics.showShareIcon.helperText.label`,
+                            },
+                            control: "hub-field-input-switch",
+                            layout: "inline-space-between",
                         },
-                        elements: [
-                            {
-                                labelKey: `${i18nScope}.fields.metrics.trailingText.label`,
-                                scope: "/properties/_metric/properties/trailingText",
-                                type: "Control",
+                    },
+                    {
+                        labelKey: `${i18nScope}.fields.metrics.shareableOnHover.label`,
+                        scope: "/properties/_metric/properties/shareableOnHover",
+                        type: "Control",
+                        rule: SHOW_FOR_SHARING_RULE_ENTITY,
+                        options: {
+                            control: "hub-field-input-switch",
+                            helperText: {
+                                labelKey: `${i18nScope}.fields.metrics.shareableOnHover.helperText.label`,
                             },
-                        ],
+                            layout: "inline-space-between",
+                        },
                     },
                 ],
             },

package/dist/esm/core/schemas/internal/metrics/ProjectUiSchemaMetrics.js.map

@@ -1 +1 @@
-{"version":3,"file":"ProjectUiSchemaMetrics.js","sourceRoot":"","sources":["../../../../../../src/core/schemas/internal/metrics/ProjectUiSchemaMetrics.ts"],"names":[],"mappings":"AAIA;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,CAC3B,SAAiB,EACjB,MAA2B,EAC3B,OAAuB,EACZ,EAAE;IACb,oCAAoC;IACpC,OAAO;QACL,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE;YACR;gBACE,IAAI,EAAE,SAAS;gBACf,QAAQ,EAAE;oBACR;wBACE,QAAQ,EAAE,GAAG,SAAS,iCAAiC;wBACvD,KAAK,EAAE,0CAA0C;wBACjD,IAAI,EAAE,SAAS;wBACf,OAAO,EAAE;4BACP,QAAQ,EAAE;gCACR;oCACE,IAAI,EAAE,OAAO;oCACb,OAAO,EAAE,WAAW;oCACpB,QAAQ,EAAE,GAAG,SAAS,6CAA6C;oCACnE,IAAI,EAAE,IAAI;oCACV,uBAAuB,EAAE,IAAI;iCAC9B;6BACF;yBACF;qBACF;oBACD;wBACE,IAAI,EAAE,SAAS;wBACf,QAAQ,EAAE,GAAG,SAAS,gCAAgC;wBACtD,OAAO,EAAE;4BACP,OAAO,EAAE,OAAO;4BAChB,IAAI,EAAE,IAAI;yBACX;wBACD,QAAQ,EAAE;4BACR;gCACE,QAAQ,EAAE,GAAG,SAAS,6BAA6B;gCACnD,KAAK,EAAE,sCAAsC;gCAC7C,IAAI,EAAE,SAAS;gCACf,OAAO,EAAE;oCACP,QAAQ,EAAE;wCACR;4CACE,IAAI,EAAE,OAAO;4CACb,OAAO,EAAE,WAAW;4CACpB,QAAQ,EAAE,GAAG,SAAS,yCAAyC;4CAC/D,IAAI,EAAE,IAAI;4CACV,uBAAuB,EAAE,IAAI;yCAC9B;qCACF;iCACF;6BACF;yBACF;qBACF;oBACD;wBACE,IAAI,EAAE,SAAS;wBACf,QAAQ,EAAE,GAAG,SAAS,oCAAoC;wBAC1D,OAAO,EAAE;4BACP,OAAO,EAAE,OAAO;4BAChB,IAAI,EAAE,IAAI;yBACX;wBACD,QAAQ,EAAE;4BACR;gCACE,QAAQ,EAAE,GAAG,SAAS,4BAA4B;gCAClD,KAAK,EAAE,qCAAqC;gCAC5C,IAAI,EAAE,SAAS;gCACf,OAAO,EAAE;oCACP,UAAU,EAAE;wCACV,QAAQ,EAAE,GAAG,SAAS,iCAAiC;wCACvD,SAAS,EAAE,QAAQ;qCACpB;iCACF;6BACF;4BACD;gCACE,QAAQ,EAAE,GAAG,SAAS,oCAAoC;gCAC1D,KAAK,EAAE,6CAA6C;gCACpD,IAAI,EAAE,SAAS;gCACf,OAAO,EAAE;oCACP,OAAO,EAAE,wBAAwB;oCACjC,IAAI,EAAE;wCACJ,SAAS,EAAE,GAAG,SAAS,mCAAmC;qCAC3D;iCACF;6BACF;yBACF;qBACF;oBACD;wBACE,IAAI,EAAE,SAAS;wBACf,QAAQ,EAAE,GAAG,SAAS,oCAAoC;wBAC1D,OAAO,EAAE;4BACP,OAAO,EAAE,OAAO;4BAChB,IAAI,EAAE,KAAK;yBACZ;wBACD,QAAQ,EAAE;4BACR;gCACE,QAAQ,EAAE,GAAG,SAAS,oCAAoC;gCAC1D,KAAK,EAAE,6CAA6C;gCACpD,IAAI,EAAE,SAAS;6BAChB;yBACF;qBACF;iBACF;aACF;SACF;KACF,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"ProjectUiSchemaMetrics.js","sourceRoot":"","sources":["../../../../../../src/core/schemas/internal/metrics/ProjectUiSchemaMetrics.ts"],"names":[],"mappings":"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"}

package/dist/esm/core/schemas/internal/metrics/editorToMetric.js

@@ -13,7 +13,7 @@ export function editorToMetric(values = {
     metricId: undefined,
 }, metricId, opts) {
     const { value, dynamicMetric } = values, config = __rest(values, ["value", "dynamicMetric"]);
-    const { layerId, field, statistic, serviceUrl, fieldType, sourceLink, sourceTitle, allowExpressionSet, expressionSet, legacyWhere, } = dynamicMetric || {};
+    const { layerId, itemId, field, statistic, serviceUrl, fieldType, sourceLink, sourceTitle, allowExpressionSet, expressionSet, legacyWhere, } = dynamicMetric || {};
     const { entityInfo, metricName } = opts || {};
     // create source
     const source = values.type === "dynamic"
@@ -45,13 +45,17 @@ export function editorToMetric(values = {
     delete config.itemId;
     // create card config
     const displayConfig = Object.assign(Object.assign({}, config), { displayType: config.displayType || "stat-card", visibility: config.visibility || MetricVisibility.hidden, metricId,
+        // dynamic metric values
         fieldType,
+        itemId,
+        expressionSet,
+        allowExpressionSet,
         statistic, 
         // if we are in dynamic mode and have a link, then we use that link
         // otherwise we use manually input sourceLink on card config
         sourceLink: values.type === "dynamic" && sourceLink ? sourceLink : config.sourceLink, sourceTitle: values.type === "dynamic" && sourceTitle
             ? sourceTitle
-            : config.sourceTitle, allowLink: values.type === "dynamic" ? config.allowDynamicLink : config.allowLink });
+            : config.sourceTitle, allowLink: values.type === "dynamic" ? config.allowDynamicLink : config.allowLink, type: values.type });
     return { metric, displayConfig };
 }
 /**
@@ -65,7 +69,7 @@ export function editorToMetric(values = {
  * NOTE: currently returns string as a MATCH and everything else as BETWEEN
  */
 export function buildWhereClause(expressionSet = []) {
-    return (expressionSet
+    const whereClause = expressionSet
         .map((expression) => {
         const { field, values, relationship } = expression;
         const escape = (value) => {
@@ -90,11 +94,11 @@ export function buildWhereClause(expressionSet = []) {
                             .join(", ")}))`;
                 break;
             case "esriFieldTypeDate":
-                // just the second bounding value
+                // just the first bounding value
                 if (typeof values[0] === "string") {
                     clause = `${field.name} >= timestamp '${escape(values[0])} 00:00:00'`;
                 }
-                // just the first bounding value
+                // just the second bounding value
                 if (typeof values[1] === "string") {
                     clause = `${field.name} <= timestamp '${escape(values[1])} 23:59:59'`;
                 }
@@ -122,6 +126,7 @@ export function buildWhereClause(expressionSet = []) {
         return clause;
     })
         .filter(Boolean)
-        .join(" AND ") || "1=1");
+        .join(" AND ") || "1=1";
+    return encodeURIComponent(whereClause);
 }
 //# sourceMappingURL=editorToMetric.js.map

package/dist/esm/core/schemas/internal/metrics/editorToMetric.js.map

@@ -1 +1 @@
-{"version":3,"file":"editorToMetric.js","sourceRoot":"","sources":["../../../../../../src/core/schemas/internal/metrics/editorToMetric.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"editorToMetric.js","sourceRoot":"","sources":["../../../../../../src/core/schemas/internal/metrics/editorToMetric.ts"],"names":[],"mappings":"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"}

package/dist/esm/core/schemas/internal/metrics/interfaces.js.map

@@ -1 +1 @@
-{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../../../../../../src/core/schemas/internal/metrics/interfaces.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,OAIX;AAJD,WAAY,OAAO;IACjB,4BAAiB,CAAA;IACjB,8BAAmB,CAAA;IACnB,gCAAqB,CAAA;AACvB,CAAC,EAJW,OAAO,KAAP,OAAO,QAIlB;AACD,MAAM,CAAN,IAAY,KAIX;AAJD,WAAY,KAAK;IACf,oBAAW,CAAA;IACX,qBAAY,CAAA;IACZ,oBAAW,CAAA;AACb,CAAC,EAJW,KAAK,KAAL,KAAK,QAIhB;AACD,MAAM,CAAN,IAAY,cAIX;AAJD,WAAY,cAAc;IACxB,mCAAiB,CAAA;IACjB,iCAAe,CAAA;IACf,iCAAe,CAAA;AACjB,CAAC,EAJW,cAAc,KAAd,cAAc,QAIzB;AACD,MAAM,CAAN,IAAY,eAKX;AALD,WAAY,eAAe;IACzB,gCAAa,CAAA;IACb,0CAAuB,CAAA;IACvB,gCAAa,CAAA;IACb,gCAAa,CAAA;AACf,CAAC,EALW,eAAe,KAAf,eAAe,QAK1B;AACD,MAAM,CAAN,IAAY,MAGX;AAHD,WAAY,MAAM;IAChB,6BAAmB,CAAA;IACnB,2BAAiB,CAAA;AACnB,CAAC,EAHW,MAAM,KAAN,MAAM,QAGjB"}
+{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../../../../../../src/core/schemas/internal/metrics/interfaces.ts"],"names":[],"mappings":"AAEA,MAAM,CAAN,IAAY,OAIX;AAJD,WAAY,OAAO;IACjB,4BAAiB,CAAA;IACjB,8BAAmB,CAAA;IACnB,gCAAqB,CAAA;AACvB,CAAC,EAJW,OAAO,KAAP,OAAO,QAIlB;AACD,MAAM,CAAN,IAAY,KAIX;AAJD,WAAY,KAAK;IACf,oBAAW,CAAA;IACX,qBAAY,CAAA;IACZ,oBAAW,CAAA;AACb,CAAC,EAJW,KAAK,KAAL,KAAK,QAIhB;AACD,MAAM,CAAN,IAAY,cAIX;AAJD,WAAY,cAAc;IACxB,mCAAiB,CAAA;IACjB,iCAAe,CAAA;IACf,iCAAe,CAAA;AACjB,CAAC,EAJW,cAAc,KAAd,cAAc,QAIzB;AACD,MAAM,CAAN,IAAY,eAKX;AALD,WAAY,eAAe;IACzB,gCAAa,CAAA;IACb,0CAAuB,CAAA;IACvB,gCAAa,CAAA;IACb,gCAAa,CAAA;AACf,CAAC,EALW,eAAe,KAAf,eAAe,QAK1B;AACD,MAAM,CAAN,IAAY,MAGX;AAHD,WAAY,MAAM;IAChB,6BAAmB,CAAA;IACnB,2BAAiB,CAAA;AACnB,CAAC,EAHW,MAAM,KAAN,MAAM,QAGjB"}

package/dist/esm/core/schemas/internal/metrics/metricToEditor.js

@@ -1,3 +1,4 @@
+import { __rest } from "tslib";
 /**
  * Util to convert a metric into editor values consumable by the configuration editor
  * @param metric - IMetric metric
@@ -5,15 +6,19 @@
  * @returns
  */
 export function metricToEditor(metric, displayConfig) {
-    let editor = Object.assign({}, displayConfig);
+    const { allowExpressionSet, expressionSet, fieldType, itemId, statistic } = displayConfig, config = __rest(displayConfig, ["allowExpressionSet", "expressionSet", "fieldType", "itemId", "statistic"]);
+    let editor = Object.assign({}, config);
     if (metric && metric.source) {
         const metricType = metric.source.type || "";
         switch (metricType) {
             case "service-query":
-                editor = Object.assign({ dynamicMetric: Object.assign({}, metric.source) }, editor);
+                editor = Object.assign({ type: "dynamic", dynamicMetric: Object.assign(Object.assign({}, metric.source), { itemId,
+                        expressionSet,
+                        allowExpressionSet,
+                        fieldType }) }, editor);
                 break;
             case "static-value":
-                editor = Object.assign(Object.assign({}, editor), { value: metric.source.value });
+                editor = Object.assign({ type: "static", value: metric.source.value }, editor);
                 break;
         }
     }

package/dist/esm/core/schemas/internal/metrics/metricToEditor.js.map

@@ -1 +1 @@
-{"version":3,"file":"metricToEditor.js","sourceRoot":"","sources":["../../../../../../src/core/schemas/internal/metrics/metricToEditor.ts"],"names":[],"mappings":"AASA;;;;;GAKG;AACH,MAAM,UAAU,cAAc,CAC5B,MAAe,EACf,aAAmC;IAEnC,IAAI,MAAM,qBAAQ,aAAa,CAAE,CAAC;IAClC,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,EAAE;QAC3B,MAAM,UAAU,GAAI,MAAM,CAAC,MAAuB,CAAC,IAAI,IAAI,EAAE,CAAC;QAE9D,QAAQ,UAAU,EAAE;YAClB,KAAK,eAAe;gBAClB,MAAM,mBACJ,aAAa,oBACP,MAAM,CAAC,MAAoC,KAE9C,MAAM,CACV,CAAC;gBACF,MAAM;YAER,KAAK,cAAc;gBACjB,MAAM,mCACD,MAAM,KACT,KAAK,EAAG,MAAM,CAAC,MAAmC,CAAC,KAAK,GACzD,CAAC;gBACF,MAAM;SACT;KACF;IAED,OAAO,MAAM,CAAC;AAChB,CAAC"}
+{"version":3,"file":"metricToEditor.js","sourceRoot":"","sources":["../../../../../../src/core/schemas/internal/metrics/metricToEditor.ts"],"names":[],"mappings":";AASA;;;;;GAKG;AACH,MAAM,UAAU,cAAc,CAC5B,MAAe,EACf,aAAmC;IAEnC,MAAM,EACJ,kBAAkB,EAClB,aAAa,EACb,SAAS,EACT,MAAM,EACN,SAAS,KAEP,aAAa,EADZ,MAAM,UACP,aAAa,EAPX,2EAOL,CAAgB,CAAC;IAClB,IAAI,MAAM,qBACL,MAAM,CACV,CAAC;IAEF,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,EAAE;QAC3B,MAAM,UAAU,GAAI,MAAM,CAAC,MAAuB,CAAC,IAAI,IAAI,EAAE,CAAC;QAE9D,QAAQ,UAAU,EAAE;YAClB,KAAK,eAAe;gBAClB,MAAM,mBACJ,IAAI,EAAE,SAAS,EACf,aAAa,kCACP,MAAM,CAAC,MAAoC,KAC/C,MAAM;wBACN,aAAa;wBACb,kBAAkB;wBAClB,SAAS,OAER,MAAM,CACV,CAAC;gBACF,MAAM;YAER,KAAK,cAAc;gBACjB,MAAM,mBACJ,IAAI,EAAE,QAAQ,EACd,KAAK,EAAG,MAAM,CAAC,MAAmC,CAAC,KAAK,IACrD,MAAM,CACV,CAAC;gBACF,MAAM;SACT;KACF;IAED,OAAO,MAAM,CAAC;AAChB,CAAC"}

package/dist/esm/core/schemas/internal/metrics/rules.js

@@ -0,0 +1,29 @@
+import { UiSchemaRuleEffects } from "../../types";
+/**
+ * Shared metric rules for uiSchema
+ */
+/** Show if the type is set to static */
+export const SHOW_FOR_STATIC_RULE_ENTITY = {
+    condition: {
+        scope: "/properties/_metric/properties/type",
+        schema: { const: "static" },
+    },
+    effect: UiSchemaRuleEffects.SHOW,
+};
+/** Show if the type is set to dynamic */
+export const SHOW_FOR_DYNAMIC_RULE_ENTITY = {
+    condition: {
+        scope: "/properties/_metric/properties/type",
+        schema: { const: "dynamic" },
+    },
+    effect: UiSchemaRuleEffects.SHOW,
+};
+/** Show if sharing is enabled */
+export const SHOW_FOR_SHARING_RULE_ENTITY = {
+    condition: {
+        scope: "/properties/_metric/properties/shareable",
+        schema: { const: true },
+    },
+    effect: UiSchemaRuleEffects.SHOW,
+};
+//# sourceMappingURL=rules.js.map

package/dist/esm/core/schemas/internal/metrics/rules.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"rules.js","sourceRoot":"","sources":["../../../../../../src/core/schemas/internal/metrics/rules.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAElD;;GAEG;AAEH,wCAAwC;AACxC,MAAM,CAAC,MAAM,2BAA2B,GAAG;IACzC,SAAS,EAAE;QACT,KAAK,EAAE,qCAAqC;QAC5C,MAAM,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE;KAC5B;IACD,MAAM,EAAE,mBAAmB,CAAC,IAAI;CACjC,CAAC;AAEF,yCAAyC;AACzC,MAAM,CAAC,MAAM,4BAA4B,GAAG;IAC1C,SAAS,EAAE;QACT,KAAK,EAAE,qCAAqC;QAC5C,MAAM,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE;KAC7B;IACD,MAAM,EAAE,mBAAmB,CAAC,IAAI;CACjC,CAAC;AAEF,iCAAiC;AACjC,MAAM,CAAC,MAAM,4BAA4B,GAAG;IAC1C,SAAS,EAAE;QACT,KAAK,EAAE,0CAA0C;QACjD,MAAM,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE;KACxB;IACD,MAAM,EAAE,mBAAmB,CAAC,IAAI;CACjC,CAAC"}

package/dist/node/content/_internal/ContentBusinessRules.js

@@ -14,8 +14,7 @@ exports.ContentDefaultFeatures = {
  */
 exports.ContentPermissions = [
     "hub:content:create",
-    // TODO: verify if this is needed:
-    // "hub:content:delete",
+    "hub:content:delete",
     "hub:content:edit",
     "hub:content:view",
     "hub:content:workspace",
@@ -50,13 +49,12 @@ exports.ContentPermissionPolicies = [
         services: ["portal"],
         entityEdit: true,
     },
-    // TODO: verify if this is needed
-    // {
-    //   permission: "hub:content:delete",
-    //   authenticated: true,
-    //   entityOwner: true,
-    //   licenses: ["hub-basic", "hub-premium", "enterprise-sites"],
-    // },
+    {
+        permission: "hub:content:delete",
+        authenticated: true,
+        services: ["portal"],
+        entityEdit: true,
+    },
     {
         permission: "hub:content:workspace",
         dependencies: ["hub:feature:workspace"],
@@ -80,7 +78,6 @@ exports.ContentPermissionPolicies = [
     {
         permission: "hub:content:workspace:settings",
         dependencies: ["hub:content:workspace", "hub:content:edit"],
-        entityOwner: true,
     },
     {
         permission: "hub:content:workspace:collaborators",

package/dist/node/content/_internal/ContentBusinessRules.js.map

@@ -1 +1 @@
-{"version":3,"file":"ContentBusinessRules.js","sourceRoot":"","sources":["../../../../src/content/_internal/ContentBusinessRules.ts"],"names":[],"mappings":";;;AAEA;;GAEG;AACU,QAAA,sBAAsB,GAAkB;AACnD,mEAAmE;CACpE,CAAC;AAEF;;;;GAIG;AACU,QAAA,kBAAkB,GAAG;IAChC,oBAAoB;IACpB,kCAAkC;IAClC,wBAAwB;IACxB,kBAAkB;IAClB,kBAAkB;IAClB,uBAAuB;IACvB,gCAAgC;IAChC,iCAAiC;IACjC,+BAA+B;IAC/B,kCAAkC;IAClC,gCAAgC;IAChC,qCAAqC;IACrC,oBAAoB;CACZ,CAAC;AAEX;;;;GAIG;AACU,QAAA,yBAAyB,GAAwB;IAC5D;QACE,UAAU,EAAE,oBAAoB;QAChC,QAAQ,EAAE,CAAC,QAAQ,CAAC;QACpB,aAAa,EAAE,IAAI;QACnB,UAAU,EAAE,CAAC,wBAAwB,CAAC;KACvC;IACD;QACE,UAAU,EAAE,kBAAkB;QAC9B,QAAQ,EAAE,CAAC,QAAQ,CAAC;QACpB,aAAa,EAAE,KAAK;KACrB;IACD;QACE,UAAU,EAAE,kBAAkB;QAC9B,aAAa,EAAE,IAAI;QACnB,QAAQ,EAAE,CAAC,QAAQ,CAAC;QACpB,UAAU,EAAE,IAAI;KACjB;IACD,iCAAiC;IACjC,IAAI;IACJ,sCAAsC;IACtC,yBAAyB;IACzB,uBAAuB;IACvB,gEAAgE;IAChE,KAAK;IACL;QACE,UAAU,EAAE,uBAAuB;QACnC,YAAY,EAAE,CAAC,uBAAuB,CAAC;KACxC;IACD;QACE,UAAU,EAAE,gCAAgC;QAC5C,YAAY,EAAE,CAAC,uBAAuB,EAAE,kBAAkB,CAAC;KAC5D;IACD;QACE,UAAU,EAAE,iCAAiC;QAC7C,YAAY,EAAE,CAAC,uBAAuB,EAAE,kBAAkB,CAAC;KAC5D;IACD;QACE,UAAU,EAAE,+BAA+B;QAC3C,YAAY,EAAE,CAAC,uBAAuB,EAAE,kBAAkB,CAAC;KAC5D;IACD;QACE,UAAU,EAAE,kCAAkC;QAC9C,YAAY,EAAE,CAAC,uBAAuB,EAAE,kBAAkB,CAAC;KAC5D;IACD;QACE,UAAU,EAAE,gCAAgC;QAC5C,YAAY,EAAE,CAAC,uBAAuB,EAAE,kBAAkB,CAAC;QAC3D,WAAW,EAAE,IAAI;KAClB;IACD;QACE,UAAU,EAAE,qCAAqC;QACjD,YAAY,EAAE,CAAC,uBAAuB,EAAE,kBAAkB,CAAC;KAC5D;IACD;QACE,UAAU,EAAE,oBAAoB;QAChC,YAAY,EAAE,CAAC,kBAAkB,CAAC;KACnC;CACF,CAAC"}
+{"version":3,"file":"ContentBusinessRules.js","sourceRoot":"","sources":["../../../../src/content/_internal/ContentBusinessRules.ts"],"names":[],"mappings":";;;AAEA;;GAEG;AACU,QAAA,sBAAsB,GAAkB;AACnD,mEAAmE;CACpE,CAAC;AAEF;;;;GAIG;AACU,QAAA,kBAAkB,GAAG;IAChC,oBAAoB;IACpB,oBAAoB;IACpB,kBAAkB;IAClB,kBAAkB;IAClB,uBAAuB;IACvB,gCAAgC;IAChC,iCAAiC;IACjC,+BAA+B;IAC/B,kCAAkC;IAClC,gCAAgC;IAChC,qCAAqC;IACrC,oBAAoB;CACZ,CAAC;AAEX;;;;GAIG;AACU,QAAA,yBAAyB,GAAwB;IAC5D;QACE,UAAU,EAAE,oBAAoB;QAChC,QAAQ,EAAE,CAAC,QAAQ,CAAC;QACpB,aAAa,EAAE,IAAI;QACnB,UAAU,EAAE,CAAC,wBAAwB,CAAC;KACvC;IACD;QACE,UAAU,EAAE,kBAAkB;QAC9B,QAAQ,EAAE,CAAC,QAAQ,CAAC;QACpB,aAAa,EAAE,KAAK;KACrB;IACD;QACE,UAAU,EAAE,kBAAkB;QAC9B,aAAa,EAAE,IAAI;QACnB,QAAQ,EAAE,CAAC,QAAQ,CAAC;QACpB,UAAU,EAAE,IAAI;KACjB;IACD;QACE,UAAU,EAAE,oBAAoB;QAChC,aAAa,EAAE,IAAI;QACnB,QAAQ,EAAE,CAAC,QAAQ,CAAC;QACpB,UAAU,EAAE,IAAI;KACjB;IACD;QACE,UAAU,EAAE,uBAAuB;QACnC,YAAY,EAAE,CAAC,uBAAuB,CAAC;KACxC;IACD;QACE,UAAU,EAAE,gCAAgC;QAC5C,YAAY,EAAE,CAAC,uBAAuB,EAAE,kBAAkB,CAAC;KAC5D;IACD;QACE,UAAU,EAAE,iCAAiC;QAC7C,YAAY,EAAE,CAAC,uBAAuB,EAAE,kBAAkB,CAAC;KAC5D;IACD;QACE,UAAU,EAAE,+BAA+B;QAC3C,YAAY,EAAE,CAAC,uBAAuB,EAAE,kBAAkB,CAAC;KAC5D;IACD;QACE,UAAU,EAAE,kCAAkC;QAC9C,YAAY,EAAE,CAAC,uBAAuB,EAAE,kBAAkB,CAAC;KAC5D;IACD;QACE,UAAU,EAAE,gCAAgC;QAC5C,YAAY,EAAE,CAAC,uBAAuB,EAAE,kBAAkB,CAAC;KAC5D;IACD;QACE,UAAU,EAAE,qCAAqC;QACjD,YAAY,EAAE,CAAC,uBAAuB,EAAE,kBAAkB,CAAC;KAC5D;IACD;QACE,UAAU,EAAE,oBAAoB;QAChC,YAAY,EAAE,CAAC,kBAAkB,CAAC;KACnC;CACF,CAAC"}

package/dist/node/core/schemas/internal/metrics/ProjectUiSchemaMetrics.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildUiSchema = void 0;
+const rules_1 = require("./rules");
 /**
  * @private
  * Exports the uiSchema of metrics for projects
@@ -10,12 +11,12 @@ exports.buildUiSchema = void 0;
  * @returns
  */
 exports.buildUiSchema = (i18nScope, config, context) => {
-    // To be filled out in a later issue
     return {
         type: "Layout",
         elements: [
             {
                 type: "Section",
+                labelKey: `${i18nScope}.sections.metrics.basic.label`,
                 elements: [
                     {
                         labelKey: `${i18nScope}.fields.metrics.cardTitle.label`,
@@ -33,78 +34,147 @@ exports.buildUiSchema = (i18nScope, config, context) => {
                             ],
                         },
                     },
+                ],
+            },
+            {
+                type: "Section",
+                labelKey: `${i18nScope}.sections.metrics.source.label`,
+                elements: [
                     {
-                        type: "Section",
-                        labelKey: `${i18nScope}.sections.metrics.source.label`,
+                        labelKey: `${i18nScope}.fields.metrics.type.label`,
+                        scope: "/properties/_metric/properties/type",
+                        type: "Control",
                         options: {
-                            section: "block",
-                            open: true,
+                            control: "hub-field-input-tile-select",
+                            enum: {
+                                i18nScope: `${i18nScope}.fields.metrics.type.enum`,
+                            },
                         },
-                        elements: [
-                            {
-                                labelKey: `${i18nScope}.fields.metrics.value.label`,
-                                scope: "/properties/_metric/properties/value",
-                                type: "Control",
-                                options: {
-                                    messages: [
-                                        {
-                                            type: "ERROR",
-                                            keyword: "minLength",
-                                            labelKey: `${i18nScope}.fields.metrics.value.message.minLength`,
-                                            icon: true,
-                                            allowShowBeforeInteract: true,
-                                        },
-                                    ],
+                    },
+                    {
+                        labelKey: `${i18nScope}.fields.metrics.value.label`,
+                        scope: "/properties/_metric/properties/value",
+                        type: "Control",
+                        rule: rules_1.SHOW_FOR_STATIC_RULE_ENTITY,
+                        options: {
+                            messages: [
+                                {
+                                    type: "ERROR",
+                                    keyword: "minLength",
+                                    labelKey: `${i18nScope}.fields.metrics.value.message.minLength`,
+                                    icon: true,
+                                    allowShowBeforeInteract: true,
                                 },
-                            },
-                        ],
+                            ],
+                        },
                     },
                     {
-                        type: "Section",
-                        labelKey: `${i18nScope}.sections.metrics.formatting.label`,
+                        scope: "/properties/_metric/properties/dynamicMetric",
+                        type: "Control",
+                        labelKey: `${i18nScope}.fields.metrics.dynamicMetric.label`,
+                        rule: rules_1.SHOW_FOR_DYNAMIC_RULE_ENTITY,
                         options: {
-                            section: "block",
-                            open: true,
+                            control: "hub-composite-input-service-query-metric",
                         },
-                        elements: [
-                            {
-                                labelKey: `${i18nScope}.fields.metrics.unit.label`,
-                                scope: "/properties/_metric/properties/unit",
-                                type: "Control",
-                                options: {
-                                    helperText: {
-                                        labelKey: `${i18nScope}.fields.metrics.unit.helperText`,
-                                        placement: "bottom",
-                                    },
-                                },
+                    },
+                    {
+                        labelKey: `${i18nScope}.fields.metrics.unit.label`,
+                        scope: "/properties/_metric/properties/unit",
+                        type: "Control",
+                        options: {
+                            helperText: {
+                                labelKey: `${i18nScope}.fields.metrics.unit.helperText`,
+                                placement: "bottom",
                             },
-                            {
-                                labelKey: `${i18nScope}.fields.metrics.unitPosition.label`,
-                                scope: "/properties/_metric/properties/unitPosition",
-                                type: "Control",
-                                options: {
-                                    control: "hub-field-input-select",
-                                    enum: {
-                                        i18nScope: `${i18nScope}.fields.metrics.unitPosition.enum`,
-                                    },
-                                },
+                        },
+                    },
+                    {
+                        labelKey: `${i18nScope}.fields.metrics.unitPosition.label`,
+                        scope: "/properties/_metric/properties/unitPosition",
+                        type: "Control",
+                        options: {
+                            control: "hub-field-input-select",
+                            enum: {
+                                i18nScope: `${i18nScope}.fields.metrics.unitPosition.enum`,
                             },
-                        ],
+                        },
                     },
+                ],
+            },
+            {
+                type: "Section",
+                labelKey: `${i18nScope}.sections.metrics.formatting.label`,
+                elements: [
+                    {
+                        labelKey: `${i18nScope}.fields.metrics.trailingText.label`,
+                        scope: "/properties/_metric/properties/trailingText",
+                        type: "Control",
+                    },
+                    {
+                        labelKey: `${i18nScope}.fields.metrics.sourceLink.label`,
+                        scope: "/properties/_metric/properties/sourceLink",
+                        type: "Control",
+                        rule: rules_1.SHOW_FOR_STATIC_RULE_ENTITY,
+                        options: {
+                            placeholder: "https://esri.com",
+                            messages: [
+                                {
+                                    /** not in use until conditional required lands */
+                                    type: "ERROR",
+                                    keyword: "required",
+                                    icon: true,
+                                    labelKey: `${i18nScope}.fields.metrics.sourceLink.message.required`,
+                                    allowShowBeforeInteract: true,
+                                },
+                            ],
+                        },
+                    },
+                    {
+                        labelKey: `${i18nScope}.fields.metrics.sourceTitle.label`,
+                        scope: "/properties/_metric/properties/sourceTitle",
+                        type: "Control",
+                        rule: rules_1.SHOW_FOR_STATIC_RULE_ENTITY,
+                    },
+                    {
+                        type: "Control",
+                        scope: "/properties/_metric/properties/allowDynamicLink",
+                        labelKey: `${i18nScope}.fields.metrics.allowDynamicLink.label`,
+                        rule: rules_1.SHOW_FOR_DYNAMIC_RULE_ENTITY,
+                        options: {
+                            layout: "inline-space-between",
+                            control: "hub-field-input-switch",
+                        },
+                    },
+                ],
+            },
+            {
+                type: "Section",
+                labelKey: `${i18nScope}.sections.metrics.sharing.label`,
+                elements: [
                     {
-                        type: "Section",
-                        labelKey: `${i18nScope}.sections.metrics.appearance.label`,
+                        labelKey: `${i18nScope}.fields.metrics.showShareIcon.label`,
+                        scope: "/properties/_metric/properties/shareable",
+                        type: "Control",
                         options: {
-                            section: "block",
-                            open: false,
+                            helperText: {
+                                labelKey: `${i18nScope}.fields.metrics.showShareIcon.helperText.label`,
+                            },
+                            control: "hub-field-input-switch",
+                            layout: "inline-space-between",
                         },
-                        elements: [
-                            {
-                                labelKey: `${i18nScope}.fields.metrics.trailingText.label`,
-                                scope: "/properties/_metric/properties/trailingText",
-                                type: "Control",
+                    },
+                    {
+                        labelKey: `${i18nScope}.fields.metrics.shareableOnHover.label`,
+                        scope: "/properties/_metric/properties/shareableOnHover",
+                        type: "Control",
+                        rule: rules_1.SHOW_FOR_SHARING_RULE_ENTITY,
+                        options: {
+                            control: "hub-field-input-switch",
+                            helperText: {
+                                labelKey: `${i18nScope}.fields.metrics.shareableOnHover.helperText.label`,
                             },
-                        ],
+                            layout: "inline-space-between",
+                        },
                     },
                 ],
             },

package/dist/node/core/schemas/internal/metrics/ProjectUiSchemaMetrics.js.map

@@ -1 +1 @@
-{"version":3,"file":"ProjectUiSchemaMetrics.js","sourceRoot":"","sources":["../../../../../../src/core/schemas/internal/metrics/ProjectUiSchemaMetrics.ts"],"names":[],"mappings":";;;AAIA;;;;;;;GAOG;AACU,QAAA,aAAa,GAAG,CAC3B,SAAiB,EACjB,MAA2B,EAC3B,OAAuB,EACZ,EAAE;IACb,oCAAoC;IACpC,OAAO;QACL,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE;YACR;gBACE,IAAI,EAAE,SAAS;gBACf,QAAQ,EAAE;oBACR;wBACE,QAAQ,EAAE,GAAG,SAAS,iCAAiC;wBACvD,KAAK,EAAE,0CAA0C;wBACjD,IAAI,EAAE,SAAS;wBACf,OAAO,EAAE;4BACP,QAAQ,EAAE;gCACR;oCACE,IAAI,EAAE,OAAO;oCACb,OAAO,EAAE,WAAW;oCACpB,QAAQ,EAAE,GAAG,SAAS,6CAA6C;oCACnE,IAAI,EAAE,IAAI;oCACV,uBAAuB,EAAE,IAAI;iCAC9B;6BACF;yBACF;qBACF;oBACD;wBACE,IAAI,EAAE,SAAS;wBACf,QAAQ,EAAE,GAAG,SAAS,gCAAgC;wBACtD,OAAO,EAAE;4BACP,OAAO,EAAE,OAAO;4BAChB,IAAI,EAAE,IAAI;yBACX;wBACD,QAAQ,EAAE;4BACR;gCACE,QAAQ,EAAE,GAAG,SAAS,6BAA6B;gCACnD,KAAK,EAAE,sCAAsC;gCAC7C,IAAI,EAAE,SAAS;gCACf,OAAO,EAAE;oCACP,QAAQ,EAAE;wCACR;4CACE,IAAI,EAAE,OAAO;4CACb,OAAO,EAAE,WAAW;4CACpB,QAAQ,EAAE,GAAG,SAAS,yCAAyC;4CAC/D,IAAI,EAAE,IAAI;4CACV,uBAAuB,EAAE,IAAI;yCAC9B;qCACF;iCACF;6BACF;yBACF;qBACF;oBACD;wBACE,IAAI,EAAE,SAAS;wBACf,QAAQ,EAAE,GAAG,SAAS,oCAAoC;wBAC1D,OAAO,EAAE;4BACP,OAAO,EAAE,OAAO;4BAChB,IAAI,EAAE,IAAI;yBACX;wBACD,QAAQ,EAAE;4BACR;gCACE,QAAQ,EAAE,GAAG,SAAS,4BAA4B;gCAClD,KAAK,EAAE,qCAAqC;gCAC5C,IAAI,EAAE,SAAS;gCACf,OAAO,EAAE;oCACP,UAAU,EAAE;wCACV,QAAQ,EAAE,GAAG,SAAS,iCAAiC;wCACvD,SAAS,EAAE,QAAQ;qCACpB;iCACF;6BACF;4BACD;gCACE,QAAQ,EAAE,GAAG,SAAS,oCAAoC;gCAC1D,KAAK,EAAE,6CAA6C;gCACpD,IAAI,EAAE,SAAS;gCACf,OAAO,EAAE;oCACP,OAAO,EAAE,wBAAwB;oCACjC,IAAI,EAAE;wCACJ,SAAS,EAAE,GAAG,SAAS,mCAAmC;qCAC3D;iCACF;6BACF;yBACF;qBACF;oBACD;wBACE,IAAI,EAAE,SAAS;wBACf,QAAQ,EAAE,GAAG,SAAS,oCAAoC;wBAC1D,OAAO,EAAE;4BACP,OAAO,EAAE,OAAO;4BAChB,IAAI,EAAE,KAAK;yBACZ;wBACD,QAAQ,EAAE;4BACR;gCACE,QAAQ,EAAE,GAAG,SAAS,oCAAoC;gCAC1D,KAAK,EAAE,6CAA6C;gCACpD,IAAI,EAAE,SAAS;6BAChB;yBACF;qBACF;iBACF;aACF;SACF;KACF,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"ProjectUiSchemaMetrics.js","sourceRoot":"","sources":["../../../../../../src/core/schemas/internal/metrics/ProjectUiSchemaMetrics.ts"],"names":[],"mappings":"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"}

package/dist/node/core/schemas/internal/metrics/editorToMetric.js

@@ -16,7 +16,7 @@ function editorToMetric(values = {
     metricId: undefined,
 }, metricId, opts) {
     const { value, dynamicMetric } = values, config = tslib_1.__rest(values, ["value", "dynamicMetric"]);
-    const { layerId, field, statistic, serviceUrl, fieldType, sourceLink, sourceTitle, allowExpressionSet, expressionSet, legacyWhere, } = dynamicMetric || {};
+    const { layerId, itemId, field, statistic, serviceUrl, fieldType, sourceLink, sourceTitle, allowExpressionSet, expressionSet, legacyWhere, } = dynamicMetric || {};
     const { entityInfo, metricName } = opts || {};
     // create source
     const source = values.type === "dynamic"
@@ -48,13 +48,17 @@ function editorToMetric(values = {
     delete config.itemId;
     // create card config
     const displayConfig = Object.assign(Object.assign({}, config), { displayType: config.displayType || "stat-card", visibility: config.visibility || Metrics_1.MetricVisibility.hidden, metricId,
+        // dynamic metric values
         fieldType,
+        itemId,
+        expressionSet,
+        allowExpressionSet,
         statistic, 
         // if we are in dynamic mode and have a link, then we use that link
         // otherwise we use manually input sourceLink on card config
         sourceLink: values.type === "dynamic" && sourceLink ? sourceLink : config.sourceLink, sourceTitle: values.type === "dynamic" && sourceTitle
             ? sourceTitle
-            : config.sourceTitle, allowLink: values.type === "dynamic" ? config.allowDynamicLink : config.allowLink });
+            : config.sourceTitle, allowLink: values.type === "dynamic" ? config.allowDynamicLink : config.allowLink, type: values.type });
     return { metric, displayConfig };
 }
 exports.editorToMetric = editorToMetric;
@@ -69,7 +73,7 @@ exports.editorToMetric = editorToMetric;
  * NOTE: currently returns string as a MATCH and everything else as BETWEEN
  */
 function buildWhereClause(expressionSet = []) {
-    return (expressionSet
+    const whereClause = expressionSet
         .map((expression) => {
         const { field, values, relationship } = expression;
         const escape = (value) => {
@@ -94,11 +98,11 @@ function buildWhereClause(expressionSet = []) {
                             .join(", ")}))`;
                 break;
             case "esriFieldTypeDate":
-                // just the second bounding value
+                // just the first bounding value
                 if (typeof values[0] === "string") {
                     clause = `${field.name} >= timestamp '${escape(values[0])} 00:00:00'`;
                 }
-                // just the first bounding value
+                // just the second bounding value
                 if (typeof values[1] === "string") {
                     clause = `${field.name} <= timestamp '${escape(values[1])} 23:59:59'`;
                 }
@@ -126,7 +130,8 @@ function buildWhereClause(expressionSet = []) {
         return clause;
     })
         .filter(Boolean)
-        .join(" AND ") || "1=1");
+        .join(" AND ") || "1=1";
+    return encodeURIComponent(whereClause);
 }
 exports.buildWhereClause = buildWhereClause;
 //# sourceMappingURL=editorToMetric.js.map

package/dist/node/core/schemas/internal/metrics/editorToMetric.js.map

@@ -1 +1 @@
-{"version":3,"file":"editorToMetric.js","sourceRoot":"","sources":["../../../../../../src/core/schemas/internal/metrics/editorToMetric.ts"],"names":[],"mappings":";;;;AAAA,2CAAyC;AACzC,oDASgC;AAGhC;;;;;;GAMG;AACH,SAAgB,cAAc,CAC5B,SAA8B;IAC5B,WAAW,EAAE,WAAW;IACxB,QAAQ,EAAE,SAAS;CACpB,EACD,QAAgB,EAChB,IAAwD;IAExD,MAAM,EAAE,KAAK,EAAE,aAAa,KAAgB,MAAM,EAAjB,MAAM,kBAAK,MAAM,EAA5C,0BAAmC,CAAS,CAAC;IACnD,MAAM,EACJ,OAAO,EACP,KAAK,EACL,SAAS,EACT,UAAU,EACV,SAAS,EACT,UAAU,EACV,WAAW,EACX,kBAAkB,EAClB,aAAa,EACb,WAAW,GACZ,GAAG,aAAa,IAAI,EAAE,CAAC;IACxB,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,IAAI,IAAI,EAAE,CAAC;IAE9C,gBAAgB;IAChB,MAAM,MAAM,GACV,MAAM,CAAC,IAAI,KAAK,SAAS;QACvB,CAAC,CAAC;YACE,IAAI,EAAE,eAAe;YACrB,UAAU;YACV,OAAO;YACP,KAAK;YACL,SAAS,EAAE,SAA+B;YAC1C,KAAK,EAAE,WAAW;gBAChB,CAAC,CAAC,WAAW;gBACb,CAAC,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC;SAC9D;QACH,CAAC,CAAC;YACE,IAAI,EAAE,cAAc;YACpB,KAAK;SACN,CAAC;IAER,gBAAgB;IAChB,MAAM,MAAM,GAAY;QACtB,MAAM;QACN,IAAI,EAAE,UAAU,IAAI,QAAQ;QAC5B,UAAU,EAAE,UAAU,IAAI;YACxB,EAAE,EAAE,SAAS;YACb,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,SAAS;SAChB;QACD,EAAE,EAAE,QAAQ;KACb,CAAC;IAEF,OAAO,MAAM,CAAC,MAAM,CAAC;IAErB,qBAAqB;IACrB,MAAM,aAAa,mCACd,MAAM,KACT,WAAW,EAAE,MAAM,CAAC,WAAW,IAAI,WAAW,EAC9C,UAAU,EAAE,MAAM,CAAC,UAAU,IAAI,0BAAgB,CAAC,MAAM,EACxD,QAAQ;QACR,SAAS;QACT,SAAS;QACT,mEAAmE;QACnE,4DAA4D;QAC5D,UAAU,EACR,MAAM,CAAC,IAAI,KAAK,SAAS,IAAI,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,EAC1E,WAAW,EACT,MAAM,CAAC,IAAI,KAAK,SAAS,IAAI,WAAW;YACtC,CAAC,CAAC,WAAW;YACb,CAAC,CAAC,MAAM,CAAC,WAAW,EACxB,SAAS,EACP,MAAM,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,GACzE,CAAC;IAEF,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC;AACnC,CAAC;AA5ED,wCA4EC;AAED;;;;;;;;;GASG;AACH,SAAgB,gBAAgB,CAAC,gBAA+B,EAAE;IAChE,OAAO,CACL,aAAa;SACV,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE;QAClB,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,UAAU,CAAC;QAEnD,MAAM,MAAM,GAAG,CAAC,KAAa,EAAE,EAAE;YAC/B,8CAA8C;YAC9C,wFAAwF;YACxF,qFAAqF;YACrF,OAAO,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,uCAAuC;QAClG,CAAC,CAAC;QAEF,2FAA2F;QAC3F,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE;YACtD,OAAO,KAAK,CAAC;SACd;QAED,IAAI,MAAM,CAAC;QAEX,QAAQ,KAAK,CAAC,IAAI,EAAE;YAClB,KAAK,qBAAqB;gBACxB,iDAAiD;gBACjD,MAAM;oBACJ,YAAY,KAAK,iCAAuB,CAAC,IAAI;wBAC3C,CAAC,CAAC,GAAG,KAAK,CAAC,IAAI,WAAW,MAAM,CAAC,CAAC,CAAC,IAAI;wBACvC,CAAC,CAAC,IAAI,KAAK,CAAC,IAAI,QAAQ,MAAM;6BACzB,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,MAAM,CAAC,KAAe,CAAC,GAAG,CAAC;6BAC9C,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;gBACxB,MAAM;YAER,KAAK,mBAAmB;gBACtB,iCAAiC;gBACjC,IAAI,OAAO,MAAM,CAAC,CAAC,CAAC,KAAK,QAAQ,EAAE;oBACjC,MAAM,GAAG,GAAG,KAAK,CAAC,IAAI,kBAAkB,MAAM,CAC5C,MAAM,CAAC,CAAC,CAAW,CACpB,YAAY,CAAC;iBACf;gBAED,gCAAgC;gBAChC,IAAI,OAAO,MAAM,CAAC,CAAC,CAAC,KAAK,QAAQ,EAAE;oBACjC,MAAM,GAAG,GAAG,KAAK,CAAC,IAAI,kBAAkB,MAAM,CAC5C,MAAM,CAAC,CAAC,CAAW,CACpB,YAAY,CAAC;iBACf;gBAED,kCAAkC;gBAClC,IACE,OAAO,MAAM,CAAC,CAAC,CAAC,KAAK,QAAQ;oBAC7B,OAAO,MAAM,CAAC,CAAC,CAAC,KAAK,QAAQ,EAC7B;oBACA,MAAM,GAAG,GAAG,KAAK,CAAC,IAAI,kBAAkB,MAAM,CAC5C,MAAM,CAAC,CAAC,CAAW,CACpB,kBAAkB,KAAK,CAAC,IAAI,kBAAkB,MAAM,CACnD,MAAM,CAAC,CAAC,CAAW,CACpB,YAAY,CAAC;iBACf;gBACD,MAAM;YAER;gBACE,gCAAgC;gBAChC,IAAI,CAAC,YAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE;oBACrB,MAAM,GAAG,IAAI,KAAK,CAAC,IAAI,QAAQ,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;iBAC5C;gBAED,iCAAiC;gBACjC,IAAI,CAAC,YAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE;oBACrB,MAAM,GAAG,IAAI,KAAK,CAAC,IAAI,QAAQ,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;iBAC5C;gBAED,kCAAkC;gBAClC,IAAI,CAAC,YAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,YAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE;oBAC1C,MAAM,GAAG,IAAI,KAAK,CAAC,IAAI,QAAQ,MAAM,CAAC,CAAC,CAAC,SAAS,KAAK,CAAC,IAAI,QAAQ,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;iBAChF;gBACD,MAAM;SACT;QAED,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC;SACD,MAAM,CAAC,OAAO,CAAC;SACf,IAAI,CAAC,OAAO,CAAC,IAAI,KAAK,CAC1B,CAAC;AACJ,CAAC;AAlFD,4CAkFC"}
+{"version":3,"file":"editorToMetric.js","sourceRoot":"","sources":["../../../../../../src/core/schemas/internal/metrics/editorToMetric.ts"],"names":[],"mappings":"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"}

package/dist/node/core/schemas/internal/metrics/interfaces.js.map

@@ -1 +1 @@
-{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../../../../../../src/core/schemas/internal/metrics/interfaces.ts"],"names":[],"mappings":";;;AAAA,IAAY,OAIX;AAJD,WAAY,OAAO;IACjB,4BAAiB,CAAA;IACjB,8BAAmB,CAAA;IACnB,gCAAqB,CAAA;AACvB,CAAC,EAJW,OAAO,GAAP,eAAO,KAAP,eAAO,QAIlB;AACD,IAAY,KAIX;AAJD,WAAY,KAAK;IACf,oBAAW,CAAA;IACX,qBAAY,CAAA;IACZ,oBAAW,CAAA;AACb,CAAC,EAJW,KAAK,GAAL,aAAK,KAAL,aAAK,QAIhB;AACD,IAAY,cAIX;AAJD,WAAY,cAAc;IACxB,mCAAiB,CAAA;IACjB,iCAAe,CAAA;IACf,iCAAe,CAAA;AACjB,CAAC,EAJW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAIzB;AACD,IAAY,eAKX;AALD,WAAY,eAAe;IACzB,gCAAa,CAAA;IACb,0CAAuB,CAAA;IACvB,gCAAa,CAAA;IACb,gCAAa,CAAA;AACf,CAAC,EALW,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAK1B;AACD,IAAY,MAGX;AAHD,WAAY,MAAM;IAChB,6BAAmB,CAAA;IACnB,2BAAiB,CAAA;AACnB,CAAC,EAHW,MAAM,GAAN,cAAM,KAAN,cAAM,QAGjB"}
+{"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../../../../../../src/core/schemas/internal/metrics/interfaces.ts"],"names":[],"mappings":";;;AAEA,IAAY,OAIX;AAJD,WAAY,OAAO;IACjB,4BAAiB,CAAA;IACjB,8BAAmB,CAAA;IACnB,gCAAqB,CAAA;AACvB,CAAC,EAJW,OAAO,GAAP,eAAO,KAAP,eAAO,QAIlB;AACD,IAAY,KAIX;AAJD,WAAY,KAAK;IACf,oBAAW,CAAA;IACX,qBAAY,CAAA;IACZ,oBAAW,CAAA;AACb,CAAC,EAJW,KAAK,GAAL,aAAK,KAAL,aAAK,QAIhB;AACD,IAAY,cAIX;AAJD,WAAY,cAAc;IACxB,mCAAiB,CAAA;IACjB,iCAAe,CAAA;IACf,iCAAe,CAAA;AACjB,CAAC,EAJW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAIzB;AACD,IAAY,eAKX;AALD,WAAY,eAAe;IACzB,gCAAa,CAAA;IACb,0CAAuB,CAAA;IACvB,gCAAa,CAAA;IACb,gCAAa,CAAA;AACf,CAAC,EALW,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAK1B;AACD,IAAY,MAGX;AAHD,WAAY,MAAM;IAChB,6BAAmB,CAAA;IACnB,2BAAiB,CAAA;AACnB,CAAC,EAHW,MAAM,GAAN,cAAM,KAAN,cAAM,QAGjB"}

package/dist/node/core/schemas/internal/metrics/metricToEditor.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.metricToEditor = void 0;
+const tslib_1 = require("tslib");
 /**
  * Util to convert a metric into editor values consumable by the configuration editor
  * @param metric - IMetric metric
@@ -8,15 +9,19 @@ exports.metricToEditor = void 0;
  * @returns
  */
 function metricToEditor(metric, displayConfig) {
-    let editor = Object.assign({}, displayConfig);
+    const { allowExpressionSet, expressionSet, fieldType, itemId, statistic } = displayConfig, config = tslib_1.__rest(displayConfig, ["allowExpressionSet", "expressionSet", "fieldType", "itemId", "statistic"]);
+    let editor = Object.assign({}, config);
     if (metric && metric.source) {
         const metricType = metric.source.type || "";
         switch (metricType) {
             case "service-query":
-                editor = Object.assign({ dynamicMetric: Object.assign({}, metric.source) }, editor);
+                editor = Object.assign({ type: "dynamic", dynamicMetric: Object.assign(Object.assign({}, metric.source), { itemId,
+                        expressionSet,
+                        allowExpressionSet,
+                        fieldType }) }, editor);
                 break;
             case "static-value":
-                editor = Object.assign(Object.assign({}, editor), { value: metric.source.value });
+                editor = Object.assign({ type: "static", value: metric.source.value }, editor);
                 break;
         }
     }

package/dist/node/core/schemas/internal/metrics/metricToEditor.js.map

@@ -1 +1 @@
-{"version":3,"file":"metricToEditor.js","sourceRoot":"","sources":["../../../../../../src/core/schemas/internal/metrics/metricToEditor.ts"],"names":[],"mappings":";;;AASA;;;;;GAKG;AACH,SAAgB,cAAc,CAC5B,MAAe,EACf,aAAmC;IAEnC,IAAI,MAAM,qBAAQ,aAAa,CAAE,CAAC;IAClC,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,EAAE;QAC3B,MAAM,UAAU,GAAI,MAAM,CAAC,MAAuB,CAAC,IAAI,IAAI,EAAE,CAAC;QAE9D,QAAQ,UAAU,EAAE;YAClB,KAAK,eAAe;gBAClB,MAAM,mBACJ,aAAa,oBACP,MAAM,CAAC,MAAoC,KAE9C,MAAM,CACV,CAAC;gBACF,MAAM;YAER,KAAK,cAAc;gBACjB,MAAM,mCACD,MAAM,KACT,KAAK,EAAG,MAAM,CAAC,MAAmC,CAAC,KAAK,GACzD,CAAC;gBACF,MAAM;SACT;KACF;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AA5BD,wCA4BC"}
+{"version":3,"file":"metricToEditor.js","sourceRoot":"","sources":["../../../../../../src/core/schemas/internal/metrics/metricToEditor.ts"],"names":[],"mappings":";;;;AASA;;;;;GAKG;AACH,SAAgB,cAAc,CAC5B,MAAe,EACf,aAAmC;IAEnC,MAAM,EACJ,kBAAkB,EAClB,aAAa,EACb,SAAS,EACT,MAAM,EACN,SAAS,KAEP,aAAa,EADZ,MAAM,kBACP,aAAa,EAPX,2EAOL,CAAgB,CAAC;IAClB,IAAI,MAAM,qBACL,MAAM,CACV,CAAC;IAEF,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,EAAE;QAC3B,MAAM,UAAU,GAAI,MAAM,CAAC,MAAuB,CAAC,IAAI,IAAI,EAAE,CAAC;QAE9D,QAAQ,UAAU,EAAE;YAClB,KAAK,eAAe;gBAClB,MAAM,mBACJ,IAAI,EAAE,SAAS,EACf,aAAa,kCACP,MAAM,CAAC,MAAoC,KAC/C,MAAM;wBACN,aAAa;wBACb,kBAAkB;wBAClB,SAAS,OAER,MAAM,CACV,CAAC;gBACF,MAAM;YAER,KAAK,cAAc;gBACjB,MAAM,mBACJ,IAAI,EAAE,QAAQ,EACd,KAAK,EAAG,MAAM,CAAC,MAAmC,CAAC,KAAK,IACrD,MAAM,CACV,CAAC;gBACF,MAAM;SACT;KACF;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AA7CD,wCA6CC"}

package/dist/node/core/schemas/internal/metrics/rules.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SHOW_FOR_SHARING_RULE_ENTITY = exports.SHOW_FOR_DYNAMIC_RULE_ENTITY = exports.SHOW_FOR_STATIC_RULE_ENTITY = void 0;
+const types_1 = require("../../types");
+/**
+ * Shared metric rules for uiSchema
+ */
+/** Show if the type is set to static */
+exports.SHOW_FOR_STATIC_RULE_ENTITY = {
+    condition: {
+        scope: "/properties/_metric/properties/type",
+        schema: { const: "static" },
+    },
+    effect: types_1.UiSchemaRuleEffects.SHOW,
+};
+/** Show if the type is set to dynamic */
+exports.SHOW_FOR_DYNAMIC_RULE_ENTITY = {
+    condition: {
+        scope: "/properties/_metric/properties/type",
+        schema: { const: "dynamic" },
+    },
+    effect: types_1.UiSchemaRuleEffects.SHOW,
+};
+/** Show if sharing is enabled */
+exports.SHOW_FOR_SHARING_RULE_ENTITY = {
+    condition: {
+        scope: "/properties/_metric/properties/shareable",
+        schema: { const: true },
+    },
+    effect: types_1.UiSchemaRuleEffects.SHOW,
+};
+//# sourceMappingURL=rules.js.map

package/dist/node/core/schemas/internal/metrics/rules.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"rules.js","sourceRoot":"","sources":["../../../../../../src/core/schemas/internal/metrics/rules.ts"],"names":[],"mappings":";;;AAAA,uCAAkD;AAElD;;GAEG;AAEH,wCAAwC;AAC3B,QAAA,2BAA2B,GAAG;IACzC,SAAS,EAAE;QACT,KAAK,EAAE,qCAAqC;QAC5C,MAAM,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE;KAC5B;IACD,MAAM,EAAE,2BAAmB,CAAC,IAAI;CACjC,CAAC;AAEF,yCAAyC;AAC5B,QAAA,4BAA4B,GAAG;IAC1C,SAAS,EAAE;QACT,KAAK,EAAE,qCAAqC;QAC5C,MAAM,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE;KAC7B;IACD,MAAM,EAAE,2BAAmB,CAAC,IAAI;CACjC,CAAC;AAEF,iCAAiC;AACpB,QAAA,4BAA4B,GAAG;IAC1C,SAAS,EAAE;QACT,KAAK,EAAE,0CAA0C;QACjD,MAAM,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE;KACxB;IACD,MAAM,EAAE,2BAAmB,CAAC,IAAI;CACjC,CAAC"}

package/dist/types/content/_internal/ContentBusinessRules.d.ts

@@ -8,7 +8,7 @@ export declare const ContentDefaultFeatures: IFeatureFlags;
  * These define the requirements any user must meet to perform related actions
  * @private
  */
-export declare const ContentPermissions: readonly ["hub:content:create", "hub:content:edit", "hub:content:view", "hub:content:workspace", "hub:content:workspace:overview", "hub:content:workspace:dashboard", "hub:content:workspace:details", "hub:content:workspace:discussion", "hub:content:workspace:settings", "hub:content:workspace:collaborators", "hub:content:manage"];
+export declare const ContentPermissions: readonly ["hub:content:create", "hub:content:delete", "hub:content:edit", "hub:content:view", "hub:content:workspace", "hub:content:workspace:overview", "hub:content:workspace:dashboard", "hub:content:workspace:details", "hub:content:workspace:discussion", "hub:content:workspace:settings", "hub:content:workspace:collaborators", "hub:content:manage"];
 /**
  * Content permission policies
  * No need to specify license for permissions that are available to all licenses

package/dist/types/core/schemas/internal/metrics/rules.d.ts

@@ -0,0 +1,34 @@
+import { UiSchemaRuleEffects } from "../../types";
+/**
+ * Shared metric rules for uiSchema
+ */
+/** Show if the type is set to static */
+export declare const SHOW_FOR_STATIC_RULE_ENTITY: {
+    condition: {
+        scope: string;
+        schema: {
+            const: string;
+        };
+    };
+    effect: UiSchemaRuleEffects;
+};
+/** Show if the type is set to dynamic */
+export declare const SHOW_FOR_DYNAMIC_RULE_ENTITY: {
+    condition: {
+        scope: string;
+        schema: {
+            const: string;
+        };
+    };
+    effect: UiSchemaRuleEffects;
+};
+/** Show if sharing is enabled */
+export declare const SHOW_FOR_SHARING_RULE_ENTITY: {
+    condition: {
+        scope: string;
+        schema: {
+            const: boolean;
+        };
+    };
+    effect: UiSchemaRuleEffects;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@esri/hub-common",
-  "version": "14.72.2",
+  "version": "14.74.0",
   "description": "Common TypeScript types and utility functions for @esri/hub.js.",
   "main": "dist/node/index.js",
   "module": "dist/esm/index.js",