@orchestrator-ui/orchestrator-ui-components 8.9.3 → 9.0.0

package/src/components/WfoTable/WfoStructuredSearchTable/utils.ts

@@ -1,5 +1,5 @@
 import { type KeyboardEventHandler, useEffect, useRef } from 'react';
-import { FullOperator, RuleGroupType, generateID } from 'react-querybuilder';
+import { FullOperator, RuleGroupType, RuleType, generateID } from 'react-querybuilder';
 import { prepareRuleGroup } from 'react-querybuilder';
 import { parseCEL } from 'react-querybuilder/parseCEL';
 
@@ -11,12 +11,14 @@ export const FILTER_CHANGE_DEBOUNCE_DELAY = 1000;
 interface SearchWithDebouncedCallbackProps {
   filterString?: string;
   isValidFilterString: boolean;
+  hasEmptyRuleValue?: boolean;
   searchCallback: () => void;
 }
 
 export const useSearchWithDebouncedCallback = ({
   filterString,
   isValidFilterString,
+  hasEmptyRuleValue = false,
   searchCallback,
 }: SearchWithDebouncedCallbackProps) => {
   const {
@@ -38,12 +40,12 @@ export const useSearchWithDebouncedCallback = ({
 
     if (!hasFilterStringChanged) return;
 
-    if (isValidFilterString) {
+    if (isValidFilterString && !hasEmptyRuleValue) {
       triggerSearch(FILTER_CHANGE_DEBOUNCE_DELAY);
     } else {
       cancelSearch();
     }
-  }, [filterString, isValidFilterString, triggerSearch, cancelSearch]);
+  }, [filterString, isValidFilterString, hasEmptyRuleValue, triggerSearch, cancelSearch]);
 
   // Enter applies the filter exactly like that button; Shift+Enter is left alone so it can
   // insert a newline in a textarea.
@@ -159,6 +161,28 @@ const SEARCH_OPERATOR_TO_RQB_OPERATOR_MAP: Record<string, string> = {
 // Operators without a value; marking them unary makes react-querybuilder's Rule hide the value editor.
 const RQB_UNARY_OPERATORS = ['null', 'notNull'];
 
+const isEmptyValue = (rule: RuleType): boolean => {
+  const { value } = rule;
+  if (RQB_UNARY_OPERATORS.includes(rule.operator)) {
+    return false;
+  } else if (typeof value !== 'string') {
+    return value === undefined || value === null;
+  } else if (rule.operator === 'between') {
+    const rangeParts = value.split(',');
+    return rangeParts.length < 2 || rangeParts.some((rangePart) => rangePart.trim() === '');
+  }
+  return value.trim() === '';
+};
+
+/** True when any rule of the group, nested groups included, has an empty value editor. */
+export const hasNestedRuleWithEmptyValue = (ruleGroup?: RuleGroupType): boolean =>
+  !!ruleGroup?.rules.some((rule) => {
+    if (typeof rule === 'string') {
+      return false;
+    }
+    return 'rules' in rule ? hasNestedRuleWithEmptyValue(rule) : isEmptyValue(rule);
+  });
+
 const OPERATOR_MAP: Record<string, OperatorDisplay> = {
   eq: { symbol: '=', description: 'equals' },
   neq: { symbol: '≠', description: 'not equals' },

package/src/configuration/version.ts

@@ -1 +1 @@
-export const ORCHESTRATOR_UI_LIBRARY_VERSION = '8.9.3';
+export const ORCHESTRATOR_UI_LIBRARY_VERSION = '9.0.0';

package/src/messages/en-GB.json

@@ -23,6 +23,7 @@
     "retrieverHybrid": "Hybrid",
     "retrieverSemantic": "Semantic",
     "search": "Search",
+    "searchError": "Search failed",
     "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",
@@ -550,7 +551,6 @@
     },
     "index": {
       "customerFullname": "Customer",
-      "customerId": "Customer ID",
       "customerShortcode": "Customer abbr",
       "description": "Description",
       "endDate": "End date",

package/src/messages/nl-NL.json

@@ -23,6 +23,7 @@
     "retrieverHybrid": "Hybride",
     "retrieverSemantic": "Semantic",
     "search": "Zoeken",
+    "searchError": "Zoeken mislukt",
     "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",
@@ -550,7 +551,6 @@
     },
     "index": {
       "customerFullname": "Klant",
-      "customerId": "Klant ID",
       "customerShortcode": "Klantafkorting",
       "description": "Beschrijving",
       "endDate": "Einddatum",

package/src/pages/index.ts

@@ -5,4 +5,3 @@ export * from './startPage';
 export * from './subscriptions';
 export * from './tasks';
 export * from './workflows';
-export * from './WfoSearchPocPage';

package/src/pages/startPage/index.ts

@@ -1,2 +1,3 @@
 export * from './WfoStartPage';
 export * from './mappers';
+export * from './searchPayloads';

package/src/pages/startPage/mappers.ts

@@ -1,19 +1,26 @@
 import { PATH_SUBSCRIPTIONS, PATH_WORKFLOWS } from '@/components';
 import { SummaryCardListItem } from '@/components/WfoSummary';
 import { ProcessSummary } from '@/rtk';
-import { SubscriptionSummary } from '@/types';
+import { SearchResult } from '@/types';
 import { formatDate } from '@/utils';
 
+import {
+  SUBSCRIPTION_DESCRIPTION_COLUMN,
+  SUBSCRIPTION_ID_COLUMN,
+  SUBSCRIPTION_START_DATE_COLUMN,
+} from './searchPayloads';
+
 export const mapProcessSummaryToSummaryCardListItem = (processSummary: ProcessSummary): SummaryCardListItem => ({
   title: processSummary.workflowName,
   value: formatDate(processSummary?.startedAt),
   url: `${PATH_WORKFLOWS}/${processSummary.processId}`,
 });
 
-export const mapSubscriptionSummaryToSummaryCardListItem = (
-  subscription: SubscriptionSummary,
-): SummaryCardListItem => ({
-  title: subscription.description,
-  value: formatDate(subscription.startDate),
-  url: `${PATH_SUBSCRIPTIONS}/${subscription.subscriptionId}`,
-});
+export const mapSubscriptionSearchResultToSummaryCardListItem = (result: SearchResult): SummaryCardListItem => {
+  const { response_columns } = result;
+  return {
+    title: String(response_columns[SUBSCRIPTION_DESCRIPTION_COLUMN] ?? ''),
+    value: formatDate(response_columns[SUBSCRIPTION_START_DATE_COLUMN] as string | null),
+    url: `${PATH_SUBSCRIPTIONS}/${response_columns[SUBSCRIPTION_ID_COLUMN]}`,
+  };
+};

package/src/pages/startPage/queryVariables.ts

@@ -13,14 +13,6 @@ const baseQueryVariables: Partial<GraphqlQueryVariables<unknown>> = {
   first: 5,
   after: 0,
 };
-const baseQueryVariablesForSubscription: Partial<GraphqlQueryVariables<Subscription>> = {
-  ...baseQueryVariables,
-  sortBy: {
-    field: 'startDate',
-    order: SortOrder.DESC,
-  },
-};
-
 const baseQueryVariablesForProcess: Partial<GraphqlQueryVariables<Process>> = {
   ...baseQueryVariables,
   sortBy: {
@@ -41,27 +33,6 @@ const getTaskFilter = (isTask: boolean): GraphqlFilter<Process> => {
   };
 };
 
-export const subscriptionsListSummaryQueryVariables: GraphqlQueryVariables<Subscription> = {
-  ...baseQueryVariablesForSubscription,
-  filterBy: [
-    {
-      field: 'status',
-      value: 'Active',
-    },
-  ],
-};
-
-export const outOfSyncSubscriptionsListSummaryQueryVariables: GraphqlQueryVariables<Subscription> = {
-  ...baseQueryVariablesForSubscription,
-  query: 'insync:false',
-  filterBy: [
-    {
-      field: 'status',
-      value: 'Active-Provisioning',
-    },
-  ],
-};
-
 export const getMyWorkflowListSummaryQueryVariables = (username: string): GraphqlQueryVariables<Process> => ({
   ...baseQueryVariablesForProcess,
   filterBy: [

package/src/pages/startPage/searchPayloads.ts

@@ -0,0 +1,22 @@
+import { SearchPayload } from '@/rtk';
+import { EntityKind, Filter } from '@/types';
+
+export const SUBSCRIPTION_ID_COLUMN = 'subscription.subscription_id';
+export const SUBSCRIPTION_DESCRIPTION_COLUMN = 'subscription.description';
+export const SUBSCRIPTION_START_DATE_COLUMN = 'subscription.start_date';
+
+const SUMMARY_CARD_ITEM_COUNT = 5;
+
+/**
+ * Builds the search payload shared by the subscription summary cards on the start page: the five
+ * most recently started subscriptions matching `filters`, with just the columns the card renders.
+ * `filters` is an Elasticsearch bool query, the same shape the subscriptions list page sends.
+ */
+export const getSubscriptionSummarySearchPayload = (filters: Filter): SearchPayload => ({
+  entity_type: EntityKind.SUBSCRIPTION,
+  query: '',
+  filters,
+  limit: SUMMARY_CARD_ITEM_COUNT,
+  order_by: { element: SUBSCRIPTION_START_DATE_COLUMN, direction: 'desc' },
+  response_columns: [SUBSCRIPTION_ID_COLUMN, SUBSCRIPTION_DESCRIPTION_COLUMN, SUBSCRIPTION_START_DATE_COLUMN],
+});