@umbraco-engage/backoffice 17.1.1 → 17.2.0-rc1

package/dist/core/extension-manifests/index.js

@@ -1,4 +1 @@
-export * from "./screen-element.extension.js";
-export * from "./collection-create-action.extension.js";
-export * from "./collection-delete-bulk-action.extension.js";
-export * from "./header-action.extension.js";
+export {};

package/dist/core/functions/date-utils.d.ts

@@ -1,25 +1,25 @@
 type DateUtilUnit = "years" | "months" | "weeks" | "days" | "hours" | "minutes" | "seconds";
 type DateUtilStartOfUnit = "year" | "month" | "week" | "day" | "isoweek";
-export declare class DateUtils {
+export declare class UeDateUtils {
     date: Date;
     constructor(date?: Date | string);
     /**
      * Sets the time to the start of the specified unit
      * @param {DateUtilStartOfUnit} unit
-     * @returns {DateUtils} - Returns the same instance for chaining
+     * @returns {UeDateUtils} - Returns the same instance for chaining
      */
     startOf(unit: DateUtilStartOfUnit): this;
     /**
      * Sets the time to the end of the specified unit
      * @param {DateUtilStartOfUnit} unit
-     * @returns {DateUtils} - Returns the same instance for chaining
+     * @returns {UeDateUtils} - Returns the same instance for chaining
      */
     endOf(unit: DateUtilStartOfUnit): this;
     /**
      * Adds time to the current date
      * @param {number} value - The amount to add
      * @param {DateUtilUnit} unit
-     * @returns {DateUtils} - Returns the same instance for chaining
+     * @returns {UeDateUtils} - Returns the same instance for chaining
      */
     add(value: any, unit: DateUtilStartOfUnit): this;
     /**

package/dist/core/functions/date-utils.js

@@ -1,11 +1,11 @@
-export class DateUtils {
+export class UeDateUtils {
     constructor(date = new Date()) {
         this.date = new Date(date); // Ensure a new instance of Date
     }
     /**
      * Sets the time to the start of the specified unit
      * @param {DateUtilStartOfUnit} unit
-     * @returns {DateUtils} - Returns the same instance for chaining
+     * @returns {UeDateUtils} - Returns the same instance for chaining
      */
     startOf(unit) {
         switch (unit) {
@@ -34,7 +34,7 @@ export class DateUtils {
     /**
      * Sets the time to the end of the specified unit
      * @param {DateUtilStartOfUnit} unit
-     * @returns {DateUtils} - Returns the same instance for chaining
+     * @returns {UeDateUtils} - Returns the same instance for chaining
      */
     endOf(unit) {
         this.startOf(unit); // Start of the unit
@@ -63,7 +63,7 @@ export class DateUtils {
      * Adds time to the current date
      * @param {number} value - The amount to add
      * @param {DateUtilUnit} unit
-     * @returns {DateUtils} - Returns the same instance for chaining
+     * @returns {UeDateUtils} - Returns the same instance for chaining
      */
     add(value, unit) {
         switch (unit) {
@@ -144,16 +144,16 @@ export class DateUtils {
         return Math.floor(this.date.getTime() / 1000);
     }
     toString(format) {
-        return DateUtils.format(this.date, format);
+        return UeDateUtils.format(this.date, format);
     }
     toMediumDate() {
-        return DateUtils.format(this.date, "MMM d, yyyy");
+        return UeDateUtils.format(this.date, "MMM d, yyyy");
     }
     toLongDate() {
-        return DateUtils.format(this.date, "MMMM d, yyyy");
+        return UeDateUtils.format(this.date, "MMMM d, yyyy");
     }
     toShortTime() {
-        return DateUtils.format(this.date, "H:mm");
+        return UeDateUtils.format(this.date, "H:mm");
     }
     /**
      * Converts a Date to an ISO 8601 UTC string (with 'Z' suffix).

package/dist/core/functions/index.d.ts

@@ -1,4 +1,4 @@
 export * from "./screen-manifest-generator.function.js";
 export * from "./date-utils.js";
-export * from './string-utils.js';
+export * from "./string-utils.js";
 export declare function makeArray<T extends string>(...args: T[]): T[];

package/dist/core/functions/index.js

@@ -1,6 +1,6 @@
 export * from "./screen-manifest-generator.function.js";
 export * from "./date-utils.js";
-export * from './string-utils.js';
+export * from "./string-utils.js";
 export function makeArray(...args) {
     return args;
 }

package/dist/core/icons/manifests.js

@@ -1,8 +1,8 @@
 export const manifests = [
     {
-        type: 'icons',
-        alias: 'Engage.Icons.Backoffice',
-        name: 'Engage Backoffice Icons',
-        js: () => import('./icons.js'),
+        type: "icons",
+        alias: "Engage.Icons.Backoffice",
+        name: "Engage Backoffice Icons",
+        js: () => import("./icons.js"),
     },
 ];

package/dist/core/index.d.ts

@@ -3,7 +3,7 @@ export * from "./context/index.js";
 export * from "./svg/index.js";
 export * from "./modal/index.js";
 export * from "./components/index.js";
-export * from "./extension-manifests/index.js";
+export type * from "./extension-manifests/index.js";
 export * from "./functions/index.js";
 export * from "./entities.js";
 export * from "./collection/index.js";

package/dist/core/index.js

@@ -3,7 +3,6 @@ export * from "./context/index.js";
 export * from "./svg/index.js";
 export * from "./modal/index.js";
 export * from "./components/index.js";
-export * from "./extension-manifests/index.js";
 export * from "./functions/index.js";
 export * from "./entities.js";
 export * from "./collection/index.js";

package/dist/core/lang/en.js

@@ -41,6 +41,7 @@ export default {
         compare: "Compare",
         completions: "Completions (last 30 days)",
         configuration: "Configuration",
+        headless: "Headless",
         confirmDelete: "Confirm delete",
         confirmDisableUeMessage: "If Umbraco Engage is disabled, no data will be collected and no personalization or A/B testing is applied.",
         contains: "Contains",
@@ -59,6 +60,7 @@ export default {
         created: "Created",
         createdBy: "Created by",
         createdByOn: (by, on) => `${by} on ${on}`,
+        custom: "Custom",
         customCode: "Custom code",
         dataCleanup: "Data Cleanup",
         dataCollection: "Data Collection",
@@ -163,6 +165,7 @@ export default {
         noPersonas: `There are no personas configured. Please configure these first, before scoring this page.`,
         noPersonasItems: `There are no personas configured. You should add these first, before scoring this page.`,
         not: "Not",
+        notAvailable: "n/a",
         notEmpty: "Filled",
         notEmptyVerb: "is filled",
         notloggedin: "Not logged in",
@@ -174,6 +177,9 @@ export default {
         pagesize: "Page size",
         pageVariant: "Page variant",
         pageviews: "Pageviews",
+        profileId: "Profile ID",
+        ipAddress: "IP Address",
+        userAgent: "User Agent",
         percent: "Percent",
         percentageChange: "% change",
         permissions: "Permissions",
@@ -229,6 +235,7 @@ export default {
         statistics: "Statistics",
         status: "Status",
         success: "Success",
+        suspiciousActivity: "Suspicious Activity",
         tablet: "Tablet",
         temporary: "Temporary",
         testSetup: "Test setup",
@@ -237,6 +244,7 @@ export default {
         to: "To",
         total: "Total",
         totalValue: "Total value",
+        trafficfilters: "Block traffic",
         trialMode: "Trial mode",
         trigger: "Trigger",
         true: "True",
@@ -257,6 +265,7 @@ export default {
         viewLog: "View log",
         visitorCookie: "Visitor Cookie",
         visitors: "Visitors",
+        warning: "Warning",
         week: "Week",
         with: "with",
         yes: "Yes",
@@ -466,14 +475,27 @@ export default {
         deleteControlGroupDataAfterDaysDescription: "After this number of days the visitors control group data will be deleted from the database.",
     },
     engage_dataCleanup: {
-        startAfterSeconds: "Start delay (in seconds)",
+        enabled: "Enabled",
+        enabledDescription: "Turn this on to allow the system to automatically delete old or temporary data based on your chosen schedule.",
+        firstRunTime: "Initial run schedule (Cron)",
+        firstRunTimeDescription: "A crontab expression used to calculate when the first clean-up run should start. After the first run, the repeat interval takes over. When configured, this takes precedence over the startup delay.",
+        startupDelay: "Startup delay",
+        startupDelayDescription: "The amount of time the system waits after the website starts up before beginning any clean-up. This prevents your site from slowing down during a reboot.",
+        interval: "Repeat interval",
+        intervalDescription: "The time interval between periodic clean-up runs (e.g. 1.00:00:00 for once per day).",
+        commandTimeout: "Command timeout",
+        commandTimeoutDescription: "The maximum number of seconds a single clean-up task is allowed to run.",
         dataCleanupLog: "Data cleanup log",
-        intervalInSeconds: "Cleanup interval (in seconds)",
-        numberOfRows: "Cleanup batch size (in rows)",
-        startAfterSecondsDescription: "The number of seconds Umbraco Engage will wait before starting the periodic cleanup process.\nThis value should be incremented if your website has a long(er) startup time.",
-        intervalInSecondsDescription: "The delay (in seconds) between periodic cleanups.\nIf your website has high traffic loads, this value should be decreased to keep up with the raw (pageview) data being inserted into your database.",
-        numberOfRowsDescription: "The maximum number of rows (pageviews) that should be cleaned up from the raw data tables in each cleanup cycle.\nThe number of records divided by the cleanup interval (in seconds) determines the average cleanup rate per second.\nThis value should be higher than the number of pageviews your website handles per second.",
-        dataCleanupLogDescription: "View the logs of the last 20 attempted data cleanup runs.",
+        dataCleanupLogDescription: "Click here to see a record of every time the clean-up ran, including what was processed and if any issues occurred.",
+    },
+    engage_dataCleanupLog: {
+        detailsExecutor: "Service",
+        detailsTable: "Table",
+        detailsRecordsAffected: "Records affected",
+        detailsDuration: "Duration",
+    },
+    engage_dataGenerationLog: {
+        detailsDuration: "Duration",
     },
     engage_internalSiteSearch: {
         automaticSearchTracking: "Is automatic search tracking enabled?",
@@ -534,6 +556,17 @@ export default {
       you have any questions, ideas or suggestions!`,
         statsIntro: "Let's see how your platform is performing the last 30 days (excluding today):",
     },
+    engage_startpageDataRetention: {
+        title: "Data retention policy",
+        anonymizedSummary: (records, days) => `Anonymized data from ${records} sessions older than ${days} days.`,
+        deletedSummary: (visitors, pageviews, days) => `Deleted data from ${visitors} visitors and ${pageviews} pageviews older than ${days} days.`,
+        completedSuccessfully: (duration, dateRange) => `Clean-up completed successfully in ${duration} (${dateRange}), according to your configured data retention policy.`,
+        completedWithErrors: (duration, dateRange) => `Clean-up completed with errors in ${duration} (${dateRange}).`,
+        errorDetails: "Error details",
+        noRunsYet: "No data cleanup runs recorded yet.",
+        schemaWarning: "Schema update required",
+        schemaWarningDetails: "Analytics data cleanup will not run until the database schema is fully up-to-date. Please check the Database Schema Status health check for details.",
+    },
     engage_personalization: {
         addCampaignGroup: "Add campaign group",
         addJourney: "Add journey",
@@ -667,6 +700,7 @@ export default {
         addVariants: "Add variants",
         addVariantsDescription: "Setup your test by adding one or more variants.",
         category: "Category",
+        condition: "Condition",
         conversionType: "Conversion type",
         css: "CSS",
         customCode: "Custom code",
@@ -689,7 +723,7 @@ export default {
         implicitCustomerJourneyStepScoring: "Implicit customer journey step scoring",
         implicitPersonaScoring: "Implicit persona scoring",
         inputType: "Input type",
-        ipAddresses: "IP addresses",
+        isActive: "Active",
         isHighPotential: "Include high potential profiles",
         isIdentified: "Include identified profiles",
         isImplicitScoringEnabled: "Enable implicit scoring",
@@ -702,6 +736,7 @@ export default {
         minimumDeviation: "Minimal deviation value",
         minimumGoalValue: "Minimum goal value",
         minimumParticipationScoreThreshold: "Threshold value",
+        mode: "Mode",
         name: "Name",
         upperScoreLimit: "Maximum points to score",
         expirationType: "Expiration type",
@@ -724,7 +759,9 @@ export default {
         title: "Title",
         titleName: "Title / Name",
         titleOfThisTest: "Title of this test",
+        type: "Type",
         value: "Value",
+        values: "Values",
         variantName: "Variant name",
         visibility: "Visibility",
     },
@@ -753,6 +790,24 @@ export default {
         sessionCookieSameSite: "Session Cookie SameSite",
         sessionCookieSameSiteDescription: "SameSite mode for the session cookie. Valid values: None, Lax, Strict.",
     },
+    engage_deliveryApi: {
+        engageApi: "Engage API",
+        contentDeliveryApi: "Content Delivery API",
+    },
+    engage_deliveryApi_engageApi: {
+        disableVisitorCookie: "Disable Visitor Cookie",
+        disableVisitorCookieDescription: "When enabled, the visitor cookie will not be set on headless (Delivery API and Engage API) requests. Clients must use the External-Visitor-Id header instead.",
+    },
+    engage_deliveryApi_contentDeliveryApi: {
+        contentByQuery: "Content By Query",
+        contentByQueryDescription: "Enable or disable segmentation for the Content By Query endpoint in the Delivery API.",
+        contentById: "Content By Id",
+        contentByIdDescription: "Enable or disable segmentation for the Content By Id endpoint in the Delivery API.",
+        contentByIds: "Content By Ids",
+        contentByIdsDescription: "Enable or disable segmentation for the Content By Ids endpoint in the Delivery API.",
+        contentByPath: "Content By Path",
+        contentByPathDescription: "Enable or disable segmentation for the Content By Path endpoint in the Delivery API.",
+    },
     engage_configuration: {
         configurationDescription: "Here you will find an overview of all the settings of Umbraco Engage. It is not possible to change these setting here directly, because you have to restart your website. The settings can be changed in the appsettings.json file.",
         noParameterFound: "No parameter found",
@@ -764,8 +819,8 @@ export default {
         dataGenerationTime: "Data generation time",
         regenerateReportingData: "Regenerate reporting data",
         dataGenerationEnabledDescription: "If true, reporting data will be generated daily at a configurable time.",
-        dataGenerationTimeDescription: "The time each day reporting data will be generated (24 hour format). This uses the local time of the webserver.",
-        dataGenerationLogDescription: "View the logs of the last 20 attempted data generation runs.",
+        dataGenerationTimeDescription: "The time each day reporting data will be generated (24 hour format). This uses the configured reporting timezone.",
+        dataGenerationLogDescription: "View the logs of attempted data generation runs.",
         pageviewCoverage: "Pageview coverage",
         pageviewCoverageTooltip: "The number of pageviews that are covered by the segment (regardless of personalization).",
         personalizedPageviews: "Personalized pageviews",
@@ -777,6 +832,8 @@ export default {
         profileCoverage: "Profile coverage",
         profileCoverageTooltip: "The number of profiles that are covered by the segment (regardless of personalization).",
         regenerateReportingDataDescription: "Warning! Regenerating reporting data might have an impact on the performance of the site!",
+        reportingTimeZone: "Reporting time zone",
+        reportingTimeZoneDescription: "The time zone that is used for reporting. By default this is the same time zone as the web server, but this can be set to another time zone.",
         segment: "Segment",
         segmentPersonalization: "Segment personalization",
         segmentPotential: "Segment potential",
@@ -840,10 +897,35 @@ export default {
         ipFiltersNoItems: "No filters have been added yet.",
         setupIpFilters: "Set up your IP filters",
         setupIpFiltersDescription: "In some cases you want to exclude the traffic from specific IP addresses. A good example is that you normally exclude your own IP address, so it doesn't have an impact on the digital Analytics reporting. Here you can specify a specific IP addresses or a regular expression.",
+        suspiciousActivity: "Suspicious Activity",
+        suspiciousActivityTitle: "Suspicious activity",
+        suspiciousActivityDescription: "This view shows requests that behave differently from normal visitors. These may include automated browsers or other non-human activity. You can use this information to decide if new block or filter rules should be added to keep your analytics accurate and trustworthy.",
         setupGoals: "Setup your goals",
         setupGoalsDescription: "Within this section you are able to set your global goals. These goals will become available throughout Umbraco Engage and will become visible within Analytics.",
         setupGoalsTip: `<span class="highlight">Tip:</span> do you have a clear purpose with your website like gathering newsletter subscriptions? Then set it as a <span class="highlight">macro</span> goal and Umbraco Engage will keep an extra eye on that specific goal for you!`,
     },
+    engage_settings_suspiciousActivity: {
+        highPageviews: "High pageviews",
+        pageviewThreshold: "Pageview Threshold",
+        pageviewThresholdDescription: "The minimum number of pageviews a visitor must have to be considered suspicious. Visitors with pageviews equal to or exceeding this value will appear in the suspicious activity overview.",
+    },
+    engage_trafficFilter: {
+        create: "Create rule",
+        edit: "Edit rule",
+        modeBlock: "Block",
+        modeFilter: "Filter",
+        modeBlockAndFilter: "Block and filter",
+        noItems: "No rules have been added yet.",
+        conditionList: "List",
+        conditionEquals: "Equals",
+        conditionContains: "Contains",
+        conditionRegularExpression: "Regular expression",
+        sidebarHeadline: "Set up your traffic blocking rules",
+        sidebarDescription: "Use block rules to control which traffic is tracked or included in analytics. Blocking rules stop data directly from being collected for specific requests, for example from bots or unwanted sources. You can create rules based on IP addresses, IP ranges, user agents, and other request details to keep your analytics accurate and free from internal or artificial traffic.",
+        IpAddress: "IP address",
+        Country: "Country",
+        UserAgent: "User agent",
+    },
     engage_utm: {
         source: "utm_source",
         medium: "utm_medium",
@@ -861,7 +943,6 @@ export default {
     },
     engage_validation: {
         invalid: "Invalid",
-        ipAddress: "Please enter a valid IP address",
     },
     engage_profile_details: {
         insights: "Insights",

package/dist/core/modal/element/engage-readonly-code-modal.element.js

@@ -14,13 +14,13 @@ let UeReadonlyCodeModalElement = class UeReadonlyCodeModalElement extends UmbMod
     >
       <p>${this.localize.term("engage_codeVariantDescription")}</p>
       ${when(this.data?.css, () => html `<ue-collapsing-box .headline=${"CSS"}>
-          <umb-code-block language="css">${this.data?.css}</umb-code-block>
-        </ue-collapsing-box>`)}
+            <umb-code-block language="css">${this.data?.css}</umb-code-block>
+          </ue-collapsing-box>`)}
       ${when(this.data?.javascript, () => html `<ue-collapsing-box .headline=${"JavaScript"}>
-          <umb-code-block language="js"
-            >${this.data?.javascript}</umb-code-block
-          >
-        </ue-collapsing-box>`)}
+            <umb-code-block language="js"
+              >${this.data?.javascript}</umb-code-block
+            >
+          </ue-collapsing-box>`)}
       <uui-button
         slot="actions"
         label=${this.localize.term("general_close")}

package/dist/core/path/edit-variant-workspace-path-pattern.class.js

@@ -1,5 +1,5 @@
 import { ueUrlPatternToString } from "./url-pattern-to-string.function.js";
-import { UmbPathPattern } from "@umbraco-cms/backoffice/router";
+import { UmbPathPattern, } from "@umbraco-cms/backoffice/router";
 export class UePathPattern extends UmbPathPattern {
     #local;
     #base;

package/dist/core/path/edit-variant-workspace-path-pattern.d.ts

@@ -1,4 +1,4 @@
-import { UePathPattern } from './edit-variant-workspace-path-pattern.class.js';
+import { UePathPattern } from "./edit-variant-workspace-path-pattern.class.js";
 export declare const ENGAGE_EDIT_VARIANT_PATH_PATTERN: UePathPattern<{
     unique: string;
     culture?: string | null;

package/dist/core/path/edit-variant-workspace-path-pattern.js

@@ -1,4 +1,4 @@
-import { UePathPattern } from './edit-variant-workspace-path-pattern.class.js';
+import { UePathPattern } from "./edit-variant-workspace-path-pattern.class.js";
 import { UMB_DOCUMENT_WORKSPACE_PATH } from "@umbraco-cms/backoffice/document";
 export const ENGAGE_EDIT_VARIANT_PATH_PATTERN = new UePathPattern("edit/:unique/:culture_&_:culture_:segment", UMB_DOCUMENT_WORKSPACE_PATH, {
     culture: "invariant",

package/dist/core/property/index.d.ts

@@ -1,4 +1,4 @@
 export * from "./property-dataset-renderer.controller.js";
 export * from "./dropdown-property.js";
 export * from "./property-value-validator.controller.js";
-export * from './types.js';
+export type * from "./types.js";

package/dist/core/property/index.js

@@ -1,4 +1,3 @@
 export * from "./property-dataset-renderer.controller.js";
 export * from "./dropdown-property.js";
 export * from "./property-value-validator.controller.js";
-export * from './types.js';

package/dist/core/property/property-config.d.ts

@@ -12,10 +12,11 @@ export declare class UePropertyConfigBase<T, ValueType> implements UePropertyCon
     dataType?: string | undefined;
     valueOut?: ((x: ValueType) => T[keyof T] | undefined) | undefined;
     valueIn?: ((x?: T[keyof T]) => ValueType) | undefined;
-    visible?: {
+    visible?: Array<{
         alias: keyof T & string;
         value?: any;
         oneOf?: Array<any>;
-    } | undefined;
+        invert?: boolean;
+    }>;
     constructor(alias: keyof T & string, mandatory?: boolean, args?: Partial<UePropertyConfig<T>>);
 }

package/dist/core/property/property-dataset-renderer.controller.js

@@ -12,7 +12,9 @@ export class UePropertyDataSetRendererController extends UmbControllerBase {
     #propertyConfiguration;
     #validators;
     #dataPath;
-    constructor(host, contextToken, properties, dataPath) {
+    constructor(host, 
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any -- required for UmbContextToken variance compatibility
+    contextToken, properties, dataPath) {
         super(host);
         this.localize = new UmbLocalizationController(this);
         this.value = [];
@@ -91,25 +93,40 @@ export class UePropertyDataSetRendererController extends UmbControllerBase {
     #camel(str) {
         return str[0].toLowerCase() + str.slice(1);
     }
+    // Build a repeat key that changes when dropdown items change,
+    // forcing Lit to recreate the element. A native <select> ignores
+    // `selected` attribute changes once it has been rendered; recreating
+    // the element is the only way to pick up the new selection.
+    #propertyKey(prop) {
+        const items = prop.config?.find((c) => this.#aliasComparison(c.alias, "items"))?.value;
+        return items
+            ? `${prop.alias}-${items.map((i) => i.value).join(",")}`
+            : prop.alias;
+    }
+    #setItem(key) {
+        if (!this.#optionGenerators[key])
+            return;
+        const items = this.#optionGenerators[key](this.data);
+        let property = this.properties?.find((x) => this.#aliasComparison(x.alias, key));
+        if (!property)
+            return;
+        if (property.config === undefined) {
+            property.config = [];
+        }
+        property = {
+            ...property,
+            ...{
+                config: appendToFrozenArray(property.config, { alias: "items", value: items }, (x) => this.#aliasComparison(x.alias, "items")),
+            },
+        };
+        this.properties = appendToFrozenArray(this.properties ?? [], property, (x) => this.#aliasComparison(x.alias, key));
+    }
     #setItems() {
         const propertyKeys = Object.keys(this.#optionGenerators);
         if (!propertyKeys.length)
             return;
         propertyKeys.forEach((key) => {
-            const items = this.#optionGenerators[key](this.data);
-            let property = this.properties?.find((x) => this.#aliasComparison(x.alias, key));
-            if (!property)
-                return;
-            if (property.config === undefined) {
-                property.config = [];
-            }
-            property = {
-                ...property,
-                ...{
-                    config: appendToFrozenArray(property.config, { alias: "items", value: items }, (x) => this.#aliasComparison(x.alias, "items")),
-                },
-            };
-            this.properties = appendToFrozenArray(this.properties ?? [], property, (x) => this.#aliasComparison(x.alias, key));
+            this.#setItem(key);
         });
     }
     #mapValues() {
@@ -118,7 +135,7 @@ export class UePropertyDataSetRendererController extends UmbControllerBase {
             const value = this.data?.[alias];
             return {
                 alias,
-                value: value !== undefined ? prop.valueIn?.(value) ?? value : value,
+                value: value !== undefined ? (prop.valueIn?.(value) ?? value) : value,
             };
         });
         this.#hostElm?.requestUpdate?.();
@@ -127,16 +144,22 @@ export class UePropertyDataSetRendererController extends UmbControllerBase {
         if (!prop.editor)
             return;
         const alias = this.#camel(prop.alias);
-        // if visibility check fails, we can leave
-        if (prop.visible && this.data) {
-            const propertyValue = this.data[this.#camel(prop.visible.alias)];
-            if (prop.visible.value !== undefined &&
-                propertyValue !== prop.visible.value) {
-                this.#removeValidator(prop.alias);
-                return;
-            }
-            if (prop.visible.oneOf?.length &&
-                !prop.visible.oneOf?.includes(propertyValue)) {
+        // if any visibility condition fails, hide the property
+        if (prop.visible?.length && this.data) {
+            const returnValue = (v, invert) => (invert ? !v : v);
+            const isVisible = prop.visible.every((condition) => {
+                const propertyValue = this.data[this.#camel(condition.alias)];
+                if (condition.value !== undefined &&
+                    propertyValue !== condition.value) {
+                    return returnValue(false, condition.invert);
+                }
+                if (condition.oneOf?.length &&
+                    !condition.oneOf.includes(propertyValue)) {
+                    return returnValue(false, condition.invert);
+                }
+                return returnValue(true, condition.invert);
+            });
+            if (!isVisible) {
                 this.#removeValidator(prop.alias);
                 return;
             }
@@ -144,7 +167,7 @@ export class UePropertyDataSetRendererController extends UmbControllerBase {
         this.#addValidator(prop.alias);
         const labelKey = typeof prop.labelKey === "function"
             ? prop.labelKey(this.data)
-            : prop.labelKey ?? alias;
+            : (prop.labelKey ?? alias);
         const dataPath = `$.values[${UmbDataPathPropertyValueQuery({
             alias: prop.alias,
         })}].value`;
@@ -184,7 +207,7 @@ export class UePropertyDataSetRendererController extends UmbControllerBase {
       @change=${(e) => this.#onValueChange(e)}
       .value=${this.value}
     >
-      ${repeat(this.properties, (p) => p.alias, (p) => this.#renderEditor(p))}
+      ${repeat(this.properties, (p) => this.#propertyKey(p), (p) => this.#renderEditor(p))}
     </umb-property-dataset>`;
     }
     destroy() {