change fix approach

zapier · Aug 10, 2023 · 9f873ba · 9f873ba
1 parent 930a6ba
commit 9f873ba
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/packages/cli/src/oclif/commands/promote.js b/packages/cli/src/oclif/commands/promote.js
@@ -90,7 +90,7 @@ ${metadataPromptHelper}`);
           .filter(({ app_change_type }) => app_change_type === 'FEATURE_UPDATE')
           .map(({ issue_id }) => `#${issue_id}`);
 
-      if (!_.isEmpty(appFeatureUpdates) || !_.isEmpty(issueFeatureUpdates)) {
+      if (appFeatureUpdates || issueFeatureUpdates) {
         this.log(
           `Feature updates: ${[
             ...appFeatureUpdates,
@@ -113,15 +113,15 @@ ${metadataPromptHelper}`);
           .filter(({ app_change_type }) => app_change_type === 'BUGFIX')
           .map(({ issue_id }) => `#${issue_id}`);
 
-      if (!_.isEmpty(appBugfixes) || !_.isEmpty(issueBugfixes)) {
+      if (appBugfixes || issueBugfixes) {
         this.log(`Bug fixes: ${[...appBugfixes, issueBugfixes].join(', ')}`);
       }
 
       if (
-        _.isEmpty(appFeatureUpdates) &&
-        _.isEmpty(issueFeatureUpdates) &&
-        _.isEmpty(appBugfixes) &&
-        _.isEmpty(issueBugfixes)
+        !appFeatureUpdates &&
+        !issueFeatureUpdates &&
+        !appBugfixes &&
+        !issueBugfixes
       ) {
         this.log(
           `No metadata was found in the changelog. Remember, you can associate the changelog with issues or triggers/actions.\n\n${metadataPromptHelper}`

diff --git a/packages/cli/src/tests/utils/changelog.js b/packages/cli/src/tests/utils/changelog.js
@@ -42,8 +42,8 @@ describe('changelog utils', () => {
     it('should be forgiving on the markdown format', async () => {
       const { appMetadata, issueMetadata, changelog } =
         await changelogUtil.getVersionChangelog('0.0.1', appDir);
-      should(appMetadata.length).equal(0);
-      should(issueMetadata.length).equal(0);
+      should(appMetadata).equal(undefined);
+      should(issueMetadata).equal(undefined);
       changelog.should.equal('initial release\n\njust for internal testing');
     });
 
@@ -74,8 +74,8 @@ describe('changelog utils', () => {
     it('should not return metadata if it is not found', async () => {
       const { appMetadata, issueMetadata, changelog } =
         await changelogUtil.getVersionChangelog('1.0.0', appDir);
-      should(appMetadata.length).equal(0);
-      should(issueMetadata.length).equal(0);
+      should(appMetadata).equal(undefined);
+      should(issueMetadata).equal(undefined);
       changelog.should.equal('* Removing beta "label".\n* Minor docs fixes.');
     });
 

diff --git a/packages/cli/src/utils/changelog.js b/packages/cli/src/utils/changelog.js
@@ -8,6 +8,9 @@ const isAppMetadata = (obj) =>
 
 const isIssueMetadata = (obj) => obj?.app_change_type && obj?.issue_id;
 
+// Turns an empty array into undefined so it will not be present in the body when sent
+const absentIfEmpty = (arr) => (arr.length === 0 ? undefined : arr);
+
 const getChangelogFromMarkdown = (version, markdown) => {
   const lines = markdown
     .replace(/\r\n/g, '\n')
@@ -53,8 +56,8 @@ const getChangelogFromMarkdown = (version, markdown) => {
 
   return {
     changelog: changelog.join('\n').trim(),
-    appMetadata,
-    issueMetadata,
+    appMetadata: absentIfEmpty(appMetadata),
+    issueMetadata: absentIfEmpty(issueMetadata),
   };
 };