feat: Add reject reason

packages/git-proxy-cli/index.ts

@@ -230,8 +230,9 @@ async function authoriseGitPush(id: string) {
 /**
  * Reject git push by ID
  * @param {string} id The ID of the git push to reject
+ * @param {string} reason The reason for rejecting the push
  */
-async function rejectGitPush(id: string) {
+async function rejectGitPush(id: string, reason: string) {
   if (!fs.existsSync(GIT_PROXY_COOKIE_FILE)) {
     console.error('Error: Reject: Authentication required');
     process.exitCode = 1;
@@ -247,7 +248,11 @@ async function rejectGitPush(id: string) {
 
     await axios.post(
       `${baseUrl}/api/v1/push/${id}/reject`,
-      {},
+      {
+        params: {
+          reason,
+        },
+      },
       {
         headers: { Cookie: cookies },
       },
@@ -261,13 +266,17 @@ async function rejectGitPush(id: string) {
 
     if (error.response) {
       switch (error.response.status) {
+        case 400:
+          errorMessage = `Error: Reject: ${error.response.data.message}`;
+          process.exitCode = 3;
+          break;
         case 401:
           errorMessage = 'Error: Reject: Authentication required';
-          process.exitCode = 3;
+          process.exitCode = 4;
           break;
         case 404:
           errorMessage = `Error: Reject: ID: '${id}': Not Found`;
-          process.exitCode = 4;
+          process.exitCode = 5;
       }
     }
     console.error(errorMessage);
@@ -553,9 +562,14 @@ yargs(hideBin(process.argv)) // eslint-disable-line @typescript-eslint/no-unused
         demandOption: true,
         type: 'string',
       },
+      reason: {
+        describe: 'Reason for rejecting the push',
+        demandOption: true,
+        type: 'string',
+      },
     },
     handler(argv) {
-      rejectGitPush(argv.id);
+      rejectGitPush(argv.id, argv.reason);
     },
   })
   .command({

packages/git-proxy-cli/test/testCli.test.ts

@@ -441,7 +441,7 @@ describe('test git-proxy-cli', function () {
       }
 
       const id = GHOST_PUSH_ID;
-      const cli = `${CLI_PATH} reject --id ${id}`;
+      const cli = `${CLI_PATH} reject --id ${id} --reason "Test rejection"`;
       const expectedExitCode = 2;
       const expectedMessages = null;
       const expectedErrorMessages = ['Error: Reject:'];
@@ -452,7 +452,7 @@ describe('test git-proxy-cli', function () {
       await helper.removeCookiesFile();
 
       const id = GHOST_PUSH_ID;
-      const cli = `${CLI_PATH} reject --id ${id}`;
+      const cli = `${CLI_PATH} reject --id ${id} --reason "Test rejection"`;
       const expectedExitCode = 1;
       const expectedMessages = null;
       const expectedErrorMessages = ['Error: Reject: Authentication required'];
@@ -464,8 +464,8 @@ describe('test git-proxy-cli', function () {
         await helper.createCookiesFileWithExpiredCookie();
         await helper.startServer();
         const id = pushId;
-        const cli = `${CLI_PATH} reject --id ${id}`;
-        const expectedExitCode = 3;
+        const cli = `${CLI_PATH} reject --id ${id} --reason "Test rejection"`;
+        const expectedExitCode = 4;
         const expectedMessages = null;
         const expectedErrorMessages = ['Error: Reject: Authentication required'];
         await helper.runCli(cli, expectedExitCode, expectedMessages, expectedErrorMessages);
@@ -480,8 +480,8 @@ describe('test git-proxy-cli', function () {
         await helper.runCli(`${CLI_PATH} login --username admin --password admin`);
 
         const id = GHOST_PUSH_ID;
-        const cli = `${CLI_PATH} reject --id ${id}`;
-        const expectedExitCode = 4;
+        const cli = `${CLI_PATH} reject --id ${id} --reason "Test rejection"`;
+        const expectedExitCode = 5;
         const expectedMessages = null;
         const expectedErrorMessages = [`Error: Reject: ID: '${id}': Not Found`];
         await helper.runCli(cli, expectedExitCode, expectedMessages, expectedErrorMessages);
@@ -757,7 +757,7 @@ describe('test git-proxy-cli', function () {
         let expectedErrorMessages = null;
         await helper.runCli(cli, expectedExitCode, expectedMessages, expectedErrorMessages);
 
-        cli = `${CLI_PATH} reject --id ${pushId}`;
+        cli = `${CLI_PATH} reject --id ${pushId} --reason "Test rejection"`;
         expectedExitCode = 0;
         expectedMessages = [`Reject: ID: '${pushId}': OK`];
         expectedErrorMessages = null;

src/db/file/pushes.ts

@@ -112,7 +112,7 @@ export const authorise = async (id: string, attestation: any): Promise<{ message
   return { message: `authorised ${id}` };
 };
 
-export const reject = async (id: string, attestation: any): Promise<{ message: string }> => {
+export const reject = async (id: string, rejection: any): Promise<{ message: string }> => {
   const action = await getPush(id);
   if (!action) {
     throw new Error(`push ${id} not found`);
@@ -121,7 +121,7 @@ export const reject = async (id: string, attestation: any): Promise<{ message: s
   action.authorised = false;
   action.canceled = false;
   action.rejected = true;
-  action.attestation = attestation;
+  action.rejection = rejection;
   await writeAudit(action);
   return { message: `reject ${id}` };
 };

src/db/index.ts

@@ -149,8 +149,8 @@ export const deletePush = (id: string): Promise<void> => sink.deletePush(id);
 export const authorise = (id: string, attestation: any): Promise<{ message: string }> =>
   sink.authorise(id, attestation);
 export const cancel = (id: string): Promise<{ message: string }> => sink.cancel(id);
-export const reject = (id: string, attestation: any): Promise<{ message: string }> =>
-  sink.reject(id, attestation);
+export const reject = (id: string, rejection: any): Promise<{ message: string }> =>
+  sink.reject(id, rejection);
 export const getRepos = (query?: Partial<RepoQuery>): Promise<Repo[]> => sink.getRepos(query);
 export const getRepo = (name: string): Promise<Repo | null> => sink.getRepo(name);
 export const getRepoByUrl = (url: string): Promise<Repo | null> => sink.getRepoByUrl(url);

src/db/mongo/pushes.ts

@@ -63,7 +63,7 @@ export const writeAudit = async (action: Action): Promise<void> => {
   await collection.updateOne({ id: data.id }, { $set: data }, options);
 };
 
-export const authorise = async (id: string, attestation: any): Promise<{ message: string }> => {
+export const authorise = async (id: string, rejection: any): Promise<{ message: string }> => {
   const action = await getPush(id);
   if (!action) {
     throw new Error(`push ${id} not found`);
@@ -72,7 +72,7 @@ export const authorise = async (id: string, attestation: any): Promise<{ message
   action.authorised = true;
   action.canceled = false;
   action.rejected = false;
-  action.attestation = attestation;
+  action.rejection = rejection;
   await writeAudit(action);
   return { message: `authorised ${id}` };
 };

src/db/types.ts

@@ -98,7 +98,7 @@ export interface Sink {
   deletePush: (id: string) => Promise<void>;
   authorise: (id: string, attestation: any) => Promise<{ message: string }>;
   cancel: (id: string) => Promise<{ message: string }>;
-  reject: (id: string, attestation: any) => Promise<{ message: string }>;
+  reject: (id: string, rejection: any) => Promise<{ message: string }>;
   getRepos: (query?: Partial<RepoQuery>) => Promise<Repo[]>;
   getRepo: (name: string) => Promise<Repo | null>;
   getRepoByUrl: (url: string) => Promise<Repo | null>;

src/proxy/actions/Action.ts

@@ -1,6 +1,6 @@
 import { processGitURLForNameAndOrg, processUrlPath } from '../routes/helper';
 import { Step } from './Step';
-import { Attestation, CommitData } from '../processors/types';
+import { Attestation, CommitData, Rejection } from '../processors/types';
 
 /**
  * Class representing a Push.
@@ -34,6 +34,7 @@ class Action {
   user?: string;
   userEmail?: string;
   attestation?: Attestation;
+  rejection?: Rejection;
   lastStep?: Step;
   proxyGitPath?: string;
   newIdxFiles?: string[];

src/proxy/processors/types.ts

@@ -19,6 +19,14 @@ export type Attestation = {
   questions: Question[];
 };
 
+export type Rejection = {
+  reviewer: {
+    username: string;
+  };
+  timestamp: string | Date;
+  reason: string;
+};
+
 export type CommitContent = {
   item: number;
   type: number;

src/routes.tsx

@@ -19,7 +19,7 @@
 import React from 'react';
 import RouteGuard from './ui/components/RouteGuard/RouteGuard';
 import Person from '@material-ui/icons/Person';
-import OpenPushRequests from './ui/views/OpenPushRequests/OpenPushRequests';
+import PushList from './ui/views/Dashboard/Dashboard';
 import PushDetails from './ui/views/PushDetails/PushDetails';
 import User from './ui/views/User/UserProfile';
 import UserList from './ui/views/UserList/UserList';
@@ -55,9 +55,7 @@ const dashboardRoutes: Route[] = [
     path: '/push',
     name: 'Dashboard',
     icon: Dashboard,
-    component: (props) => (
-      <RouteGuard component={OpenPushRequests} fullRoutePath={`/dashboard/push`} />
-    ),
+    component: (props) => <RouteGuard component={PushList} fullRoutePath={`/dashboard/push`} />,
     layout: '/dashboard',
     visible: true,
   },

src/service/routes/push.ts

@@ -1,6 +1,7 @@
 import express, { Request, Response } from 'express';
 import * as db from '../../db';
 import { PushQuery } from '../../db/types';
+import { convertIgnorePatternToMinimatch } from '@eslint/compat';
 
 const router = express.Router();
 
@@ -43,6 +44,14 @@ router.post('/:id/reject', async (req: Request, res: Response) => {
     return;
   }
 
+  const reason = req.body.params?.reason;
+  if (!reason || reason.trim().length === 0) {
+    res.status(400).send({
+      message: 'Rejection reason is required',
+    });
+    return;
+  }
+
   const id = req.params.id;
   const { username } = req.user as { username: string };
 
@@ -71,8 +80,27 @@ router.post('/:id/reject', async (req: Request, res: Response) => {
   const isAllowed = await db.canUserApproveRejectPush(id, username);
 
   if (isAllowed) {
-    const result = await db.reject(id, null);
-    console.log(`user ${username} rejected push request for ${id}`);
+    console.log(`user ${username} rejected push request for ${id} with reason: ${reason}`);
+
+    const reviewerList = await db.getUsers({ username });
+    const reviewerEmail = reviewerList[0].email;
+
+    if (!reviewerEmail) {
+      res.status(401).send({
+        message: `There was no registered email address for the reviewer: ${username}`,
+      });
+      return;
+    }
+
+    const rejection = {
+      reason,
+      timestamp: new Date(),
+      reviewer: {
+        username,
+        reviewerEmail,
+      },
+    };
+    const result = await db.reject(id, rejection);
     res.send(result);
   } else {
     res.status(401).send({

src/ui/components/CustomTabs/CustomTabs.tsx

@@ -16,7 +16,7 @@ type HeaderColor = 'warning' | 'success' | 'danger' | 'info' | 'primary' | 'rose
 export type TabItem = {
   tabName: string;
   tabIcon?: React.ComponentType<SvgIconProps>;
-  tabContent: React.ReactNode;
+  tabContent?: React.ReactNode;
 };
 
 interface CustomTabsProps {
@@ -25,6 +25,9 @@ interface CustomTabsProps {
   tabs: TabItem[];
   rtlActive?: boolean;
   plainTabs?: boolean;
+  defaultTab?: number;
+  value?: number;
+  onChange?: (value: number) => void;
 }
 
 const CustomTabs: React.FC<CustomTabsProps> = ({
@@ -33,12 +36,20 @@ const CustomTabs: React.FC<CustomTabsProps> = ({
   tabs,
   title,
   rtlActive = false,
+  defaultTab = 0,
+  value: controlledValue,
+  onChange: controlledOnChange,
 }) => {
-  const [value, setValue] = useState(0);
+  const [internalValue, setInternalValue] = useState(defaultTab);
   const classes = useStyles();
+  const value = controlledValue !== undefined ? controlledValue : internalValue;
 
   const handleChange = (event: React.ChangeEvent<unknown>, newValue: number) => {
-    setValue(newValue);
+    if (controlledOnChange) {
+      controlledOnChange(newValue);
+    } else {
+      setInternalValue(newValue);
+    }
   };
 
   const cardTitle = clsx({
@@ -80,7 +91,7 @@ const CustomTabs: React.FC<CustomTabsProps> = ({
       </CardHeader>
       <CardBody>
         {tabs.map((prop, key) => (
-          <div key={key} style={{ display: key === value ? 'block' : 'none' }}>
+          <div key={key} style={{ display: key === internalValue ? 'block' : 'none' }}>
             {prop.tabContent}
           </div>
         ))}