diff --git a/src/Pages/Dashboard/partials/SearchResultsTable.tsx b/src/Pages/Dashboard/partials/SearchResultsTable.tsx index 67cf864..fa75199 100644 --- a/src/Pages/Dashboard/partials/SearchResultsTable.tsx +++ b/src/Pages/Dashboard/partials/SearchResultsTable.tsx @@ -41,7 +41,6 @@ const SearchResultsTable: FC = ({ 'text-overflow': 'ellipsis', 'white-space': 'nowrap', overflow: 'hidden', - padding: 0, }; const rowData = currentPageData?.map((item: any, ind: number) => { @@ -69,13 +68,6 @@ const SearchResultsTable: FC = ({ }); const columnData = [ - { - field: 'id', - headerName: 'Incident Id', - suppressSizeToFit: true, - width: 120, - suppressMovable: true, - }, { field: 'incidentName', headerName: 'Channel Name', @@ -184,7 +176,7 @@ const SearchResultsTable: FC = ({ onGridSizeChanged={onGridSizeChanged} onRowClicked={handleOpenDrawer} suppressColumnMoveAnimation - rowHeight={70} + rowHeight={54} detailRowAutoHeight={true} /> = ({ incidentId, slackChannel }) => { +
+ {IncidentConstants.incidentId}: + + {incidentDetails?.id} + +
); }; @@ -237,9 +244,9 @@ const DrawerMode: FC = ({ incidentId, slackChannel }) => { return (
{returnContent()} -
+
{returnHeaderDetails()} -
+
Participants: {returnParticipants()}
diff --git a/src/Pages/Incidents/constants.ts b/src/Pages/Incidents/constants.ts index 7ac379c..b99e46a 100644 --- a/src/Pages/Incidents/constants.ts +++ b/src/Pages/Incidents/constants.ts @@ -10,6 +10,7 @@ export const IncidentConstants = { description: 'Description', team: 'Team', channel: 'Channel name', + incidentId: 'Incident Id', }; export const FETCH_INCIDENT_DATA = (payload: any): string => { diff --git a/src/Pages/Severity/SeverityForm.tsx b/src/Pages/Severity/SeverityForm.tsx index b166eec..84f7340 100644 --- a/src/Pages/Severity/SeverityForm.tsx +++ b/src/Pages/Severity/SeverityForm.tsx @@ -17,17 +17,20 @@ import { import styles from './Severity.module.scss'; const SeverityForm = (props: SeverityFormProps) => { - const { severityId, isExpanded } = props; + const { severityId, isExpanded, setLastUpdatedAt } = props; const [severities, setSeverities] = useState({}); const [slackUsers, setSlackUsers] = useState(''); const [isLoading, setIsLoading] = useState(false); - const fetchSeverityById = () => { + const fetchSeverityById = (updateDate = false) => { const endPoint = FETCH_SINGLE_SEVERITY_DATA(severityId); setIsLoading(true); ApiService.get(endPoint) .then(response => { setIsLoading(false); + if (updateDate) { + setLastUpdatedAt(response?.data?.data?.lastUpdatedAt); + } setSeverities(response?.data?.data); }) .catch(error => { @@ -61,7 +64,7 @@ const SeverityForm = (props: SeverityFormProps) => { ApiService.post(endPoint, { severities: payload }) .then(response => { toast.success('Severities Updated Successfully'); - fetchSeverityById(); + fetchSeverityById(true); }) .catch(error => { const toastMessage = `${ @@ -120,10 +123,11 @@ const SeverityForm = (props: SeverityFormProps) => {
setSlackUsers(e.target.value)} - hintMsg="Please add as a comma separated string" + hintMsg="Please enter the values separated by commas. " fullWidth />
diff --git a/src/Pages/Severity/SeverityResults.tsx b/src/Pages/Severity/SeverityResults.tsx index 503d20c..fb05072 100644 --- a/src/Pages/Severity/SeverityResults.tsx +++ b/src/Pages/Severity/SeverityResults.tsx @@ -18,7 +18,7 @@ import styles from './Severity.module.scss'; const SeverityResults = () => { const [data, setData] = useState([]); const [isLoading, setIsLoading] = useState(false); - + const [lastUpdated, setLastUpdated] = useState(''); const [severityId, setSeverityId] = useState(''); useEffect(() => { @@ -46,11 +46,20 @@ const SeverityResults = () => { return ; } + const returnAccordionKey = (value): string => { + return lastUpdated.length ? `${value}-${lastUpdated}` : `${value}`; + }; + + const returnDate = date => { + const finalDate = lastUpdated.length ? lastUpdated : date; + return returnFormattedDate(finalDate); + }; + return (
{data?.map((severity: any) => ( -
+
{ if (isExpanded) setSeverityId(severity?.id); @@ -66,7 +75,7 @@ const SeverityResults = () => { className={styles['title']} color="#585858" > - Updated At: {returnFormattedDate(severity?.lastUpdatedAt)} + Updated At: {returnDate(severity?.lastUpdatedAt)} )}
@@ -75,6 +84,7 @@ const SeverityResults = () => {
diff --git a/src/Pages/Severity/constants.ts b/src/Pages/Severity/constants.ts index b6587e2..bc3cd7a 100644 --- a/src/Pages/Severity/constants.ts +++ b/src/Pages/Severity/constants.ts @@ -5,6 +5,7 @@ export const UPDATE_SEVERITY_DATA = `${window?.config?.BASE_API_URL}/severities` export interface SeverityFormProps { severityId: string; isExpanded: boolean; + setLastUpdatedAt: (value: string) => void; } export const FETCH_SINGLE_SEVERITY_DATA = (payload: string): string => { diff --git a/src/Pages/Team/partials/TeamForm.tsx b/src/Pages/Team/partials/TeamForm.tsx index 50ff4cb..715c8d1 100644 --- a/src/Pages/Team/partials/TeamForm.tsx +++ b/src/Pages/Team/partials/TeamForm.tsx @@ -98,8 +98,9 @@ const TeamForm = (props: TeamFormProps) => { setSlackUserIds(e.target.value)} - hintMsg="Please add as a comma separated string" + hintMsg="Please enter the values separated by commas." fullWidth />