@clickview/ship-it 0.0.4 → 0.0.5

package/dist/T2/Analytics Web.md

@@ -0,0 +1,7 @@
+
+# Code changes
+- Opting out of marketing features when we initialise google analytics
+
+
+# Testing
+

package/dist/T2/ClickView Online.md

@@ -0,0 +1,64 @@
+
+# Before release
+- Update `ClickView.UserApi.Common` to full release
+
+
+# Code changes
+- Bumping `ClickView.UserApi.Common` to next version so it includes the `changeOnNextLogin` property. 
+
+- Remove all legacy ADI services and utilities that are no longer needed
+
+- Remove `ClickViewOnlineService.svc`
+
+* Update `ShortCodeApiClient` to take in `MasterCustomerId` and `UserId` for all endpoints. Close INBOX-2612
+* Include `MasterCustomerId` and `UserId` in the `SharedResource` model for creating and updating share code
+* Remove code for migrating the `username` in shortcode api when doing sso user migration since everything in shortcode api is using master user id now
+* Some minor code cleanup for the lack of `await`
+
+- Replaced all use of `object` type with the appropriate model from `BatchApi`.
+- Fixed serialization of request body's / request responses not working correctly
+
+- Added images for the user actions wizard
+
+- Moving `EmailService` into our dependency injection.
+- Removing old code that was no longer used in `OnlineSignOnSecretKey`
+
+* Partially implements CVO-535:
+  * Added an ajax controller with endpoints to interact with Batch API.
+  * Added new scopes for Batch API.
+  * Added support for bulk actions wizard routes in `BatchJobController`.
+
+
+# Testing
+
+
+
+* Ensure all existing share functionalities in Online still work
+
+- n/a
+
+- n/a
+
+- Test the following from both a forgot password email and an activate account email from old usermanager.
+  - Link works and you can change your password
+  - Link does not work if used for a second time
+  - Make sure the user's email is verified after using the links
+- Make sure a forgot password and activate account link generated from before this release has gone out, still works after this release has gone out. Talk to Sha to get a instances of old links.
+
+* n/a
+
+
+# Customer changes
+- ClickView Online no longer supports ADI
+
+* Nothing is changed from the customer's perspective
+
+- Making forgot password and email activation links send from old user manager valid for 3 months. Implements CORE-566
+- Making forgot password and email activation links send from old user manager one time use only. This is to improve security around the links since we have increased how long they are valid for. Implements CVO-538.
+- Making forgot password and email activation links send from old user manager verify the user's email address. Implements CVO-537
+- The change password view will now show 
+
+
+# Dependencies
+* The changes to accept `CustomerId` and `UserId` in shortcode Api has already been pushed to production, so no dependency is required.
+

package/dist/T2/ClickView.Curator.md

@@ -0,0 +1,45 @@
+
+# Customer changes
+- Fixed a bug where resending a user an activation email would not work. Fixes INBOX-2966
+
+- Fixed a bug where resending a user an activation email would not work. Fixes INBOX-2931
+
+
+# Code changes
+* Added the customer ID to the request body for sending a email verification email
+
+- Added the customer ID to the request body for resending an activation email
+
+- Bumping `ClickView.UserApi.Common` to next version so it includes the `changeOnNextLogin` property. 
+
+* Replaced all use of `object` type with the appropriate model from `BatchApi`.
+* Fixed serialization of request body's / request responses not working correctly
+
+- Added images for the user actions wizard
+
+- Partially implements CC-92:
+  - Added an ajax controller with endpoints to interact with Batch API.
+  - Added new scopes for Batch API.
+  - Added support for bulk actions wizard routes in `CustomerController`.
+
+
+# Testing
+- When you edit the email address for a user who does not have a verified email, they should successfully receive an email to verify their new email address. This should work whether they're in the customer you're currently logged into curator as or not.
+
+- Attempting to "resend activation email" should successfully send the activation email to the selected user whether they're in the customer you're currently logged into curator as or not.
+
+
+* n/a
+
+- n/a
+
+- n/a
+
+
+# Dependencies
+- https://gitlab.cvinternal.net/internal/users.api/-/merge_requests/108
+
+
+# Before release
+- Update `ClickView.UserApi.Common` to full release
+

package/dist/T2/Lite.md

@@ -0,0 +1,17 @@
+
+# Customer changes
+- The text that displays in the transition at the end of onboarding will now use "Grade" instead of "Year group". Fixes INBOX-2927
+
+
+# Testing
+- The text that displays in the transition at the end of onboarding should now use "Grade" instead of "Year group"
+
+
+- n/a
+
+
+# Code changes
+- Opting out of marketing features when we initialise google analytics
+
+- Added a new image to display when a video is no longer available on a student's feed. Related to INBOX-2470
+

