fixed issue with logging and added filters for userID and activity

Author: porterbot

modules/AdministrationGUI/src/main/java/org/janelia/workstation/admin/RetrieveLogsPanel.java

@@ -93,15 +93,44 @@ private void setupUI() {
         constraints.gridy = 1;
         contentPanel.add(neuronNameTextField, constraints);
 
+        // Activity filter
+        final JLabel activityLabel = new JLabel("Activity");
+        final JComboBox<TmOperation.Activity> activityComboBox = new JComboBox<>(
+                TmOperation.Activity.values());  // assuming Activity is an enum in TmOperation
+        activityComboBox.insertItemAt(null, 0); // allow 'no filter'
+        activityComboBox.setSelectedIndex(0);
+
+        constraints.gridx = 0;
+        constraints.gridy = 2;
+        contentPanel.add(activityLabel, constraints);
+        constraints.gridx = 1;
+        constraints.gridy = 2;
+        contentPanel.add(activityComboBox, constraints);
+
+        // UserID filter
+        final JLabel userIdLabel = new JLabel("User ID");
+        final JTextField userIdTextField = new JTextField();
+        userIdTextField.setText("");
+        userIdTextField.setEditable(true);
+        userIdTextField.setFocusable(true);
+
+        constraints.gridx = 0;
+        constraints.gridy = 3;
+        contentPanel.add(userIdLabel, constraints);
+        constraints.gridx = 1;
+        constraints.gridy = 3;
+        contentPanel.add(userIdTextField, constraints);
+
+
         File defaultFile = Utils.getOutputFile(System.getProperty("user.home"), "log_results", "csv");
         final JTextField fileOutputLocation = new JTextField();
         fileOutputLocation.setText(defaultFile.getAbsolutePath());
         JButton outputButton = new JButton("Choose Export Location");
         constraints.gridx = 1;
-        constraints.gridy = 2;
+        constraints.gridy = 4;
         contentPanel.add(fileOutputLocation, constraints);
         constraints.gridx = 0;
-        constraints.gridy = 2;
+        constraints.gridy = 4;
         contentPanel.add(outputButton, constraints);
 
         add(contentPanel, BorderLayout.CENTER);
@@ -134,11 +163,13 @@ public void actionPerformed(ActionEvent ae) {
                 TiledMicroscopeDomainMgr domainMgr = TiledMicroscopeDomainMgr.getDomainMgr();
                 String workspaceId = workspaceNameTextField.getText();
                 String neuronId = neuronNameTextField.getText();
+                TmOperation.Activity activity = (TmOperation.Activity) activityComboBox.getSelectedItem();
+                String userId = userIdTextField.getText().isEmpty() ? null : userIdTextField.getText();
+
                 Long workspaceId_L =(workspaceId.equals("")?null:Long.parseLong(workspaceId));
                 Long neuronId_L =(neuronId.equals("")?null:Long.parseLong(neuronId));
                 List<TmOperation> logs = domainMgr.getOperationLogs(workspaceId_L,
-                        neuronId_L,
-                        null, null, AccessManager.getSubjectKey());
+                        neuronId_L,  userId, activity, AccessManager.getSubjectKey());
                 try {
                     BufferedWriter writer = new BufferedWriter(new FileWriter(fileOutputLocation.getText()));
                     for (TmOperation log : logs) {
@@ -161,11 +192,11 @@ public void actionPerformed(ActionEvent ae) {
         });
 
         constraints.gridx = 1;
-        constraints.gridy = 3;
+        constraints.gridy = 5;
         contentPanel.add(okButton, constraints);
 
         constraints.gridx = 1;
-        constraints.gridy = 4;
+        constraints.gridy = 6;
         contentPanel.add(statusLabel, constraints);
         revalidate();
     }

modules/CommonGUI/src/main/resources/org/janelia/workstation/common/release_notes/curr_release.txt

@@ -1,5 +1,5 @@
-// 9.23
+// 9.23.1
 
 Horta
-* Added support for self-registration for Demo Hortacloud instance
-* Expanded event logging for additional user events
+* Added filter for userId and activity in search events
+* Fixed issue with recording of timestamp and user in event logging

modules/CommonGUI/src/main/resources/org/janelia/workstation/common/release_notes/prev_releases.txt

@@ -1,3 +1,9 @@
+// 9.23
+
+Horta
+* Added support for self-registration for Demo Hortacloud instance
+* Expanded event logging for additional user events
+
 // 9.22
 
 Horta

modules/ViewerController/src/main/java/org/janelia/workstation/controller/TmViewerManager.java

@@ -68,7 +68,8 @@ public void logOperation (TmOperation.Activity activity, Date timestamp, Long el
             workspaceId = modelManager.getCurrentWorkspace().getId();
         TmOperation newOperationLog = new TmOperation();
         newOperationLog.setActivity(activity);
-        newOperationLog.setTimestamp(timestamp);
+        newOperationLog.setTimestamp(new Date());
+        newOperationLog.setUser(AccessManager.getSubjectKey() );
         newOperationLog.setElapsedTime(elapsedTime);
         newOperationLog.setWorkspaceId(workspaceId);
         if (modelManager.getCurrentSelections().getCurrentNeuron()!=null)

modules/ViewerController/src/main/java/org/janelia/workstation/controller/access/TiledMicroscopeDomainMgr.java

@@ -159,11 +159,11 @@ public  List<TmWorkspaceInfo> getLargestWorkspaces () {
         return client.getLargestWorkspaces(AccessManager.getSubjectKey());
     }
 
-    public List<TmOperation> getOperationLogs (Long workspaceId, Long neuronId, Date startTime, Date endTime,
+    public List<TmOperation> getOperationLogs (Long workspaceId, Long neuronId, String userId, TmOperation.Activity activity,
                                                String subjectKey) {
         LOG.debug("getOperationLogs(workspaceId={}, neuronId={}, startTime={}, endTime={})",
-                workspaceId, neuronId, startTime, endTime);
-        return client.getOperationLogs(workspaceId, neuronId, startTime, endTime, subjectKey);
+                workspaceId, neuronId, userId, activity);
+        return client.getOperationLogs(workspaceId, neuronId, userId, activity, subjectKey);
     }
 
     public void createOperationLog (TmOperation operation, String subjectKey) {

modules/ViewerController/src/main/java/org/janelia/workstation/controller/access/TiledMicroscopeRestClient.java

@@ -141,14 +141,14 @@ public List<TmWorkspaceInfo> getLargestWorkspaces(String subjectKey ) {
     }
 
     public List<TmOperation> getOperationLogs(Long workspaceId, Long neuronId,
-                                   Date startTime, Date endTime,
+                                              String userId, TmOperation.Activity activity,
                                    String subjectKey ) {
         WebTarget target =  getMouselightDataEndpoint("/operation/log/search")
                 .queryParam("username", subjectKey)
                 .queryParam("workspaceId", workspaceId)
                 .queryParam("neuronId", neuronId)
-                .queryParam("timestamp", startTime)
-                .queryParam("timestamp", endTime);
+                .queryParam("userId", userId)
+                .queryParam("activity", activity);
         Response response = target
                 .request("application/json")
                 .get();