Actions v2

common/changes/@contentauth/toolkit/actions-v2_2024-04-05-16-41.json

@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@contentauth/toolkit",
+      "comment": "Add types for c2pa.actions.v2",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@contentauth/toolkit"
+}

common/changes/c2pa/actions-v2_2024-04-05-16-41.json

@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "c2pa",
+      "comment": "Add support for c2pa.actions.v2 in selectEditsAndActivity",
+      "type": "patch"
+    }
+  ],
+  "packageName": "c2pa"
+}

packages/c2pa/src/selectors/selectEditsAndActivity.ts

@@ -7,7 +7,12 @@
  * it.
  */
 
-import { ActionV1, C2paActionsAssertion } from '@contentauth/toolkit';
+import {
+  ActionV1,
+  ActionV2,
+  C2paActionsAssertion,
+  C2paActionsAssertionV2,
+} from '@contentauth/toolkit';
 import debug from 'debug';
 import each from 'lodash/each';
 import compact from 'lodash/fp/compact';
@@ -127,7 +132,10 @@ export async function selectEditsAndActivity(
     manifest.assertions.get('com.adobe.dictionary')[0] ??
     manifest.assertions.get('adobe.dictionary')[0];
 
-  const [actionAssertion] = manifest.assertions.get('c2pa.actions');
+  const [actionsV2] = manifest.assertions.get('c2pa.actions.v2');
+  const [actionsV1] = manifest.assertions.get('c2pa.actions');
+
+  const actionAssertion = actionsV2 ?? actionsV1;
 
   if (!actionAssertion) {
     return null;
@@ -146,7 +154,7 @@ export async function selectEditsAndActivity(
 }
 
 async function getPhotoshopCategorizedActions(
-  actions: ActionV1[],
+  actions: ActionV1[] | ActionV2[],
   dictionaryUrl: string,
   locale = DEFAULT_LOCALE,
   iconVariant: IconVariant = 'dark',
@@ -196,7 +204,7 @@ interface OverrideActionMap {
  * @returns List of translated action categories
  */
 export function getC2paCategorizedActions(
-  actionsAssertion: C2paActionsAssertion,
+  actionsAssertion: C2paActionsAssertion | C2paActionsAssertionV2,
   locale: string = DEFAULT_LOCALE,
 ): TranslatedDictionaryCategory[] {
   const actions = actionsAssertion.data.actions as AdobeCompatAction[];

packages/toolkit/types/index.ts

@@ -99,6 +99,13 @@ export type C2paActionsAssertion = Assertion<
   }
 >;
 
+export type C2paActionsAssertionV2 = Assertion<
+  'c2pa.actions.v2',
+  {
+    actions: ActionV2[];
+  }
+>;
+
 export type C2paHashDataAssertion = Assertion<
   'c2pa.hash.data',
   {
@@ -130,10 +137,39 @@ export type Web3Assertion = Assertion<
 
 export type ManifestAssertion =
   | C2paActionsAssertion
+  | C2paActionsAssertionV2
   | C2paHashDataAssertion
   | CreativeWorkAssertion
   | Web3Assertion;
 
+export interface ActionV2 {
+  action: string;
+  softwareAgent?: GeneratorInfoMap | string;
+  description?: string;
+  digitalSourceType?: string;
+  when?: string;
+  changes?: Change[];
+  actors?: Actor[];
+  related?: ActionV2[];
+  reason?: string;
+  parameters?: ParametersV2;
+}
+interface ParametersV2 {
+  ingredient?: HashedUri;
+  description?: string;
+  [key: string]: any;
+}
+
+interface Change {
+  [key: string]: any;
+}
+
+interface GeneratorInfoMap {
+  name: string;
+  version: string;
+  [key: string]: any;
+}
+
 export interface ActionV1 {
   action: string;
   softwareAgent?: string;