@applicaster/zapp-react-native-utils 16.0.0-rc.90 → 16.0.0-rc.91

package/configurationUtils/__tests__/modalBlocksParser.test.ts

@@ -1,4 +1,7 @@
-import { parseModalBlocksConfiguration } from "../modalBlocksParser";
+import {
+  getEmptyModalBlocksStructure,
+  parseModalBlocksConfiguration,
+} from "../modalBlocksParser";
 
 // Mock the platform selection logic so it's consistent
 jest.mock("../../reactUtils", () => ({
@@ -151,110 +154,55 @@ describe("parseModalBlocksConfiguration", () => {
     );
   });
 
-  it("should map button.create_new_playlist_asset onto leadingIcon.asset", () => {
+  it("should ignore keys that do not map to a known block sub-component", () => {
     const result = parseModalBlocksConfiguration(
       {
         "button.create_new_playlist_asset":
           "https://placehold.co/24x24/FF00FF/FFFFFF/png?text=CN",
-      },
-      "playlist-experience"
-    );
-
-    expect(result.button.leadingIcon.default).toEqual(
-      expect.objectContaining({
-        asset: "https://placehold.co/24x24/FF00FF/FFFFFF/png?text=CN",
-      })
-    );
-  });
-
-  it("should map item.checkbox_asset and checked_checkbox_asset onto item.checkbox", () => {
-    const result = parseModalBlocksConfiguration(
-      {
         "item.checkbox_asset":
           "https://placehold.co/24x24/FF3B30/FFFFFF/png?text=CB",
-        "item.checked_checkbox_asset":
-          "https://placehold.co/24x24/FFD60A/000000/png?text=CK",
-      },
-      "playlist-experience"
-    );
-
-    expect(result.item.checkbox.default).toEqual(
-      expect.objectContaining({
-        asset: "https://placehold.co/24x24/FF3B30/FFFFFF/png?text=CB",
-        checkedAsset: "https://placehold.co/24x24/FFD60A/000000/png?text=CK",
-      })
-    );
-  });
-
-  it("should map reorder/remove Studio assets onto item.actionButtons", () => {
-    const result = parseModalBlocksConfiguration(
-      {
-        "reorder_playlist_item.remove_from_playlist_asset":
-          "https://placehold.co/24x24/00FF00/000000/png?text=RM",
         "reorder_playlist_item.reorder_handle_asset":
           "https://placehold.co/24x24/FF3B30/FFFFFF/png?text=RH",
       },
       "playlist-experience"
     );
 
-    expect(result.item.actionButtons.default).toEqual(
-      expect.objectContaining({
-        removeAsset: "https://placehold.co/24x24/00FF00/000000/png?text=RM",
-        dragAsset: "https://placehold.co/24x24/FF3B30/FFFFFF/png?text=RH",
-      })
-    );
+    expect(result.button.leadingIcon.default?.asset).toBeUndefined();
+    expect(result.item.checkbox.default).toBeUndefined();
+    expect(result.item.actionButtons.default).toBeUndefined();
   });
+});
 
-  it("should fall back to flavor1 reorder/remove assets", () => {
-    const result = parseModalBlocksConfiguration(
-      {
-        "playlist_experience_assets_flavor1.remove_from_playlist_asset":
-          "https://placehold.co/24x24/00FF00/000000/png?text=RM",
-        "playlist_experience_assets_flavor1.reorder_handle_asset":
-          "https://placehold.co/24x24/FF3B30/FFFFFF/png?text=RH",
-      },
-      "playlist-experience"
-    );
+describe("getEmptyModalBlocksStructure", () => {
+  it("should return every block with empty containers and no state entries", () => {
+    const result = getEmptyModalBlocksStructure();
 
-    expect(result.item.actionButtons.default).toEqual(
-      expect.objectContaining({
-        removeAsset: "https://placehold.co/24x24/00FF00/000000/png?text=RM",
-        dragAsset: "https://placehold.co/24x24/FF3B30/FFFFFF/png?text=RH",
-      })
-    );
+    expect(result.header.container).toEqual({});
+    expect(result.item.background).toEqual({});
+    expect(result.button.background).toEqual({});
+    expect(result.action.background).toEqual({});
+
+    expect(result.button.leadingIcon.default).toBeUndefined();
+    expect(result.item.checkbox.default).toBeUndefined();
+    expect(result.item.actionButtons.default).toBeUndefined();
   });
 
-  it("should fall back to flavor2 reorder/remove assets", () => {
-    const result = parseModalBlocksConfiguration(
-      {
-        "playlist_experience_assets_flavor2.remove_from_playlist_asset":
-          "https://placehold.co/24x24/00FF00/000000/png?text=RM",
-        "playlist_experience_assets_flavor2.reorder_handle_asset":
-          "https://placehold.co/24x24/FF3B30/FFFFFF/png?text=RH",
-      },
-      "playlist-experience"
-    );
+  it("should return a fresh object on every call", () => {
+    const first = getEmptyModalBlocksStructure();
+    const second = getEmptyModalBlocksStructure();
 
-    expect(result.item.actionButtons.default).toEqual(
-      expect.objectContaining({
-        removeAsset: "https://placehold.co/24x24/00FF00/000000/png?text=RM",
-        dragAsset: "https://placehold.co/24x24/FF3B30/FFFFFF/png?text=RH",
-      })
-    );
+    expect(first).not.toBe(second);
+    expect(first.header).not.toBe(second.header);
+    expect(first).toEqual(second);
   });
 
-  it("should ignore playlist-only asset keys for other theme plugins", () => {
-    const result = parseModalBlocksConfiguration(
-      {
-        "button.create_new_playlist_asset":
-          "https://placehold.co/24x24/FF00FF/FFFFFF/png?text=CN",
-        "playlist_experience_assets_flavor1.reorder_handle_asset":
-          "https://placehold.co/24x24/FF3B30/FFFFFF/png?text=RH",
-      },
-      "queue-action"
-    );
+  it("should be what the parser returns when config or componentName is missing", () => {
+    expect(
+      parseModalBlocksConfiguration(undefined as any, "queue_action")
+    ).toEqual(getEmptyModalBlocksStructure());
 
-    expect(result.button.leadingIcon.default?.asset).toBeUndefined();
-    expect(result.item.actionButtons.default?.dragAsset).toBeUndefined();
+    expect(parseModalBlocksConfiguration({ foo: "bar" }, "")).toEqual(
+      getEmptyModalBlocksStructure()
+    );
   });
 });

package/configurationUtils/modalBlocksParser.ts

@@ -52,10 +52,7 @@ export type ModalBlocksConfig = {
   };
 };
 
-export const parseModalBlocksConfiguration = (
-  configuration: Record<string, any>,
-  componentName: string
-): ModalBlocksConfig => {
+export const getEmptyModalBlocksStructure = (): ModalBlocksConfig => {
   const result: ModalBlocksConfig = {
     header: {
       container: {},
@@ -106,6 +103,15 @@ export const parseModalBlocksConfiguration = (
     },
   };
 
+  return result;
+};
+
+export const parseModalBlocksConfiguration = (
+  configuration: Record<string, any>,
+  componentName: string
+): ModalBlocksConfig => {
+  const result = getEmptyModalBlocksStructure();
+
   if (!configuration || !componentName) {
     return result;
   }
@@ -190,107 +196,5 @@ export const parseModalBlocksConfiguration = (
 
   parseBlock("button", ["background", "title", "icons", "leading_icon"]);
 
-  // Playlist-experience Studio keys live in this shared parser because modal
-  // blocks are themed by themePluginId. Gate them so other plugins are not
-  // affected by playlist-only asset names.
-  const isPlaylistExperience =
-    normalizedComponentName === "playlist_experience";
-
-  // Studio uploads Create New icon as button.create_new_playlist_asset (not
-  // button.leading_icon.asset). Map it onto leadingIcon so AudioPlayerButton
-  // can override the hardcoded action-type asset.
-  const createNewPlaylistAsset = isPlaylistExperience
-    ? configuration["button.create_new_playlist_asset"] ||
-      configuration[
-        `${normalizedComponentName}_button_create_new_playlist_asset`
-      ]
-    : undefined;
-
-  if (createNewPlaylistAsset) {
-    if (!result.button.leadingIcon.default) {
-      result.button.leadingIcon.default = {};
-    }
-
-    result.button.leadingIcon.default.asset = createNewPlaylistAsset;
-  }
-
-  // Studio checkbox assets are top-level item.* keys (not a parseBlock
-  // sub-component). Map onto item.checkbox so multiSelect can render them.
-  const checkboxAsset =
-    configuration["item.checkbox_asset"] ||
-    configuration[`${normalizedComponentName}_item_checkbox_asset`];
-
-  const checkedCheckboxAsset =
-    configuration["item.checked_checkbox_asset"] ||
-    configuration[`${normalizedComponentName}_item_checked_checkbox_asset`];
-
-  if (checkboxAsset || checkedCheckboxAsset) {
-    if (!result.item.checkbox.default) {
-      result.item.checkbox.default = {};
-    }
-
-    if (checkboxAsset) {
-      result.item.checkbox.default.asset = checkboxAsset;
-    }
-
-    if (checkedCheckboxAsset) {
-      result.item.checkbox.default.checkedAsset = checkedCheckboxAsset;
-    }
-  }
-
-  // Edit Order row icons: prefer reorder_playlist_item.*, then flavor1, then
-  // flavor2 playlist_experience_assets_* (playlist-experience theme only).
-  const removeAsset = isPlaylistExperience
-    ? configuration["reorder_playlist_item.remove_from_playlist_asset"] ||
-      configuration[
-        `${normalizedComponentName}_reorder_playlist_item_remove_from_playlist_asset`
-      ] ||
-      configuration[
-        "playlist_experience_assets_flavor1.remove_from_playlist_asset"
-      ] ||
-      configuration[
-        `${normalizedComponentName}_assets_flavor1_remove_from_playlist_asset`
-      ] ||
-      configuration[
-        "playlist_experience_assets_flavor2.remove_from_playlist_asset"
-      ] ||
-      configuration[
-        `${normalizedComponentName}_assets_flavor2_remove_from_playlist_asset`
-      ]
-    : undefined;
-
-  const dragAsset = isPlaylistExperience
-    ? configuration["reorder_playlist_item.reorder_handle_asset"] ||
-      configuration[
-        `${normalizedComponentName}_reorder_playlist_item_reorder_handle_asset`
-      ] ||
-      configuration[
-        "playlist_experience_assets_flavor1.reorder_handle_asset"
-      ] ||
-      configuration[
-        `${normalizedComponentName}_assets_flavor1_reorder_handle_asset`
-      ] ||
-      configuration[
-        "playlist_experience_assets_flavor2.reorder_handle_asset"
-      ] ||
-      configuration[
-        `${normalizedComponentName}_assets_flavor2_reorder_handle_asset`
-      ]
-    : undefined;
-
-  if (removeAsset || dragAsset) {
-    if (!result.item.actionButtons.default) {
-      result.item.actionButtons.default = {};
-    }
-
-    if (removeAsset) {
-      result.item.actionButtons.default.removeAsset = removeAsset;
-    }
-
-    if (dragAsset) {
-      result.item.actionButtons.default.dragAsset = dragAsset;
-    }
-  }
-
   return result;
 };

package/entryActions/__tests__/buildEntryActions.test.ts

@@ -60,7 +60,7 @@ describe("buildEntryActions - alias & label resolution", () => {
     expect(state.label).toBe("Label Property Action");
   });
 
-  it("resolves entry action with known backend button alias (e.g. add_all_to_queue)", () => {
+  it("humanizes an un-overridden alias and falls back to the placeholder asset", () => {
     const entry = {
       id: "entry-3",
       extensions: {
@@ -71,11 +71,7 @@ describe("buildEntryActions - alias & label resolution", () => {
             dismiss_on_action: true,
           },
           {
-            button: { alias: "add_to_playlist" },
-            actions: [{ type: "test" }],
-          },
-          {
-            button: { alias: "delete_collection" },
+            button: { alias: "custom_unknown_action" },
             actions: [{ type: "test" }],
           },
         ],
@@ -84,42 +80,86 @@ describe("buildEntryActions - alias & label resolution", () => {
 
     const actions = resolveEntryActions(entry as any);
 
-    expect(actions).toHaveLength(3);
+    expect(actions).toHaveLength(2);
 
+    // No built-in alias vocabulary any more: underscores become spaces and
+    // only the first letter is capitalized, so "queue" stays lowercase.
     expect(actions[0].action.initialEntryState(entry as any)).toMatchObject({
       state: 0,
-      label: "Add all to Queue",
+      label: "Add all to queue",
     });
 
     expect(actions[1].action.initialEntryState(entry as any)).toMatchObject({
       state: 0,
-      label: "Add to Playlist",
+      label: "Custom unknown action",
     });
 
-    expect(actions[2].action.initialEntryState(entry as any)).toMatchObject({
-      state: 0,
-      label: "Delete collection",
-    });
+    // The asset has no such fallback: without an override it is the red-box
+    // placeholder, so a missing Studio icon is visible rather than absent.
+    for (const action of actions) {
+      expect(action.action.initialEntryState(entry as any)).toMatchObject({
+        asset: expect.stringMatching(/^data:image\/png;base64,/),
+      });
+    }
   });
 
-  it("formats unknown alias nicely as fallback", () => {
+  it("prefers aliasPresentation overrides over the humanized fallbacks", () => {
+    const deps = {
+      actionExecutor: { handleActions: jest.fn() } as any,
+      actionContext: {},
+      aliasPresentation: {
+        labels: { add_all_to_queue: "Add all to Queue" },
+        assets: { add_all_to_queue: "http://example.com/queue.png" },
+      },
+    };
+
     const entry = {
       id: "entry-4",
       extensions: {
         entry_action: [
           {
-            button: { alias: "custom_unknown_action" },
+            button: { alias: "add_all_to_queue" },
+            actions: [{ type: "test" }],
+          },
+          {
+            button: { alias: "not_overridden" },
             actions: [{ type: "test" }],
           },
         ],
       },
     };
 
-    const actions = resolveEntryActions(entry as any);
+    const actions = buildEntryActions(entry as any, deps);
 
-    expect(actions).toHaveLength(1);
+    expect(actions[0].action.initialEntryState(entry as any)).toMatchObject({
+      label: "Add all to Queue",
+      asset: "http://example.com/queue.png",
+    });
+
+    // Overrides are per-alias, so an alias absent from the map still humanizes.
+    expect(actions[1].action.initialEntryState(entry as any)).toMatchObject({
+      label: "Not overridden",
+    });
+  });
+
+  it("returns no asset when the button has neither iconURL nor alias", () => {
+    const entry = {
+      id: "entry-5",
+      extensions: {
+        entry_action: [
+          {
+            button: { label: "Plain Label" },
+            actions: [{ type: "test" }],
+          },
+        ],
+      },
+    };
+
+    const actions = resolveEntryActions(entry as any);
     const state = actions[0].action.initialEntryState(entry as any);
-    expect(state.label).toBe("Custom unknown action");
+
+    expect(state.label).toBe("Plain Label");
+    expect(state.asset).toBeUndefined();
   });
 
   it("uses actionExecutor.getActionState for plugin-provided label and asset", () => {

package/entryActions/aliasPresentation.ts

@@ -1,52 +1,29 @@
 /**
- * Presentation defaults for backend action aliases.
+ * Presentation fallbacks for backend action aliases.
  *
  * Entries may declare an action by `alias` alone, without a label or an icon.
- * These maps are the last-resort labels/icons for the aliases we know about; an
- * unknown alias falls back to a humanized version of the alias itself.
+ * There is no built-in alias vocabulary: a label falls back to a humanized
+ * version of the alias itself, and an icon falls back to an inline placeholder
+ * that is deliberately conspicuous, so a missing asset reads as unconfigured
+ * rather than as a deliberate blank.
  *
- * They are defaults, not a framework guarantee: an app that speaks a different
- * alias vocabulary, needs other languages, or does not want to depend on these
- * icon hosts passes its own through `EntryActionDeps.aliasPresentation`.
+ * Both are last resorts, not a framework guarantee: an app that speaks its own
+ * alias vocabulary or needs other languages passes labels and assets through
+ * `EntryActionDeps.aliasPresentation`, which is consulted per alias.
  */
 
 import { EntryAction } from "./types";
 
-const ADD_TO_PLAYLIST_ICON =
-  "https://assets-secure.applicaster.com/zapp/assets/app_family/1710/906728572617/playlist_add_24dp_FFFFFF_FILL0_wght400_GRAD0_opsz24.png";
-
-const REMOVE_ICON =
-  "https://assets-secure.applicaster.com/zapp/assets/app_family/1710/372097240191/remove_24dp_EA3323_FILL0_wght400_GRAD0_opsz24.png";
-
-const EDIT_ICON =
-  "https://upload.wikimedia.org/wikipedia/commons/b/b6/Edit-icon.png";
-
-/** Known backend action alias labels. */
-export const ALIAS_LABELS: Record<string, string> = {
-  add_to_playlist: "Add to Playlist",
-  add_to_queue: "Add to Queue",
-  add_all_to_queue: "Add all to Queue",
-  play_all: "Play All",
-  remove_item: "Remove item",
-  delete_collection: "Delete collection",
-  create_collection: "Create collection",
-  edit: "Edit",
-  edit_name: "Edit Name & Details",
-};
+import { createLogger } from "@applicaster/zapp-react-native-utils/logger";
 
-/** Known backend action alias image assets. */
-export const ALIAS_ASSETS: Record<string, string> = {
-  add_to_playlist: ADD_TO_PLAYLIST_ICON,
-  add_to_queue: ADD_TO_PLAYLIST_ICON,
-  add_all_to_queue: ADD_TO_PLAYLIST_ICON,
-  play_all: ADD_TO_PLAYLIST_ICON,
-  remove_item: REMOVE_ICON,
-  delete_collection: REMOVE_ICON,
-  edit: EDIT_ICON,
-  edit_name: EDIT_ICON,
-};
+const logger = createLogger({
+  category: "zapp-react-native-utils:aliasPresentation",
+});
+
+const PLACEHOLDER_RED_BOX =
+  "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAJ0lEQVR4nO3NMQEAAAjDsIF/z2ACvlRAU5NMHuvPOQAAAAAAAMBdC/07Ai5sNw+CAAAAAElFTkSuQmCC";
 
-/** Per-app overrides for the maps above. */
+/** Per-app labels and icons, keyed by alias, that outrank the fallbacks. */
 export type AliasPresentation = {
   labels?: Record<string, string>;
   assets?: Record<string, string>;
@@ -56,7 +33,7 @@ function formatAliasLabel(
   alias: string,
   overrides?: AliasPresentation
 ): string {
-  const label = overrides?.labels?.[alias] ?? ALIAS_LABELS[alias];
+  const label = overrides?.labels?.[alias];
 
   if (label) {
     return label;
@@ -107,7 +84,7 @@ export function resolveButtonLabel(
   return "";
 }
 
-/** Icon to show for an entry action: explicit iconURL, else the alias default. */
+/** Icon to show for an entry action: explicit iconURL, matching alias asset or fallback to red box. */
 export function resolveButtonAsset(
   button: EntryAction["button"],
   overrides?: AliasPresentation
@@ -120,5 +97,12 @@ export function resolveButtonAsset(
     return undefined;
   }
 
-  return overrides?.assets?.[button.alias] ?? ALIAS_ASSETS[button.alias];
+  if (!overrides?.assets?.[button.alias]) {
+    logger.log_warning(
+      `Entry action alias '${button.alias}' was not resolved by any plugin feedDecorator or app override. Falling back to placeholder red box.`,
+      { data: { button } }
+    );
+  }
+
+  return overrides?.assets?.[button.alias] ?? PLACEHOLDER_RED_BOX;
 }

package/entryActions/index.ts

@@ -1,8 +1,6 @@
 export { buildEntryActions, isEntryAction } from "./buildEntryActions";
 
 export {
-  ALIAS_ASSETS,
-  ALIAS_LABELS,
   resolveButtonAsset,
   resolveButtonLabel,
   resolveExplicitLabel,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/zapp-react-native-utils",
-  "version": "16.0.0-rc.90",
+  "version": "16.0.0-rc.91",
   "description": "Applicaster Zapp React Native utilities package",
   "main": "index.js",
   "types": "index.d.ts",
@@ -27,7 +27,7 @@
   },
   "homepage": "https://github.com/applicaster/quickbrick#readme",
   "dependencies": {
-    "@applicaster/applicaster-types": "16.0.0-rc.90",
+    "@applicaster/applicaster-types": "16.0.0-rc.91",
     "buffer": "^5.2.1",
     "camelize": "^1.0.0",
     "dayjs": "^1.11.10",