Skip to content

Commit 2d575c1

Browse files
author
naman-contentstack
committed
merge development in feat/Asseet-scanning-v1
2 parents 0ca69b8 + b894e01 commit 2d575c1

74 files changed

Lines changed: 1983 additions & 1661 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/issues-jira.yml

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

.talismanrc

Lines changed: 72 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,74 @@
11
fileignoreconfig:
2-
- filename: packages/contentstack-external-migrate/src/services/contentful/contentful.service.ts
3-
checksum: e710b7fbad0a413403de9b937bcc98a9cc84a2d6a920a836ddfa78706b959822
4-
- filename: packages/contentstack-external-migrate/src/services/contentful/extension.service.ts
5-
checksum: 1c0c95059828ccecc2e2f6bc5a377eb37a6e879a2bc2605943857a0bbfd37aad
6-
- filename: packages/contentstack-external-migrate/src/services/contentful/app/index.json
7-
checksum: 508b3ef2dfcabcba03bb85b2716c1690a2a693254cf7605978d909006dd52028
8-
- filename: packages/contentstack-external-migrate/src/services/contentful/migration-contentful/utils/apps/appDetails.json
9-
checksum: a80c6dfcb90b6a964e604b47699dee694b1dd93630e69859c04bdd41a0f4a7c0
10-
- filename: packages/contentstack-external-migrate/docs/manifest-schema.md
11-
checksum: 96e188eb1cbb29d1ee3206634ac6a8cd4243c72cf42019cbb848e0e6e83c2b5f
12-
- filename: packages/contentstack-external-migrate/docs/implementation-principles.md
13-
checksum: 2a96dfbe9270fd50c42f781a40cbdf674d12d7f00784d4bd8640f3064b0d319f
14-
- filename: packages/contentstack-external-migrate/test/commands/migrate/audit.test.ts
15-
checksum: 0daa06c38f5b5879cf9e5854c96f5ee4976524b2de5ff3e62c64b0e28239e508
16-
- filename: packages/contentstack-external-migrate/test/commands/migrate/import.test.ts
17-
checksum: e931a9cb89e9cb6ce384e0ae0218b5e9df3d8631caea5997cdab4e007b6d9d9a
18-
- filename: packages/contentstack-external-migrate/src/services/contentful/users.ts
19-
checksum: 86dce671e996019419256dbb5ebd8d927392715cdecda3a44e2d2315ac13adbe
20-
- filename: packages/contentstack-external-migrate/src/services/contentful/utils/index.ts
21-
checksum: cbc04052ad999e5a2ec6fbcbcd4e1df388d8c3575ffbd8370764934892477b0f
22-
- filename: packages/contentstack-import/src/import/modules/webhooks.ts
23-
checksum: 8c9527f966fe24debfb36d96a280ac3b2dd6494a58128380c69d7475e595436d
24-
- filename: packages/contentstack-external-migrate/src/services/contentful/contentful/jsonRTE.ts
25-
checksum: f19ae1132a29a93bb2e027366ab495ada1928afc9e7acd21fc7dc0cb774bc46e
26-
- filename: packages/contentstack-external-migrate/docs/phases/phase-4-export.md
27-
checksum: afb2edadd487e28d2ecc4ff837703dd654394c0469bc70a848e98b07bb934141
28-
- filename: packages/contentstack-external-migrate/docs/phases/phase-5-manifest-and-review.md
29-
checksum: e7ea9d0095b38ed4722456d20560256eb9b7362e452929ba30925c5c66212415
30-
- filename: packages/contentstack-import/test/unit/import/modules/webhooks.test.ts
31-
checksum: 3924a3e38211b8554f25365fe3100cb83361d03370fdaa77e5c7f9e74abafcee
32-
- filename: packages/contentstack-external-migrate/docs/phases/phase-3-import.md
33-
checksum: 188c1a2b310f15b53608e97f4273e42296a87a20e3e03c0030c2140b873cc809
34-
- filename: packages/contentstack-external-migrate/docs/phases/phase-2-audit.md
35-
checksum: 8aa4d20af2def7b9afec9f3be7cfa269095dd92be015c6dd16774a27b13f4a65
36-
- filename: packages/contentstack-external-migrate/src/services/contentful/marketplace.service.ts
37-
checksum: 0f6b8c3bd68093b0e42bf2bf4345321f99e9dda7eafc233a79c296257641950a
38-
- filename: packages/contentstack-external-migrate/test/lib/manifest.test.ts
39-
checksum: 1e80e263e06653dfd967779696b243582fe2aefc89084a2d05499807fec49e37
40-
- filename: packages/contentstack-external-migrate/src/services/contentful/contentful/roles.ts
41-
checksum: 149d43d9348bf970339297b73bf66ead41efafc51ef1881b147845b4893976ad
42-
- filename: packages/contentstack-external-migrate/src/lib/conversion-summary.ts
43-
checksum: 05303adaed06435152ff69f022b2282faec63b53b36c404555c806cc808d5efa
44-
- filename: packages/contentstack-external-migrate/src/services/contentful/contentful/taxonomy.service.ts
45-
checksum: 6bc4638c31b5e4a87f26033b5bbea7404594e4fabc25447c8e76ec3b8b7602bb
46-
- filename: packages/contentstack-external-migrate/src/adapters/contentful/validator.ts
47-
checksum: c42584ad1a31a2cc085871eb62cd29c41c350b4f5ec51153e95f1279097f9b59
48-
- filename: packages/contentstack-external-migrate/docs/architecture.md
49-
checksum: 0c157fef081918197a1213c8dbb1f07fd0d1313eaf90d18ddee335c0685db7b1
50-
- filename: packages/contentstack-external-migrate/src/adapters/contentful/convert.ts
51-
checksum: 0c7cd556f5a7104bfac80f5933f3ce8f61349648462aa80e456db0390cd8491d
52-
- filename: packages/contentstack-external-migrate/src/commands/migrate/status.ts
53-
checksum: 316f723f0ec85b99f4b631f35e0acbbc1c80baec0cece8fc930243c4bb9ccbfd
54-
- filename: packages/contentstack-external-migrate/src/services/contentful/migration-contentful/libs/createInitialMapper.js
55-
checksum: 7431b4ea396ca3ad670c380108b4bf2061f45526fd36161096dd4dd46b4b6f8b
56-
- filename: packages/contentstack-external-migrate/src/commands/migrate/import.ts
57-
checksum: b1749716d8555d8a5af23c32a1b8ee8b39fa2b3dd0c51aff77f814e9766f8a92
58-
- filename: packages/contentstack-external-migrate/src/lib/manifest.ts
59-
checksum: 6674d08800ae8b3a657f7506cf7e6906b8b952ea90b50240d0314b7cb82d7d47
60-
- filename: packages/contentstack-external-migrate/src/services/contentful/migration-contentful/libs/contentTypeMapper.js
61-
checksum: 02e0f6cce67b4e070134b3908ce44c063e12133e88c373785bb414eb93e1a9ea
62-
- filename: packages/contentstack-external-migrate/src/lib/create-stack.ts
63-
checksum: e38b3286c9091a40d3f6ce24e2b0215c9c26457591d269f886a6a27cfbeca402
64-
- filename: packages/contentstack-external-migrate/src/commands/migrate/create.ts
65-
checksum: 29dece984996d02fac42520335529071c619ee14d293a95a732c1811fe739f41
66-
- filename: packages/contentstack-external-migrate/src/services/contentful/content-type-creator.ts
67-
checksum: 653a7e0443f6b9712ed91ad45aa4189864bee710ea4bd3ac40031225da4da5a5
68-
- filename: pnpm-lock.yaml
69-
checksum: 07642e8dd04d580185a459e5b088d8a1bb4e91be4e04f4842bf4fe4775205bf6
2+
- filename: pnpm-lock.yaml
3+
checksum: 17968d9c5a68d526b2493deea339d611cc57f00dcdc6f3401954ed12d527e47e
4+
- filename: packages/contentstack-bulk-operations/src/messages/index.ts
5+
checksum: 097f7ed876622aed6edc3f12995a92e219f96c3d053ec078d45c762f7ebe085e
6+
- filename: packages/contentstack-apps-cli/src/messages/index.ts
7+
checksum: 5d7991adb5056a14359c5a43db995460a72234916138dbc5ec14f726faf0054b
8+
- filename: packages/contentstack-query-export/test/unit/common-helper.test.ts
9+
checksum: a0aa399a2ec15760fe25f7e952d64792b55d3c38d2281858a48e64f0f9081344
10+
- filename: packages/contentstack-import/test/unit/commands/cm/stacks/import.test.ts
11+
checksum: a52fbd82e4296734d5eb5b06cc9a10d7e2c1fe7b58d15a44d3246f0f2762d5a1
12+
- filename: packages/contentstack-export-to-csv/src/messages/index.ts
13+
checksum: 54cbfb3fb83d06ce46766897066ace927c190b2383154b45423e668f63fa4392
14+
- filename: packages/contentstack-import/test/unit/import/modules/assets.test.ts
15+
checksum: 64e3af1e307d0f001370870267fa4cedd2ae81d0f3c38c2e184e69a9a68b2b30
16+
- filename: packages/contentstack-bulk-operations/test/unit/base-bulk-command.test.ts
17+
checksum: 522b91a2d4bb6a73ebe5ab92c0111e74d567c4360470beefd6a7ca8d30a6e311
18+
- filename: packages/contentstack-import/test/unit/import/modules/base-class.test.ts
19+
checksum: 7616f13a4c908eead76c1625cb146320a8a23f31732acb2ea8472e2e0a8b2692
20+
- filename: packages/contentstack-import/test/unit/import/modules/content-types.test.ts
21+
checksum: cd47b1694cb1edffb11fed0f2024fac631b0279ebf55113510d9121c4b957ab1
22+
- filename: packages/contentstack-export-to-csv/test/unit/utils/error-handler.test.ts
23+
checksum: 7216dd610334e6f4a0e2701712408a273a5a2bd4a5ec30b6d6aae043e2b53cc8
24+
- filename: packages/contentstack-bulk-operations/test/unit/utils/bulk-operation-log-handler.test.ts
25+
checksum: 8698f77bbb828df10ddc3a94726076a262fbf47d2468233c7e10e66cac42f97d
26+
- filename: packages/contentstack-import/test/unit/import/modules/entries.test.ts
27+
checksum: 02332fc203e92039b5fcab6e2e14d14ea5444a4cba2be853009b4c4994692637
28+
- filename: packages/contentstack-import/test/unit/import/modules/global-fields.test.ts
29+
checksum: 4bd86f40b28433470eea876acc9254042c3b24556acdfdb7b15375a948acc094
30+
- filename: packages/contentstack-export/test/unit/utils/common-helper.test.ts
31+
checksum: 928f173ca03855a516ac468dba84092fd5f66d2e41b0100bb548e0af364a4ef5
32+
- filename: packages/contentstack-bulk-operations/test/unit/utils/config-builder.test.ts
33+
checksum: e5891257999e9e940956ca77f5a7834be35d259edccd41c06f77736194ad7454
34+
- filename: packages/contentstack-export/test/unit/utils/export-config-handler.test.ts
35+
checksum: 0e7777f73da4f41f4e01e768dba1f3f62ab36778c4f9cd0b519fd1e3bb5c410f
36+
- filename: packages/contentstack-import/test/unit/import/modules/index.test.ts
37+
checksum: 6c2bc4bb09dc750532e84a2d6a8198e145bd142bc21ce0d97ae0c8da55dea723
38+
- filename: packages/contentstack-export/test/unit/utils/interactive.test.ts
39+
checksum: 0ea47db305f576c8c9da8cb34ae915f6b01992208ff1c4380cb7ffd93f538e5d
40+
- filename: packages/contentstack-bulk-operations/test/unit/utils/revert-retry-handler.test.ts
41+
checksum: c34a4bdea186f4ce48171d90b8ab0f1c94162e441acb23e3a0e00cb9f9f9255f
42+
- filename: packages/contentstack-clone/test/commands/stack-clone.test.ts
43+
checksum: 4547ba010cc3c9954de49e2b2bef45288dd070c4ad000b6ae3e9a8c9bb1ad296
44+
- filename: packages/contentstack-clone/test/lib/helpers/command-helpers.test.ts
45+
checksum: 32d385a677a76faa54cb3ddfe92fb1f1f53cfab878a78e2792c823a363956bd2
46+
- filename: packages/contentstack-export/test/unit/utils/marketplace-app-helper.test.ts
47+
checksum: 3734c4cf7145ef32ad424ccbc160ea8be9b38157762aa66ade51879ab369cee9
48+
- filename: packages/contentstack-import/test/unit/utils/marketplace-app-helper.test.ts
49+
checksum: 878be77164311c0ab86629fe18fd3d1be7ff187447e4e5ab65a241b3be0a8d24
50+
- filename: packages/contentstack-clone/test/lib/util/clone-handler.branch.test.ts
51+
checksum: db8c090aaada21d3952c5bc382228a0a11cebb63926512a5e2581bdaf5f4c2f6
52+
- filename: packages/contentstack-content-type/tests/utils/index.test.ts
53+
checksum: 8510fedf5eb6078c27d6a0d65d8bff4aa2d41b545246aed220d1a6a643188ad8
54+
- filename: packages/contentstack-import/test/unit/utils/common-helper.test.ts
55+
checksum: 12c8161a1cb313fa98b612d72e605f6e5190b9f9561d6e73c269c7d106e1a196
56+
- filename: packages/contentstack-import/test/unit/utils/interactive.test.ts
57+
checksum: dad20e229e02e847b5e939fdaf987b1a6c9ff4e1529b6d96a51130f7293285a9
58+
- filename: packages/contentstack-content-type/tests/core/contentstack/client.test.ts
59+
checksum: da15b04aa0a7ab0e48f70b847e68c05372943279e51c22f8539b01bb48033183
60+
- filename: packages/contentstack-import-setup/test/unit/common-helper.test.ts
61+
checksum: 7ac4645401fd3629347a8a182f8a320f177de545a96b8027422bd68040513068
62+
- filename: packages/contentstack-import-setup/test/unit/login-handler.test.ts
63+
checksum: fa7cb2aeb0873e5650beed42096ef4a8edd012a7217818ab0cab2ba6c4611934
64+
- filename: packages/contentstack-content-type/tests/core/command.test.ts
65+
checksum: 81da32fc47083a3421f5f1d9c04149ab313cb238d6416d3182f8b6d64dc8827d
66+
- filename: packages/contentstack-import/test/unit/utils/login-handler.test.ts
67+
checksum: 49dd751f846f50fe00d60e7f02b5bd237d36480048bf5e06a24f1cf9fe752a1b
68+
- filename: packages/contentstack-migrate-rte/test/utils/index.js
69+
checksum: f67235e607a446e5b2dd624046966a1ac5af7bce128aa080ec3c420c48b8bddc
70+
- filename: packages/contentstack-import/test/unit/import/modules/marketplace-apps.test.ts
71+
checksum: 42f4d0a15080a69423d4e82b11a6a1933c5f72930cdc4a55b86f27fdc980aeea
72+
- filename: packages/contentstack-migrate-rte/test/commands/json-migration.test.js
73+
checksum: 0d18641a32f7cf33d013a5a7c447c1067ba77022513b42304a727f873c741e99
7074
version: '1.0'