package/dist/T2/Release Notes.md

@@ -0,0 +1,161 @@
+# Testing
+- In LE, viewing a video description that contains special characters should now be displayed correctly. For example `'`, `"`, `>`.
+- In LE, when updated a video title to be a dangerous string, it should now be handled safely in the success/error alert.
+  - For example: setting the title to `<img src="https://i.imgur.com/SQIDYQ5.png">` should _not_ render the image in the alert.
+- In Lite, while watching a video click on the create a clip button (scissors), then click cancel. You should go back to the same point in the video.
+- In Lite, share a public playlist and attempt to access it via sharelink while unauthenticated:
+  - The playlist page should accessible as expected
+  - Any public videos within the playlist should also be accessible and watchable
+- In curator user manager, if you deactivate/reactivate a user, then try to re-deactivate/reactivate them back to their initial state, this should be possible with no issues. Previously, on the second attempt, the popup would be for the whatever the first attempt was (e.g. if you just deactivated them then tried to reactivate them, the popup would be the "deactivate" popup again).
+- In curator user manager, if you unverify a user's email address, their old email address should no longer remain shown in the user list.
+- I new user manager in Online, Lite and Curator, ensure that when setting a students password, the checkbox to force the student to change their password on next login is appropriately respected.
+- Online, curator, and lite user managers all support a bulk action to change a student's year group.
+- Pagination works in user manager in lite both with and without a search query.
+- "Year group rollover" and "Change year group" should now appear as separate actions within the bulk user actions wizards.
+- The "year group rollover" action should not be accessible if a rollover has been performed on that school recently, or if the admin has not selected every single user.
+- Year group rollover works in Online's new user manager for users with bulk actions enabled.
+- Curator's cannot access bulk actions if they are not a dev.
+- Searching in user manager and selecting users from there to perform a bulk action on should allow you to proceed to the "action selector" step with those users.
+- Performing a year group rollover action should work end to end. The year group that gets set as the graduating year group should have all students rolling over to that year deactivated.
+  - Test this on your own school
+  - Test this on another school. I was using Matt's school so I wouldn't mess with anyone else's data
+- Year group rollover should not be performable more than once per customer (message Joosh if you need to perform it again for testing purposes and I will clear the database)
+- If a year group rollover is performed and some users do not have a year group, an appropriate error is shown for those users once the bulk action is completed.
+- If a year group rollover completely fails, an error is displayed
+- If a year group rollover successfully runs with no users having errors, a success image is displayed
+- Bulk action for deactivating users should work in online, curator, and lite.
+- Bulk action for reactivating users should work in online, curator, and lite.
+- Bulk action for deleting users should work in online, curator, and lite.
+- Alerts that appear in Online after creating or deleting a playlist no longer display the text `<strong></strong>` around the playlist name.
+- Alerts that appear in Online after creating or deleting a playlist are not vulnerable to XSS attacks.
+* Go to curator and choose a test school that is not yours and change the email for a user, make sure that the user can receive the verification email.
+
+* Go to curator and choose a test school that is not yours and trigger the `Resend activation email` for any pending user who has an email, make sure that the user can receive the email.
+* Go to staff manager in lite and choose a pending user to resend the activation email, make sure that the user can receive the email.
+
+- Hit `/v1/users/learner/change-password` for a user with `changeOnNextLogin` set to true, and make sure auth requires the user to change their password
+
+- When you edit the email address for a user who does not have a verified email, they should successfully receive an email to verify their new email address. This should work whether they're in the customer you're currently logged into curator as or not.
+
+- Attempting to "resend activation email" should successfully send the activation email to the selected user whether they're in the customer you're currently logged into curator as or not.
+
+* Ensure all existing share functionalities in Online still work
+
+- Test the following from both a forgot password email and an activate account email from old usermanager.
+  - Link works and you can change your password
+  - Link does not work if used for a second time
+  - Make sure the user's email is verified after using the links
+- Make sure a forgot password and activate account link generated from before this release has gone out, still works after this release has gone out. Talk to Sha to get a instances of old links.
+
+## Library editor
+
+### Customer changes
+- Fixed bug where descriptions were displaying URL encoded special characters instead of their unencoded form.
+  - Fixes INBOX-2912
+- Closed XSS vulnerability where alerts were rendering un-escaped mark up.
+
+### Code changes
+- Removed unnecessary extra escaping of description text.
+- Escape video name when used in alerts.
+
+## Lite
+
+### Customer changes
+- Clicking "cancel" in the clip editor will now take you to the play page at the same point in time. Fixes INBOX-2957.
+- Fixed bug where accessing a public playlist when unauthenticated would require users to sign in
+  - Fixes INBOX-2971
+- Slightly tweaked the copy for the classrooms list page for admins to say "Other classrooms in my school" instead of "All classrooms in my school". Fixes INBOX-2885
+- The text that displays in the transition at the end of onboarding will now use "Grade" instead of "Year group". Fixes INBOX-2927
+
+### Code changes
+- Fixed the URL being html encoded instead of slugified when hitting cancel in the clip editor.
+- Updated `PlaylistView` to check the current user is authenticated before trying to fetch their presentations
+- `optimize` all requests in PlaylistView
+- Opting out of marketing features when we initialise google analytics
+- Added a new image to display when a video is no longer available on a student's feed. Related to INBOX-2470
+
+## Player
+
+### Code changes
+- The create a clip player now has an onReady function to return the reference to the player object, similar to the regular player
+
+## Shared
+
+### Customer changes
+- Fixed a bug where disabled password inputs were not being styled properly. Fixes INBOX-2942.
+
+### Code changes
+- Made `onClickRemove` optional in our `InputSelection` which is the pill that shows in the share search bar. I've re-used this element as part of the add to classroom bulk action.
+- Updated `UserManagerAppLinks` so that we can customise it for each client. Curator and Lite now require settings and the addToClassroom details and confirmation steps, while Online doesn't
+- Changing a students password in student manager will now have a checkbox to optionally require the student to change their password on first login. This will default to being toggled. 
+
+![example](https://i.imgur.com/jI8NbVT.png)
+
+## Curator
+
+### Customer changes
+- Fixed some issues in user manager where the UI would not reflect updates made to users. For example: deactivating, reactivating, and unverifying email actions would not properly update the UI after the action had completed. Fixes INBOX-2761
+
+- Fixed a bug where resending a user an activation email would not work. Fixes INBOX-2966
+
+- Fixed a bug where resending a user an activation email would not work. Fixes INBOX-2931
+
+### Code changes
+- Endpoints in `JobRequests` now no longer accept a `customerId`
+* Added the customer ID to the request body for sending a email verification email
+
+- Added the customer ID to the request body for resending an activation email
+
+- Bumping `ClickView.UserApi.Common` to next version so it includes the `changeOnNextLogin` property. 
+
+* Replaced all use of `object` type with the appropriate model from `BatchApi`.
+* Fixed serialization of request body's / request responses not working correctly
+
+- Added images for the user actions wizard
+
+- Partially implements CC-92:
+  - Added an ajax controller with endpoints to interact with Batch API.
+  - Added new scopes for Batch API.
+  - Added support for bulk actions wizard routes in `CustomerController`.
+
+## Online
+
+### Customer changes
+- Fixed a bug where alerts that appear after creating or deleting a playlist would display the text `<strong></strong>`. Fixes INBOX-2873
+- ClickView Online no longer supports ADI
+
+- Making forgot password and email activation links send from old user manager valid for 3 months. Implements CORE-566
+- Making forgot password and email activation links send from old user manager one time use only. This is to improve security around the links since we have increased how long they are valid for. Implements CVO-538.
+- Making forgot password and email activation links send from old user manager verify the user's email address. Implements CVO-537
+- The change password view will now show 
+
+### Code changes
+- Online's alerts no longer escape the HTML passed into them. I believe this should be fine as these alerts should be using `LanguageService`, and `LanguageService` escapes any dynamic phrase options (such as playlist names). Escaping the rest of the phrase (which the dev writes) doesn't need to happen.
+- Bumping `ClickView.UserApi.Common` to next version so it includes the `changeOnNextLogin` property. 
+
+- Remove all legacy ADI services and utilities that are no longer needed
+
+- Remove `ClickViewOnlineService.svc`
+
+* Update `ShortCodeApiClient` to take in `MasterCustomerId` and `UserId` for all endpoints. Close INBOX-2612
+* Include `MasterCustomerId` and `UserId` in the `SharedResource` model for creating and updating share code
+* Remove code for migrating the `username` in shortcode api when doing sso user migration since everything in shortcode api is using master user id now
+* Some minor code cleanup for the lack of `await`
+
+- Replaced all use of `object` type with the appropriate model from `BatchApi`.
+- Fixed serialization of request body's / request responses not working correctly
+
+- Added images for the user actions wizard
+
+- Moving `EmailService` into our dependency injection.
+- Removing old code that was no longer used in `OnlineSignOnSecretKey`
+
+* Partially implements CVO-535:
+  * Added an ajax controller with endpoints to interact with Batch API.
+  * Added new scopes for Batch API.
+  * Added support for bulk actions wizard routes in `BatchJobController`.
+
+# Analytics Web
+
+## Code changes
+- Opting out of marketing features when we initialise google analytics

package/dist/T2/Users.Api.md

@@ -0,0 +1,28 @@
+
+# Customer changes
+* Fixed a bug where support changes an unverified email for a user on behalf of our customer in curator and the verification email does not get sent out automatically. Partially fixes INBOX-2966
+
+* Fixed a bug where support triggers `Resend activation email` on behalf of our customer in curator but the email is not received by the customer. Partially fixes INBOX-2931
+
+
+# Code changes
+* Pass down optional `CustomerId` to backend to fetch the user with right customer associated to it
+* Consolidate `SendVerificationEmailRequest` and `SendActivationEmailRequest` to `BaseSendEmailRequest`
+
+* Added an optional `CustomerId` in  `SendActivationEmailRequest` model so that it can be passed to backend to fetch the user with right customer associated to it
+
+- `/v1/users/learner/change-password` now takes a `changeOnNextLogin` property in it's body, which it forwards on to auth when changing the password.
+
+
+# Testing
+* Go to curator and choose a test school that is not yours and change the email for a user, make sure that the user can receive the verification email.
+
+* Go to curator and choose a test school that is not yours and trigger the `Resend activation email` for any pending user who has an email, make sure that the user can receive the email.
+* Go to staff manager in lite and choose a pending user to resend the activation email, make sure that the user can receive the email.
+
+- Hit `/v1/users/learner/change-password` for a user with `changeOnNextLogin` set to true, and make sure auth requires the user to change their password
+
+
+# Before release
+* Publish `.Common` nuget package to nuget server
+

package/dist/T2/clickview.md

@@ -0,0 +1,98 @@
+
+# Testing
+- n/a
+- In LE, viewing a video description that contains special characters should now be displayed correctly. For example `'`, `"`, `>`.
+- In LE, when updated a video title to be a dangerous string, it should now be handled safely in the success/error alert.
+  - For example: setting the title to `<img src="https://i.imgur.com/SQIDYQ5.png">` should _not_ render the image in the alert.
+- In Lite, while watching a video click on the create a clip button (scissors), then click cancel. You should go back to the same point in the video.
+- In Lite, share a public playlist and attempt to access it via sharelink while unauthenticated:
+  - The playlist page should accessible as expected
+  - Any public videos within the playlist should also be accessible and watchable
+- n/a
+- In curator user manager, if you deactivate/reactivate a user, then try to re-deactivate/reactivate them back to their initial state, this should be possible with no issues. Previously, on the second attempt, the popup would be for the whatever the first attempt was (e.g. if you just deactivated them then tried to reactivate them, the popup would be the "deactivate" popup again).
+- In curator user manager, if you unverify a user's email address, their old email address should no longer remain shown in the user list.
+- I new user manager in Online, Lite and Curator, ensure that when setting a students password, the checkbox to force the student to change their password on next login is appropriately respected.
+- Online, curator, and lite user managers all support a bulk action to change a student's year group.
+- n/a
+- Pagination works in user manager in lite both with and without a search query.
+- "Year group rollover" and "Change year group" should now appear as separate actions within the bulk user actions wizards.
+- The "year group rollover" action should not be accessible if a rollover has been performed on that school recently, or if the admin has not selected every single user.
+- Year group rollover works in Online's new user manager for users with bulk actions enabled.
+- Curator's cannot access bulk actions if they are not a dev.
+- Searching in user manager and selecting users from there to perform a bulk action on should allow you to proceed to the "action selector" step with those users.
+- Performing a year group rollover action should work end to end. The year group that gets set as the graduating year group should have all students rolling over to that year deactivated.
+  - Test this on your own school
+  - Test this on another school. I was using Matt's school so I wouldn't mess with anyone else's data
+- Year group rollover should not be performable more than once per customer (message Joosh if you need to perform it again for testing purposes and I will clear the database)
+- If a year group rollover is performed and some users do not have a year group, an appropriate error is shown for those users once the bulk action is completed.
+- If a year group rollover completely fails, an error is displayed
+- If a year group rollover successfully runs with no users having errors, a success image is displayed
+- Bulk action for deactivating users should work in online, curator, and lite.
+- Bulk action for reactivating users should work in online, curator, and lite.
+- Bulk action for deleting users should work in online, curator, and lite.
+- Alerts that appear in Online after creating or deleting a playlist no longer display the text `<strong></strong>` around the playlist name.
+- Alerts that appear in Online after creating or deleting a playlist are not vulnerable to XSS attacks.
+- n/a
+
+# Library editor
+
+## Customer changes
+- Fixed bug where descriptions were displaying URL encoded special characters instead of their unencoded form.
+  - Fixes INBOX-2912
+- Closed XSS vulnerability where alerts were rendering un-escaped mark up.
+
+## Code changes
+- Removed unnecessary extra escaping of description text.
+- Escape video name when used in alerts.
+
+# Lite
+
+## Customer changes
+- Clicking "cancel" in the clip editor will now take you to the play page at the same point in time. Fixes INBOX-2957.
+- Fixed bug where accessing a public playlist when unauthenticated would require users to sign in
+  - Fixes INBOX-2971
+- Slightly tweaked the copy for the classrooms list page for admins to say "Other classrooms in my school" instead of "All classrooms in my school". Fixes INBOX-2885
+
+## Code changes
+- Fixed the URL being html encoded instead of slugified when hitting cancel in the clip editor.
+- Updated `PlaylistView` to check the current user is authenticated before trying to fetch their presentations
+- `optimize` all requests in PlaylistView
+
+# Player
+
+## Code changes
+- The create a clip player now has an onReady function to return the reference to the player object, similar to the regular player
+
+# Shared
+
+## Customer changes
+- Fixed a bug where disabled password inputs were not being styled properly. Fixes INBOX-2942.
+
+## Code changes
+- Made `onClickRemove` optional in our `InputSelection` which is the pill that shows in the share search bar. I've re-used this element as part of the add to classroom bulk action.
+- Updated `UserManagerAppLinks` so that we can customise it for each client. Curator and Lite now require settings and the addToClassroom details and confirmation steps, while Online doesn't
+- Changing a students password in student manager will now have a checkbox to optionally require the student to change their password on first login. This will default to being toggled. 
+
+![example](https://i.imgur.com/jI8NbVT.png)
+
+# Curator
+
+## Customer changes
+- Fixed some issues in user manager where the UI would not reflect updates made to users. For example: deactivating, reactivating, and unverifying email actions would not properly update the UI after the action had completed. Fixes INBOX-2761
+
+## Code changes
+- Endpoints in `JobRequests` now no longer accept a `customerId`
+
+# Dependencies
+- https://gitlab.cvinternal.net/internal/users.api/-/merge_requests/107
+- https://gitlab.cvinternal.net/clickview/front-end/ClickView.Curator/-/merge_requests/881
+- https://gitlab.cvinternal.net/clickview/front-end/ClickView.Online/-/merge_requests/3048
+- https://gitlab.cvinternal.net/clickview/front-end/ClickView.Curator/-/merge_requests/880
+
+# Online
+
+## Customer changes
+- Fixed a bug where alerts that appear after creating or deleting a playlist would display the text `<strong></strong>`. Fixes INBOX-2873
+
+## Code changes
+- Online's alerts no longer escape the HTML passed into them. I believe this should be fine as these alerts should be using `LanguageService`, and `LanguageService` escapes any dynamic phrase options (such as playlist names). Escaping the rest of the phrase (which the dev writes) doesn't need to happen.

package/lib/src/api-clients/git-lab/GitLabApiClient.js

@@ -78,14 +78,6 @@ var GitLabApiClient = /** @class */ (function () {
                             })];
                     case 1:
                         mergeRequests = _a.sent();
-                        /**
-                         * Filter out only projectIds we care about
-                         */
-                        if (projectIds === null || projectIds === void 0 ? void 0 : projectIds.length) {
-                            mergeRequests = mergeRequests.filter(function (mr) {
-                                return projectIds.some(function (p) { return mr.project_id.toString() === p.toString(); });
-                            });
-                        }
                         return [2 /*return*/, mergeRequests.map(GitLabMapper_1.GitLabMapper.mergeRequest)];
                 }
             });
