Merge pull request #4817 from gchq/gh-4815

#4815 Fix annotation initial assignedTo

Author: stroomdev66

stroom-app/src/main/resources/ui/noauth/swagger/stroom.json

@@ -10455,6 +10455,36 @@
         "tags" : [ "Authorisation" ]
       }
     },
+    "/userRef/v1/getUserByUuid" : {
+      "post" : {
+        "operationId" : "getUserByUuid",
+        "requestBody" : {
+          "content" : {
+            "application/json" : {
+              "schema" : {
+                "type" : "string"
+              }
+            }
+          },
+          "description" : "uuid",
+          "required" : true
+        },
+        "responses" : {
+          "default" : {
+            "content" : {
+              "application/json" : {
+                "schema" : {
+                  "$ref" : "#/components/schemas/UserRef"
+                }
+              }
+            },
+            "description" : "default response"
+          }
+        },
+        "summary" : "Resolve a user ref by UUID",
+        "tags" : [ "Authorisation" ]
+      }
+    },
     "/users/v1/createGroup" : {
       "post" : {
         "operationId" : "createGroup",

stroom-app/src/main/resources/ui/noauth/swagger/stroom.yaml

@@ -7176,6 +7176,26 @@ paths:
         user is admin or has Manage Users permission then they can see all users.
       tags:
       - Authorisation
+  /userRef/v1/getUserByUuid:
+    post:
+      operationId: getUserByUuid
+      requestBody:
+        content:
+          application/json:
+            schema:
+              type: string
+        description: uuid
+        required: true
+      responses:
+        default:
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/UserRef"
+          description: default response
+      summary: Resolve a user ref by UUID
+      tags:
+      - Authorisation
   /users/v1/createGroup:
     post:
       operationId: createGroup

stroom-core-client/src/main/java/stroom/annotation/client/AnnotationEditPresenter.java

@@ -265,15 +265,17 @@ private void changeAssignedTo(final UserRef selected) {
     }
 
     private void setAssignedTo(final UserRef assignedTo) {
-        currentAssignedTo = assignedTo;
-        getView().setAssignedTo(assignedTo);
-//        if (currentAssignedTo == null) {
-//            assignedToPresenter.setClearSelectionText(null);
-//        } else {
-//            assignedToPresenter.setClearSelectionText("Clear");
-//        }
-//        assignedToPresenter.clearFilter();
-        assignedToPresenter.setSelected(currentAssignedTo);
+        assignedToPresenter.resolve(assignedTo, userRef -> {
+            currentAssignedTo = userRef;
+            getView().setAssignedTo(userRef);
+    //        if (currentAssignedTo == null) {
+    //            assignedToPresenter.setClearSelectionText(null);
+    //        } else {
+    //            assignedToPresenter.setClearSelectionText("Clear");
+    //        }
+    //        assignedToPresenter.clearFilter();
+            assignedToPresenter.setSelected(currentAssignedTo);
+        });
     }
 
     private void changeComment(final String selected) {

stroom-core-client/src/main/java/stroom/dashboard/client/table/AnnotationManager.java

@@ -27,6 +27,7 @@
 import stroom.query.api.v2.Column;
 import stroom.query.client.presenter.TableRow;
 import stroom.svg.shared.SvgImage;
+import stroom.util.shared.UserRef;
 import stroom.widget.menu.client.presenter.IconMenuItem;
 import stroom.widget.menu.client.presenter.Item;
 import stroom.widget.menu.client.presenter.ShowMenuEvent;
@@ -237,14 +238,16 @@ private void createAnnotation(final List<EventId> eventIdList) {
         final String title = getValue(tableComponentSettings, selectedItems, "title");
         final String subject = getValue(tableComponentSettings, selectedItems, "subject");
         final String status = getValue(tableComponentSettings, selectedItems, "status");
-//        final String assignedTo = getValue(tableComponentSettings, selectedItems, "assignedTo");
+        final String assignedTo = getValue(tableComponentSettings, selectedItems, "assignedTo");
         final String comment = getValue(tableComponentSettings, selectedItems, "comment");
 
         final Annotation annotation = new Annotation();
         annotation.setTitle(title);
         annotation.setSubject(subject);
         annotation.setStatus(status);
-//        annotation.setAssignedTo(optUserName);
+        if (assignedTo != null) {
+            annotation.setAssignedTo(UserRef.builder().uuid(assignedTo).build());
+        }
         annotation.setComment(comment);
 
         ShowAnnotationEvent.fire(changeStatusPresenter, annotation, eventIdList);

stroom-core-client/src/main/java/stroom/hyperlink/client/HyperlinkEventHandlerImpl.java

@@ -17,8 +17,10 @@
 import stroom.pipeline.shared.stepping.StepType;
 import stroom.pipeline.stepping.client.event.BeginPipelineSteppingEvent;
 import stroom.task.client.TaskMonitorFactory;
+import stroom.util.client.Console;
 import stroom.util.shared.DefaultLocation;
 import stroom.util.shared.TextRange;
+import stroom.util.shared.UserRef;
 import stroom.widget.popup.client.event.RenamePopupEvent;
 import stroom.widget.popup.client.event.ShowPopupEvent;
 import stroom.widget.popup.client.presenter.PopupSize;
@@ -154,10 +156,11 @@ private void openAnnotation(final String href, final TaskMonitorFactory taskMoni
         final Long annotationId = getLongParam(href, "annotationId");
         final Long streamId = getLongParam(href.toLowerCase(Locale.ROOT), "streamId".toLowerCase(Locale.ROOT));
         final Long eventId = getLongParam(href.toLowerCase(Locale.ROOT), "eventId".toLowerCase(Locale.ROOT));
+        final String eventIdList = getParam(href, "eventIdList");
         final String title = getParam(href, "title");
         final String subject = getParam(href, "subject");
         final String status = getParam(href, "status");
-//        final String assignedTo = getParam(href, "assignedTo");
+        final String assignedTo = getParam(href, "assignedTo");
         final String comment = getParam(href, "comment");
 
         // assignedTo is a display name so have to convert it back to a unique username
@@ -166,14 +169,30 @@ private void openAnnotation(final String href, final TaskMonitorFactory taskMoni
         annotation.setTitle(title);
         annotation.setSubject(subject);
         annotation.setStatus(status);
-//        annotation.setAssignedTo(assignedTo);
+        if (assignedTo != null) {
+            annotation.setAssignedTo(UserRef.builder().uuid(assignedTo).build());
+        }
         annotation.setComment(comment);
 
         final List<EventId> linkedEvents = new ArrayList<>();
         if (streamId != null && eventId != null) {
             linkedEvents.add(new EventId(streamId, eventId));
         }
 
+        if (eventIdList != null && !eventIdList.isBlank()) {
+            final String[] eventIdStringArray = eventIdList.split(",");
+            for (final String eventIdString : eventIdStringArray) {
+                try {
+                    final EventId eventId1 = EventId.parse(eventIdString);
+                    if (eventId1 != null) {
+                        linkedEvents.add(eventId1);
+                    }
+                } catch (final RuntimeException e) {
+                    Console.log(e::getMessage, e);
+                }
+            }
+        }
+
         ShowAnnotationEvent.fire(this, annotation, linkedEvents);
     }
 

stroom-core-client/src/main/java/stroom/security/client/presenter/UserRefPopupPresenter.java

@@ -21,6 +21,7 @@
 import stroom.data.client.presenter.RestDataProvider;
 import stroom.data.grid.client.MyDataGrid;
 import stroom.data.grid.client.PagerView;
+import stroom.dispatch.client.DefaultErrorHandler;
 import stroom.dispatch.client.RestErrorHandler;
 import stroom.dispatch.client.RestFactory;
 import stroom.query.api.v2.ExpressionOperator;
@@ -220,6 +221,20 @@ public void setSelected(final UserRef userRef) {
         selectionModel.setSelected(userRef);
     }
 
+    public void resolve(final UserRef userRef, final Consumer<UserRef> consumer) {
+        if (userRef == null || userRef.getUuid() == null) {
+            consumer.accept(userRef);
+        } else {
+            restFactory
+                    .create(RESOURCE)
+                    .method(res -> res.getUserByUuid(userRef.getUuid()))
+                    .onSuccess(consumer)
+                    .onFailure(new DefaultErrorHandler(this, () -> consumer.accept(userRef)))
+                    .taskMonitorFactory(pagerView)
+                    .exec();
+        }
+    }
+
     public void refresh() {
         if (dataProvider == null) {
             //noinspection Convert2Diamond // GWT

stroom-core-shared/src/main/java/stroom/annotation/shared/EventId.java

@@ -61,7 +61,7 @@ public boolean equals(final Object o) {
         }
         final EventId eventId1 = (EventId) o;
         return streamId == eventId1.streamId &&
-                eventId == eventId1.eventId;
+               eventId == eventId1.eventId;
     }
 
     @Override

stroom-core-shared/src/main/java/stroom/security/shared/UserRefResource.java

@@ -25,8 +25,15 @@ public interface UserRefResource extends RestResource, DirectRestService {
     @Path("/find")
     @Operation(
             summary = "Find the users and groups matching the supplied criteria of users who belong to at least " +
-                    "one of the same groups as the current user. If the current user is admin or has " +
-                    "Manage Users permission then they can see all users.",
+                      "one of the same groups as the current user. If the current user is admin or has " +
+                      "Manage Users permission then they can see all users.",
             operationId = "findUserRefs")
     ResultPage<UserRef> find(@Parameter(description = "criteria", required = true) FindUserCriteria criteria);
+
+    @POST
+    @Path("/getUserByUuid")
+    @Operation(
+            summary = "Resolve a user ref by UUID",
+            operationId = "getUserByUuid")
+    UserRef getUserByUuid(@Parameter(description = "uuid", required = true) String uuid);
 }

stroom-query/stroom-query-common/src/main/java/stroom/query/common/v2/ResultStoreManager.java

@@ -260,11 +260,13 @@ private SearchRequest addQueryKey(final SearchRequest searchRequest) {
     }
 
     private SearchRequest addCurrentUserParam(final SearchRequest searchRequest) {
-        // Add a param for `currentUser()`
         final List<Param> params = NullSafe.mutableList(searchRequest.getQuery().getParams());
-
         final UserRef userRef = securityContext.getUserRef();
+        params.add(new Param(ParamKeys.CURRENT_USER_UUID, userRef.getUuid()));
         params.add(new Param(ParamKeys.CURRENT_USER, userRef.toDisplayString()));
+        if (userRef.getDisplayName() != null) {
+            params.add(new Param(ParamKeys.CURRENT_USER_DISPLAY_NAME, userRef.getDisplayName()));
+        }
         if (userRef.getSubjectId() != null) {
             params.add(new Param(ParamKeys.CURRENT_USER_SUBJECT_ID, userRef.getSubjectId()));
         }

stroom-query/stroom-query-language/src/main/java/stroom/query/language/functions/AbstractCurrentUser.java

@@ -0,0 +1,56 @@
+/*
+ * Copyright 2017 Crown Copyright
+ *
+ * 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.
+ */
+
+package stroom.query.language.functions;
+
+import stroom.query.language.token.Param;
+
+import java.text.ParseException;
+import java.util.Map;
+
+abstract class AbstractCurrentUser extends AbstractFunction {
+
+    private Generator gen = Null.GEN;
+
+    public AbstractCurrentUser(final String name) {
+        super(name, 0, 0);
+    }
+
+    @Override
+    public void setParams(final Param[] params) throws ParseException {
+        super.setParams(params);
+    }
+
+    @Override
+    public void setStaticMappedValues(final Map<String, String> staticMappedValues) {
+        final String v = staticMappedValues.get(getKey());
+        if (v != null) {
+            gen = new StaticValueGen(ValString.create(v));
+        }
+    }
+
+    @Override
+    public Generator createGenerator() {
+        return gen;
+    }
+
+    @Override
+    public boolean hasAggregate() {
+        return false;
+    }
+
+    abstract String getKey();
+}