From 1097ec64b276217f028c2c582fe8f2599a1aec85 Mon Sep 17 00:00:00 2001
From: x032205 <x032205@gmail.com>
Date: Mon, 19 May 2025 15:40:07 -0400
Subject: [PATCH] ui improvements

---
 frontend/src/components/v2/Select/Select.tsx  |  1 +
 .../components/ShareSecretForm.tsx            | 34 ++++++++++++++++---
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/v2/Select/Select.tsx b/frontend/src/components/v2/Select/Select.tsx
index e0dc90186..a35dc00d2 100644
--- a/frontend/src/components/v2/Select/Select.tsx
+++ b/frontend/src/components/v2/Select/Select.tsx
@@ -123,6 +123,7 @@ export const SelectItem = forwardRef<HTMLDivElement, SelectItemProps>(
     return (
       <SelectPrimitive.Item
         {...props}
+        disabled={isDisabled}
         className={twMerge(
           "relative mb-0.5 cursor-pointer select-none items-center overflow-hidden truncate rounded-md py-2 pl-10 pr-4 text-sm outline-none transition-all hover:bg-mineshaft-500 data-[highlighted]:bg-mineshaft-700/80",
           isSelected && "bg-primary",
diff --git a/frontend/src/pages/public/ShareSecretPage/components/ShareSecretForm.tsx b/frontend/src/pages/public/ShareSecretPage/components/ShareSecretForm.tsx
index 322aa20ae..e347f1482 100644
--- a/frontend/src/pages/public/ShareSecretPage/components/ShareSecretForm.tsx
+++ b/frontend/src/pages/public/ShareSecretPage/components/ShareSecretForm.tsx
@@ -291,6 +291,15 @@ export const ShareSecretForm = ({
                     label="Expires In"
                     errorText={error?.message}
                     isError={Boolean(error)}
+                    helperText={
+                      expiresInOptions.length !== filteredExpiresInOptions.length ? (
+                        <span className="text-yellow-500">
+                          Limited to{" "}
+                          {filteredExpiresInOptions[filteredExpiresInOptions.length - 1].label} by
+                          organization
+                        </span>
+                      ) : undefined
+                    }
                   >
                     <Select
                       defaultValue={field.value}
@@ -298,8 +307,12 @@ export const ShareSecretForm = ({
                       onValueChange={(e) => onChange(e)}
                       className="w-full"
                     >
-                      {filteredExpiresInOptions.map(({ label, value: expiresInValue }) => (
-                        <SelectItem value={String(expiresInValue || "")} key={label}>
+                      {expiresInOptions.map(({ label, value: expiresInValue }) => (
+                        <SelectItem
+                          value={String(expiresInValue || "")}
+                          key={label}
+                          isDisabled={!filteredExpiresInOptions.some((v) => v.label === label)}
+                        >
                           {label}
                         </SelectItem>
                       ))}
@@ -315,6 +328,15 @@ export const ShareSecretForm = ({
                     label="Max Views"
                     errorText={error?.message}
                     isError={Boolean(error)}
+                    helperText={
+                      viewLimitOptions.length !== filteredViewLimitOptions.length ? (
+                        <span className="text-yellow-500">
+                          Limited to{" "}
+                          {filteredViewLimitOptions[filteredViewLimitOptions.length - 1].label} by
+                          organization
+                        </span>
+                      ) : undefined
+                    }
                   >
                     <Select
                       defaultValue={field.value}
@@ -322,8 +344,12 @@ export const ShareSecretForm = ({
                       onValueChange={(e) => onChange(e)}
                       className="w-full"
                     >
-                      {filteredViewLimitOptions.map(({ label, value: viewLimitValue }) => (
-                        <SelectItem value={String(viewLimitValue || "")} key={label}>
+                      {viewLimitOptions.map(({ label, value: viewLimitValue }) => (
+                        <SelectItem
+                          value={String(viewLimitValue || "")}
+                          key={label}
+                          isDisabled={!filteredViewLimitOptions.some((v) => v.label === label)}
+                        >
                           {label}
                         </SelectItem>
                       ))}