Merge branch 'develop' of https://dev.azure.com/imagetemplates/documati.io/_git/dqoado into develop

Author: piotrczarnas

dqops/src/main/frontend/src/pages/GlobalIncidents/GlobalIncidentDashboard/GlobalIncidentsDashboard.tsx

@@ -12,7 +12,7 @@ export default function GlobalIncidentsDashboard({
   const groups = incidents.topIncidents || {};
 
   return (
-    <div className="flex flex-wrap pt-4 grid lg:grid-cols-1 screen1900:grid-cols-2">
+    <div className="flex flex-wrap pt-2 grid lg:grid-cols-1 screen1900:grid-cols-2">
       {Object.entries(groups)
         .filter(([, value]) => value.length !== 0)
         .sort(([, valueA], [, valueB]) => {

dqops/src/main/frontend/src/pages/GlobalIncidents/Summary/Gauge.tsx

@@ -2,7 +2,6 @@ import React from "react";
 import { IncidentCountsModel, IncidentSeverityLevelCountsModel, TopIncidentsModel } from "../../../api";
 import SectionWrapper from "../../../components/Dashboard/SectionWrapper";
 import moment from 'moment';
-import Button from "../../../components/Button";
 import { ROUTES } from "../../../shared/routes";
 import { useHistory } from 'react-router-dom';
 
@@ -16,7 +15,7 @@ export default function Gauge({
   incidentCounts: IncidentCountsModel | undefined,
   colorClassName: string,
   title: string,
-  severity: string,
+  severity: number,
   status: string
 }) {
   const history = useHistory();
@@ -26,28 +25,27 @@ export default function Gauge({
     return formattedDate;
   }
 
-  const goToIncidents = (severity: string, status: string) => {
+  const goToIncidents = (severity: number, status: string) => {
     history.push(
       ROUTES.INCIDENT_CONNECTION(
-        `*?severity=${severity}&status=${status}`
+        `*?severity=${severity}&${status}=true`
       )
     );
   };
 
   return (
-    <SectionWrapper 
-      className={"flex justify-center border-2 my-4 mx-4 lg:mx-10 xl:mx-14 2xl:mx-4 screen1900:mx-14 screen3000:mx-34 " + colorClassName}
-      title={title}
-      // titleIcon={<div className={"w-4 h-4 border " + colorClassName}></div>}
-    >
-      <div 
-        className="w-[150px]"
+    <div className={"flex flex-col justify-center mx-1 lg:mx-4 lg:my-2 pb-2 cursor-pointer border-2 " + colorClassName}>
+      <div
+        className="w-full min-w-[110px] max-w-[160px] mx-auto"
         onClick={() => goToIncidents(severity, status)}
       >
-        <div className="text-center pt-1 pb-3 text-2xl ">
+        <div className="text-center pt-1 text-2xl w-full">
           {incidentCounts?.currentMonthCount && incidentCounts?.previousMonthCount && incidentCounts?.currentMonthCount + incidentCounts?.previousMonthCount}
         </div>
-        <div className="flex justify-between text-xs px-5">
+        <div className="text-center pb-3 text-2xl text-xs">
+          {title}
+        </div>
+        <div className="flex justify-between text-xs px-1">
           <div className="">
             Last 24h
           </div>
@@ -57,7 +55,7 @@ export default function Gauge({
               {incidentCounts?.countFromLast24h}
           </div>
         </div>
-        <div className="flex justify-between text-xs px-5">
+        <div className="flex justify-between text-xs px-1">
           <div className="">
             Last 7 days
           </div>
@@ -67,7 +65,7 @@ export default function Gauge({
               {incidentCounts?.countFromLast7days}
           </div>
         </div>
-        <div className="flex justify-between text-xs px-5">
+        <div className="flex justify-between text-xs px-1">
           <div className="">
             {incidentCounts?.currentMonthDate && getMonthName(incidentCounts?.currentMonthDate)}
           </div>
@@ -77,7 +75,7 @@ export default function Gauge({
               {incidentCounts?.currentMonthCount}
           </div>
         </div>
-        <div className="flex justify-between text-xs px-5">
+        <div className="flex justify-between text-xs px-1">
           <div className="">
             {incidentCounts?.previousMonthDate && getMonthName(incidentCounts?.previousMonthDate)}
           </div>
@@ -88,7 +86,7 @@ export default function Gauge({
           </div>
         </div>
       </div>
-    </SectionWrapper>
+    </div>
   );
 
 }

dqops/src/main/frontend/src/pages/GlobalIncidents/Summary/IncidentSeverityLevelCounts.tsx

@@ -8,41 +8,39 @@ export default function IncidentSeverityLevelCounts({
   incidentSeverityLevelCounts,
   title,
   icon,
-  classNameValue,
   incidentStatus
 }: {
   incidentSeverityLevelCounts: IncidentSeverityLevelCountsModel | undefined,
   title: string,
   icon: React.ReactNode
-  classNameValue: string,
   incidentStatus: string
 }) {
 
   return (
     <SectionWrapper 
-      className={"flex items-center m-4 grid grid-cols-3 " + classNameValue}
+      className={"flex items-center grid grid-cols-3 "}
       title={title}
       titleIcon={icon}
     >
       <Gauge 
         incidentCounts={incidentSeverityLevelCounts?.warningCounts}
         colorClassName="border-yellow-500"
         title="Warnings"
-        severity="warning"
+        severity={1}
         status={incidentStatus}
       />
       <Gauge 
         incidentCounts={incidentSeverityLevelCounts?.errorCounts} 
         colorClassName="border-orange-500"
         title="Errors"
-        severity="error"
+        severity={2}
         status={incidentStatus}
       />
       <Gauge 
         incidentCounts={incidentSeverityLevelCounts?.fatalCounts}
         colorClassName="border-red-500"
         title="Fatal errors"
-        severity="fatal"
+        severity={3}
         status={incidentStatus}
       />
     </SectionWrapper>

dqops/src/main/frontend/src/pages/GlobalIncidents/Summary/SummaryTable.tsx

@@ -11,19 +11,17 @@ export default function Summary({
 }) {
 
   return (
-    <div className="flex flex-wrap m-2 mt-3 p-2 grid md:grid-cols-1 2xl:grid-cols-2">
+    <div className="flex flex-wrap mt-4 ml-2 p-1 grid grid-cols-1 lg:grid-cols-2">
       <IncidentSeverityLevelCounts 
         incidentSeverityLevelCounts={incidents.openIncidentSeverityLevelCounts} 
         title="Open incidents"
         icon={<SvgIcon name="info-filled" className="text-red-900 w-6 h-6" />}
-        classNameValue=""
         incidentStatus="open"
       />
       <IncidentSeverityLevelCounts 
         incidentSeverityLevelCounts={incidents.acknowledgedIncidentSeverityLevelCounts} 
         title="Acknowledged incidents"
         icon={<div className="w-5 h-5 rounded-full bg-black" />}
-        classNameValue=""
         incidentStatus="acknowledged"
       />
     </div>

dqops/src/main/frontend/src/pages/IncidentConnection/index.tsx

@@ -46,6 +46,28 @@ const options = [
   }
 ];
 
+const severityOptions = [
+  {
+    label: '',
+    value: undefined
+  },
+  {
+    label: 'Warning',
+    value: 1,
+    icon: renderIncidentHighestSeveritySquare(1)
+  },
+  {
+    label: 'Error',
+    value: 2,
+    icon: renderIncidentHighestSeveritySquare(2)
+  },
+  {
+    label: 'Fatal',
+    value: 3,
+    icon: renderIncidentHighestSeveritySquare(3)
+  }
+];
+
 const statusOptions = [
   {
     label: 'OPEN',
@@ -443,9 +465,10 @@ export const IncidentConnection = () => {
     );
     dispatch(
       getIncidentsByConnection({
+        ...params,
         ...(filters || {}),
         ...obj,
-        ...params,
+
         connection
       })
     );
@@ -480,6 +503,17 @@ export const IncidentConnection = () => {
             </div>
           </div>
           <div className="flex items-center">
+            <Select
+              options={severityOptions}
+              className="mr-8 w-40"
+              value={
+                filters.severity === undefined
+                  ? 'Select severity'
+                  : filters.severity
+              }
+              onChange={(val) => onChangeFilter({ severity: val })}
+              placeholder="Select severity"
+            />
             <div className="mr-20">
               <StatusSelect onChangeFilter={onChangeFilter} />
             </div>

dqops/src/main/frontend/src/redux/actions/incidents.actions.ts

@@ -99,6 +99,7 @@ export const getIncidentsByConnection =
     acknowledgedIncidents = true,
     resolvedIncidents = false,
     mutedIncidents = false,
+    severity = undefined,
     page = 1,
     pageSize = 10,
     optionalFilter = '',
@@ -118,6 +119,7 @@ export const getIncidentsByConnection =
           acknowledgedIncidents,
           resolvedIncidents,
           mutedIncidents,
+          severity,
           page,
           pageSize,
           optionalFilter,

dqops/src/main/frontend/src/redux/reducers/incidents.reducer.ts

@@ -25,6 +25,7 @@ export interface IncidentFilter {
   acknowledgedIncidents?: boolean;
   resolvedIncidents?: boolean;
   mutedIncidents?: boolean;
+  severity?: number;
   page?: number;
   pageSize?: number;
   optionalFilter?: string;

dqops/src/main/java/com/dqops/data/incidents/models/IncidentListFilterParameters.java

@@ -93,6 +93,12 @@ public class IncidentListFilterParameters {
     @JsonPropertyDescription("Load incidents in 'muted' status. The default value is false.")
     private boolean muted = false;
 
+    /**
+     * Load incidents with given severity level.
+     */
+    @JsonPropertyDescription("Load incidents with given severity level.")
+    private Integer severity;
+
     /**
      * Sort order.
      */

dqops/src/main/java/com/dqops/data/incidents/models/IncidentSeverityLevelCountsModel.java

@@ -51,7 +51,7 @@ public static IncidentSeverityLevelCountsModel createInstance(ZoneId defaultTime
 
     /**
      * Processes the incident of a given severity that occurred on the specific time to verify the incrementation of inner counts.
-     * @param highestSeverity The highest severity value that.
+     * @param highestSeverity The highest severity value to be count.
      * @param occurrenceTime The time of occurrence of the incident.
      */
     public void processAddCount(int highestSeverity, Instant occurrenceTime){

dqops/src/main/java/com/dqops/data/incidents/services/IncidentsDataServiceImpl.java

@@ -160,10 +160,16 @@ public Collection<IncidentModel> loadRecentIncidentsOnConnection(
                     String status = statusColumn.get(rowIndex);
                     IncidentStatus incidentStatus = IncidentStatus.valueOf(status);
 
+                    int highestSeverity = highestSeverityColumn.get(rowIndex);
+
                     if (!filterParameters.isIncidentStatusEnabled(incidentStatus)) {
                         continue; // skipping
                     }
 
+                    if (filterParameters.getSeverity() != null && filterParameters.getSeverity() != highestSeverity) {
+                        continue; // skipping
+                    }
+
                     if (!Strings.isNullOrEmpty(filterParameters.getCategory())) {
                         if (!Objects.equals(checkCategoryColumn.get(rowIndex), filterParameters.getCategory())) {
                             continue;
@@ -210,7 +216,7 @@ public Collection<IncidentModel> loadRecentIncidentsOnConnection(
                     if (!issueUrlColumn.isMissing(rowIndex)) {
                         incidentModel.setIssueUrl(issueUrlColumn.get(rowIndex));
                     }
-                    incidentModel.setHighestSeverity(highestSeverityColumn.get(rowIndex));
+                    incidentModel.setHighestSeverity(highestSeverity);
                     if (minSeverityColumn != null && !minSeverityColumn.isMissing(rowIndex)) {
                         incidentModel.setMinimumSeverity(minSeverityColumn.get(rowIndex));
                     }
@@ -582,7 +588,7 @@ public TopIncidentsModel findTopIncidents(TopIncidentGrouping incidentGrouping,
                     if (!issueUrlColumn.isMissing(rowIndex)) {
                         incidentModel.setIssueUrl(issueUrlColumn.get(rowIndex));
                     }
-                    incidentModel.setHighestSeverity(highestSeverityColumn.get(rowIndex));
+                    incidentModel.setHighestSeverity(highestSeverity);
                     if (minSeverityColumn != null && !minSeverityColumn.isMissing(rowIndex)) {
                         incidentModel.setMinimumSeverity(minSeverityColumn.get(rowIndex));
                     }

dqops/src/main/java/com/dqops/rest/controllers/IncidentsController.java

@@ -335,6 +335,8 @@ public Mono<ResponseEntity<Flux<IncidentModel>>> findRecentIncidentsOnConnection
                 @RequestParam(required = false) Optional<Boolean> resolved,
             @ApiParam(name = "muted", value = "Returns muted incidents, when the parameter is missing, the default value is false", required = false)
                 @RequestParam(required = false) Optional<Boolean> muted,
+            @ApiParam(name = "severity", value = "Returns incidents with given severity level", required = false)
+                @RequestParam(required = false) Optional<Integer> severity,
             @ApiParam(name = "page", value = "Page number, the first page is 1", required = false)
                 @RequestParam(required = false) Optional<Integer> page,
             @ApiParam(name = "limit", value = "Page size, the default is 50 rows", required = false)
@@ -356,6 +358,7 @@ public Mono<ResponseEntity<Flux<IncidentModel>>> findRecentIncidentsOnConnection
             filterParameters.setAcknowledged(acknowledged.orElse(Boolean.TRUE));
             filterParameters.setResolved(resolved.orElse(Boolean.FALSE));
             filterParameters.setMuted(muted.orElse(Boolean.FALSE));
+            filterParameters.setSeverity(severity.orElse(null));
             filterParameters.setDimension(dimension.orElse(null));
             filterParameters.setCategory(category.orElse(null));
 
@@ -433,7 +436,7 @@ public Mono<ResponseEntity<Mono<TopIncidentsModel>>> findTopIncidentsGrouped(
             @RequestParam(required = false) Optional<TopIncidentGrouping> groupBy,
             @ApiParam(name = "limit", value = "The result limit for each group. When this parameter is missing, returns the default limit of " + TOP_INCIDENTS_LIMIT_PER_GROUP, required = false)
             @RequestParam(required = false) Optional<Integer> limit,
-            @ApiParam(name = "limit", value = "Optional filter to configure a time window before now to scan for incidents based on the incident's first seen attribute.", required = false)
+            @ApiParam(name = "days", value = "Optional filter to configure a time window before now to scan for incidents based on the incident's first seen attribute.", required = false)
             @RequestParam(required = false) Optional<Integer> days) {
         return Mono.fromFuture(CompletableFuture.supplyAsync(() -> {
             TopIncidentsModel topIncidentsModel = this.incidentsDataService.findTopIncidents(