feat(recordings): more tools for filtering by labels

jest.config.js

@@ -32,7 +32,7 @@ module.exports = {
   preset: "ts-jest/presets/js-with-ts",
 
   // The path to a module that runs some code to configure or set up the testing framework before each test
-  setupFilesAfterEnv: ['<rootDir>/test-setup.js'],
+  setupFilesAfterEnv: ['<rootDir>/test-setup.js', "@testing-library/jest-dom"],
 
   // The test environment that will be used for testing.
   testEnvironment: "jsdom",

package.json

@@ -84,10 +84,12 @@
     "@patternfly/react-icons": "^4.75.1",
     "@patternfly/react-styles": "^4.74.1",
     "@patternfly/react-table": "^4.93.1",
+    "@reduxjs/toolkit": "^1.8.5",
     "@types/lodash": "^4.14.175",
     "express": "^4.17.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
+    "react-redux": "^8.0.2",
     "react-router-last-location": "^2.0.1"
   }
 }

src/app/AppLayout/AppLayout.tsx

@@ -253,7 +253,7 @@ const AppLayout: React.FunctionComponent<IAppLayout> = ({children}) => {
       <NavList id="nav-list-simple">
         {navGroups.map((title) => {
           return (
-          <NavGroup title={title}>
+          <NavGroup title={title} key={title}>
             {routes.filter(route => route.navGroup === title)
               .map((route, idx) => {
                 return (
@@ -295,6 +295,7 @@ const AppLayout: React.FunctionComponent<IAppLayout> = ({children}) => {
           .map(( { key, title, message, variant } ) => (
             <Alert
               variant={variant}
+              key={title}
               title={title}
               actionClose={<AlertActionCloseButton onClose={() => handleMarkNotificationRead(key)} />}
               timeout={true}

src/app/Modal/DeleteWarningUtils.tsx

@@ -102,4 +102,4 @@ export const DeleteWarningKinds : DeleteWarning[] = [
 export const getFromWarningMap = (warning: DeleteWarningType): DeleteWarning | undefined => {
     const wt = DeleteWarningKinds.find(t => t.id === warning);
     return wt;
-}
+}

src/app/RecordingMetadata/BulkEditLabels.tsx

@@ -47,6 +47,7 @@ import { RecordingLabelFields } from './RecordingLabelFields';
 import { HelpIcon } from '@patternfly/react-icons';
 import { NO_TARGET } from '@app/Shared/Services/Target.service';
 import { NotificationCategory } from '@app/Shared/Services/NotificationChannel.service';
+import { hashCode } from '@app/utils/utils';
 
 export interface BulkEditLabelsProps {
   isTargetRecording: boolean;
@@ -62,11 +63,20 @@ export const BulkEditLabels: React.FunctionComponent<BulkEditLabelsProps> = (pro
   const [valid, setValid] = React.useState(ValidatedOptions.default);
   const addSubscription = useSubscriptions();
 
+  const getIdxFromRecording = React.useCallback((r: ArchivedRecording): number =>  {
+    if (props.isTargetRecording) {
+      return (r as ActiveRecording).id;
+    } else {
+      return hashCode(r.name);
+    }
+  }, [hashCode, props.isTargetRecording]);
+
   const handleUpdateLabels = React.useCallback(() => {
     const tasks: Observable<any>[] = [];
     const toDelete = savedCommonLabels.filter((label) => !includesLabel(commonLabels, label));
 
-    recordings.forEach((r: ArchivedRecording, idx) => {
+    recordings.forEach((r: ArchivedRecording) => {
+      const idx = getIdxFromRecording(r);
       if (props.checkedIndices.includes(idx)) {
         let updatedLabels = [...parseLabels(r.metadata.labels), ...commonLabels];
         updatedLabels = updatedLabels.filter((label) => {
@@ -106,7 +116,9 @@ export const BulkEditLabels: React.FunctionComponent<BulkEditLabelsProps> = (pro
   const updateCommonLabels = React.useCallback(
     (setLabels: (l: RecordingLabel[]) => void) => {
       let allRecordingLabels = [] as RecordingLabel[][];
-      recordings.forEach((r: ArchivedRecording, idx) => {
+
+      recordings.forEach((r: ArchivedRecording) => {
+        const idx = getIdxFromRecording(r);
         if (props.checkedIndices.includes(idx)) {
           allRecordingLabels.push(parseLabels(r.metadata.labels));
         }
@@ -159,25 +171,8 @@ export const BulkEditLabels: React.FunctionComponent<BulkEditLabelsProps> = (pro
     addSubscription(context.target.target().subscribe(refreshRecordingList));
   }, [addSubscription, context, context.target, refreshRecordingList]);
 
-  React.useEffect(() => {
-    addSubscription(
-      combineLatest([
-        context.target.target(),
-        merge(
-          context.notificationChannel.messages(NotificationCategory.ActiveRecordingDeleted),
-          context.notificationChannel.messages(NotificationCategory.SnapshotDeleted)
-        ),
-      ]).subscribe((parts) => {
-        const currentTarget = parts[0];
-        const event = parts[1];
-        if (currentTarget.connectUrl != event.message.target) {
-          return;
-        }
-        setRecordings((old) => old.filter((r) => r.name != event.message.recording.name));
-      })
-    );
-  }, [addSubscription, context, context.notificationChannel, setRecordings]);
-
+  // Depends only on RecordingMetadataUpdated notifications
+  // since updates on list of recordings will mount a completely new BulkEditLabels.
   React.useEffect(() => {
     addSubscription(
       combineLatest([
@@ -236,7 +231,7 @@ export const BulkEditLabels: React.FunctionComponent<BulkEditLabelsProps> = (pro
           </Split>
         </StackItem>
         <StackItem>
-          <LabelCell labels={savedCommonLabels} />
+          <LabelCell target='' labels={savedCommonLabels} />
         </StackItem>
         <StackItem>
           {editing ? (
@@ -263,6 +258,7 @@ export const BulkEditLabels: React.FunctionComponent<BulkEditLabelsProps> = (pro
           ) : (
             <Button
               key="edit labels"
+              aria-label='Edit Labels'
               variant="secondary"
               onClick={handleEditLabels}
               isDisabled={!props.checkedIndices.length}

src/app/RecordingMetadata/ClickableLabel.tsx

@@ -0,0 +1,88 @@
+/*
+ * Copyright The Cryostat Authors
+ *
+ * The Universal Permissive License (UPL), Version 1.0
+ *
+ * Subject to the condition set forth below, permission is hereby granted to any
+ * person obtaining a copy of this software, associated documentation and/or data
+ * (collectively the "Software"), free of charge and under any and all copyright
+ * rights in the Software, and any and all patent rights owned or freely
+ * licensable by each licensor hereunder covering either (i) the unmodified
+ * Software as contributed to or provided by such licensor, or (ii) the Larger
+ * Works (as defined below), to deal in both
+ *
+ * (a) the Software, and
+ * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+ * one is included with the Software (each a "Larger Work" to which the Software
+ * is contributed by such licensors),
+ *
+ * without restriction, including without limitation the rights to copy, create
+ * derivative works of, display, perform, and distribute the Software and make,
+ * use, sell, offer for sale, import, export, have made, and have sold the
+ * Software and the Larger Work(s), and to sublicense the foregoing rights on
+ * either these or other terms.
+ *
+ * This license is subject to the following condition:
+ * The above copyright notice and either this complete permission notice or at
+ * a minimum a reference to the UPL must be included in all copies or
+ * substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+import { getLabelDisplay } from "@app/Recordings/Filters/LabelFilter";
+import { Label } from "@patternfly/react-core";
+import React from "react";
+import { RecordingLabel } from "./RecordingLabel";
+
+
+export interface ClickableLabelCellProps {
+  label: RecordingLabel;
+  isSelected: boolean;
+  onLabelClick: (label: RecordingLabel) => void
+}
+
+export const ClickableLabel: React.FunctionComponent<ClickableLabelCellProps> = (props) => {
+  const [isHoveredOrFocused, setIsHoveredOrFocused] = React.useState(false);
+  const labelColor = React.useMemo(() => props.isSelected? "blue": "grey", [props.isSelected]);
+
+  const handleHoveredOrFocused = React.useCallback(() => setIsHoveredOrFocused(true), [setIsHoveredOrFocused]);
+  const handleNonHoveredOrFocused = React.useCallback(() => setIsHoveredOrFocused(false), [setIsHoveredOrFocused]);
+
+  const style = React.useMemo(() => {
+    if (isHoveredOrFocused) {
+      const defaultStyle = { cursor: "pointer", "--pf-c-label__content--before--BorderWidth": "2.5px"};
+      if (props.isSelected) {
+        return {...defaultStyle, "--pf-c-label__content--before--BorderColor": "#06c"}
+      }
+      return {...defaultStyle, "--pf-c-label__content--before--BorderColor": "#8a8d90"}
+    }
+    return {};
+  }, [props.isSelected, isHoveredOrFocused]);
+
+  const handleLabelClicked = React.useCallback(
+    () => props.onLabelClick(props.label), 
+    [props.label, props.onLabelClick, getLabelDisplay]
+  );
+
+  return <>
+    <Label
+      aria-label={`${props.label.key}: ${props.label.value}`}
+      style={style}
+      onMouseEnter={handleHoveredOrFocused}
+      onMouseLeave={handleNonHoveredOrFocused}
+      onFocus={handleHoveredOrFocused}
+      onClick={handleLabelClicked}
+      key={props.label.key}
+      color={labelColor}
+      >
+        {`${props.label.key}: ${props.label.value}`}
+    </Label>
+  </>;
+}

src/app/RecordingMetadata/LabelCell.tsx

@@ -36,21 +36,60 @@
  * SOFTWARE.
  */
 
+import { getLabelDisplay } from '@app/Recordings/Filters/LabelFilter';
+import { UpdateFilterOptions } from '@app/Shared/Redux/RecordingFilterReducer';
 import { Label, Text } from '@patternfly/react-core';
 import React from 'react';
+import { ClickableLabel } from './ClickableLabel';
 import { RecordingLabel } from './RecordingLabel';
 
 export interface LabelCellProps {
+  target: string;
   labels: RecordingLabel[];
+  clickableOptions?: { // If undefined, labels are not clickable (i.e. display only) and only displayed in grey.
+    labelFilters: string[];
+    updateFilters: (target: string, updateFilterOptions: UpdateFilterOptions) => void
+  }
 }
 
 export const LabelCell: React.FunctionComponent<LabelCellProps> = (props) => {
-  // TODO make labels clickable to select multiple recordings with the same label
+  const isLabelSelected = React.useCallback((label: RecordingLabel) => {
+    if (props.clickableOptions) {
+      const labelFilterSet = new Set(props.clickableOptions.labelFilters);
+      return labelFilterSet.has(getLabelDisplay(label))
+    }
+    return false;
+  }, [getLabelDisplay, props.clickableOptions]);
+
+  const getLabelColor = React.useCallback((label: RecordingLabel) => isLabelSelected(label)? "blue": "grey", [isLabelSelected]);
+  const onLabelSelectToggle = React.useCallback(
+    (clickedLabel: RecordingLabel) => {
+      if (props.clickableOptions) {
+        props.clickableOptions.updateFilters(props.target, {filterKey: "Label", filterValue: getLabelDisplay(clickedLabel), deleted: isLabelSelected(clickedLabel)})
+      }
+    },
+    [props.clickableOptions, props.target, getLabelDisplay]);
+
   return (
     <>
-      {!!props.labels && props.labels.length ? (
-        props.labels.map((l) => <Label key={l.key} color="grey">{`${l.key}: ${l.value}`}</Label>)
-      ) : (
+      {!!props.labels && props.labels.length? (
+        props.labels.map((label) =>
+        props.clickableOptions?
+          <ClickableLabel
+            key={label.key}
+            label={label}
+            isSelected={isLabelSelected(label)}
+            onLabelClick={onLabelSelectToggle}
+          /> :
+          <Label
+            aria-label={`${label.key}: ${label.value}`}
+            key={label.key}
+            color={getLabelColor(label)}
+          >
+            {`${label.key}: ${label.value}`}
+          </Label>
+
+        )) : (
         <Text>-</Text>
       )}
     </>

src/app/RecordingMetadata/RecordingLabel.tsx

@@ -49,10 +49,10 @@ export const parseLabels = (jsonLabels) => {
   });
 };
 
-export const includesLabel = (arr, searchLabel) => {
+export const includesLabel = (arr: RecordingLabel[], searchLabel: RecordingLabel) => {
   return arr.some(l => isEqualLabel(searchLabel, l));
 }
 
-const isEqualLabel = (a, b) => {
+const isEqualLabel = (a: RecordingLabel, b: RecordingLabel) => {
   return (a.key === b.key) && (a.value === b.value);
 }

src/app/RecordingMetadata/RecordingLabelFields.tsx

@@ -167,7 +167,7 @@ export const RecordingLabelFields: React.FunctionComponent<RecordingLabelFieldsP
 
   return (
     <>
-      <Button onClick={handleAddLabelButtonClick} variant="link" icon={<PlusCircleIcon />}>
+      <Button aria-label='Add Label' onClick={handleAddLabelButtonClick} variant="link" icon={<PlusCircleIcon />}>
         Add Label
       </Button>
       {!!props.labels && props.labels.map((label, idx) => (