From 9355eadf32265bd59cd0d891ae630ee802f12bde Mon Sep 17 00:00:00 2001
From: Ramon Candel <mameo@MacBook-Pro-de-Ramon.local>
Date: Thu, 18 Apr 2024 09:32:56 +0200
Subject: [PATCH 1/2] added prevention value for when photos endpoint is
 deleted

---
 src/app/drive/services/usage.service.ts | 38 +++++++++++++++++++------
 1 file changed, 29 insertions(+), 9 deletions(-)

diff --git a/src/app/drive/services/usage.service.ts b/src/app/drive/services/usage.service.ts
index 886be4477..bcb4a8d61 100644
--- a/src/app/drive/services/usage.service.ts
+++ b/src/app/drive/services/usage.service.ts
@@ -1,5 +1,6 @@
 import { UsageResponse } from '@internxt/sdk/dist/drive/storage/types';
 import { SdkFactory } from '../../core/factory/sdk';
+import errorService from '../../core/services/error.service';
 
 export interface UsageDetailsProps {
   drive: number;
@@ -11,10 +12,15 @@ export async function fetchUsage(): Promise<UsageResponse> {
   const storageClient = SdkFactory.getInstance().createStorageClient();
   const photosClient = await SdkFactory.getInstance().createPhotosClient();
 
-  const [driveUsage, { usage: photosUsage }] = await Promise.all([
-    storageClient.spaceUsage(),
-    photosClient.photos.getUsage(),
-  ]);
+  let photosUsage = 0;
+  const driveUsage = await storageClient.spaceUsage();
+
+  try {
+    const { usage } = await photosClient.photos.getUsage();
+    photosUsage = usage;
+  } catch (error) {
+    errorService.reportError(error);
+  }
 
   driveUsage.total += photosUsage;
 
@@ -25,14 +31,28 @@ async function getUsageDetails(): Promise<UsageDetailsProps> {
   const storageClient = SdkFactory.getInstance().createStorageClient();
   const photosClient = await SdkFactory.getInstance().createPhotosClient();
 
-  const [{ drive, backups }, { usage: photosUsage }] = await Promise.all([
-    storageClient.spaceUsage(),
-    photosClient.photos.getUsage(),
-  ]);
+  let drive = 0;
+  let backups = 0;
+  let photos = 0;
+
+  try {
+    const { drive: storageDrive, backups: storageBackups } = await storageClient.spaceUsage();
+    drive = storageDrive;
+    backups = storageBackups;
+  } catch (error) {
+    errorService.reportError(error);
+  }
+
+  try {
+    const { usage } = await photosClient.photos.getUsage();
+    photos = usage;
+  } catch (error) {
+    errorService.reportError(error);
+  }
 
   return {
     drive,
-    photos: photosUsage,
+    photos,
     backups,
   };
 }

From 2fdae304c4629dd16a40552d392bb8c4e0e37867 Mon Sep 17 00:00:00 2001
From: Ramon Candel <mameo@MacBook-Pro-de-Ramon.local>
Date: Thu, 18 Apr 2024 16:54:14 +0200
Subject: [PATCH 2/2] Removed delete photos buttons

---
 src/app/photos/components/Preview.tsx | 15 +++++++--------
 src/app/photos/components/Toolbar.tsx | 11 ++---------
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/src/app/photos/components/Preview.tsx b/src/app/photos/components/Preview.tsx
index 6b1aba07a..875cd55d4 100644
--- a/src/app/photos/components/Preview.tsx
+++ b/src/app/photos/components/Preview.tsx
@@ -1,14 +1,14 @@
-import { CaretLeft, DownloadSimple, Share, Trash, X } from '@phosphor-icons/react';
-import { useState, useEffect, Fragment } from 'react';
 import { Transition } from '@headlessui/react';
-import { useDispatch, useSelector } from 'react-redux';
-import { getPhotoBlob, getPhotoPreview } from 'app/network/download';
-import { RootState } from '../../store';
-import { photosSlice, PhotosState } from '../../store/slices/photos';
-import useIdle from '../../core/hooks/useIdle';
 import { PhotosItemType } from '@internxt/sdk/dist/photos';
+import { CaretLeft, DownloadSimple, Share, X } from '@phosphor-icons/react';
 import * as Sentry from '@sentry/react';
 import { useTranslationContext } from 'app/i18n/provider/TranslationProvider';
+import { getPhotoBlob, getPhotoPreview } from 'app/network/download';
+import { Fragment, useEffect, useState } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import useIdle from '../../core/hooks/useIdle';
+import { RootState } from '../../store';
+import { PhotosState, photosSlice } from '../../store/slices/photos';
 
 export default function Preview({
   onDownloadClick,
@@ -210,7 +210,6 @@ function Toolbar({
         <div className="flex">
           <TopIcon Target={DownloadSimple} onClick={onDownloadClick} />
           <TopIcon Target={Share} onClick={onShareClick} />
-          <TopIcon Target={Trash} onClick={onDeleteClick} />
         </div>
       </div>
     </Transition>
diff --git a/src/app/photos/components/Toolbar.tsx b/src/app/photos/components/Toolbar.tsx
index 9dad8bf1f..9d1719025 100644
--- a/src/app/photos/components/Toolbar.tsx
+++ b/src/app/photos/components/Toolbar.tsx
@@ -1,7 +1,7 @@
+import { DownloadSimple, Share, X } from '@phosphor-icons/react';
+import { useTranslationContext } from 'app/i18n/provider/TranslationProvider';
 import { HTMLAttributes } from 'react';
 import { PlacesType } from 'react-tooltip';
-import { useTranslationContext } from 'app/i18n/provider/TranslationProvider';
-import { DownloadSimple, Share, Trash, X } from '@phosphor-icons/react';
 import TooltipElement from '../../shared/components/Tooltip/Tooltip';
 
 const createToolTipsProps = (id: string, content: string, place: PlacesType): HTMLAttributes<HTMLElement> => ({
@@ -55,13 +55,6 @@ export default function Toolbar({
           toolTipProps={createToolTipsProps('photos-share-tooltip', translate('actions.share'), 'bottom')}
         />
         <TooltipElement id={'photos-share-tooltip'} className="z-40" />
-        <Icon
-          Target={Trash}
-          onClick={onDeleteClick}
-          dataTest="photos-delete-selected"
-          toolTipProps={createToolTipsProps('photos-delete-tooltip', translate('actions.delete'), 'bottom')}
-        />
-        <TooltipElement id={'photos-delete-tooltip'} className="z-40" />
       </div>
     </div>
   );