@orchestrator-ui/orchestrator-ui-components 8.7.2 → 8.8.1

package/src/messages/en-GB.json

@@ -24,6 +24,7 @@
     "searchModalText": "<p>Different options are available from free text search covering all data columns, or column specific filtering. Note that: <p></p><ul><li>Hidden columns are included</li> <li>Searching is case-insensitive</li> <li>Ordering of words does not matter (unless it is a Phrase)</li> <li>TSV (text search vector) search only available for subscriptions table</li></ul></p> <p>For example:</p> <li><b>\"l2vpn\"</b> – free text search</li> <li><b>tag:l2vpn</b> – search in a specific column</li><li><b>tag:lp description:test</b> – search in multiple columns</li><li><b>tag:(lp|lr)</b> – multiselect within 1 column</li><li><b>-tag:lp</b> – negated filter</li><li><b>test*</b> – prefix filter</li> <p></p><p><b>Note:</b> Search words containing characters `|-*():\"` may not be valid, as they are part of the search query grammar</p><p>Invalid search strings are for example:</p><ul><li>2a10:e300:fff0::/48</li> <li>\"node123(planned)\"</li> <li>\"node123|planned\"</li></ul>",
     "searchModalTitle": "Search string options",
     "showAllColumnsInDetailView": "Show all columns in detail view",
+    "showMatchDetails": "Show match details",
     "tableSettings": "Table settings",
     "unauthorizedPage": "You are not authorized to see this page",
     "unknownError": "Unknown error"
