release: v0.15.0 (#45)

* feat: Unshare file (#44)

---------

Co-authored-by: Miguel Mateo Mendoza Rojas <115849391+MiguelMRojas@users.noreply.github.com>

Author: PedroChaparro

CHANGELOG.md

@@ -1,3 +1,12 @@
+# [0.15.0](https://github.com/PedroChaparro/alternative-frontend-react/compare/v0.14.0...v0.15.0) (2023-10-25)
+
+
+### Features
+
+* Unshare file ([#44](https://github.com/PedroChaparro/alternative-frontend-react/issues/44)) ([8bb105c](https://github.com/PedroChaparro/alternative-frontend-react/commit/8bb105c20762c59c522ec5c3b6587597920c1f49))
+
+
+
 # [0.14.0](https://github.com/PedroChaparro/alternative-frontend-react/compare/v0.13.0...v0.14.0) (2023-10-25)
 
 
@@ -34,12 +43,3 @@
 
 
 
-# [0.11.0](https://github.com/PedroChaparro/alternative-frontend-react/compare/v0.10.0...v0.11.0) (2023-10-24)
-
-
-### Features
-
-* List shared files ([#33](https://github.com/PedroChaparro/alternative-frontend-react/issues/33)) ([b19c51f](https://github.com/PedroChaparro/alternative-frontend-react/commit/b19c51f733526ecefe01806ea6112aadeb275532))
-
-
-

e2e/files/share-files.spec.tsx

@@ -146,4 +146,48 @@ test.describe.serial("Users can share files", () => {
     // Assert the shared file is shown
     await expect(page.getByText("yellow.jpg")).toBeVisible();
   });
+
+  test("Users can un-share a file", async ({ page }) => {
+    // Login with the owner user
+    await page.goto("/login");
+    await page.getByLabel("Username").fill(username);
+    await page.getByLabel("Password", { exact: true }).fill(password);
+    await page.getByRole("button", { name: "Submit", exact: true }).click();
+    await page.waitForURL(/\/files$/);
+
+    // Open the folder dropdown
+    const folderCard = page.getByRole("button", {
+      name: `${sharedFolder} card`
+    });
+    await expect(folderCard).toBeVisible();
+    await folderCard.getByLabel(`More options for ${sharedFolder}`).click();
+
+    // Select the "Manage access" option
+    const shareButton = page.getByRole("menuitem", {
+      name: "Manage access",
+      exact: true
+    });
+    await expect(shareButton).toBeVisible();
+    await shareButton.click();
+
+    // Assert modal is open
+    await expect(page.getByRole("dialog")).toBeVisible();
+    await expect(page.getByText("Manage access")).toBeVisible();
+
+    // Assert the other user is shown
+    const userRow = page.getByText(new RegExp(usernameShare, "i"));
+    await expect(userRow).toBeVisible();
+
+    // Unshare the file
+    const unShareButton = page.getByRole("button", {
+      name: `Un-share with ${usernameShare}`
+    });
+    await unShareButton.click();
+
+    // Assert an alert is shown
+    await expect(page.getByText("File unshared successfully")).toBeVisible();
+
+    // Assert the other user does not appears
+    await expect(userRow).not.toBeVisible();
+  });
 });

package.json

@@ -1,7 +1,7 @@
 {
   "name": "unofficial-frontend-react",
   "private": true,
-  "version": "0.14.0",
+  "version": "0.15.0",
   "type": "module",
   "scripts": {
     "dev": "vite",

src/screens/files/dialogs/access-management/users-with-access/UserWithAccessRow.tsx

@@ -1,4 +1,8 @@
 import { Button } from "@/components/ui/button";
+import { AuthContext, FilesDialogsContext } from "@/context";
+import { unshareFileService } from "@/services/files/unshare-file.service";
+import { useContext } from "react";
+import { toast } from "sonner";
 
 interface UserWithAccessRowProps {
   user: string;
@@ -9,11 +13,24 @@ export const UserWithAccessRow = ({
   user,
   unshareCallback
 }: UserWithAccessRowProps) => {
-  const handleUnshare = () => {
-    // TODO: Make the request to unshare the file
+  const { session } = useContext(AuthContext);
+  const { selectedFile } = useContext(FilesDialogsContext);
 
-    // Remove the user from the UI
-    unshareCallback(user);
+  const handleUnshare = async (userName: string) => {
+    const unShareRequest = {
+      token: session?.token as string,
+      fileUUID: selectedFile?.uuid as string,
+      otherUsername: userName
+    };
+
+    const { success, msg } = await unshareFileService(unShareRequest);
+    if (!success) {
+      toast.error(msg);
+      return;
+    }
+
+    toast.success(msg);
+    unshareCallback(userName);
   };
 
   return (
@@ -25,7 +42,7 @@ export const UserWithAccessRow = ({
       <Button
         variant={"destructive"}
         aria-label={`Un-share with ${user}`}
-        onClick={handleUnshare}
+        onClick={() => handleUnshare(user)}
       >
         Un-share
       </Button>

src/services/files/unshare-file.service.ts

@@ -0,0 +1,51 @@
+import { ENVIRONMENT } from "@/config/environment";
+import axios, { AxiosError } from "axios";
+
+type UnshareFileRequest = {
+  token: string;
+  fileUUID: string;
+  otherUsername: string;
+};
+
+type UnshareFileResponse = {
+  success: boolean;
+  msg: string;
+};
+
+export const unshareFileService = async (
+  req: UnshareFileRequest
+): Promise<UnshareFileResponse> => {
+  const URL = `${ENVIRONMENT.PROXY_BASE_URL}/file/unshare`;
+
+  try {
+    const unshareFileResponse = await axios.post(
+      URL,
+      {
+        fileUUID: req.fileUUID,
+        otherUsername: req.otherUsername
+      },
+      {
+        headers: {
+          Authorization: `Bearer ${req.token}`
+        }
+      }
+    );
+    const { data } = unshareFileResponse;
+
+    return {
+      success: true,
+      msg: data.msg
+    };
+  } catch (error) {
+    let errorMsg = "There was an error while trying to un-share the file";
+
+    if (error instanceof AxiosError) {
+      errorMsg = error.response?.data.msg || errorMsg;
+    }
+
+    return {
+      success: false,
+      msg: errorMsg
+    };
+  }
+};