Skip to content

Commit 79237e0

Browse files
committed
Merge branch 'locale-based-bulk-actions' of github.com:contentful/contentful-management.js into locale-based-bulk-actions
2 parents f710030 + 7368df8 commit 79237e0

File tree

8 files changed

+3247
-2047
lines changed

8 files changed

+3247
-2047
lines changed

lib/common-types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ export interface EntityMetaSysProps extends MetaSysProps {
281281
firstPublishedAt?: string
282282
publishedCounter?: number
283283
locale?: string
284-
fieldStatus: { '*': Record<string, 'draft' | 'changed' | 'published'> }
284+
fieldStatus?: { '*': Record<string, 'draft' | 'changed' | 'published'> }
285285
}
286286

287287
export interface EntryMetaSysProps extends EntityMetaSysProps {

lib/entities/app-installation.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ export type AppInstallationProps = {
1111
appDefinition: SysLink
1212
environment: SysLink
1313
space: SysLink
14+
organization: SysLink
1415
}
1516
/**
1617
* Free-form installation parameters (API limits stringified length to 32KB)

package-lock.json

Lines changed: 3240 additions & 2038 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/integration/generate-random-id.ts

Lines changed: 0 additions & 3 deletions
This file was deleted.

test/integration/upload-credential.ts renamed to test/integration/upload-credential.test.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import { expect } from 'chai'
2-
import { describe, test } from 'mocha'
1+
import { expect, describe, test, beforeAll, afterAll } from 'vitest'
32
import type { Environment, PlainClientAPI, Space } from '../../lib/export-types'
43
import {
54
createTestEnvironment,
@@ -14,14 +13,14 @@ describe('Upload Credential Integration', () => {
1413
let environment: Environment
1514
let client: PlainClientAPI
1615

17-
before(async () => {
16+
beforeAll(async () => {
1817
space = (await createTestSpace(initClient(), 'Entry')) as Space
1918
environment = (await createTestEnvironment(space, 'Testing Environment')) as Environment
2019
client = initPlainClient()
2120
await waitForEnvironmentToBeReady(space, environment)
2221
})
2322

24-
after(() => {
23+
afterAll(() => {
2524
if (space) {
2625
return space.delete()
2726
}

test/unit/entities/upload-credential-test.ts renamed to test/unit/entities/upload-credential.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { describe, test } from 'mocha'
1+
import { describe, test } from 'vitest'
22
import { wrapUploadCredential } from '../../../lib/entities/upload-credential'
33
import { cloneMock } from '../mocks/entities'
44
import setupMakeRequest from '../mocks/makeRequest'

test/unit/mocks/entities.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1271,6 +1271,7 @@ const mocks = {
12711271
teamMembership: teamMembershipMock,
12721272
teamSpaceMembership: teamSpaceMembershipMock,
12731273
upload: uploadMock,
1274+
uploadCredential: uploadCredentialMock,
12741275
usage: usageMock,
12751276
uiConfig: uiConfigMock,
12761277
user: userMock,

0 commit comments

Comments
 (0)