Merge branch 'main' into fix/fix-lines-not-wrapping-sanction-check-match

packages/app-builder/src/components/ExternalLink.tsx

@@ -1,5 +1,5 @@
-import clsx from 'clsx';
 import { forwardRef } from 'react';
+import { cn } from 'ui-design-system';
 
 export const linkClasses =
   'hover:text-purple-60 focus:text-purple-60 font-semibold lowercase text-purple-65 hover:underline focus:underline';
@@ -9,7 +9,7 @@ export const ExternalLink = forwardRef<HTMLAnchorElement, React.ComponentPropsWi
     return (
       <a
         ref={ref}
-        className={clsx(linkClasses, className)}
+        className={cn(linkClasses, className)}
         target="_blank"
         rel="noopener noreferrer"
         {...otherProps}

packages/app-builder/src/components/Scenario/Sanction/FieldTrigger.tsx

@@ -1,11 +1,18 @@
-import { type AstNode, NewEmptyTriggerAstNode } from '@app-builder/models';
+import {
+  type AstNode,
+  isUndefinedAstNode,
+  NewEmptyTriggerAstNode,
+  NewUndefinedAstNode,
+} from '@app-builder/models';
 import { useCurrentRuleValidationRule } from '@app-builder/routes/_builder+/scenarios+/$scenarioId+/i+/$iterationId+/_layout';
 import { useTriggerValidationFetcher } from '@app-builder/routes/ressources+/scenarios+/$scenarioId+/$iterationId+/validate-with-given-trigger-or-rule';
 import { useEditorMode } from '@app-builder/services/editor';
 import { useAstNodeEditor, useValidateAstNode } from '@app-builder/services/editor/ast-editor';
 import { useGetScenarioErrorMessage } from '@app-builder/services/validation';
 import { useEffect } from 'react';
+import { Trans, useTranslation } from 'react-i18next';
 import { hasSubObject } from 'remeda';
+import { Button } from 'ui-design-system';
 import { useStore } from 'zustand';
 
 import { AstBuilder, type AstBuilderProps } from '../AstBuilder';
@@ -41,11 +48,13 @@ export const FieldTrigger = ({
   iterationId: string;
   options: AstBuilderProps['options'];
 }) => {
+  const { t } = useTranslation(['scenarios']);
   const editor = useEditorMode();
 
   const astEditorStore = useAstNodeEditor({
-    initialAstNode: trigger ?? NewEmptyTriggerAstNode(),
+    initialAstNode: trigger ?? NewUndefinedAstNode(),
   });
+  const isTriggerNull = isUndefinedAstNode(astEditorStore.getState().rootAstNode);
 
   const astNode = useStore(astEditorStore, (state) => state.rootAstNode);
 
@@ -57,10 +66,52 @@ export const FieldTrigger = ({
     onChange?.(hasSubObject(NewEmptyTriggerAstNode(), astNode) ? undefined : astNode);
   }, [astNode, onChange]);
 
+  const handleAddTrigger = () => {
+    astEditorStore.setState({
+      rootAstNode: NewEmptyTriggerAstNode(),
+    });
+  };
+
+  const handleDeleteTrigger = () => {
+    astEditorStore.setState({
+      rootAstNode: NewUndefinedAstNode(),
+    });
+  };
+
   return (
-    <div onBlur={onBlur}>
-      <AstBuilder viewOnly={editor === 'view'} astEditorStore={astEditorStore} options={options} />
-      {type === 'rule' ? <EvaluationErrorsWrapper /> : null}
+    <div onBlur={onBlur} className="flex flex-col gap-4">
+      {isTriggerNull ? (
+        <div className="border-blue-58 bg-blue-96 text-blue-58 text-s flex items-center rounded border p-2">
+          <span>
+            <Trans
+              t={t}
+              i18nKey="scenarios:trigger.trigger_object.no_trigger"
+              values={{ objectType: options.triggerObjectType }}
+            />
+          </span>
+        </div>
+      ) : (
+        <AstBuilder
+          viewOnly={editor === 'view'}
+          astEditorStore={astEditorStore}
+          options={options}
+        />
+      )}
+      {type === 'rule' ? (
+        <EvaluationErrorsWrapper />
+      ) : (
+        <div className="flex justify-end">
+          {isTriggerNull ? (
+            <Button type="button" variant="secondary" onClick={handleAddTrigger}>
+              {t('scenarios:trigger.trigger_object.add_trigger')}
+            </Button>
+          ) : (
+            <Button type="button" variant="secondary" onClick={handleDeleteTrigger}>
+              {t('scenarios:trigger.trigger_object.delete_trigger')}
+            </Button>
+          )}
+        </div>
+      )}
     </div>
   );
 };

packages/app-builder/src/constants/sanction-check-entity.tsx

@@ -1,7 +1,7 @@
 import { ExternalLink } from '@app-builder/components/ExternalLink';
 import { type SanctionCheckEntitySchema } from '@app-builder/models/sanction-check';
 
-export type PropertyDataType = 'string' | 'country' | 'url' | 'date';
+export type PropertyDataType = 'string' | 'country' | 'url' | 'date' | 'wikidataId';
 export type PropertyForSchema<
   Schema extends SanctionCheckEntitySchema,
   _R = never,
@@ -169,7 +169,7 @@ const propertyMetadata = {
   weakAlias: { type: 'string' },
   website: { type: 'url' },
   weight: { type: 'string' },
-  wikidataId: { type: 'string' },
+  wikidataId: { type: 'wikidataId' },
 } satisfies Record<SanctionCheckEntityProperty, { type: PropertyDataType }>;
 
 export function getSanctionEntityProperties(schema: SanctionCheckEntitySchema) {
@@ -212,6 +212,12 @@ export function createPropertyTransformer(ctx: { language: string; formatLanguag
         }
       case 'date':
         return <time dateTime={value}>{intlDate.format(new Date(value))}</time>;
+      case 'wikidataId':
+        return (
+          <ExternalLink href={`https://wikidata.org/wiki/${value}`} className="normal-case">
+            {value}
+          </ExternalLink>
+        );
     }
   };
 }

packages/app-builder/src/routes/_builder+/scenarios+/$scenarioId+/i+/$iterationId+/sanction.tsx

@@ -121,7 +121,7 @@ const editSanctionFormSchema = z.object({
     z.literal('decline'),
     z.literal('block_and_review'),
   ]),
-  triggerRule: z.any().nullish(),
+  triggerRule: z.any(),
   query: z
     .object({
       name: z.any().nullish(),