Fix lock explorative annotations (#7847)

* only show locking option in explorative annoations table incase the user is the owner & remove double newline * ignore files of vscode metals (for scala) addon * remove accidental inverted logic
scalableminds · May 31, 2024 · e76b238 · e76b238
1 parent 5818b61
commit e76b238
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 33 deletions.
diff --git a/.gitignore b/.gitignore
@@ -77,3 +77,6 @@ coverage-ts
 temp-webknossos-schema**
 conf/application.conf-e
 .env
+.bloop
+.metals
+metals.sbt
diff --git a/frontend/javascripts/dashboard/explorative_annotations_view.tsx b/frontend/javascripts/dashboard/explorative_annotations_view.tsx
@@ -309,41 +309,40 @@ class ExplorativeAnnotationsView extends React.PureComponent<Props, State> {
           >
             Download
           </AsyncLink>
-          <br />
           {this.isTracingEditable(tracing) ? (
-            <AsyncLink
-              href="#"
-              onClick={() => this.finishOrReopenAnnotation("finish", tracing)}
-              icon={<InboxOutlined key="inbox" className="icon-margin-right" />}
-              disabled={tracing.isLockedByOwner}
-              title={tracing.isLockedByOwner ? "Locked annotations cannot be archived." : undefined}
-            >
-              Archive
-            </AsyncLink>
+            <>
+              <br />
+              <AsyncLink
+                href="#"
+                onClick={() => this.finishOrReopenAnnotation("finish", tracing)}
+                icon={<InboxOutlined key="inbox" className="icon-margin-right" />}
+                disabled={tracing.isLockedByOwner}
+                title={
+                  tracing.isLockedByOwner ? "Locked annotations cannot be archived." : undefined
+                }
+              >
+                Archive
+              </AsyncLink>
+            </>
+          ) : null}
+          {isActiveUserOwner ? (
+            <>
+              <br />
+              <AsyncLink
+                href="#"
+                onClick={() => this.setLockedState(tracing, !tracing.isLockedByOwner)}
+                icon={
+                  tracing.isLockedByOwner ? (
+                    <LockOutlined key="lock" className="icon-margin-right" />
+                  ) : (
+                    <UnlockOutlined key="unlock" className="icon-margin-right" />
+                  )
+                }
+              >
+                {tracing.isLockedByOwner ? "Unlock" : "Lock"}
+              </AsyncLink>
+            </>
           ) : null}
-          <br />
-          <AsyncLink
-            href="#"
-            title={
-              !isActiveUserOwner
-                ? `Only the owner can ${
-                    tracing.isLockedByOwner ? "unlock" : "lock"
-                  } this annotation.`
-                : undefined
-            }
-            disabled={!isActiveUserOwner}
-            onClick={() => this.setLockedState(tracing, !tracing.isLockedByOwner)}
-            icon={
-              tracing.isLockedByOwner ? (
-                <LockOutlined key="lock" className="icon-margin-right" />
-              ) : (
-                <UnlockOutlined key="unlock" className="icon-margin-right" />
-              )
-            }
-          >
-            {tracing.isLockedByOwner ? "Unlock" : "Lock"}
-          </AsyncLink>
-          <br />
         </div>
       );
     } else {