Merge branch 'main' into concurrent-edit-config-family

greenbone · Oct 25, 2023 · 201e211 · 201e211
2 parents e8e137d + bf25293
commit 201e211
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gsa",
-  "version": "22.8.1-dev1",
+  "version": "22.8.2-dev1",
   "description": "Greenbone Security Assistant",
   "keywords": [
     "openvas",

diff --git a/src/version.js b/src/version.js
@@ -27,7 +27,7 @@ const getMajorMinorVersion = () => {
   return `${major}.${minor}`;
 };
 
-export const VERSION = '22.8.1-dev1';
+export const VERSION = '22.8.2-dev1';
 
 export const RELEASE_VERSION = getMajorMinorVersion();
 

diff --git a/src/web/pages/results/row.js b/src/web/pages/results/row.js
@@ -70,8 +70,8 @@ const Row = ({
     entity.overrides.filter(override => override.isActive()).length > 0;
   const hasTickets = entity.tickets.length > 0;
   const deltaSeverity = entity.delta?.result?.severity;
-  const deltaHostname = entity.delta?.result?.host.hostname;
-  const deltaQoD = entity.delta?.result?.qod.value;
+  const deltaHostname = entity.delta?.result?.host?.hostname;
+  const deltaQoD = entity.delta?.result?.qod?.value;
   return (
     <TableRow>
       {delta && (
@@ -105,20 +105,19 @@ const Row = ({
       <TableData>
         <IconDivider>
           <SeverityBar severity={entity.severity} />
-          {isDefined(entity.delta?.result) &&
-            entity.severity !== deltaSeverity && (
-              <DeltaDifferenceIcon
-                title={_('Severity is changed from {{deltaSeverity}}.', {
-                  deltaSeverity,
-                })}
-              />
-            )}
+          {isDefined(deltaSeverity) && entity.severity !== deltaSeverity && (
+            <DeltaDifferenceIcon
+              title={_('Severity is changed from {{deltaSeverity}}.', {
+                deltaSeverity,
+              })}
+            />
+          )}
         </IconDivider>
       </TableData>
       <TableData align="end">
         <IconDivider>
           <Qod value={entity.qod.value} />
-          {isDefined(entity.delta?.result) && entity.qod.value !== deltaQoD && (
+          {isDefined(deltaQoD) && entity.qod.value !== deltaQoD && (
             <DeltaDifferenceIcon
               title={_('QoD is changed from {{deltaQoD}}.', {deltaQoD})}
             />
@@ -141,7 +140,7 @@ const Row = ({
           {host.hostname.length > 0 && (
             <span title={host.hostname}>{shorten(host.hostname, 40)}</span>
           )}
-          {isDefined(entity.delta?.result) &&
+          {isDefined(deltaHostname) &&
             deltaHostname.length > 0 &&
             host.hostname !== deltaHostname && (
               <DeltaDifferenceIcon