@servicetitan/dte-pdf-editor 1.39.0 → 1.41.0

package/dist/utils/conditions/schema-data-points.utils.js

@@ -24,7 +24,6 @@ function walkSchema(schema, prefix, parentTitles) {
             result.push({
                 fieldType,
                 fullKey,
-                group: fieldType === 'number' ? 'Numeric Fields' : 'Data Model',
                 title: fullTitle || fullKey,
             });
         }
@@ -52,7 +51,6 @@ export function getDocumentFieldsDataPointOptions(fields) {
         result.push({
             fieldType,
             fullKey: f.path,
-            group: 'Document Fields',
             title: f.label || f.path,
         });
     }

package/dist/utils/conditions/schema-data-points.utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"schema-data-points.utils.js","sourceRoot":"","sources":["../../../src/utils/conditions/schema-data-points.utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"schema-data-points.utils.js","sourceRoot":"","sources":["../../../src/utils/conditions/schema-data-points.utils.ts"],"names":[],"mappings":"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"}

package/dist/utils/formula/format-calculated-result.utils.d.ts

@@ -3,5 +3,5 @@ import { CalculatedFieldFormat } from '../../interface/types';
  * Format a calculated formula result for display using advanced settings.
  * Applies rounding, decimal places, thousands/decimal separators, result type (number/currency/percent/date), and prefix/postfix.
  */
-export declare function formatCalculatedResult(value: number, format: CalculatedFieldFormat | undefined): string;
+export declare const formatCalculatedResult: (value: number, format: CalculatedFieldFormat | undefined) => string;
 //# sourceMappingURL=format-calculated-result.utils.d.ts.map

package/dist/utils/formula/format-calculated-result.utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"format-calculated-result.utils.d.ts","sourceRoot":"","sources":["../../../src/utils/formula/format-calculated-result.utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAA6B,MAAM,uBAAuB,CAAC;AA8DzF;;;GAGG;AACH,wBAAgB,sBAAsB,CAClC,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,qBAAqB,GAAG,SAAS,GAC1C,MAAM,CA8BR"}
+{"version":3,"file":"format-calculated-result.utils.d.ts","sourceRoot":"","sources":["../../../src/utils/formula/format-calculated-result.utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAA6B,MAAM,uBAAuB,CAAC;AA2EzF;;;GAGG;AACH,eAAO,MAAM,sBAAsB,GAC/B,OAAO,MAAM,EACb,QAAQ,qBAAqB,GAAG,SAAS,KAC1C,MAiCF,CAAC"}

package/dist/utils/formula/format-calculated-result.utils.js

@@ -1,5 +1,5 @@
-import { DEFAULT_DATE_FORMAT } from '../../constants';
-function roundValue(value, decimals, mode) {
+import { DEFAULT_DATE_FORMAT, MAX_DATE_DISPLAY_RANGE_YEARS } from '../../constants';
+const roundValue = (value, decimals, mode) => {
     const factor = 10 ** decimals;
     const scaled = value * factor;
     switch (mode) {
@@ -10,8 +10,8 @@ function roundValue(value, decimals, mode) {
         default:
             return Math.round(scaled) / factor;
     }
-}
-function formatIntegerPart(s, thousandsSeparator, decimalSeparator) {
+};
+const formatIntegerPart = (s, thousandsSeparator, decimalSeparator) => {
     if (!thousandsSeparator) {
         return s;
     }
@@ -24,7 +24,7 @@ function formatIntegerPart(s, thousandsSeparator, decimalSeparator) {
         i = start;
     }
     return parts.join(sep);
-}
+};
 const DATE_FORMAT_TOKENS = {
     YYYY: d => String(d.getFullYear()),
     YY: d => String(d.getFullYear()).slice(-2),
@@ -36,7 +36,7 @@ const DATE_FORMAT_TOKENS = {
     D: d => String(d.getDate()),
 };
 const DATE_TOKEN_PATTERN = new RegExp(Object.keys(DATE_FORMAT_TOKENS).join('|'), 'g');
-function formatDateValue(epochMs, dateFormat) {
+const formatDateValue = (epochMs, dateFormat) => {
     const date = new Date(epochMs);
     if (isNaN(date.getTime())) {
         return '';
@@ -45,17 +45,32 @@ function formatDateValue(epochMs, dateFormat) {
         const fn = DATE_FORMAT_TOKENS[match];
         return fn ? fn(date) : match;
     });
-}
+};
+const isDateWithinDisplayRange = (epochMs, referenceMs = Date.now()) => {
+    const date = new Date(epochMs);
+    if (isNaN(date.getTime())) {
+        return false;
+    }
+    const ref = new Date(referenceMs);
+    const min = new Date(ref);
+    min.setFullYear(min.getFullYear() - MAX_DATE_DISPLAY_RANGE_YEARS);
+    const max = new Date(ref);
+    max.setFullYear(max.getFullYear() + MAX_DATE_DISPLAY_RANGE_YEARS);
+    return date >= min && date <= max;
+};
 /**
  * Format a calculated formula result for display using advanced settings.
  * Applies rounding, decimal places, thousands/decimal separators, result type (number/currency/percent/date), and prefix/postfix.
  */
-export function formatCalculatedResult(value, format) {
+export const formatCalculatedResult = (value, format) => {
     var _a;
     if (format == null) {
         return String(value);
     }
     if (format.resultType === 'date') {
+        if (!isDateWithinDisplayRange(value)) {
+            return '';
+        }
         return formatDateValue(value, (_a = format.dateFormat) !== null && _a !== void 0 ? _a : DEFAULT_DATE_FORMAT);
     }
     const { decimalSeparator, decimalSeparatorEnabled, decimals, postfixText, prefixText, roundingMode, thousandsSeparator, } = format;
@@ -67,5 +82,5 @@ export function formatCalculatedResult(value, format) {
     const decSuffix = decimals > 0 ? decimalSep + (decPart !== null && decPart !== void 0 ? decPart : '') : '';
     const numberStr = intFormatted + decSuffix;
     return `${prefixText}${numberStr}${postfixText}`;
-}
+};
 //# sourceMappingURL=format-calculated-result.utils.js.map

package/dist/utils/formula/format-calculated-result.utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"format-calculated-result.utils.js","sourceRoot":"","sources":["../../../src/utils/formula/format-calculated-result.utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"format-calculated-result.utils.js","sourceRoot":"","sources":["../../../src/utils/formula/format-calculated-result.utils.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@servicetitan/dte-pdf-editor",
-  "version": "1.39.0",
+  "version": "1.41.0",
   "description": "",
   "main": "./dist/index.js",
   "typings": "./dist/index.d.ts",

package/src/components/display-conditions/condition-group.tsx

@@ -1,4 +1,4 @@
-import { Button, Flex, SegmentedControl, Text } from '@servicetitan/anvil2';
+import { Button, Flex, Text } from '@servicetitan/anvil2';
 import PlusIcon from '@servicetitan/anvil2/assets/icons/material/round/add.svg';
 import TrashIcon from '@servicetitan/anvil2/assets/icons/material/round/delete.svg';
 import { useCallback } from 'react';
@@ -12,31 +12,36 @@ import { ConditionRow } from './condition-row';
 
 export interface ConditionGroupProps {
     canDelete: boolean;
+    conditionJoinOperator: 'and' | 'or';
     dataPointOptions: DataPointOption[];
     group: DisplayConditionGroup;
     onDelete: () => void;
     onUpdate: (g: DisplayConditionGroup) => void;
     ruleIndex: number;
+    /** When 1, the UI hides the per-rule title (single-rule layout). */
+    totalRuleCount: number;
 }
 
 export function ConditionGroup({
     canDelete,
+    conditionJoinOperator,
     dataPointOptions,
     group,
     onDelete,
     onUpdate,
     ruleIndex,
+    totalRuleCount,
 }: Readonly<ConditionGroupProps>) {
     const addCondition = useCallback(() => {
         const newCondition: DisplayConditionSingle = {
             ...defaultCondition(),
-            logicalOperator: 'and',
+            logicalOperator: conditionJoinOperator,
         };
         onUpdate({
             ...group,
             conditions: [...group.conditions, newCondition],
         });
-    }, [group, onUpdate]);
+    }, [conditionJoinOperator, group, onUpdate]);
 
     const updateCondition = useCallback(
         (index: number, c: DisplayConditionSingle) => {
@@ -62,61 +67,29 @@ export function ConditionGroup({
         [group, onUpdate],
     );
 
-    const handleLogicalOperatorChange = useCallback(
-        (conditionIndex: number, value: string) => {
-            const next = [...group.conditions];
-            next[conditionIndex] = {
-                ...next[conditionIndex],
-                logicalOperator: value as 'and' | 'or',
-            };
-            onUpdate({ ...group, conditions: next });
-        },
-        [group, onUpdate],
-    );
+    const showRuleHeading = totalRuleCount > 1;
 
     return (
         <Flex direction="column" gap="2" flex={1}>
-            <Flex direction="row" alignItems="center" justifyContent="space-between" flex={1}>
-                <Text size="medium" variant="body" style={{ fontWeight: 'bold' }}>
-                    Rule {ruleIndex + 1}
-                </Text>
-                {canDelete && (
-                    <Button
-                        appearance="ghost"
-                        aria-label="Delete rule"
-                        icon={{ before: TrashIcon }}
-                        size="large"
-                        onClick={onDelete}
-                    />
-                )}
-            </Flex>
-            <Flex
-                direction="column"
-                gap="3"
-                flex={1}
-                style={{
-                    border: '1px solid #e0e0e0',
-                    borderRadius: 8,
-                    padding: 12,
-                }}
-            >
+            {showRuleHeading && (
+                <Flex direction="row" alignItems="center" justifyContent="space-between" flex={1}>
+                    <Text size="medium" variant="body" style={{ fontWeight: 'bold' }}>
+                        Rule {ruleIndex + 1}
+                    </Text>
+                    {canDelete && (
+                        <Button
+                            appearance="ghost"
+                            aria-label="Delete rule"
+                            icon={{ before: TrashIcon }}
+                            size="large"
+                            onClick={onDelete}
+                        />
+                    )}
+                </Flex>
+            )}
+            <Flex direction="column" gap="3" flex={1}>
                 {group.conditions.map((c, i) => (
                     <Flex key={c.id} direction="column" gap="3" style={{ padding: '8px 0' }}>
-                        {i > 0 && (
-                            <Flex justifyContent="center" alignItems="center" gap="2">
-                                <SegmentedControl
-                                    selected={c.logicalOperator ?? 'and'}
-                                    onChange={(v: string) => handleLogicalOperatorChange(i, v)}
-                                >
-                                    <SegmentedControl.Segment value="and">
-                                        And
-                                    </SegmentedControl.Segment>
-                                    <SegmentedControl.Segment value="or">
-                                        Or
-                                    </SegmentedControl.Segment>
-                                </SegmentedControl>
-                            </Flex>
-                        )}
                         <ConditionRow
                             canRemove
                             condition={c}

package/src/components/display-conditions/condition-groups-section.tsx

@@ -1,9 +1,11 @@
-import { Button, Flex, SegmentedControl } from '@servicetitan/anvil2';
+import { Button, Flex } from '@servicetitan/anvil2';
 import PlusIcon from '@servicetitan/anvil2/assets/icons/material/round/add.svg';
+import { MAX_DISPLAY_CONDITION_RULES_UI } from '../../constants';
 import type { DataPointOption, DisplayConditionGroup } from '../../interface/types';
 import { ConditionGroup } from './condition-group';
 
 export interface ConditionGroupsSectionProps {
+    conditionJoinOperator: 'and' | 'or';
     dataPointOptions: DataPointOption[];
     groups: DisplayConditionGroup[];
     onAddGroup: () => void;
@@ -12,6 +14,7 @@ export interface ConditionGroupsSectionProps {
 }
 
 export function ConditionGroupsSection({
+    conditionJoinOperator,
     dataPointOptions,
     groups,
     onAddGroup,
@@ -22,42 +25,25 @@ export function ConditionGroupsSection({
         <Flex direction="column" gap="4">
             {groups.map((group, index) => (
                 <Flex key={group.id} direction="column" gap="3">
-                    {index > 0 && (
-                        <Flex
-                            justifyContent="center"
-                            alignItems="center"
-                            gap="2"
-                            style={{ padding: '12px' }}
-                        >
-                            <SegmentedControl
-                                selected={group.logicalOperator ?? 'and'}
-                                onChange={(value: string) =>
-                                    onUpdateGroup(index, {
-                                        ...group,
-                                        logicalOperator: value as 'and' | 'or',
-                                    })
-                                }
-                            >
-                                <SegmentedControl.Segment value="and">And</SegmentedControl.Segment>
-                                <SegmentedControl.Segment value="or">Or</SegmentedControl.Segment>
-                            </SegmentedControl>
-                        </Flex>
-                    )}
                     <ConditionGroup
                         canDelete={groups.length > 1}
+                        conditionJoinOperator={conditionJoinOperator}
                         dataPointOptions={dataPointOptions}
                         group={group}
                         onDelete={() => onRemoveGroup(index)}
                         onUpdate={g => onUpdateGroup(index, g)}
                         ruleIndex={index}
+                        totalRuleCount={groups.length}
                     />
                 </Flex>
             ))}
-            <Flex justifyContent="center" flex={1} style={{ paddingTop: 8 }}>
-                <Button appearance="secondary" icon={{ before: PlusIcon }} onClick={onAddGroup}>
-                    Add Rule
-                </Button>
-            </Flex>
+            {groups.length < MAX_DISPLAY_CONDITION_RULES_UI && (
+                <Flex justifyContent="center" flex={1} style={{ paddingTop: 8 }}>
+                    <Button appearance="secondary" icon={{ before: PlusIcon }} onClick={onAddGroup}>
+                        Add Rule
+                    </Button>
+                </Flex>
+            )}
         </Flex>
     );
 }

package/src/components/display-conditions/condition-row.tsx

@@ -100,7 +100,6 @@ export function ConditionRow({
             <Flex flex={1}>
                 <Combobox
                     flex={1}
-                    groupBy="group"
                     itemToKey={(item: DataPointOption | null) => item?.fullKey ?? ''}
                     itemToString={(item: DataPointOption | null) => item?.title ?? ''}
                     items={dataPointOptions}

package/src/components/display-conditions/display-condition-modal.tsx

@@ -1,10 +1,45 @@
-import { Button, Dialog, Divider, Flex, SegmentedControl, Text } from '@servicetitan/anvil2';
+import { Button, Chip, Dialog, Flex, SegmentedControl, Text } from '@servicetitan/anvil2';
 import { useCallback, useMemo, useState } from 'react';
 import { defaultGroup, defaultState, MODAL_CONTENT_MAX_HEIGHT } from '../../constants';
 import type { DisplayConditionState, PdfField, SchemaObject } from '../../interface/types';
 import { getDataPointOptions, isValidNumber } from '../../utils';
 import { ConditionGroupsSection } from './condition-groups-section';
 
+type ConditionMatchType = 'and' | 'or';
+
+const deriveConditionMatchType = (conditionState: DisplayConditionState): ConditionMatchType => {
+    for (let g = 0; g < conditionState.groups.length; g++) {
+        const group = conditionState.groups[g];
+        if (g > 0 && group.logicalOperator === 'or') {
+            return 'or';
+        }
+        for (let i = 1; i < group.conditions.length; i++) {
+            if (group.conditions[i]?.logicalOperator === 'or') {
+                return 'or';
+            }
+        }
+    }
+    return 'and';
+};
+
+const applyConditionMatchType = (
+    conditionState: DisplayConditionState,
+    matchType: ConditionMatchType,
+): DisplayConditionState => {
+    return {
+        ...conditionState,
+        groups: conditionState.groups.map((group, groupIndex) => ({
+            ...group,
+            ...(groupIndex > 0 ? { logicalOperator: matchType } : {}),
+            conditions: group.conditions.map((c, i) =>
+                i === 0
+                    ? { ...c, logicalOperator: undefined }
+                    : { ...c, logicalOperator: matchType },
+            ),
+        })),
+    };
+};
+
 const BEHAVIOR_OPTIONS = [
     { label: 'Show', value: 'show' },
     { label: 'Hide', value: 'hide' },
@@ -30,6 +65,9 @@ export function DisplayConditionModal({
     const [state, setState] = useState<DisplayConditionState>(() =>
         initialState?.groups?.length ? initialState : defaultState(),
     );
+    const [matchType, setMatchType] = useState<ConditionMatchType>(() =>
+        deriveConditionMatchType(initialState?.groups?.length ? initialState : defaultState()),
+    );
 
     const dataPointOptions = useMemo(
         () => getDataPointOptions(schema, documentFields),
@@ -41,7 +79,8 @@ export function DisplayConditionModal({
     }, [onClose]);
 
     const handleSave = useCallback(() => {
-        const hasValidGroup = state.groups.some(group =>
+        const finalState = applyConditionMatchType(state, matchType);
+        const hasValidGroup = finalState.groups.some(group =>
             group.conditions.some(
                 c =>
                     c.dataPointKey &&
@@ -51,12 +90,12 @@ export function DisplayConditionModal({
             ),
         );
         if (hasValidGroup) {
-            onSave(state);
+            onSave(finalState);
         } else {
             onSave(null);
         }
         onClose();
-    }, [onSave, state, onClose]);
+    }, [onSave, state, matchType, onClose]);
 
     const updateGroup = useCallback((index: number, group: DisplayConditionState['groups'][0]) => {
         setState(prev => {
@@ -86,14 +125,19 @@ export function DisplayConditionModal({
     const addGroup = useCallback(() => {
         setState(prev => ({
             ...prev,
-            groups: [...prev.groups, { ...defaultGroup(), logicalOperator: 'and' }],
+            groups: [...prev.groups, { ...defaultGroup(), logicalOperator: matchType }],
         }));
-    }, []);
+    }, [matchType]);
 
     const handleBehaviorChange = useCallback((behavior: DisplayConditionState['behavior']) => {
         setState(prev => ({ ...prev, behavior }));
     }, []);
 
+    const handleConditionMatchTypeChange = useCallback((value: ConditionMatchType) => {
+        setMatchType(value);
+        setState(prev => applyConditionMatchType(prev, value));
+    }, []);
+
     const canSave = useMemo(() => {
         for (const group of state.groups) {
             for (const condition of group.conditions) {
@@ -120,7 +164,7 @@ export function DisplayConditionModal({
 
     return (
         <Dialog open onClose={handleClose} size="xlarge">
-            <Dialog.Header>Rules and Conditions</Dialog.Header>
+            <Dialog.Header>Conditions</Dialog.Header>
             <Dialog.Content>
                 <Flex
                     direction="column"
@@ -132,12 +176,34 @@ export function DisplayConditionModal({
                     }}
                 >
                     <Flex direction="column" gap="3">
-                        <Text size="medium" variant="body" style={{ fontWeight: 'bold' }}>
-                            When conditions are met:
-                        </Text>
+                        <Flex
+                            direction="row"
+                            alignItems="center"
+                            gap="2"
+                            style={{ flexWrap: 'wrap' }}
+                        >
+                            <Text size="medium" variant="body" style={{ fontWeight: 'bold' }}>
+                                When
+                            </Text>
+                            <SegmentedControl
+                                size="small"
+                                selected={matchType}
+                                onChange={handleConditionMatchTypeChange}
+                            >
+                                <SegmentedControl.Segment value="and">All</SegmentedControl.Segment>
+                                <SegmentedControl.Segment value="or">Any</SegmentedControl.Segment>
+                            </SegmentedControl>
+                            <Text size="medium" variant="body" style={{ fontWeight: 'bold' }}>
+                                of the
+                            </Text>
+                            <Chip label="IF" size="small" />
+                            <Text size="medium" variant="body" style={{ fontWeight: 'bold' }}>
+                                conditions are met
+                            </Text>
+                        </Flex>
                         <Flex direction="row" alignItems="center" gap="3">
                             <Text size="small" subdued variant="body">
-                                Select to show or hide this field.
+                                Select to include or exclude selected template/file.
                             </Text>
 
                             <SegmentedControl
@@ -153,20 +219,14 @@ export function DisplayConditionModal({
                             </SegmentedControl>
                         </Flex>
                     </Flex>
-                    <Divider />
                     <ConditionGroupsSection
+                        conditionJoinOperator={matchType}
                         dataPointOptions={dataPointOptions}
                         groups={state.groups}
                         onAddGroup={addGroup}
                         onRemoveGroup={removeGroup}
                         onUpdateGroup={updateGroup}
                     />
-                    {!canSave && (
-                        <Text size="small" subdued variant="body">
-                            Complete each condition before saving. Data point and value are
-                            required, and numeric fields must contain a valid number.
-                        </Text>
-                    )}
                 </Flex>
             </Dialog.Content>
             <Dialog.Footer sticky>

package/src/components/field-sidebar/field-sidebar.tsx

@@ -1,7 +1,6 @@
 import { Button, Flex, Icon, Text } from '@servicetitan/anvil2';
 import IconMenuOpen from '@servicetitan/anvil2/assets/icons/material/round/menu_open.svg';
-
-import { FC, useState } from 'react';
+import { FC, useMemo, useState } from 'react';
 import { menuGroups } from '../../constants';
 import { useToggle } from '../../hooks';
 import { DataModelFieldGroup, FieldTypeEnum, FieldTypeOption } from '../../interface/types';
@@ -14,12 +13,14 @@ import { GenericFieldTypeList } from './generic-field-type-list';
 
 interface FieldSidebarProps {
     dataModelGroups?: DataModelFieldGroup[];
+    hideFields?: FieldTypeEnum[];
     onDragEnd(): void;
     onDragStart(fieldOption: FieldTypeOption): void;
 }
 
 export const FieldSidebar: FC<FieldSidebarProps> = ({
     dataModelGroups = [],
+    hideFields,
     onDragEnd,
     onDragStart,
 }) => {
@@ -31,10 +32,17 @@ export const FieldSidebar: FC<FieldSidebarProps> = ({
         open();
     };
 
+    const filteredMenuGroups = useMemo(() => {
+        if (hideFields?.length) {
+            return menuGroups.filter(menuGroup => !hideFields.includes(menuGroup.key));
+        }
+        return menuGroups;
+    }, [hideFields]);
+
     return (
         <Flex className="dte-field-sidebar-container skeleton-item">
             <FieldMenuGroup
-                menuGroups={menuGroups}
+                menuGroups={filteredMenuGroups}
                 onClickMenu={handleActiveFieldTypeChange}
                 activeFieldKey={activeFieldType}
             />

package/src/components/pdf-editor/pdf-editor.tsx

@@ -1,7 +1,7 @@
 import { Flex } from '@servicetitan/anvil2';
 import { FC, ReactNode, useCallback, useMemo, useRef } from 'react';
 import { usePdfFieldDnD, usePdfFieldSelection } from '../../hooks';
-import { PdfField, RecipientInfo, SchemaObject } from '../../interface/types';
+import { FieldTypeEnum, PdfField, RecipientInfo, SchemaObject } from '../../interface/types';
 import { extractGroupedFieldsFromDataModel, mapColorsToRecipients } from '../../utils';
 import { FieldConfigPanelOverlay } from '../field-config-panel/field-config-panel-overlay';
 import { FieldSidebar } from '../field-sidebar/field-sidebar';
@@ -18,6 +18,7 @@ export interface PdfEditorProps {
     dataModel?: SchemaObject;
     recipients?: RecipientInfo[];
     fields?: PdfField[];
+    hideFields?: FieldTypeEnum[];
     onLoadSuccess?(numPages: number): void;
     onFieldsChange(fields: PdfField[]): void;
 }
@@ -27,6 +28,7 @@ export const PdfEditor: FC<PdfEditorProps> = ({
     errorPlaceholder,
     errors = {},
     fields = [],
+    hideFields,
     loading = false,
     loadingPlaceholder,
     onFieldsChange,
@@ -83,6 +85,7 @@ export const PdfEditor: FC<PdfEditorProps> = ({
 
             <Flex className="dte-pdf-editor-sidebar-container">
                 <FieldSidebar
+                    hideFields={hideFields}
                     dataModelGroups={dataModelGroups}
                     onDragStart={pdfFieldDnd.handleDragStart}
                     onDragEnd={pdfFieldDnd.handleDragEnd}

package/src/constants/calculated.constants.ts

@@ -3,3 +3,5 @@ export const CALCULATED_OPERATIONS = ['+', '-', '*', '/', '(', ')'];
 export const DEFAULT_DATE_FORMAT = 'MM/DD/YYYY';
 
 export const MAX_DATE_CALC_DAYS = 365;
+
+export const MAX_DATE_DISPLAY_RANGE_YEARS = 2;

package/src/constants/conditions.constants.ts

@@ -24,3 +24,9 @@ export const defaultState = (): DisplayConditionState => ({
 });
 
 export const MODAL_CONTENT_MAX_HEIGHT = '70vh';
+
+/**
+ * Temporary product limit: the editor UI allows only this many rules (groups).
+ * The data model and evaluation still support multiple groups for existing templates.
+ */
+export const MAX_DISPLAY_CONDITION_RULES_UI = 1;

package/src/interface/types.ts

@@ -240,6 +240,5 @@ export const VALUE_LESS_OPERATORS: ConditionOperator[] = ['is_empty', 'is_not_em
 export interface DataPointOption {
     fieldType: 'number' | 'string';
     fullKey: string;
-    group: string;
     title: string;
 }

package/src/utils/conditions/schema-data-points.utils.ts

@@ -43,7 +43,6 @@ function walkSchema(
             result.push({
                 fieldType,
                 fullKey,
-                group: fieldType === 'number' ? 'Numeric Fields' : 'Data Model',
                 title: fullTitle || fullKey,
             });
         }
@@ -75,7 +74,6 @@ export function getDocumentFieldsDataPointOptions(
         result.push({
             fieldType,
             fullKey: f.path,
-            group: 'Document Fields',
             title: f.label || f.path,
         });
     }