diff --git a/jest.config.js b/jest.config.js index 4bf863e3..150ae9ee 100644 --- a/jest.config.js +++ b/jest.config.js @@ -1,7 +1,7 @@ module.exports = { preset: "ts-jest", testEnvironment: "node", - testTimeout: 240000, + testTimeout: 480000, testMatch: ["**/*.test.ts"], transformIgnorePatterns: [ "/packages/cma-client-node/node_modules/(?!(got|p-cancelable|@szmarczak|lowercase-keys)/)", diff --git a/lerna.json b/lerna.json index e49ea3cd..28eb0c66 100644 --- a/lerna.json +++ b/lerna.json @@ -2,5 +2,5 @@ "packages": [ "packages/*" ], - "version": "5.1.20" + "version": "5.2.0-alpha.1" } diff --git a/packages/cma-client-browser/package.json b/packages/cma-client-browser/package.json index d54b5dc5..e782cc46 100644 --- a/packages/cma-client-browser/package.json +++ b/packages/cma-client-browser/package.json @@ -1,6 +1,6 @@ { "name": "@datocms/cma-client-browser", - "version": "5.1.20", + "version": "5.2.0-alpha.1", "description": "Browser client for DatoCMS REST Content Management API", "keywords": [ "datocms", @@ -28,7 +28,7 @@ "url": "git+https://github.com/datocms/js-rest-api-clients.git" }, "dependencies": { - "@datocms/cma-client": "^5.1.20", + "@datocms/cma-client": "^5.2.0-alpha.1", "@datocms/rest-client-utils": "^5.1.13" }, "scripts": { diff --git a/packages/cma-client-node/package-lock.json b/packages/cma-client-node/package-lock.json index ab75e5cf..2ef4a8e9 100644 --- a/packages/cma-client-node/package-lock.json +++ b/packages/cma-client-node/package-lock.json @@ -1,6 +1,6 @@ { "name": "@datocms/cma-client-node", - "version": "5.1.20", + "version": "5.2.0-alpha.1", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/packages/cma-client-node/package.json b/packages/cma-client-node/package.json index b60a47fe..76710620 100644 --- a/packages/cma-client-node/package.json +++ b/packages/cma-client-node/package.json @@ -1,6 +1,6 @@ { "name": "@datocms/cma-client-node", - "version": "5.1.20", + "version": "5.2.0-alpha.1", "description": "NodeJS client for DatoCMS REST Content Management API", "keywords": [ "datocms", @@ -28,7 +28,7 @@ "url": "git+https://github.com/datocms/js-rest-api-clients.git" }, "dependencies": { - "@datocms/cma-client": "^5.1.20", + "@datocms/cma-client": "^5.2.0-alpha.1", "@datocms/rest-client-utils": "^5.1.13", "mime-types": "^2.1.35", "tmp-promise": "^3.0.3" diff --git a/packages/cma-client/package-lock.json b/packages/cma-client/package-lock.json index 8426edc1..6262f724 100644 --- a/packages/cma-client/package-lock.json +++ b/packages/cma-client/package-lock.json @@ -1,6 +1,6 @@ { "name": "@datocms/cma-client", - "version": "5.1.20", + "version": "5.2.0-alpha.1", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/packages/cma-client/package.json b/packages/cma-client/package.json index a23cd1cd..9368b752 100644 --- a/packages/cma-client/package.json +++ b/packages/cma-client/package.json @@ -1,6 +1,6 @@ { "name": "@datocms/cma-client", - "version": "5.1.20", + "version": "5.2.0-alpha.1", "description": "JS client for DatoCMS REST Content Management API", "keywords": [ "datocms", diff --git a/packages/cma-client/resources.json b/packages/cma-client/resources.json index 4a4a9217..f6686eb2 100644 --- a/packages/cma-client/resources.json +++ b/packages/cma-client/resources.json @@ -3013,7 +3013,7 @@ "requestStructure": { "type": "upload_request", "attributes": ["filename"], - "relationships": [] + "relationships": ["upload_collection"] }, "queryParamsRequired": false, "responseType": "UploadRequestCreateTargetSchema", diff --git a/packages/cma-client/src/generated/ApiTypes.ts b/packages/cma-client/src/generated/ApiTypes.ts index 87f388e9..3114b926 100644 --- a/packages/cma-client/src/generated/ApiTypes.ts +++ b/packages/cma-client/src/generated/ApiTypes.ts @@ -106,6 +106,16 @@ export type WorkflowIdentity = string; * via the `definition` "id". */ export type EnvironmentIdentity = string; +/** + * RFC 4122 UUID of upload collection expressed in URL-safe base64 format + * + * This interface was referenced by `UploadCollection`'s JSON-Schema + * via the `definition` "identity". + * + * This interface was referenced by `UploadCollection`'s JSON-Schema + * via the `definition` "id". + */ +export type UploadCollectionIdentity = string; /** * ID of build_trigger * @@ -475,16 +485,6 @@ export type SchemaMenuItemReorderSchema = { * via the `reorder.jobSchema` link. */ export type SchemaMenuItemReorderJobSchema = SchemaMenuItem[]; -/** - * RFC 4122 UUID of upload collection expressed in URL-safe base64 format - * - * This interface was referenced by `UploadCollection`'s JSON-Schema - * via the `definition` "identity". - * - * This interface was referenced by `UploadCollection`'s JSON-Schema - * via the `definition` "id". - */ -export type UploadCollectionIdentity = string; /** * JSON API type field * @@ -2097,7 +2097,8 @@ export type Role = { | 'create' | 'delete' | 'edit_creator' - | 'replace_asset'; + | 'replace_asset' + | 'move'; /** * Permitted creator */ @@ -2110,6 +2111,8 @@ export type Role = { * Permitted localized content in this locale. Required when `localization_scope` is `localized` */ locale?: string | null; + upload_collection?: UploadCollectionIdentity | null; + move_to_upload_collection?: UploadCollectionIdentity | null; }[]; /** * Prohibited actions on a model (or all) for a role @@ -2126,7 +2129,8 @@ export type Role = { | 'create' | 'delete' | 'edit_creator' - | 'replace_asset'; + | 'replace_asset' + | 'move'; /** * Permitted creator */ @@ -2139,6 +2143,8 @@ export type Role = { * Permitted localized content in this locale. Required when `localization_scope` is `localized` */ locale?: string | null; + upload_collection?: UploadCollectionIdentity | null; + move_to_upload_collection?: UploadCollectionIdentity | null; }[]; /** * Allowed build triggers for a role @@ -2344,7 +2350,8 @@ export type RoleMeta = { | 'create' | 'delete' | 'edit_creator' - | 'replace_asset'; + | 'replace_asset' + | 'move'; /** * Permitted creator */ @@ -2357,6 +2364,8 @@ export type RoleMeta = { * Permitted localized content in this locale. Required when `localization_scope` is `localized` */ locale?: string | null; + upload_collection?: UploadCollectionIdentity | null; + move_to_upload_collection?: UploadCollectionIdentity | null; }[]; /** * Prohibited actions on a model (or all) for a role @@ -2373,7 +2382,8 @@ export type RoleMeta = { | 'create' | 'delete' | 'edit_creator' - | 'replace_asset'; + | 'replace_asset' + | 'move'; /** * Permitted creator */ @@ -2386,6 +2396,8 @@ export type RoleMeta = { * Permitted localized content in this locale. Required when `localization_scope` is `localized` */ locale?: string | null; + upload_collection?: UploadCollectionIdentity | null; + move_to_upload_collection?: UploadCollectionIdentity | null; }[]; /** * Allowed build triggers for a role @@ -2575,7 +2587,8 @@ export type RoleAttributes = { | 'create' | 'delete' | 'edit_creator' - | 'replace_asset'; + | 'replace_asset' + | 'move'; /** * Permitted creator */ @@ -2588,6 +2601,8 @@ export type RoleAttributes = { * Permitted localized content in this locale. Required when `localization_scope` is `localized` */ locale?: string | null; + upload_collection?: UploadCollectionIdentity | null; + move_to_upload_collection?: UploadCollectionIdentity | null; }[]; /** * Prohibited actions on a model (or all) for a role @@ -2604,7 +2619,8 @@ export type RoleAttributes = { | 'create' | 'delete' | 'edit_creator' - | 'replace_asset'; + | 'replace_asset' + | 'move'; /** * Permitted creator */ @@ -2617,6 +2633,8 @@ export type RoleAttributes = { * Permitted localized content in this locale. Required when `localization_scope` is `localized` */ locale?: string | null; + upload_collection?: UploadCollectionIdentity | null; + move_to_upload_collection?: UploadCollectionIdentity | null; }[]; /** * Allowed build triggers for a role @@ -2813,7 +2831,8 @@ export type RoleCreateSchema = { | 'create' | 'delete' | 'edit_creator' - | 'replace_asset'; + | 'replace_asset' + | 'move'; /** * Permitted creator */ @@ -2826,6 +2845,8 @@ export type RoleCreateSchema = { * Permitted localized content in this locale. Required when `localization_scope` is `localized` */ locale?: string | null; + upload_collection?: UploadCollectionIdentity | null; + move_to_upload_collection?: UploadCollectionIdentity | null; }[]; /** * Prohibited actions on a model (or all) for a role @@ -2842,7 +2863,8 @@ export type RoleCreateSchema = { | 'create' | 'delete' | 'edit_creator' - | 'replace_asset'; + | 'replace_asset' + | 'move'; /** * Permitted creator */ @@ -2855,6 +2877,8 @@ export type RoleCreateSchema = { * Permitted localized content in this locale. Required when `localization_scope` is `localized` */ locale?: string | null; + upload_collection?: UploadCollectionIdentity | null; + move_to_upload_collection?: UploadCollectionIdentity | null; }[]; /** * Allowed build triggers for a role @@ -3045,7 +3069,8 @@ export type RoleUpdateSchema = { | 'create' | 'delete' | 'edit_creator' - | 'replace_asset'; + | 'replace_asset' + | 'move'; /** * Permitted creator */ @@ -3058,6 +3083,8 @@ export type RoleUpdateSchema = { * Permitted localized content in this locale. Required when `localization_scope` is `localized` */ locale?: string | null; + upload_collection?: UploadCollectionIdentity | null; + move_to_upload_collection?: UploadCollectionIdentity | null; }[]; /** * Prohibited actions on a model (or all) for a role @@ -3074,7 +3101,8 @@ export type RoleUpdateSchema = { | 'create' | 'delete' | 'edit_creator' - | 'replace_asset'; + | 'replace_asset' + | 'move'; /** * Permitted creator */ @@ -3087,6 +3115,8 @@ export type RoleUpdateSchema = { * Permitted localized content in this locale. Required when `localization_scope` is `localized` */ locale?: string | null; + upload_collection?: UploadCollectionIdentity | null; + move_to_upload_collection?: UploadCollectionIdentity | null; }[]; /** * Allowed build triggers for a role @@ -8373,6 +8403,7 @@ export type UploadRequestCreateSchema = { * The original file name */ filename?: string; + upload_collection?: UploadCollectionData | null; }; /** * If the asset linked to an Upload entity is a video file, you have the option to include additional audio tracks and subtitle tracks to it. diff --git a/packages/cma-client/src/generated/RawApiTypes.ts b/packages/cma-client/src/generated/RawApiTypes.ts index 29c04d2c..6e970763 100644 --- a/packages/cma-client/src/generated/RawApiTypes.ts +++ b/packages/cma-client/src/generated/RawApiTypes.ts @@ -108,6 +108,16 @@ export type WorkflowIdentity = string; * via the `definition` "id". */ export type EnvironmentIdentity = string; +/** + * RFC 4122 UUID of upload collection expressed in URL-safe base64 format + * + * This interface was referenced by `UploadCollection`'s JSON-Schema + * via the `definition` "identity". + * + * This interface was referenced by `UploadCollection`'s JSON-Schema + * via the `definition` "id". + */ +export type UploadCollectionIdentity = string; /** * ID of build_trigger * @@ -403,16 +413,6 @@ export type SchemaMenuItemInstancesHrefSchema = { * via the `definition` "type". */ export type UploadCollectionType = 'upload_collection'; -/** - * RFC 4122 UUID of upload collection expressed in URL-safe base64 format - * - * This interface was referenced by `UploadCollection`'s JSON-Schema - * via the `definition` "identity". - * - * This interface was referenced by `UploadCollection`'s JSON-Schema - * via the `definition` "id". - */ -export type UploadCollectionIdentity = string; /** * This interface was referenced by `UploadCollection`'s JSON-Schema * via the `instances.hrefSchema` link. @@ -1733,7 +1733,8 @@ export type RoleAttributes = { | 'create' | 'delete' | 'edit_creator' - | 'replace_asset'; + | 'replace_asset' + | 'move'; /** * Permitted creator */ @@ -1746,6 +1747,8 @@ export type RoleAttributes = { * Permitted localized content in this locale. Required when `localization_scope` is `localized` */ locale?: string | null; + upload_collection?: UploadCollectionIdentity | null; + move_to_upload_collection?: UploadCollectionIdentity | null; }[]; /** * Prohibited actions on a model (or all) for a role @@ -1762,7 +1765,8 @@ export type RoleAttributes = { | 'create' | 'delete' | 'edit_creator' - | 'replace_asset'; + | 'replace_asset' + | 'move'; /** * Permitted creator */ @@ -1775,6 +1779,8 @@ export type RoleAttributes = { * Permitted localized content in this locale. Required when `localization_scope` is `localized` */ locale?: string | null; + upload_collection?: UploadCollectionIdentity | null; + move_to_upload_collection?: UploadCollectionIdentity | null; }[]; /** * Allowed build triggers for a role @@ -1987,7 +1993,8 @@ export type RoleMeta = { | 'create' | 'delete' | 'edit_creator' - | 'replace_asset'; + | 'replace_asset' + | 'move'; /** * Permitted creator */ @@ -2000,6 +2007,8 @@ export type RoleMeta = { * Permitted localized content in this locale. Required when `localization_scope` is `localized` */ locale?: string | null; + upload_collection?: UploadCollectionIdentity | null; + move_to_upload_collection?: UploadCollectionIdentity | null; }[]; /** * Prohibited actions on a model (or all) for a role @@ -2016,7 +2025,8 @@ export type RoleMeta = { | 'create' | 'delete' | 'edit_creator' - | 'replace_asset'; + | 'replace_asset' + | 'move'; /** * Permitted creator */ @@ -2029,6 +2039,8 @@ export type RoleMeta = { * Permitted localized content in this locale. Required when `localization_scope` is `localized` */ locale?: string | null; + upload_collection?: UploadCollectionIdentity | null; + move_to_upload_collection?: UploadCollectionIdentity | null; }[]; /** * Allowed build triggers for a role @@ -2222,7 +2234,8 @@ export type RoleCreateSchema = { | 'create' | 'delete' | 'edit_creator' - | 'replace_asset'; + | 'replace_asset' + | 'move'; /** * Permitted creator */ @@ -2235,6 +2248,8 @@ export type RoleCreateSchema = { * Permitted localized content in this locale. Required when `localization_scope` is `localized` */ locale?: string | null; + upload_collection?: UploadCollectionIdentity | null; + move_to_upload_collection?: UploadCollectionIdentity | null; }[]; /** * Prohibited actions on a model (or all) for a role @@ -2251,7 +2266,8 @@ export type RoleCreateSchema = { | 'create' | 'delete' | 'edit_creator' - | 'replace_asset'; + | 'replace_asset' + | 'move'; /** * Permitted creator */ @@ -2264,6 +2280,8 @@ export type RoleCreateSchema = { * Permitted localized content in this locale. Required when `localization_scope` is `localized` */ locale?: string | null; + upload_collection?: UploadCollectionIdentity | null; + move_to_upload_collection?: UploadCollectionIdentity | null; }[]; /** * Allowed build triggers for a role @@ -2478,7 +2496,8 @@ export type RoleUpdateSchema = { | 'create' | 'delete' | 'edit_creator' - | 'replace_asset'; + | 'replace_asset' + | 'move'; /** * Permitted creator */ @@ -2491,6 +2510,8 @@ export type RoleUpdateSchema = { * Permitted localized content in this locale. Required when `localization_scope` is `localized` */ locale?: string | null; + upload_collection?: UploadCollectionIdentity | null; + move_to_upload_collection?: UploadCollectionIdentity | null; }[]; /** * Prohibited actions on a model (or all) for a role @@ -2507,7 +2528,8 @@ export type RoleUpdateSchema = { | 'create' | 'delete' | 'edit_creator' - | 'replace_asset'; + | 'replace_asset' + | 'move'; /** * Permitted creator */ @@ -2520,6 +2542,8 @@ export type RoleUpdateSchema = { * Permitted localized content in this locale. Required when `localization_scope` is `localized` */ locale?: string | null; + upload_collection?: UploadCollectionIdentity | null; + move_to_upload_collection?: UploadCollectionIdentity | null; }[]; /** * Allowed build triggers for a role @@ -8662,6 +8686,14 @@ export type UploadRequestCreateSchema = { filename?: string; [k: string]: unknown; }; + relationships?: { + /** + * Upload collection to which the asset belongs + */ + upload_collection?: { + data: UploadCollectionData | null; + }; + }; }; }; /** diff --git a/packages/cma-client/src/generated/resources/UploadRequest.ts b/packages/cma-client/src/generated/resources/UploadRequest.ts index 21dc0ee2..24370f7f 100644 --- a/packages/cma-client/src/generated/resources/UploadRequest.ts +++ b/packages/cma-client/src/generated/resources/UploadRequest.ts @@ -19,7 +19,7 @@ export default class UploadRequest extends BaseResource { Utils.serializeRequestBody(body, { type: 'upload_request', attributes: ['filename'], - relationships: [], + relationships: ['upload_collection'], }), ).then((body) => Utils.deserializeResponseBody( diff --git a/packages/rest-api-events/package-lock.json b/packages/rest-api-events/package-lock.json index 8878dc7e..c1ceacef 100644 --- a/packages/rest-api-events/package-lock.json +++ b/packages/rest-api-events/package-lock.json @@ -1,6 +1,6 @@ { "name": "@datocms/rest-api-events", - "version": "5.1.20", + "version": "5.2.0-alpha.1", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/packages/rest-api-events/package.json b/packages/rest-api-events/package.json index 582b8ab9..8d5bd88e 100644 --- a/packages/rest-api-events/package.json +++ b/packages/rest-api-events/package.json @@ -1,6 +1,6 @@ { "name": "@datocms/rest-api-events", - "version": "5.1.20", + "version": "5.2.0-alpha.1", "description": "Utilities to receive real-time events from DatoCMS REST APIs", "keywords": [ "datocms", @@ -39,7 +39,7 @@ "pusher-js": "^7.0.6" }, "devDependencies": { - "@datocms/cma-client": "^5.1.20", + "@datocms/cma-client": "^5.2.0-alpha.1", "@datocms/dashboard-client": "^5.1.13" }, "gitHead": "ac4164968026ba62a2841d31d2b60c31eadb2cc8"