@@ -520,7 +521,8 @@
       "title": "Subscriptions",
       "workflowsTab": {
         "startWithNewestLabel": "Start with newest first",
-        "startWithOldestLabel": "Start with oldest first"
+        "startWithOldestLabel": "Start with oldest first",
+        "hideValidateTasks": "Hide validation tasks"
       }
     },
     "index": {

package/src/messages/nl-NL.json

@@ -24,6 +24,7 @@
     "searchModalText": "<p>Er zijn verschillende opties beschikbaar: zoeken in vrije tekst voor alle datakolommen en specifiek per kolom te filteren. Houd er rekening mee dat: </p><p></p><ul><li>Verborgen kolommen zijn inbegrepen</li> <li>Zoeken is niet hoofdlettergevoelig</li> <li>De volgorde van woorden doet er niet toe (tenzij het een quote)</li> <li>TSV (text search vector) zoekactie alleen beschikbaar voor subscription tabel</li></ul><p>Bijvoorbeeld:</p> <li><b>\"l2vpn\"</b> – vrije tekst search</li> <li><b>tag:l2vpn</b> – zoeken in een specifieke kolom</li> <li><b>tag:lp beschrijving: test</b> – zoeken in meerdere kolommen</li><li><b>tag:(lp|lr)</b> – multi select binnen 1 kolom</li> <li><b>-tag:lp</b> – omgekeerd filteren</li> <li><b>test*</b> – prefix filter</li> <p></p><p><b>Opmerking:</b> Zoeken op woorden die tekens `|-*():\"` bevatten, zijn mogelijk niet geldig, omdat ze deel uitmaken van de grammatica van de zoekfunctie</p><p>Ongeldige zoekwoorden zijn bijvoorbeeld:</p><ul><li>2a10:e300:fff0::/48</li> <li>\"node123(gepland)\"</li> <li>\"node123|gepland\"</li></ul>",
     "searchModalTitle": "Zoekwoorden opties",
     "showAllColumnsInDetailView": "Toon alle kolommen in detailweergave",
+    "showMatchDetails": "Toon overeenkomstdetails",
     "tableSettings": "Tabel instellingen",
     "unauthorizedPage": "Niet geautoriseerd om deze pagina te bekijken",
     "unknownError": "Onbekende fout"
@@ -519,8 +520,9 @@
       "tag": "Tag",
       "title": "Subscriptions",
       "workflowsTab": {
-        "startWithNewestLabel": "Start met nieuwste eerst",
-        "startWithOldestLabel": "Start met oudste eerst"
+        "startWithNewestLabel": "Start met nieuwste",
+        "startWithOldestLabel": "Start met oudste",
+        "hideValidateTasks": "Verberg validatie taken"
       }
     },
     "index": {

package/src/pages/WfoSearchPocPage.tsx

@@ -1,7 +1,6 @@
 import React, { ReactNode, useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import type { RuleGroupType } from 'react-querybuilder';
 import { formatQuery } from 'react-querybuilder/formatQuery';
-import { parseCEL } from 'react-querybuilder/parseCEL';
 
 import { useTranslations } from 'next-intl';
 import Link from 'next/link';
@@ -89,7 +88,6 @@ const getDataFromResponse = <T extends object>(
       },
       {} as Record<string, ReactNode>,
     ),
-    shouldOnlyShowOnHover: true,
   };
 
   const items: T[] = responseColumns.map((responseColumn) => {
@@ -389,21 +387,19 @@ export const WfoSearchPocPage = () => {
   };
 
   const safeCelParse = useCallback((celString: string) => {
-    try {
-      const ruleGroup = parseCEL(celString);
-      if (celString === '') {
-        setIsValidFilterString(true);
-      } else if (ruleGroup?.rules?.length > 0) {
-        // parseCEL returns a query object — check if it has any rules
-        setIsValidFilterString(true);
-        setQueryBuilderRuleGroup(ruleGroup);
-      } else {
-        // If there are no rules created based on this string then
-        // we assume the string is not valid. In any case it will not do anything
-        // to the search results
-        setIsValidFilterString(false);
-      }
-    } catch {
+    if (celString === '') {
+      setIsValidFilterString(true);
+      return;
+    }
+    // parseCelToRuleGroup returns undefined when the string parses to no rules — in that
+    // case we assume the string is not valid. In any case it would not do anything to the
+    // search results. It also assigns the rule ids parseCEL leaves out, which the query
+    // builder needs to keep rule identity stable across query updates.
+    const ruleGroup = parseCelToRuleGroup(celString);
+    if (ruleGroup) {
+      setIsValidFilterString(true);
+      setQueryBuilderRuleGroup(ruleGroup);
+    } else {
       setIsValidFilterString(false);
     }
   }, []);
@@ -448,7 +444,11 @@ export const WfoSearchPocPage = () => {
         setIsValidFilterString(true);
       } else {
         setFilterString(celQuery);
-        setIsValidFilterString(true);
+        // formatQuery output is normally valid CEL, but not unconditionally — a rule can
+        // hold state formatQuery renders as unparseable CEL (e.g. a 'field' value source
+        // renders its value unquoted). Validate the round trip so the invalid marker and
+        // the Apply button track what the textarea actually shows.
+        setIsValidFilterString(!!parseCelToRuleGroup(celQuery));
       }
     }
   };
@@ -507,6 +507,7 @@ export const WfoSearchPocPage = () => {
         data={subscriptionListItems}
         rowExpandingConfiguration={rowExpandingConfiguration}
         defaultHiddenColumns={tableDefaults?.hiddenColumns}
+        defaultShowMatchDetails={tableDefaults?.showMatchDetails}
         filterString={filterString}
         handleSearch={handleApplyFilter}
         isLoading={isFetching}

package/src/pages/tasks/WfoTasksListPage.tsx

@@ -110,6 +110,7 @@ export const WfoTasksListPage = () => {
       'productName',
       'customer',
       'customerAbbreviation',
+      'note',
       'subscriptions',
       'createdBy',
       'assignee',

package/src/rtk/endpoints/search.ts

@@ -112,5 +112,6 @@ export const {
   useLazySearchQuery,
   useSearchWithPaginationMutation,
   useSearchPathsQuery,
+  useLazySearchPathsQuery,
   useSearchDefinitionsQuery,
 } = searchApi;

package/src/types/types.ts

@@ -134,12 +134,12 @@ export interface ProductDefinition {
 export type ProductsSummary = Pick<ProductDefinition, 'name'> & SubscriptionsResult<never>;
 
 export enum WorkflowTarget {
-  CREATE = 'create',
-  MODIFY = 'modify',
-  TERMINATE = 'terminate',
-  SYSTEM = 'system',
-  VALIDATE = 'validate',
-  RECONCILE = 'reconcile',
+  CREATE = 'CREATE',
+  MODIFY = 'MODIFY',
+  TERMINATE = 'TERMINATE',
+  SYSTEM = 'SYSTEM',
+  VALIDATE = 'VALIDATE',
+  RECONCILE = 'RECONCILE',
 }
 
 export type Process = {
@@ -624,11 +624,11 @@ export type SubscriptionActions = {
   reason?: string;
   locked_relations?: string[];
   locked_relations_detail?: SubscriptionRelation[];
-  modify: SubscriptionAction[];
-  terminate: SubscriptionAction[];
-  system: SubscriptionAction[];
-  validate: SubscriptionAction[];
-  reconcile: SubscriptionAction[];
+  [WorkflowTarget.MODIFY]: SubscriptionAction[];
+  [WorkflowTarget.TERMINATE]: SubscriptionAction[];
+  [WorkflowTarget.SYSTEM]: SubscriptionAction[];
+  [WorkflowTarget.VALIDATE]: SubscriptionAction[];
+  [WorkflowTarget.RECONCILE]: SubscriptionAction[];
 };
 
 export enum CacheTagType {

package/src/utils/getDefaultTableConfig.ts

@@ -19,10 +19,12 @@ import { ProductBlockDefinition, ProductDefinition, ResourceTypeDefinition, Work
 function getTableConfig<T>(
   hiddenColumns: (keyof T)[] = [],
   selectedPageSize = DEFAULT_PAGE_SIZE,
+  showMatchDetails = false,
 ): StoredTableConfig<T> {
   return {
     selectedPageSize,
     hiddenColumns,
+    showMatchDetails,
   };
 }