Added lock user attribution

nasa · Oct 8, 2024 · e7d485a · e7d485a
1 parent 3389b3b
commit e7d485a
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/src/plugins/persistence/couch/scripts/lockObjects.mjs b/src/plugins/persistence/couch/scripts/lockObjects.mjs
@@ -84,6 +84,12 @@ function processObjectTreeFrom(parentObjectIdentifier) {
           //2. Lock or unlock object
           document.model.locked = locked;
           document.model.disallowUnlock = locked;
+
+          if (locked) {
+            document.model.lockedBy = 'script';
+          } else {
+            delete document.model.lockedBy;
+          }
           //3. Push document to a batch
           documentBatch.push(document);
           //4. Persist batch if necessary, reporting failures

diff --git a/src/ui/layout/BrowseBar.vue b/src/ui/layout/BrowseBar.vue
@@ -429,9 +429,26 @@ export default {
       this.actionCollection.off('update', this.updateActionItems);
       delete this.actionCollection;
     },
-    toggleLock(flag) {
+    async toggleLock(flag) {
       if (!this.domainObject.disallowUnlock) {
+        const wasTransactionActive = this.openmct.objects.isTransactionActive();
+        let transaction;
+
+        if (!wasTransactionActive) {
+          transaction = this.openmct.objects.startTransaction();
+        }
+
         this.openmct.objects.mutate(this.domainObject, 'locked', flag);
+        const userName = await this.openmct.user.getCurrentUser();
+
+        if (userName !== undefined) {
+          this.openmct.objects.mutate(this.domainObject, 'lockedBy', userName);
+        }
+
+        if (!wasTransactionActive) {
+          await transaction.commit();
+          this.openmct.objects.endTransaction();
+        }
       }
     },
     setStatus(status) {