Notifications System Version 2

src/commons/sagas/RequestsSaga.ts

@@ -1014,11 +1014,12 @@ export const putAssessmentConfigs = async (
   return resp;
 };
 
+// Notification related request
 export const putNotificationConfigs = async (
   tokens: Tokens,
   notificationConfigs: NotificationConfiguration[]
 ) => {
-  return await request(`notifications/config`, 'PUT', {
+  return await request(`courses/${courseIdWithoutPrefix()}/admin/notifications/config`, 'PUT', {
     ...tokens,
     body: notificationConfigs,
     noHeaderAccept: true
@@ -1081,11 +1082,15 @@ export const removeTimeOptions = async (
   tokens: Tokens,
   timeOptionIds: number[]
 ): Promise<Response | null> => {
-  const resp = await request(`notifications/options`, 'DELETE', {
-    ...tokens,
-    body: timeOptionIds,
-    noHeaderAccept: true
-  });
+  const resp = await request(
+    `courses/${courseIdWithoutPrefix()}/admin/notifications/options`,
+    'DELETE',
+    {
+      ...tokens,
+      body: timeOptionIds,
+      noHeaderAccept: true
+    }
+  );
 
   return resp;
 };
@@ -1094,7 +1099,7 @@ export const putTimeOptions = async (
   tokens: Tokens,
   timeOptions: TimeOption[]
 ): Promise<Response | null> => {
-  const resp = await request(`notifications/options`, 'PUT', {
+  const resp = await request(`courses/${courseIdWithoutPrefix()}/notifications/options`, 'PUT', {
     ...tokens,
     body: timeOptions,
     noHeaderAccept: true
@@ -1106,9 +1111,13 @@ export const putTimeOptions = async (
 export const getNotificationConfigs = async (
   tokens: Tokens
 ): Promise<NotificationConfiguration[] | null> => {
-  const resp = await request(`notifications/config/${courseIdWithoutPrefix()}`, 'GET', {
-    ...tokens
-  });
+  const resp = await request(
+    `courses/${courseIdWithoutPrefix()}/admin/notifications/config`,
+    'GET',
+    {
+      ...tokens
+    }
+  );
   if (!resp || !resp.ok) {
     return null;
   }
@@ -1120,9 +1129,13 @@ export const getConfigurableNotificationConfigs = async (
   tokens: Tokens,
   courseRegId: number
 ): Promise<NotificationConfiguration[] | null> => {
-  const resp = await request(`notifications/config/user/${courseRegId}`, 'GET', {
-    ...tokens
-  });
+  const resp = await request(
+    `courses/${courseIdWithoutPrefix()}/notifications/config/user/${courseRegId}`,
+    'GET',
+    {
+      ...tokens
+    }
+  );
   if (!resp || !resp.ok) {
     return null;
   }
@@ -1155,13 +1168,17 @@ export const putNotificationPreferences = async (
   notiPrefs: NotificationPreference[],
   courseRegId: number
 ): Promise<Response | null> => {
-  const resp = await request(`notifications/preferences`, 'PUT', {
-    ...tokens,
-    body: notiPrefs.map(pref => {
-      return { ...pref, courseRegId: courseRegId };
-    }),
-    noHeaderAccept: true
-  });
+  const resp = await request(
+    `courses/${courseIdWithoutPrefix()}/notifications/preferences`,
+    'PUT',
+    {
+      ...tokens,
+      body: notiPrefs.map(pref => {
+        return { ...pref, courseRegId: courseRegId };
+      }),
+      noHeaderAccept: true
+    }
+  );
 
   return resp;
 };

src/pages/academy/adminPanel/subcomponents/NotificationConfigPanel.tsx

@@ -15,7 +15,6 @@ import { NotificationConfiguration, TimeOption } from 'src/commons/application/t
 import { useTypedSelector } from 'src/commons/utils/Hooks';
 
 import BooleanCell from './assessmentConfigPanel/BooleanCell';
-import SelectCell from './notificationConfigPanel/SelectCell';
 import TimeOptionCell from './notificationConfigPanel/TimeOptionCell';
 
 const NotificationConfigPanel = () => {
@@ -94,16 +93,21 @@ const NotificationConfigPanel = () => {
     return params.data!.notificationType.forStaff ? 'Staff' : 'Student';
   };
 
+  const notificationTypeId: ValueFormatterFunc<NotificationConfiguration> = params => {
+    const id = params.data!.notificationType?.id || 0;
+    return String(id);
+  };
+
   const columnDefs: ColDef[] = [
     {
-      headerName: 'Notification Type',
-      field: 'notificationType.name',
+      headerName: 'Assessment Type',
+      field: 'assessmentConfig.type',
+      valueFormatter: assessmentTypeFormatter,
       rowDrag: true
     },
     {
-      headerName: 'Assessment Type',
-      field: 'assessmentConfig.type',
-      valueFormatter: assessmentTypeFormatter
+      headerName: 'Notification Type',
+      field: 'notificationType.name'
     },
     {
       headerName: 'Recipients',
@@ -119,16 +123,20 @@ const NotificationConfigPanel = () => {
     //   headerName: 'Past 30 Days',
     //   field: 'notificationType.id'
     // },
+
     {
-      headerName: 'Reminder Time Options (hours)',
+      headerName: 'Default Reminder Time(hours)',
       field: 'timeOptions',
       cellRenderer: TimeOptionCell,
       cellRendererParams: {
         setStateHandler: setTimeOptions,
         setDelete: addTimeOptionsToDelete,
-        field: 'timeOptions'
+        field: 'timeOptions',
+        typeId: notificationTypeId
       }
     },
+
+    /*
     {
       headerName: 'Default Reminder (hours)',
       field: 'timeOptions',
@@ -138,6 +146,7 @@ const NotificationConfigPanel = () => {
         field: 'timeOptions'
       }
     },
+    */
     {
       headerName: 'Enabled',
       field: 'isEnabled',

src/pages/academy/adminPanel/subcomponents/notificationConfigPanel/TimeOptionCell.tsx

@@ -12,6 +12,7 @@ type OwnProps = {
   field: KeysOfType<NotificationConfiguration, TimeOption[]>;
   setStateHandler: (rowIndex: number, value: TimeOption[]) => void;
   setDelete: (timeOption: TimeOption) => void;
+  typeId: string;
 };
 
 const TimeOptionCell: React.FC<TimeOptionCellProps> = props => {
@@ -45,10 +46,11 @@ const TimeOptionCell: React.FC<TimeOptionCellProps> = props => {
       const newTimeOption: TimeOption = {
         id: -1,
         minutes: parseFloat(value as string) * 60,
-        isDefault: false
+        isDefault: true
       };
 
       setValues([...values, value]);
+      console.log(props.rowIndex, value, values);
       props.setStateHandler(props.rowIndex, [...timeOptions, newTimeOption]);
     } else {
       // TODO: Toaster if posisble
@@ -57,5 +59,4 @@ const TimeOptionCell: React.FC<TimeOptionCellProps> = props => {
 
   return <TagInput values={values} onRemove={onRemove} onAdd={onAdd} />;
 };
-
 export default TimeOptionCell;