Merge branch 'ws-1813-add-save-and-close' into '2.8.2-DEVELOPMENT'

WS-1813: Add save and save and close buttons to editor

See merge request !1399

apps/web/src/app/workspaces/components/editor/editor.component.html

@@ -31,6 +31,7 @@
     <div class="modal-footer">
         <button type="button" class="btn btn-outline-secondary mr-auto" (click)="undoEditChanges()">Revert Changes</button>
         <button type="button" class="btn btn-secondary" (click)="modal.close('exit')">Cancel</button>
-        <button type="button" class="btn btn-primary" mdbBtn (click)="modal.close('save')">Save</button>
+        <button type="button" class="btn btn-primary" mdbBtn (click)="this.newEditEvent.emit(this.editedData)">Save</button>
+        <button type="button" class="btn btn-primary" mdbBtn (click)="modal.close('save-and-close')">Save and Close</button>
     </div>
 </ng-template>

apps/web/src/app/workspaces/components/editor/editor.component.ts

@@ -51,7 +51,7 @@ export class EditorComponent implements OnInit {
     this.toggleEditorOpen()
     this.modalService.open(content, { ariaLabelledBy: "modal-title", centered: true, size: "lg" }).result.then(
       (result) => {
-        if (result === "save" && this.editedData) {
+        if (result === "save-and-close" && this.editedData) {
           // "Save" button clicked; emit edited data to parent component
           this.newEditEvent.emit(this.editedData)
           this.toggleEditorOpen()