Web: Shared: LinkRow: reworked link regeneration to link deletion

packages/shared/components/share/Share.types.ts

@@ -92,6 +92,8 @@ export type ExpiredComboBoxProps = {
   ) => Promise<void>;
   isDisabled?: boolean;
   isRoomsLink?: boolean;
+  changeAccessOption: (item: TOption, link: TFileLink) => Promise<void>;
+  accessOptions: TOption[];
 };
 
 export type ShareProps = {

packages/shared/components/share/index.tsx

@@ -244,11 +244,7 @@ const Share = (props: ShareProps) => {
 
       if (item.access === ShareAccessRights.None) {
         deleteLink(link.sharedTo.id);
-        if (link.sharedTo.primary) {
-          toastr.success(t("Common:GeneralAccessLinkRemove"));
-        } else {
-          toastr.success(t("Common:AdditionalLinkRemove"));
-        }
+        toastr.success(t("Common:LinkRemoved"));
       } else {
         updateLink(link, res);
         if (item.access === ShareAccessRights.DenyAccess) {

packages/shared/components/share/sub-components/ExpiredComboBox.tsx

@@ -37,12 +37,15 @@ import { getExpiredOptions } from "../Share.helpers";
 import { ExpiredComboBoxProps } from "../Share.types";
 
 import ShareCalendar from "./ShareCalendar";
+import { ShareAccessRights } from "../../../enums";
 
 const ExpiredComboBox = ({
   link,
   changeExpirationOption,
   isDisabled,
   isRoomsLink,
+  changeAccessOption,
+  accessOptions,
 }: ExpiredComboBoxProps) => {
   const { t, i18n } = useTranslation(["Common"]);
   const calendarRef = useRef<HTMLDivElement | null>(null);
@@ -108,8 +111,9 @@ const ExpiredComboBox = ({
     return { date: calculatedDate + 1, label: t("Common:Days") };
   };
 
-  const onRegenerateClick = () => {
-    setSevenDays();
+  const onRemoveLink = () => {
+    const opt = accessOptions.find((o) => o.access === ShareAccessRights.None);
+    if (opt) changeAccessOption(opt, link);
   };
 
   useEffect(() => {
@@ -182,9 +186,9 @@ const ExpiredComboBox = ({
             fontWeight={400}
             fontSize="12px"
             color="#4781D1"
-            onClick={onRegenerateClick}
+            onClick={onRemoveLink}
           >
-            {t("Common:Regenerate")}
+            {t("Common:RemoveLink")}
           </Link>
         </Text>
       ) : (

packages/shared/components/share/sub-components/LinkRow.tsx

@@ -163,9 +163,11 @@ const LinkRow = ({
             {!isPrimaryLink && (
               <ExpiredComboBox
                 link={link}
+                accessOptions={accessOptions}
                 changeExpirationOption={changeExpirationOption}
                 isDisabled={isLoaded || isArchiveFolder}
                 isRoomsLink={isRoomsLink}
+                changeAccessOption={changeAccessOption}
               />
             )}
           </div>

public/locales/en/Common.json

@@ -373,6 +373,8 @@
   "RecoverDescribeYourProblemPlaceholder": "Describe your problem",
   "RecoverTitle": "Access recovery",
   "Regenerate": "Regenerate",
+  "RemoveLink": "Remove link",
+  "LinkRemoved": "Link removed",
   "RegistrationEmail": "Your registration email address",
   "ReloadPage": "Reload page",
   "Remember": "Remember me",