Skip to content

Commit 04174e1

Browse files
Merge pull request #1977 from contentstack/fix/dx-3204
handle pagination in sync when no entries are returned.
2 parents 7351f20 + 2cf98e8 commit 04174e1

File tree

10 files changed

+1957
-1616
lines changed

10 files changed

+1957
-1616
lines changed

.talismanrc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ fileignoreconfig:
117117
- filename: packages/contentstack/package.json
118118
checksum: 9b0fdd100effcdbb5ee3809f7f102bfd11c88dd76e49db5103434f3aa29473dd
119119
- filename: pnpm-lock.yaml
120-
checksum: 36c2ea27373817a1498cc1698ae588cfc87c3961ae24e42a4154c0b2a42782d5
120+
checksum: cb5c86b02ad84cbd3f0d0bd8ca2acd40ce3f87c59450331ab204f8fba5043a0d
121121
- filename: packages/contentstack-audit/src/audit-base-command.ts
122122
checksum: bd99d269c0b6694577f4751fa96b3d85856e41bbef624b4ec1196630d6c1d168
123123
- filename: packages/contentstack-migrate-rte/test/commands/json-migration.test.js
@@ -127,11 +127,12 @@ fileignoreconfig:
127127
- filename: packages/contentstack-bootstrap/test/bootstrap.test.js
128128
checksum: 5f0355a5048183d61b605cbc160e6727a9de32832d9159e903fee49f9ab751d5
129129
- filename: package-lock.json
130-
checksum: b3061364331292cbe5b4a91109664f0a0646c7d62f36027d57bffd96d5868479
130+
checksum: 791af8308bb250145dd7328852d20f0ee8cb2f4b8085ab9c79e382e729f81697
131131
- filename: packages/contentstack-utilities/test/unit/logger.test.ts
132132
checksum: c773181ea55c49d91363adacf0424b84c927e3cffd6bef1444ec2559ddf1b3b0
133133
- filename: packages/contentstack-utilities/src/logger/cliErrorHandler.ts
134134
checksum: 023cf08f215cd0778599fb8478c94419373d4687f04421c4eb99d87de86a4a3e
135135
- filename: packages/contentstack-utilities/src/logger/logger.ts
136136
checksum: 09f3b73dd995bafc253265c676f06308513e6b1842d9bc01d39e6b6945a54c7d
137+
137138
version: "1.0"

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
11
# Changelog
22

33
Please refer to the Contentstack Command-line Interface release notes [here](https://www.contentstack.com/docs/developers/cli/cli-changelog).
4+
## @contentstack/cli-cm-bulk-publish
5+
### Version: 1.8.2
6+
#### Date: June-30-2025
7+
##### Fix:
8+
- handle pagination in sync when no entries are returned.

package-lock.json

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

packages/contentstack-bulk-publish/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ $ npm install -g @contentstack/cli-cm-bulk-publish
1818
$ csdx COMMAND
1919
running command...
2020
$ csdx (--version)
21-
@contentstack/cli-cm-bulk-publish/1.8.1 darwin-arm64 node-v22.14.0
21+
@contentstack/cli-cm-bulk-publish/1.8.2 darwin-arm64 node-v22.14.0
2222
$ csdx --help [COMMAND]
2323
USAGE
2424
$ csdx COMMAND

packages/contentstack-bulk-publish/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@contentstack/cli-cm-bulk-publish",
33
"description": "Contentstack CLI plugin for bulk publish actions",
4-
"version": "1.8.1",
4+
"version": "1.8.2",
55
"author": "Contentstack",
66
"bugs": "https://github.com/contentstack/cli/issues",
77
"dependencies": {

packages/contentstack-bulk-publish/src/consumer/publish.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,6 @@ async function getEnvironment(stack, environment) {
268268
if (Array.isArray(environment) && environment.length) {
269269
for (let i = 0; i < environment.length; i++) {
270270
const key = await stack.environment(environment[i]).fetch();
271-
console.log(key);
272271
mapping[key.uid] = environment[i];
273272
}
274273
} else {

packages/contentstack-bulk-publish/src/producer/unpublish.js

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ const command = new Command();
1616
const { isEmpty } = require('../util');
1717
const { fetchBulkPublishLimit } = require('../util/common-utility');
1818
const VARIANTS_UNPUBLISH_API_VERSION = '3.2';
19+
const delay = (ms) => new Promise((res) => setTimeout(res, ms));
1920

2021
let bulkUnPublishSet = [];
2122
let bulkUnPulishAssetSet = [];
@@ -196,7 +197,6 @@ async function getSyncEntries(
196197
}
197198

198199
const Stack = new command.deliveryAPIClient.Stack(deliveryAPIOptions);
199-
200200
Stack.setHost(config.cda);
201201

202202
const syncData = {};
@@ -227,28 +227,29 @@ async function getSyncEntries(
227227
// Call bulkAction for entries without variants
228228
await bulkAction(stack, entriesResponse.items, bulkUnpublish, environment, locale, apiVersion, bulkPublishLimit, false);
229229
}
230-
231-
if (entriesResponse.items.length === 0) {
230+
if (entriesResponse.items.length === 0 && !entriesResponse.pagination_token) {
232231
if (!changedFlag) console.log('No Entries/Assets Found published on specified environment');
233232
return resolve();
234233
}
235-
setTimeout(async () => {
236-
await getSyncEntries(
237-
stack,
238-
config,
239-
locale,
240-
queryParams,
241-
bulkUnpublish,
242-
environment,
243-
deliveryToken,
244-
apiVersion,
245-
bulkPublishLimit,
246-
variantsFlag,
247-
null,
248-
);
249-
}, 3000);
234+
235+
await delay(3000);
236+
await getSyncEntries(
237+
stack,
238+
config,
239+
locale,
240+
queryParams,
241+
bulkUnpublish,
242+
environment,
243+
deliveryToken,
244+
apiVersion,
245+
bulkPublishLimit,
246+
variantsFlag,
247+
entriesResponse.pagination_token,
248+
);
249+
250+
return resolve();
250251
} catch (error) {
251-
reject(error);
252+
return reject(error);
252253
}
253254
});
254255
}

packages/contentstack/README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3776,8 +3776,7 @@ USAGE
37763776
$ csdx launch:functions [-p <value>] [-d <value>]
37773777
37783778
FLAGS
3779-
-d, --data-dir=<value> [default: /Users/aman.kumar/Documents/datasync-repo/cli/packages/contentstack] Current working
3780-
directory
3779+
-d, --data-dir=<value> [default: /Users/sunil.lakshman/Documents/cli/packages/contentstack] Current working directory
37813780
-p, --port=<value> [default: 3000] Port number
37823781
37833782
DESCRIPTION

packages/contentstack/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"@contentstack/cli-auth": "~1.4.1",
2727
"@contentstack/cli-cm-bootstrap": "~1.14.1",
2828
"@contentstack/cli-cm-branches": "~1.4.3",
29-
"@contentstack/cli-cm-bulk-publish": "~1.8.1",
29+
"@contentstack/cli-cm-bulk-publish": "~1.8.2",
3030
"@contentstack/cli-cm-clone": "~1.14.2",
3131
"@contentstack/cli-cm-export": "~1.16.2",
3232
"@contentstack/cli-cm-export-to-csv": "~1.8.2",

pnpm-lock.yaml

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

0 commit comments

Comments
 (0)