Merge pull request #618 from Enterprise-CMCS/master

Release to val
Enterprise-CMCS · Jul 2, 2024 · 7b877ea · 7b877ea
2 parents d6357eb + 05d5d9e
commit 7b877ea
Show file tree

Hide file tree

Showing 9 changed files with 286 additions and 347 deletions.
diff --git a/src/packages/shared-types/forms.ts b/src/packages/shared-types/forms.ts
@@ -33,7 +33,6 @@ export type RHFSlotProps = {
   descriptionClassName?: string;
   dependency?: DependencyRule;
   rules?: RegisterOptions;
-  horizontalLayout?: boolean;
 } & {
   [K in keyof RHFComponentMap]: {
     rhf: K;

diff --git a/src/packages/shared-types/inputs.ts b/src/packages/shared-types/inputs.ts
@@ -18,7 +18,6 @@ export type DatePickerProps = {
 export interface InputProps
   extends React.InputHTMLAttributes<HTMLInputElement> {
   icon?: string;
-  iconRight?: boolean;
 }
 
 export type RadioProps = React.ComponentPropsWithoutRef<

diff --git a/src/services/api/webforms/ABP1/v202402.ts b/src/services/api/webforms/ABP1/v202402.ts
diff --git a/src/services/ui/src/components/Inputs/button.tsx b/src/services/ui/src/components/Inputs/button.tsx
@@ -6,7 +6,7 @@ import { cn } from "@/utils";
 import { Loader2 } from "lucide-react";
 
 const buttonVariants = cva(
-  "inline-flex items-center justify-center rounded-md text-base font-bold ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50",
+  "inline-flex items-center justify-center rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50",
   {
     variants: {
       variant: {

diff --git a/src/services/ui/src/components/Inputs/input.tsx b/src/services/ui/src/components/Inputs/input.tsx
@@ -3,20 +3,18 @@ import { cn } from "@/utils";
 import { InputProps } from "shared-types";
 
 const Input = React.forwardRef<HTMLInputElement, InputProps>(
-  ({ className, icon, iconRight, ...props }, ref) => {
+  ({ className, icon, ...props }, ref) => {
     return (
-      <div className="relative w-fit">
+      <div className="relative">
         {icon && (
-          <span
-            className={`absolute inset-y-0  flex items-center  text-gray-500 ${iconRight ? "right-0 pr-2" : "left-0 pl-2"}`}
-          >
+          <span className="absolute inset-y-0 left-0 flex items-center pl-2 text-gray-500">
             {icon}
           </span>
         )}
         <input
           className={cn(
             "flex h-9 w-full rounded-sm border border-black bg-transparent px-3 py-1 text-sm shadow-sm transition-colors file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50",
-            icon && (iconRight ? "pr-6" : "pl-6"),
+            icon && "pl-6",
             className,
           )}
           ref={ref}

diff --git a/src/services/ui/src/components/RHF/Slot.tsx b/src/services/ui/src/components/RHF/Slot.tsx
@@ -24,7 +24,6 @@ export const RHFSlot = <
   descriptionClassName,
   labelClassName,
   formItemClassName,
-  horizontalLayout,
   ...rest
 }: RHFSlotProps & { control: any; parentId?: string }): ControllerProps<
   TFieldValues,
@@ -40,11 +39,9 @@ export const RHFSlot = <
 
     return (
       <FormItem
-        className={`flex gap-1 py-2${
+        className={`flex flex-col gap-1 py-2${
           formItemClassName ? ` ${formItemClassName}` : ""
-        }
-        ${horizontalLayout ? "" : " flex-col"}
-        `}
+        }`}
         data-testid={rest.name + "Wrapper"}
       >
         {(label || styledLabel) && (
@@ -58,12 +55,7 @@ export const RHFSlot = <
           </FormDescription>
         )}
         <FormControl>
-          <SlotField
-            {...rest}
-            horizontalLayout={horizontalLayout}
-            control={control}
-            field={field}
-          />
+          <SlotField {...rest} control={control} field={field} />
         </FormControl>
         {description && !descriptionAbove && (
           <FormDescription className={descriptionClassName}>

diff --git a/src/services/ui/src/components/RHF/SlotField.tsx b/src/services/ui/src/components/RHF/SlotField.tsx
@@ -52,7 +52,6 @@ export const SlotField = ({
   parentId,
   fields,
   name,
-  horizontalLayout,
 }: SlotFieldProps) => {
   switch (rhf) {
     case "Input":
@@ -212,7 +211,7 @@ export const SlotField = ({
         <RadioGroup
           onValueChange={field.onChange}
           defaultValue={field.value}
-          className={`flex  ${horizontalLayout ? "pl-5 gap-5" : "flex-col space-y-1"}`}
+          className="flex flex-col space-y-1"
         >
           {(props as RHFComponentMap["Radio"]).options.map((OPT) => {
             return (
@@ -276,7 +275,7 @@ export const OptChildren = ({
               control={control}
               name={parentId + SLOT.name}
               {...(SLOT.rules && { rules: SLOT.rules })}
-              render={RHFSlot({ ...SLOT, control, parentId })}
+              render={RHFSlot({ ...SLOT, parentId, control })}
             />
           </div>
         ))}

diff --git a/src/services/ui/src/components/RHF/dependencyWrapper.tsx b/src/services/ui/src/components/RHF/dependencyWrapper.tsx
@@ -4,7 +4,7 @@ import { DependencyRule, DependencyWrapperProps } from "shared-types";
 
 const checkTriggeringValue = (
   dependentValue: unknown[],
-  dependency?: DependencyRule,
+  dependency?: DependencyRule
 ) => {
   return !!dependency?.conditions?.every((d, i) => {
     switch (d.type) {
@@ -27,7 +27,7 @@ const checkTriggeringValue = (
 };
 
 export const DependencyWrapper = (
-  props: PropsWithChildren<DependencyWrapperProps>,
+  props: PropsWithChildren<DependencyWrapperProps>
 ) => {
   // Check for dependencies which won't exist outside of forms
   if (
@@ -51,7 +51,7 @@ const DependencyWrapperHandler = ({
   const { watch, setValue } = useFormContext();
   const [wasSetLast, setWasSetLast] = useState(false);
   const dependentValues = watch(
-    dependency?.conditions?.map((c) => c.name) ?? [],
+    dependency?.conditions?.map((c) => c.name) ?? []
   );
   const isTriggered =
     dependency && checkTriggeringValue(dependentValues, dependency);

diff --git a/src/services/ui/src/features/webforms/WebFormBody.tsx b/src/services/ui/src/features/webforms/WebFormBody.tsx
@@ -83,7 +83,7 @@ const ClearDataButton: FC<{ reset: () => void }> = ({ reset }) => {
   if (clearDataButton) {
     return (
       <Button type="button" onClick={reset} variant="outline" className="mx-2">
-        Clear
+        Clear Data
       </Button>
     );
   }