Fix started notebooks disappear issue

backend/src/routes/api/status/adminAllowedUsers.ts

@@ -45,7 +45,8 @@ const getUserActivityFromNotebook = async (
     .map<[string | undefined, string | undefined]>((notebook) => [
       notebook.metadata.annotations?.['opendatahub.io/username'],
       notebook.metadata.annotations?.['notebooks.kubeflow.org/last-activity'] ||
-        notebook.metadata.annotations?.['kubeflow-resource-stopped'],
+        notebook.metadata.annotations?.['kubeflow-resource-stopped'] ||
+        'Now',
     ])
     .filter(
       (arr): arr is [string, string] =>

frontend/src/__mocks__/mockAllowedUsers.ts

@@ -3,12 +3,14 @@ import { AllowedUser, PrivilegeState } from '~/pages/notebookController/screens/
 type MockAllowedUsersType = {
   username?: string;
   privilege?: PrivilegeState;
+  lastActivity?: string;
 };
 export const mockAllowedUsers = ({
   username = 'test-user',
   privilege = PrivilegeState.USER,
+  lastActivity = '2024-02-14T14:22:05Z',
 }: MockAllowedUsersType): AllowedUser => ({
   username,
   privilege,
-  lastActivity: '2024-02-14T14:22:05Z',
+  lastActivity,
 });

frontend/src/__tests__/cypress/cypress/pages/administration.ts

@@ -1,3 +1,4 @@
+import { Modal } from './components/Modal';
 import { TableRow } from './components/table';
 
 class NotebookController {
@@ -95,5 +96,16 @@ class AdministrationUsersRow extends TableRow {
   }
 }
 
+class StopNotebookModal extends Modal {
+  constructor() {
+    super('Stop server modal Stop server');
+  }
+
+  findStopNotebookServerButton() {
+    return this.find().findByTestId('stop-nb-server-button');
+  }
+}
+
 export const administration = new AdministrationTab();
 export const notebookController = new NotebookController();
+export const stopNotebookModal = new StopNotebookModal();

frontend/src/__tests__/cypress/cypress/tests/mocked/applications/administration.cy.ts

@@ -1,16 +1,18 @@
 import { mockRoleBindingK8sResource } from '~/__mocks__/mockRoleBindingK8sResource';
-import { mockK8sResourceList } from '~/__mocks__';
+import { mockK8sResourceList, mockNotebookK8sResource } from '~/__mocks__';
 import type { RoleBindingSubject } from '~/types';
 import { mockAllowedUsers } from '~/__mocks__/mockAllowedUsers';
 import { mockNotebookImageInfo } from '~/__mocks__/mockNotebookImageInfo';
 import {
   administration,
   notebookController,
+  stopNotebookModal,
 } from '~/__tests__/cypress/cypress/pages/administration';
 import { be } from '~/__tests__/cypress/cypress/utils/should';
 import { asProductAdminUser, asProjectEditUser } from '~/__tests__/cypress/cypress/utils/users';
 import type { AllowedUser } from '~/pages/notebookController/screens/admin/types';
 import { testPagination } from '~/__tests__/cypress/cypress/utils/pagination';
+import { mockStartNotebookData } from '~/__mocks__/mockStartNotebookData';
 
 const groupSubjects: RoleBindingSubject[] = [
   {
@@ -21,13 +23,13 @@ const groupSubjects: RoleBindingSubject[] = [
 ];
 
 type HandlersProps = {
-  allowedUser?: AllowedUser[];
+  allowedUsers?: AllowedUser[];
 };
 
 const initIntercepts = ({
-  allowedUser = [mockAllowedUsers({}), mockAllowedUsers({ username: 'regularuser1' })],
+  allowedUsers = [mockAllowedUsers({}), mockAllowedUsers({ username: 'regularuser1' })],
 }: HandlersProps) => {
-  cy.interceptOdh('GET /api/status/openshift-ai-notebooks/allowedUsers', allowedUser);
+  cy.interceptOdh('GET /api/status/openshift-ai-notebooks/allowedUsers', allowedUsers);
   cy.interceptOdh(
     'GET /api/rolebindings/opendatahub/openshift-ai-notebooks-image-pullers',
     mockK8sResourceList([
@@ -103,7 +105,7 @@ describe('Administration Tab', () => {
         username: `Test user-${i}`,
       }),
     );
-    initIntercepts({ allowedUser: mockAllowedUser });
+    initIntercepts({ allowedUsers: mockAllowedUser });
     notebookController.visit();
     notebookController.findAdministrationTab().click();
     // top pagination
@@ -113,6 +115,38 @@ describe('Administration Tab', () => {
     testPagination({ totalItems, firstElement: 'Test user-0', paginationVariant: 'bottom' });
   });
 
+  it('Validate that last activity will be "Just now" and user can stop server from the table, when notebook lacks the last-activity annotation', () => {
+    const allowedUsers = [
+      mockAllowedUsers({}),
+      mockAllowedUsers({ username: 'regularuser1', lastActivity: 'Now' }),
+    ];
+    initIntercepts({ allowedUsers });
+    cy.interceptOdh(
+      'GET /api/notebooks/openshift-ai-notebooks/:username/status',
+      { path: { username: 'jupyter-nb-regularuser1' } },
+      {
+        notebook: mockNotebookK8sResource({ image: 'code-server-notebook:2023.2' }),
+        isRunning: true,
+      },
+    );
+    cy.interceptOdh('PATCH /api/notebooks', mockStartNotebookData({})).as('stopNotebookServer');
+    notebookController.visit();
+    notebookController.findAdministrationTab().click();
+
+    const userRow = administration.getRow('regularuser1');
+    userRow.shouldHavePrivilege('User');
+    userRow.shouldHaveLastActivity('Just now');
+    userRow.findServerStatusButton().should('have.text', 'View server');
+    userRow.findKebabAction('Stop server').click();
+
+    stopNotebookModal.findStopNotebookServerButton().should('be.enabled');
+    stopNotebookModal.findStopNotebookServerButton().click();
+
+    cy.wait('@stopNotebookServer').then((interception) => {
+      expect(interception.request.body).to.eql({ state: 'stopped', username: 'test-user' });
+    });
+  });
+
   it('Validate that clicking on "Start server" button will open a form in administartion tab and "Start your server" button will navigate to notebook server tab', () => {
     initIntercepts({});
     notebookController.visit();

frontend/src/__tests__/cypress/cypress/tests/mocked/applications/notebookServer.cy.ts

@@ -6,7 +6,10 @@ import { mockNotebookImageInfo } from '~/__mocks__/mockNotebookImageInfo';
 import { mockStartNotebookData } from '~/__mocks__/mockStartNotebookData';
 import { notebookServer } from '~/__tests__/cypress/cypress/pages/notebookServer';
 import { asProductAdminUser, asProjectEditUser } from '~/__tests__/cypress/cypress/utils/users';
-import { notebookController } from '~/__tests__/cypress/cypress/pages/administration';
+import {
+  notebookController,
+  stopNotebookModal,
+} from '~/__tests__/cypress/cypress/pages/administration';
 import { homePage } from '~/__tests__/cypress/cypress/pages/home/home';
 
 const groupSubjects: RoleBindingSubject[] = [
@@ -87,8 +90,9 @@ describe('NotebookServer', () => {
         isRunning: false,
       },
     );
-    notebookServer.findStopNotebookServerButton().should('be.visible');
-    notebookServer.findStopNotebookServerButton().click();
+
+    stopNotebookModal.findStopNotebookServerButton().should('be.enabled');
+    stopNotebookModal.findStopNotebookServerButton().click();
 
     cy.wait('@stopNotebookServer').then((interception) => {
       expect(interception.request.body).to.eql({ state: 'stopped', username: 'test-user' });

frontend/src/pages/notebookController/screens/admin/__tests__/useCheckForAllowedUsers.spec.ts

@@ -0,0 +1,54 @@
+import { testHook } from '~/__tests__/unit/testUtils/hooks';
+import { getAllowedUsers } from '~/redux/actions/actions';
+import { mockAllowedUsers } from '~/__mocks__/mockAllowedUsers';
+import useCheckForAllowedUsers from '~/pages/notebookController/screens/admin/useCheckForAllowedUsers';
+import { AllowedUser } from '~/pages/notebookController/screens/admin/types';
+
+jest.mock('~/redux/actions/actions', () => ({
+  getAllowedUsers: jest.fn(),
+}));
+
+jest.mock('~/pages/notebookController/useNamespaces', () => () => ({
+  notebookNamespace: 'test-project',
+  dashboardNamespace: 'opendatahub',
+}));
+
+const getAllowedUsersMock = jest.mocked(getAllowedUsers);
+
+describe('useCheckForAllowedUsers', () => {
+  it('should return list of users', async () => {
+    const mockAllowedUser: AllowedUser = mockAllowedUsers({});
+    getAllowedUsersMock.mockResolvedValue([mockAllowedUser]);
+    const renderResult = testHook(useCheckForAllowedUsers)();
+
+    expect(getAllowedUsersMock).toHaveBeenCalledTimes(1);
+    expect(renderResult).hookToStrictEqual([[], false, undefined]);
+    expect(renderResult).hookToHaveUpdateCount(1);
+
+    await renderResult.waitForNextUpdate();
+    expect(getAllowedUsersMock).toHaveBeenCalledTimes(1);
+    expect(renderResult).hookToStrictEqual([[mockAllowedUser], true, undefined]);
+    expect(renderResult).hookToHaveUpdateCount(2);
+  });
+
+  it('should handle error', async () => {
+    const error = (message: string) => ({
+      response: {
+        data: {
+          message,
+        },
+      },
+    });
+    getAllowedUsersMock.mockRejectedValue(error('error1'));
+    const renderResult = testHook(useCheckForAllowedUsers)();
+
+    expect(getAllowedUsersMock).toHaveBeenCalledTimes(1);
+    expect(renderResult).hookToStrictEqual([[], false, undefined]);
+    expect(renderResult).hookToHaveUpdateCount(1);
+
+    await renderResult.waitForNextUpdate();
+    expect(getAllowedUsersMock).toHaveBeenCalledTimes(1);
+    expect(renderResult).hookToStrictEqual([[], false, new Error('error1')]);
+    expect(renderResult).hookToHaveUpdateCount(2);
+  });
+});