packages/contentstack-apps-cli/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@contentstack/apps-cli",
3-
"version": "1.7.1",
3+
"version": "1.7.2",
44
"description": "App ClI",
55
"author": "Contentstack CLI",
66
"homepage": "https://github.com/contentstack/cli-plugins/tree/main/packages/contentstack-apps-cli",

packages/contentstack-apps-cli/src/commands/app/install.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export default class Install extends AppCLIBaseCommand {
2626
description: commonMsg.APP_UID,
2727
}),
2828
"stack-api-key": flags.string({
29-
description: commonMsg.STACK_API_KEY,
29+
description: commonMsg.STACK_API_KEY_placeholder,
3030
}),
3131
...AppCLIBaseCommand.baseFlags,
3232
};
@@ -88,7 +88,7 @@ export default class Install extends AppCLIBaseCommand {
8888
// in case a stack app is selected and no stack-api-key is provided
8989
if (appType === "stack" && !this.flags["stack-api-key"]) {
9090
this.log(
91-
$t(installAppMsg.MISSING_STACK_API_KEY, {
91+
$t(installAppMsg.MISSING_STACK_API_KEY_placeholder, {
9292
app: app?.name || app?.uid,
9393
}),
9494
"warn"

packages/contentstack-apps-cli/src/commands/app/reinstall.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export default class Reinstall extends AppCLIBaseCommand {
2525
description: commonMsg.APP_UID,
2626
}),
2727
"stack-api-key": flags.string({
28-
description: commonMsg.STACK_API_KEY,
28+
description: commonMsg.STACK_API_KEY_placeholder,
2929
}),
3030
...AppCLIBaseCommand.baseFlags,
3131
};
@@ -84,7 +84,7 @@ export default class Reinstall extends AppCLIBaseCommand {
8484
appType = "stack";
8585

8686
this.log(
87-
$t(reinstallAppMsg.MISSING_STACK_API_KEY, {
87+
$t(reinstallAppMsg.MISSING_STACK_API_KEY_placeholder, {
8888
app: app?.name || app?.uid,
8989
}),
9090
"warn"

packages/contentstack-apps-cli/src/messages/index.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ const commonMsg = {
3838
APP_UID: "Provide the app UID of an existing app.",
3939
APP_TYPE_DESCRIPTION: "Type of app",
4040
CONTACT_SUPPORT: "Contact the support team for help.",
41-
STACK_API_KEY: "API key of the stack where the app operation is to be performed.",
41+
STACK_API_KEY_placeholder: "API key of the stack where the app operation is to be performed.",
4242
USER_TERMINATION: "Process terminated by the user.",
4343
CLI_APP_CLI_LOGIN_FAILED: "You're not logged in. Run $ csdx auth:login to continue."
4444
};
@@ -97,7 +97,7 @@ const installAppMsg = {
9797
CHOOSE_A_STACK: "Please select a stack",
9898
APP_INSTALLED_SUCCESSFULLY: "{app} installed successfully in {target}.",
9999
INSTALL_ORG_APP_TO_STACK: "{app} is an organization app. It cannot be installed to a stack. Do you want to proceed?",
100-
MISSING_STACK_API_KEY: "As {app} is a stack app, it can only be installed in a stack. Please select a stack.",
100+
MISSING_STACK_API_KEY_placeholder: "As {app} is a stack app, it can only be installed in a stack. Please select a stack.",
101101
INSTALLING_APP_NOTICE: "Installing {app} on {type} {target}.",
102102
APP_ALREADY_INSTALLED: "Please use $ csdx app:reinstall to reinstall the app.",
103103
}
@@ -115,7 +115,7 @@ const reinstallAppMsg = {
115115
CHOOSE_A_STACK: "Please select a stack",
116116
APP_REINSTALLED_SUCCESSFULLY: "{app} reinstalled successfully in {target}.",
117117
REINSTALL_ORG_APP_TO_STACK: "{app} is an organization app. It cannot be reinstalled to a stack. Do you want to proceed?",
118-
MISSING_STACK_API_KEY: "As {app} is a stack app, it can only be reinstalled in a stack. Please select a stack.",
118+
MISSING_STACK_API_KEY_placeholder: "As {app} is a stack app, it can only be reinstalled in a stack. Please select a stack.",
119119
REINSTALLING_APP_NOTICE: "Reinstalling {app} on {type} {target}.",
120120
APP_UID: "Provide the app UID of an existing app to be reinstalled.",
121121
APP_ALREADY_LATEST_VERSION: "The application is already up to date; no new version is available.",

0 commit comments

Comments
 (0)