fix(web-client): do not display fields when condition does not match

OptimistikSAS · Feb 6, 2025 · f3aa370 · f3aa370
1 parent 54989b5
commit f3aa370
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 8 deletions.
diff --git a/backend/src/south/south-mqtt/south-mqtt.spec.ts b/backend/src/south/south-mqtt/south-mqtt.spec.ts
@@ -500,7 +500,7 @@ describe('SouthMQTT with Basic Auth', () => {
       south.getTimestamp({}, configuration.items[3].settings.jsonPayload!.timestampPayload!, testData.constants.dates.FAKE_NOW)
     ).toEqual(testData.constants.dates.FAKE_NOW);
     expect(logger.warn).toHaveBeenCalledWith(
-      `Timestamp found for path ${configuration.items[3].settings.jsonPayload!.timestampPayload!.timestampPath!} in ${JSON.stringify(
+      `Timestamp not found for path ${configuration.items[3].settings.jsonPayload!.timestampPayload!.timestampPath!} in ${JSON.stringify(
         {}
       )}. Using OIBus timestamp "${testData.constants.dates.FAKE_NOW}" instead`
     );

diff --git a/backend/src/south/south-mqtt/south-mqtt.ts b/backend/src/south/south-mqtt/south-mqtt.ts
@@ -311,7 +311,7 @@ export default class SouthMQTT extends SouthConnector<SouthMQTTSettings, SouthMQ
     const timestamp = objectPath.get(data, formatOptions.timestampPath!);
     if (!timestamp) {
       this.logger.warn(
-        `Timestamp found for path ${formatOptions.timestampPath!} in ${JSON.stringify(
+        `Timestamp not found for path ${formatOptions.timestampPath!} in ${JSON.stringify(
           data
         )}. Using OIBus timestamp "${messageTimestamp}" instead`
       );

diff --git a/frontend/src/app/history-query/history-query-detail/history-query-detail.component.ts b/frontend/src/app/history-query/history-query-detail/history-query-detail.component.ts
@@ -126,6 +126,12 @@ export class HistoryQueryDetailComponent implements OnInit, OnDestroy {
         const northSettings: Record<string, string> = JSON.parse(JSON.stringify(this.historyQuery!.northSettings));
         this.northDisplayedSettings = northManifest.settings
           .filter(setting => setting.displayInViewMode)
+          .filter(setting => {
+            if (setting.conditionalDisplay) {
+              return setting.conditionalDisplay.values.includes(northSettings[setting.conditionalDisplay.field]);
+            }
+            return true;
+          })
           .map(setting => {
             return {
               key: setting.type === 'OibSelect' ? setting.translationKey + '.title' : setting.translationKey,
@@ -140,6 +146,12 @@ export class HistoryQueryDetailComponent implements OnInit, OnDestroy {
         const southSettings: Record<string, string> = JSON.parse(JSON.stringify(this.historyQuery!.southSettings));
         this.southDisplayedSettings = southManifest.settings
           .filter(setting => setting.displayInViewMode)
+          .filter(setting => {
+            if (setting.conditionalDisplay) {
+              return setting.conditionalDisplay.values.includes(southSettings[setting.conditionalDisplay.field]);
+            }
+            return true;
+          })
           .map(setting => {
             return {
               key: setting.type === 'OibSelect' ? setting.translationKey + '.title' : setting.translationKey,

diff --git a/frontend/src/app/north/north-detail/north-detail.component.ts b/frontend/src/app/north/north-detail/north-detail.component.ts
@@ -105,6 +105,12 @@ export class NorthDetailComponent implements OnInit, OnDestroy {
         const northSettings: Record<string, string | boolean> = JSON.parse(JSON.stringify(this.northConnector!.settings));
         this.displayedSettings = manifest.settings
           .filter(setting => setting.displayInViewMode)
+          .filter(setting => {
+            if (setting.conditionalDisplay) {
+              return setting.conditionalDisplay.values.includes(northSettings[setting.conditionalDisplay.field]);
+            }
+            return true;
+          })
           .map(setting => {
             switch (setting.type) {
               case 'OibText':

diff --git a/frontend/src/app/south/edit-south/edit-south.component.html b/frontend/src/app/south/edit-south/edit-south.component.html
@@ -76,9 +76,8 @@ <h1 [translate]="'south.edit-title'" [translateParams]="{ name: southConnector.n
             </oib-box>
           </div>
           <!-- items -->
-
           @if (mode === 'edit' && southConnector) {
-            <div id="actions" class="d-flex justify-content-end">
+            <div class="d-flex justify-content-end">
               <div class="btn-group">
                 <oib-save-button [insideOfGroup]="false" form="south-form" [state]="state" />
               </div>
@@ -92,8 +91,7 @@ <h1 [translate]="'south.edit-title'" [translateParams]="{ name: southConnector.n
               [saveChangesDirectly]="saveItemChangesDirectly"
               (inMemoryItems)="updateInMemoryItems($event)"
             />
-          }
-          @if (mode === 'create') {
+          } @else if (mode === 'create') {
             <oib-south-items
               [southId]="southId"
               [southConnector]="southConnector"
@@ -103,7 +101,7 @@ <h1 [translate]="'south.edit-title'" [translateParams]="{ name: southConnector.n
               [saveChangesDirectly]="saveItemChangesDirectly"
               (inMemoryItems)="updateInMemoryItems($event)"
             />
-            <div id="actions" class="mt-2 d-flex justify-content-end">
+            <div class="mt-2 d-flex justify-content-end">
               <div class="btn-group">
                 <oib-save-button [insideOfGroup]="false" form="south-form" [state]="state" />
               </div>

diff --git a/frontend/src/app/south/south-detail/south-detail.component.ts b/frontend/src/app/south/south-detail/south-detail.component.ts
@@ -105,6 +105,12 @@ export class SouthDetailComponent implements OnInit, OnDestroy {
         const southSettings: Record<string, string> = JSON.parse(JSON.stringify(this.southConnector!.settings));
         this.displayedSettings = manifest.settings
           .filter(setting => setting.displayInViewMode)
+          .filter(setting => {
+            if (setting.conditionalDisplay) {
+              return setting.conditionalDisplay.values.includes(southSettings[setting.conditionalDisplay.field]);
+            }
+            return true;
+          })
           .map(setting => {
             return {
               key: setting.type === 'OibSelect' ? setting.translationKey + '.title' : setting.translationKey,

diff --git a/frontend/src/i18n/en.json b/frontend/src/i18n/en.json
@@ -1640,7 +1640,7 @@
       "suffix": "Suffix"
     },
     "oianalytics": {
-      "use-oia-module": "Use OIA module",
+      "use-oia-module": "Use OIAnalytics registration",
       "timeout": "Timeout",
       "compress": "Compress",
       "specific-settings": {