Master 2.1.1 (#5858)

* Update version

* Don't delete annotations if there aren't any (#5829)

* don't delete annotations if there aren't any

* add test and align playwright-test

* align core with test

* added annotation describing test

* Add `aria-label` for time conductor history button (#5830)

* [Overlay Plot] Inspector series and legend sync fix (#5835)

* fixed overlay plots to react to series removals correctly, added alias visual to elements pool aliased items

* Keep transaction open on failed editor save (#5840)

* do not end a transaction on a failed editor save
* add unit tests for successful editor save and unsuccessful editor save

* If no matching tags, do not attempt tag search (#5839)

* do not attempt search if no matching tags

* fix timing on test

* commit again in hopes that github will run checks

* add back null tag check

* add some better documentation to tests

Co-authored-by: Andrew Henry <akhenry@gmail.com>

* Update version for  master

Co-authored-by: Scott Bell <scott@traclabs.com>
Co-authored-by: Jesse Mazzella <ozyx@users.noreply.github.com>
Co-authored-by: Jamie V <jamie.j.vigliotta@nasa.gov>
Co-authored-by: David Tsay <3614296+davetsay@users.noreply.github.com>
Co-authored-by: Andrew Henry <akhenry@gmail.com>

src/api/Editor.js

@@ -63,10 +63,9 @@ export default class Editor extends EventEmitter {
             .then(() => {
                 this.editing = false;
                 this.emit('isEditing', false);
+                this.openmct.objects.endTransaction();
             }).catch(error => {
                 throw error;
-            }).finally(() => {
-                this.openmct.objects.endTransaction();
             });
     }
 

src/api/EditorSpec.js

@@ -0,0 +1,80 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2022, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+import {
+    createOpenMct, resetApplicationState
+} from '../utils/testing';
+
+describe('The Editor API', () => {
+    let openmct;
+
+    beforeEach((done) => {
+        openmct = createOpenMct();
+        openmct.on('start', done);
+
+        spyOn(openmct.objects, 'endTransaction');
+
+        openmct.startHeadless();
+    });
+
+    afterEach(() => {
+        return resetApplicationState(openmct);
+    });
+
+    it('opens a transaction on edit', () => {
+        expect(
+            openmct.objects.isTransactionActive()
+        ).toBeFalse();
+        openmct.editor.edit();
+        expect(
+            openmct.objects.isTransactionActive()
+        ).toBeTrue();
+    });
+
+    it('closes an open transaction on successful save', async () => {
+        spyOn(openmct.objects, 'getActiveTransaction')
+            .and.returnValue({
+                commit: () => Promise.resolve(true)
+            });
+
+        openmct.editor.edit();
+        await openmct.editor.save();
+
+        expect(
+            openmct.objects.endTransaction
+        ).toHaveBeenCalled();
+    });
+
+    it('does not close an open transaction on failed save', async () => {
+        spyOn(openmct.objects, 'getActiveTransaction')
+            .and.returnValue({
+                commit: () => Promise.reject()
+            });
+
+        openmct.editor.edit();
+        await openmct.editor.save().catch(() => {});
+
+        expect(
+            openmct.objects.endTransaction
+        ).not.toHaveBeenCalled();
+    });
+});

src/api/annotation/AnnotationAPI.js

@@ -346,6 +346,10 @@ export default class AnnotationAPI extends EventEmitter {
     */
     async searchForTags(query, abortController) {
         const matchingTagKeys = this.#getMatchingTags(query);
+        if (!matchingTagKeys.length) {
+            return [];
+        }
+
         const searchResults = (await Promise.all(this.openmct.objects.search(matchingTagKeys, abortController, this.openmct.objects.SEARCH_TYPES.TAGS))).flat();
         const filteredDeletedResults = searchResults.filter((result) => {
             return !(result._deleted);

src/api/annotation/AnnotationAPISpec.js

@@ -185,5 +185,10 @@ describe("The Annotation API", () => {
             expect(results).toBeDefined();
             expect(results.length).toEqual(1);
         });
+        it("returns no tags for empty search", async () => {
+            const results = await openmct.annotation.searchForTags('q');
+            expect(results).toBeDefined();
+            expect(results.length).toEqual(0);
+        });
     });
 });