Skip to content

Commit fb8be26

Browse files
committed
Merge main to develop
2 parents b7ef478 + 5eaa2c7 commit fb8be26

File tree

20 files changed

+82
-275
lines changed

20 files changed

+82
-275
lines changed

.github/workflows/TASKLIST_CARBONISATION.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ jobs:
2626
path: zeebe
2727
ref: 'main'
2828
- name: Setup form-js cache
29-
uses: actions/setup-node@22c0e7494f4cf8e8133097a3fefafe255caf66eb
29+
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e
3030
with:
3131
node-version: '20'
3232
cache: 'npm'
3333
cache-dependency-path: ./form-js/package-lock.json
3434
- name: Setup Tasklist cache
35-
uses: actions/setup-node@22c0e7494f4cf8e8133097a3fefafe255caf66eb
35+
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e
3636
with:
3737
node-version: '20'
3838
cache: 'yarn'

packages/form-js-editor/src/features/properties-panel/PropertiesProvider.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import {
1010
TableHeaderGroups,
1111
LayoutGroup,
1212
SecurityAttributesGroup,
13-
DownloadSettings,
1413
} from './groups';
1514

1615
import { hasEntryConfigured } from './Util';
@@ -58,7 +57,6 @@ export class PropertiesProvider {
5857
groups = [
5958
...groups,
6059
GeneralGroup(field, editField, getService),
61-
DownloadSettings(field, editField),
6260
...OptionsGroups(field, editField, getService),
6361
...TableHeaderGroups(field, editField),
6462
SecurityAttributesGroup(field, editField),

packages/form-js-editor/src/features/properties-panel/entries/EndpointKey.js

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

packages/form-js-editor/src/features/properties-panel/entries/index.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,4 @@ export { VersionTagEntry } from './VersionTagEntry';
4343
export { AcceptEntry } from './AcceptEntry';
4444
export { MultipleEntry } from './MultipleEntry';
4545
export { DocumentsDataSourceEntry } from './DocumentsDataSource';
46-
export { EndpointKeyEntry } from './EndpointKey';
4746
export { MaxHeightEntry } from './MaxHeightEntry';

packages/form-js-editor/src/features/properties-panel/groups/DownloadSettings.js

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

packages/form-js-editor/src/features/properties-panel/groups/index.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,3 @@ export { LayoutGroup } from './LayoutGroup';
99
export { SecurityAttributesGroup } from './SecurityAttributesGroup';
1010
export { ConditionGroup } from './ConditionGroup';
1111
export { TableHeaderGroups } from './TableHeaderGroups';
12-
export { DownloadSettings } from './DownloadSettings';

packages/form-js-editor/test/spec/features/properties-panel/PropertiesPanel.spec.js

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3464,27 +3464,6 @@ describe('properties panel', function () {
34643464
});
34653465
});
34663466
});
3467-
3468-
describe('documentPreview', function () {
3469-
it('entries', function () {
3470-
// given
3471-
const field = schema.components.find(({ id }) => id === 'myDocuments');
3472-
3473-
bootstrapPropertiesPanel({
3474-
container,
3475-
field,
3476-
});
3477-
3478-
// then
3479-
expectPanelStructure(container, {
3480-
General: ['Title', 'Document reference'],
3481-
'Download settings': ['Document URL'],
3482-
Condition: [],
3483-
Appearance: ['Max height of preview container'],
3484-
'Custom properties': [],
3485-
});
3486-
});
3487-
});
34883467
});
34893468

34903469
describe('custom properties', function () {

packages/form-js-editor/test/spec/form.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,6 @@
251251
"type": "documentPreview",
252252
"id": "myDocuments",
253253
"dataSource": "=myDocuments",
254-
"endpointKey": "=myDocumentsEndpointKey",
255254
"maxHeight": 500
256255
},
257256
{

packages/form-js-playground/test/spec/Playground.spec.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,28 +85,29 @@ describe('playground', function () {
8585
documents: [
8686
{
8787
documentId: 'document0',
88-
contentHash: '1234567890',
88+
endpoint: 'https://pub-280be5f41fe1419e8d236b586696129e.r2.dev/document0',
8989
metadata: {
9090
fileName: 'My document.pdf',
9191
contentType: 'application/pdf',
9292
},
9393
},
9494
{
9595
documentId: 'document1',
96+
endpoint: 'https://pub-280be5f41fe1419e8d236b586696129e.r2.dev/document1',
9697
metadata: {
9798
fileName: 'My document.png',
9899
contentType: 'image/png',
99100
},
100101
},
101102
{
102103
documentId: 'document2',
104+
endpoint: 'https://pub-280be5f41fe1419e8d236b586696129e.r2.dev/document2',
103105
metadata: {
104106
fileName: 'My document.zip',
105107
contentType: 'application/zip',
106108
},
107109
},
108110
],
109-
defaultDocumentsEndpointKey: 'https://pub-280be5f41fe1419e8d236b586696129e.r2.dev/{documentId}',
110111
};
111112

112113
// when

0 commit comments

Comments
 (0)