@@ -241,20 +233,23 @@ var GitLabApiClient = /** @class */ (function () {
             });
         });
     };
-    GitLabApiClient.prototype.getMergeRequest = function (projectId, sourceBranch, targetBranch) {
+    GitLabApiClient.prototype.getMergeRequest = function (projectId, sourceBranch, targetBranch, state) {
         return __awaiter(this, void 0, void 0, function () {
-            var mergeRequests, mergeRequest;
+            var opts, mergeRequests, mergeRequest;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.client.MergeRequests.all({
+                    case 0:
+                        opts = {
                             projectId: projectId,
                             sourceBranch: sourceBranch,
-                            targetBranch: targetBranch,
-                            /**
-                             * We only care about open MRs, this allows us to close any MR and run the CLI again if needed
-                             */
-                            state: 'opened'
-                        })];
+                            targetBranch: targetBranch
+                        };
+                        /**
+                         * We only care about open MRs, this allows us to close any MR and run the CLI again if needed
+                         */
+                        if (state)
+                            opts.state = state;
+                        return [4 /*yield*/, this.client.MergeRequests.all(opts)];
                     case 1:
                         mergeRequests = _a.sent();
                         mergeRequest = mergeRequests[0];

package/lib/src/interfaces/MergeRequestState.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/src/interfaces/index.js

@@ -19,6 +19,7 @@ __exportStar(require("./command-options"), exports);
 __exportStar(require("./models"), exports);
 __exportStar(require("./view-models"), exports);
 __exportStar(require("./Config"), exports);
+__exportStar(require("./MergeRequestState"), exports);
 __exportStar(require("./ShipItCommand"), exports);
 __exportStar(require("./ShipItTask"), exports);
 __exportStar(require("./VersionType"), exports);

package/lib/src/services/GitLabService.js

@@ -82,40 +82,51 @@ var GitLabService = /** @class */ (function () {
         this.apiClient = apiClient;
     }
     GitLabService.prototype.getProjects = function (options) {
+        var _a;
         return __awaiter(this, void 0, void 0, function () {
             var allMergeRequests, mergeRequests, projectIds, projects, mappedProjects, _i, mappedProjects_1, mappedProject, extraProjects;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
                         if (this.projects)
                             return [2 /*return*/, this.projects];
                         return [4 /*yield*/, this.apiClient.getMergeRequests(options)];
                     case 1:
-                        allMergeRequests = _a.sent();
+                        allMergeRequests = _b.sent();
                         mergeRequests = allMergeRequests.filter(function (mr) { return mr.targetBranch !== 'master'; });
                         if (!(mergeRequests === null || mergeRequests === void 0 ? void 0 : mergeRequests.length))
                             throw new errors_1.ShipItError('Could not find any merge requests for the specified options');
                         projectIds = lodash_1.default.uniqBy(mergeRequests, function (m) { return m.projectId; }).map(function (m) { return m.projectId; });
                         return [4 /*yield*/, this.apiClient.getProjectsByIds(projectIds)];
                     case 2:
-                        projects = _a.sent();
+                        projects = _b.sent();
                         if (!(projects === null || projects === void 0 ? void 0 : projects.length) || projects.length !== projectIds.length)
                             throw new errors_1.ShipItError('Could not find all projects for the found merge requests');
                         mappedProjects = projects.map(function (p) { return (__assign(__assign({}, p), { mergeRequests: mergeRequests.filter(function (mr) { return mr.projectId === p.id; }) })); });
                         _i = 0, mappedProjects_1 = mappedProjects;
-                        _a.label = 3;
+                        _b.label = 3;
                     case 3:
                         if (!(_i < mappedProjects_1.length)) return [3 /*break*/, 6];
                         mappedProject = mappedProjects_1[_i];
                         return [4 /*yield*/, this.getExtraProjects(mappedProject, projectIds)];
                     case 4:
-                        extraProjects = _a.sent();
+                        extraProjects = _b.sent();
                         Array.prototype.push.apply(mappedProjects, extraProjects.map(function (p) { return (__assign(__assign({}, p), { mergeRequests: [] })); }));
-                        _a.label = 5;
+                        _b.label = 5;
                     case 5:
                         _i++;
                         return [3 /*break*/, 3];
-                    case 6: return [2 /*return*/, (this.projects = mappedProjects)];
+                    case 6:
+                        /**
+                         * We need to filter our relevant projects after we've added extra projects via tags
+                         */
+                        if ((_a = options.projectIds) === null || _a === void 0 ? void 0 : _a.length) {
+                            mappedProjects = mappedProjects.filter(function (p) {
+                                var _a;
+                                return (_a = options.projectIds) === null || _a === void 0 ? void 0 : _a.some(function (pid) { return p.id.toString() === pid; });
+                            });
+                        }
+                        return [2 /*return*/, (this.projects = mappedProjects)];
                 }
             });
         });
@@ -254,8 +265,8 @@ var GitLabService = /** @class */ (function () {
             });
         });
     };
