fix: owned services filter not working

grycap · Jan 3, 2025 · dc6c649 · dc6c649
1 parent 5564148
commit dc6c649
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 7 deletions.
diff --git a/src/pages/ui/minio/components/AddBucketButton/index.tsx b/src/pages/ui/minio/components/AddBucketButton/index.tsx
@@ -50,7 +50,7 @@ export default function AddBucketButton() {
       <PopoverContent className="w-80">
         <div className="grid gap-4">
           <div className="space-y-2">
-            <h4 className="font-medium leading-none">Create MinIO Bucket</h4>
+            <h4 className="font-medium leading-none">Create bucket</h4>
           </div>
           <div className="grid gap-2">
             <Label htmlFor="bucketName">Bucket Name</Label>

diff --git a/src/pages/ui/services/components/ServicesList/domain/filterUtils.ts b/src/pages/ui/services/components/ServicesList/domain/filterUtils.ts
@@ -1,3 +1,4 @@
+import { AuthData } from "@/contexts/AuthContext";
 import {
   Service,
   ServiceFilter,
@@ -7,12 +8,25 @@ import {
 interface Props {
   services: Service[];
   filter: ServiceFilter;
-  user: string;
+  authData: AuthData;
 }
 
-function handleFilterServices({ services, filter, user }: Props) {
+function handleFilterServices({ services, filter, authData }: Props) {
   return services.filter((service) => {
-    if (filter.onlyOwned && service.owner !== user) return false;
+    if (filter.onlyOwned) {
+      const token = authData.token;
+
+      if (!token) {
+        return (
+          service.allowed_users.includes(authData.user) ||
+          service.owner === authData.user
+        );
+      }
+
+      if (token && !service.allowed_users.includes(token)) {
+        return false;
+      }
+    }
 
     const param = service[ServiceFilterByKey[filter.type]] as string;
 

diff --git a/src/pages/ui/services/components/ServicesList/index.tsx b/src/pages/ui/services/components/ServicesList/index.tsx
@@ -77,7 +77,7 @@ function ServicesList() {
     const filteredServices = handleFilterServices({
       filter,
       services,
-      user: authData.user,
+      authData,
     });
     return filteredServices;
   }, [services, filter, authData?.user]);

diff --git a/src/pages/ui/services/components/Topbar/components/FilterBy.tsx b/src/pages/ui/services/components/Topbar/components/FilterBy.tsx
@@ -86,8 +86,11 @@ function ServicesFilterBy() {
               }}
               style={{ fontSize: 16 }}
             />
-            <label htmlFor="ownedItems" style={{ fontSize: 14 }}>
-              Only owned services
+            <label
+              htmlFor="ownedItems"
+              style={{ fontSize: 14, marginTop: "1px" }}
+            >
+              My services
             </label>
           </div>
         </SelectContent>