added logic to cover clicking directly on a card. updated tests, upda…

…ted copy
nebari-dev · Sep 16, 2024 · 8b6d120 · 8b6d120
1 parent f6fb587
commit 8b6d120
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 11 deletions.
diff --git a/jhub_apps/static/js/index.js b/jhub_apps/static/js/index.js
diff --git a/ui/src/components/app-card/app-card.tsx b/ui/src/components/app-card/app-card.tsx
@@ -69,6 +69,7 @@ export const AppCard = ({
   const [, setIsDeleteOpen] = useRecoilState<boolean>(isDeleteOpen);
   const [, setIsStartNotRunningOpen] = useRecoilState(isStartNotRunningOpen);
 
+
   useEffect(() => {
     if (serverStatus) {
       setAppStatus(serverStatus);
@@ -110,6 +111,11 @@ export const AppCard = ({
       id: 'start',
       title: 'Start',
       onClick: () => {
+        if (isShared) {
+          // Show error if it's a shared app
+          setNotification('You don\'t have permission to start this app. Please ask the owner to start it.');
+          return;
+        }
         setIsStartOpen(true);
         setCurrentApp(app!); // Add the non-null assertion operator (!) to ensure that app is not undefined
       },
@@ -120,8 +126,12 @@ export const AppCard = ({
       id: 'stop',
       title: 'Stop',
       onClick: () => {
+        if (isShared) {
+          setNotification('You don\'t have permission to stop this app. Please ask the owner to stop it.');
+          return;
+        }
         setIsStopOpen(true);
-        setCurrentApp(app!); // Set the current app when Stop is clicked
+        setCurrentApp(app!); 
       },
       visible: true,
       disabled: serverStatus !== 'Running', // Disable stop if the app is not running
@@ -132,7 +142,7 @@ export const AppCard = ({
       onClick: () =>
         (window.location.href = `${API_BASE_URL}/edit-app?id=${id}`),
       visible: true,
-      disabled: isShared || id === '' || !isAppCard, // Disable edit for shared apps
+      disabled: isShared || id === '' || !isAppCard,
     },
     {
       id: 'delete',
@@ -148,6 +158,7 @@ export const AppCard = ({
   ];
 
 
+
   const getHoverClass = (id: string) => {
     const element = document.querySelector(
       `#card-content-container-${id}`,
@@ -195,7 +206,7 @@ export const AppCard = ({
               url: app?.url || '',
               ready: app?.ready || false,
               public: app?.public || false,
-              shared: false,
+              shared: app?.shared || isShared || false,
               last_activity: new Date(app?.last_activity || ''),
               status: 'Ready',
             });

diff --git a/ui/src/pages/home/home.test.tsx b/ui/src/pages/home/home.test.tsx
@@ -758,7 +758,7 @@ describe('Home', () => {
 
     // Expect the snackbar to display the 403 Forbidden error message
     await waitFor(() => {
-      const snackbar = getByText(/You don't have permission to start this app \(403 Forbidden\)/);
+      const snackbar = getByText(/You don't have permission to start this app. Please ask the owner to start it./);
       expect(snackbar).toBeInTheDocument();
     });
   });
@@ -804,7 +804,7 @@ describe('Home', () => {
 
     // Expect the snackbar to display the 403 Forbidden error message
     await waitFor(() => {
-      const snackbar = getByText(/You don't have permission to stop this app \(403 Forbidden\)/);
+      const snackbar = getByText(/You don't have permission to stop this app. Please ask the owner/);
       expect(snackbar).toBeInTheDocument();
     });
   });

diff --git a/ui/src/pages/home/home.tsx b/ui/src/pages/home/home.tsx
@@ -157,7 +157,7 @@ export const Home = (): React.ReactElement => {
     const sharedApp = currentApp?.shared;
     if (sharedApp) {
       setSubmitting(false);
-      setSnackbarMessage('You don\'t have permission to start this app (403 Forbidden). Please ask the owner to start it.');
+      setSnackbarMessage('You don\'t have permission to start this app. Please ask the owner to start it.');
       setSnackbarSeverity('error');
       setSnackbarOpen(true);
       return;
@@ -179,7 +179,7 @@ export const Home = (): React.ReactElement => {
           if (isErrorWithResponse(error)) {
             const status = error.response?.status;
             if (status === 403) {
-              setSnackbarMessage('You don\'t have permission to start this app (403 Forbidden). Please ask the owner to start it.');
+              setSnackbarMessage('You don\'t have permission to start this app. Please ask the owner to start it.');
             } else if (status === 404) {
               setSnackbarMessage('App not found (404).');
             } else if (status === 500) {
@@ -209,7 +209,7 @@ export const Home = (): React.ReactElement => {
     const sharedApp = currentApp?.shared;
     if (sharedApp) {
       setSubmitting(false);
-      setSnackbarMessage('You don\'t have permission to stop this app (403 Forbidden). Please ask the owner to stop it.');
+      setSnackbarMessage('You don\'t have permission to stop this app. Please ask the owner to stop it.');
       setSnackbarSeverity('error');
       setSnackbarOpen(true);
       return;
@@ -230,7 +230,7 @@ export const Home = (): React.ReactElement => {
           if (isErrorWithResponse(error)) {
             const status = error.response?.status;
             if (status === 403) {
-              setSnackbarMessage('You don\'t have permission to stop this app (403 Forbidden). Please ask the owner to stop it.');
+              setSnackbarMessage('You don\'t have permission to stop this app. Please ask the owner to stop it.');
             } else if (status === 404) {
               setSnackbarMessage('App not found (404).');
             } else if (status === 500) {