-    GitLabService.prototype.getMergeRequest = function (projectId, branchName) {
-        return this.apiClient.getMergeRequest(projectId, branchName, 'master');
+    GitLabService.prototype.getMergeRequest = function (projectId, branchName, state) {
+        return this.apiClient.getMergeRequest(projectId, branchName, 'master', state);
     };
     GitLabService.prototype.getMergeRequestById = function (projectId, mergeRequestId) {
         if (isNaN(+mergeRequestId))
@@ -299,7 +310,7 @@ var GitLabService = /** @class */ (function () {
             var mergeRequest;
             return __generator(this, function (_c) {
                 switch (_c.label) {
-                    case 0: return [4 /*yield*/, this.getMergeRequest(projectId, branchName)];
+                    case 0: return [4 /*yield*/, this.getMergeRequest(projectId, branchName, 'opened')];
                     case 1:
                         mergeRequest = _c.sent();
                         if (!mergeRequest)

package/lib/src/startup/AddMilestoneCommand.js

@@ -1,4 +1,15 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -39,10 +50,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.processMilestoneCommandOptions = exports.getAddMilestoneCommand = void 0;
 var utils_1 = require("../utils");
 function processOptions(options) {
-    var opts = {
-        milestone: options.milestone,
-        version: 'minor'
-    };
+    var opts = __assign(__assign({}, options), { version: 'minor' });
     if (options.projectIds)
         opts.projectIds = utils_1.ProjectIds.getProjectIds(options.projectIds);
     if (options.hotfix && options.major)

package/lib/src/startup/SetupCommands.js

@@ -1,15 +1,4 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -46,12 +35,8 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupCommands = void 0;
-var lodash_1 = __importDefault(require("lodash"));
 var AddMilestoneCommand_1 = require("./AddMilestoneCommand");
 var GetAction_1 = require("./GetAction");
 function setupCommands(program, container) {
@@ -77,7 +62,7 @@ function setupCommands(program, container) {
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    options = __assign(__assign({}, (0, AddMilestoneCommand_1.processMilestoneCommandOptions)(lodash_1.default.omit(opts, 'triggerMonorepoBuild'))), { triggerMonorepoBuild: !!opts.triggerMonorepoBuild });
+                    options = (0, AddMilestoneCommand_1.processMilestoneCommandOptions)(opts);
                     return [4 /*yield*/, getAction('release')(options)];
                 case 1:
                     _a.sent();
@@ -95,7 +80,19 @@ function setupCommands(program, container) {
         .option('-m, --milestone <milestone>')
         .option('-b, --monorepoBranchName <monorepoBranchName>')
         .option('-p, --projectIds <projectIds...>')
-        .action(getAction('install-packages'));
+        .action(function (opts) { return __awaiter(_this, void 0, void 0, function () {
+        var options;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    options = (0, AddMilestoneCommand_1.processMilestoneCommandOptions)(opts);
+                    return [4 /*yield*/, getAction('install-packages')(options)];
+                case 1:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
     program.command('validate-mr')
         .description('Validate a merge request in a single project, ensuring it has a milestone and valid description')
         .option('-p, --projectId <projectId>')
@@ -106,12 +103,18 @@ function setupCommands(program, container) {
         .option('-m, --milestone <milestone>')
         .option('--monorepoBranchName <monorepoBranchName>')
         .option('-p, --projectIds <projectIds...>')
-        .action(getAction('start-consuming-project-builds'));
-    program.command('start-consuming-project-builds')
-        .description('Trigger TeamCity builds in all consuming projects that are a part of a milestone')
-        .option('-m, --milestone <milestone>')
-        .option('--monorepoBranchName <monorepoBranchName>')
-        .option('-p, --projectIds <projectIds...>')
-        .action(getAction('start-consuming-project-builds'));
+        .action(function (opts) { return __awaiter(_this, void 0, void 0, function () {
+        var options;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    options = (0, AddMilestoneCommand_1.processMilestoneCommandOptions)(opts);
+                    return [4 /*yield*/, getAction('start-consuming-project-builds')(options)];
+                case 1:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
 }
 exports.setupCommands = setupCommands;

package/lib/src/tasks/CreateMergeRequestTask.js

@@ -80,7 +80,7 @@ var CreateMergeRequestTask = /** @class */ (function () {
                             utils_1.Logger.logError("[".concat(project.title, "]: [").concat(branchName, "] does not exist"));
                             return [3 /*break*/, 6];
                         }
-                        return [4 /*yield*/, this.service.getMergeRequest(project.id, branchName)];
+                        return [4 /*yield*/, this.service.getMergeRequest(project.id, branchName, 'opened')];
                     case 4:
                         mergeRequest = _b.sent();
                         if (mergeRequest) {

package/lib/src/tasks/InstallPackagesTask.js

@@ -225,6 +225,8 @@ var InstallPackagesTask = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         rootDir = ROOT_DIRECTORIES[project.id];
+                        if (!rootDir)
+                            return [2 /*return*/, false];
                         return [4 /*yield*/, this.getFileText(project.id, branchName, "".concat(rootDir, "/package.json"))];
                     case 1:
                         packageJson = _a.sent();

package/lib/src/tasks/StartConsumingProjectBuildsTask.js

@@ -62,7 +62,7 @@ var StartConsumingProjectBuildsTask = /** @class */ (function () {
     }
     StartConsumingProjectBuildsTask.prototype.run = function (_options) {
         return __awaiter(this, void 0, void 0, function () {
-            var milestone, options, projects, consumingProjects, projectBuildMap, _i, consumingProjects_1, project, branchName, build, totalBuilds, project;
+            var milestone, options, projects, consumingProjects, projectBuildMap, _i, consumingProjects_1, project, branchName, buildId, build, totalBuilds, project;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -81,7 +81,7 @@ var StartConsumingProjectBuildsTask = /** @class */ (function () {
                     case 2:
                         if (!milestone)
                             return [2 /*return*/, false];
-                        utils_1.Logger.logInfo("Found milestone \"".concat(milestone, "\". Proceeding to install packages in consuming projects..."));
+                        utils_1.Logger.logInfo("Found milestone \"".concat(milestone, "\". Proceeding to run builds for consuming projects..."));
                         options = {
                             version: _options.version,
                             projectIds: _options.projectIds,
@@ -108,7 +108,12 @@ var StartConsumingProjectBuildsTask = /** @class */ (function () {
                             utils_1.Logger.logWarning("Release branch in project \"".concat(project.title, "\" with milestone \"").concat(options.milestone, "\" was not found. Skipping project..."));
                             return [3 /*break*/, 7];
                         }
-                        return [4 /*yield*/, this.teamCityService.startBuild(TeamCityBuildIDs_1.TeamCityBuildIds[project.id.toString()], branchName)];
+                        buildId = TeamCityBuildIDs_1.TeamCityBuildIds[project.id.toString()];
+                        if (!buildId) {
+                            utils_1.Logger.logWarning("Skipping build for ".concat(project.title, " as no Team City build ID has been specified"));
+                            return [3 /*break*/, 7];
+                        }
+                        return [4 /*yield*/, this.teamCityService.startBuild(buildId, branchName)];
                     case 6:
                         build = _a.sent();
                         projectBuildMap[project.title] = build;

package/lib/src/tasks/TagMasterTask.js

@@ -94,7 +94,7 @@ var TagMasterTask = /** @class */ (function () {
                             return [3 /*break*/, 7];
                         }
                         return [4 /*yield*/, this.service.createRelease(project.id, {
-                                name: "".concat(options.milestone, " Release"),
+                                name: nextVersion,
                                 tag: nextVersion,
                                 description: mergeRequest.description,
                                 ref: mergeRequest.mergeCommit,

package/lib/src/utils/Descriptions.js

@@ -7,7 +7,8 @@ var VALID_HEADINGS = {
     'customer changes': true,
     'code changes': true,
     'testing': true,
-    'notes': true
+    'notes': true,
+    'other': true
 };
 var VALID_MONOREPO_HEADINGS = {
     'common': true,
@@ -24,11 +25,12 @@ var VALID_MONOREPO_HEADINGS = {
     'testing': true,
     'dependencies': true,
     'notes': true,
-    'monorepo': true
+    'monorepo': true,
+    'before release': true
 };
 function toObject(lines, headingPrefix) {
     var obj = {};
-    var currentHeading = 'Other';
+    var currentHeading = 'other';
     for (var _i = 0, lines_1 = lines; _i < lines_1.length; _i++) {
         var line = lines_1[_i];
         // Skip empty lines
@@ -55,8 +57,9 @@ function toObject(lines, headingPrefix) {
     return obj;
 }
 exports.Descriptions = {
-    isDescriptionValid: function (description, headingPrefix) {
+    isDescriptionValid: function (description, headingPrefix, checkForTesting) {
         if (headingPrefix === void 0) { headingPrefix = '#'; }
+        if (checkForTesting === void 0) { checkForTesting = true; }
         if (!description.trim())
             return false;
         var obj = toObject(description.split('\n'), headingPrefix);
@@ -65,7 +68,7 @@ exports.Descriptions = {
             return false;
         if (keys.some(function (k) { return !VALID_HEADINGS[k]; }))
             return false;
-        if (obj['testing'] === undefined)
+        if (checkForTesting && obj['testing'] === undefined)
             return false;
         return true;
     },
@@ -78,12 +81,13 @@ exports.Descriptions = {
             return false;
         if (keys.some(function (k) { return !VALID_MONOREPO_HEADINGS[k]; }))
             return false;
-        if (!obj['testing'])
+        if (obj['testing'] === undefined)
             return false;
         var isValid = Object.keys(obj).every(function (key) {
-            if (key !== 'dependencies' && key !== 'testing')
+            if (key === 'dependencies' || key === 'testing')
                 return true;
-            return exports.Descriptions.isDescriptionValid(obj[key], '##');
+            var subValid = exports.Descriptions.isDescriptionValid(obj[key], '##', false);
+            return subValid;
         });
         return isValid;
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clickview/ship-it",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "Release Manager",
   "main": "./lib/index.js",
   "bin": {