Merge branch 'main' into custom-target-form

Signed-off-by: Ian Bolton <ibolton@redhat.com>
konveyor · Oct 27, 2023 · 891d936 · 891d936
2 parents 43f9d4a + fe11195
commit 891d936
Show file tree

Hide file tree

Showing 13 changed files with 564 additions and 172 deletions.
diff --git a/client/src/app/api/models.ts b/client/src/app/api/models.ts
@@ -130,6 +130,8 @@ export interface Application {
   assessments?: Ref[];
   assessed?: boolean;
   archetypes?: Ref[];
+  risk?: Risk;
+  confidence?: number;
 }
 
 export interface Review {

diff --git a/client/src/app/components/SimpleSelect.tsx b/client/src/app/components/SimpleSelect.tsx
@@ -38,29 +38,32 @@ export const SimpleSelect: React.FC<ISimpleSelectProps> = ({
 }) => {
   const [isOpen, setIsOpen] = useState(false);
   return (
-    <Select
-      menuAppendTo="parent" // prevent menu from being clipped by modal edges
-      maxHeight={200}
-      placeholderText={placeholderText}
-      toggleAriaLabel={toggleAriaLabel}
-      isOpen={isOpen}
-      onToggle={(_, isOpen) => setIsOpen(isOpen)}
-      onSelect={(_, selection) => {
-        onChange(selection);
-        if (props.variant !== "checkbox") {
-          setIsOpen(false);
-        }
-      }}
-      selections={value}
-      {...props}
-    >
-      {options.map((option, index) => (
-        <SelectOption
-          key={`${index}-${option.toString()}`}
-          value={option}
-          {...(typeof option === "object" && (option as OptionWithValue).props)}
-        />
-      ))}
-    </Select>
+    <>
+      <Select
+        menuAppendTo="parent" // prevent menu from being clipped by modal edges
+        maxHeight={200}
+        placeholderText={placeholderText}
+        toggleAriaLabel={toggleAriaLabel}
+        isOpen={isOpen}
+        onToggle={(_, isOpen) => setIsOpen(isOpen)}
+        onSelect={(_, selection) => {
+          onChange(selection);
+          if (props.variant !== "checkbox") {
+            setIsOpen(false);
+          }
+        }}
+        selections={value}
+        {...props}
+      >
+        {options.map((option, index) => (
+          <SelectOption
+            key={`${index}-${option.toString()}`}
+            value={option}
+            {...(typeof option === "object" &&
+              (option as OptionWithValue).props)}
+          />
+        ))}
+      </Select>
+    </>
   );
 };
diff --git a/client/src/app/components/SimpleSelectBasic.tsx b/client/src/app/components/SimpleSelectBasic.tsx
@@ -0,0 +1,59 @@
+import React, { useState } from "react";
+
+import {
+  Select,
+  SelectList,
+  SelectOption,
+  MenuToggle,
+  MenuToggleElement,
+} from "@patternfly/react-core";
+
+export interface ISimpleSelectBasicProps {
+  onChange: (selection: string) => void;
+  options: string[];
+  value?: string;
+  placeholderText?: string;
+}
+
+export const SimpleSelectBasic: React.FC<ISimpleSelectBasicProps> = ({
+  onChange,
+  options,
+  value,
+  placeholderText = "Select...",
+}) => {
+  const [isOpen, setIsOpen] = useState(false);
+
+  const toggle = (toggleRef: React.Ref<MenuToggleElement>) => (
+    <MenuToggle
+      isFullWidth
+      ref={toggleRef}
+      onClick={() => {
+        setIsOpen(!isOpen);
+      }}
+      isExpanded={isOpen}
+    >
+      {value || placeholderText || ""}
+    </MenuToggle>
+  );
+
+  return (
+    <Select
+      isOpen={isOpen}
+      toggle={toggle}
+      onOpenChange={(isOpen) => setIsOpen(isOpen)}
+      selected={value}
+      onSelect={(_, selection) => {
+        onChange(selection as string);
+        setIsOpen(false);
+      }}
+    >
+      <SelectList>
+        {options.map((option, index) => (
+          <SelectOption key={`${index}-${option.toString()}`} value={option}>
+            {option.toString()}
+          </SelectOption>
+        ))}
+      </SelectList>
+    </Select>
+  );
+};