Enable discard/undiscard entry

- Disallow duplicate entries creation. - Remove selection of entry after creation from auto draft entries
the-deep · Dec 18, 2023 · b58b6bd · b58b6bd
1 parent 531ea17
commit b58b6bd
Show file tree

Hide file tree

Showing 7 changed files with 326 additions and 81 deletions.
diff --git a/app/components/entry/EntryInput/index.tsx b/app/components/entry/EntryInput/index.tsx
@@ -250,6 +250,7 @@ function EntryInput<T extends string | number | undefined>(props: EntryInputProp
                     styles.section,
                     sectionContainerClassName,
                     compactMode && styles.compact,
+                    displayHorizontally && styles.horizontal,
                 )}
                 renderer={CompactSection}
                 keySelector={sectionKeySelector}

diff --git a/app/components/entry/EntryInput/styles.css b/app/components/entry/EntryInput/styles.css
@@ -69,6 +69,9 @@
         &.compact {
             border-bottom: var(--dui-width-separator-thin) solid var(--dui-color-separator);
         }
+        &.horizontal {
+            border-bottom: unset;
+        }
     }
 
     .secondary-tagging {

diff --git a/app/views/EntryEdit/LeftPane/AssistItem/AssistPopup/index.tsx b/app/views/EntryEdit/LeftPane/AssistItem/AssistPopup/index.tsx
@@ -4,16 +4,11 @@ import {
     Kraken,
     Container,
     Message,
-    QuickActionButton,
 } from '@the-deep/deep-ui';
 import {
     SetValueArg,
     Error,
 } from '@togglecorp/toggle-form';
-import {
-    IoClose,
-} from 'react-icons/io5';
-import { FiEdit2 } from 'react-icons/fi';
 
 import EntryInput from '#components/entry/EntryInput';
 import { GeoArea } from '#components/GeoMultiSelectInput';
@@ -34,12 +29,9 @@ interface Props<NAME extends string | number | undefined> {
     value: PartialEntryType;
     onChange: (val: SetValueArg<PartialEntryType>, name: NAME) => void;
     error: Error<PartialEntryType> | undefined;
-    onEntryCreateButtonClick: () => void;
     variant?: 'normal' | 'compact' | 'nlp';
     // NOTE: Normal entry creation refers to entry created without use of
     // recommendations
-    onNormalEntryCreateButtonClick: () => void;
-    onEntryDiscardButtonClick: () => void;
     geoAreaOptions: GeoArea[] | undefined | null;
     onGeoAreaOptionsChange: React.Dispatch<React.SetStateAction<GeoArea[] | undefined | null>>;
     predictionsLoading?: boolean;
@@ -50,6 +42,8 @@ interface Props<NAME extends string | number | undefined> {
     messageText: string | undefined;
     excerptShown?: boolean;
     displayHorizontally?: boolean;
+
+    footerActions: React.ReactNode;
 }
 
 function AssistPopup<NAME extends string | number | undefined>(props: Props<NAME>) {
@@ -63,9 +57,6 @@ function AssistPopup<NAME extends string | number | undefined>(props: Props<NAME
         name,
         error,
         frameworkDetails,
-        onEntryCreateButtonClick,
-        onNormalEntryCreateButtonClick,
-        onEntryDiscardButtonClick,
         geoAreaOptions,
         onGeoAreaOptionsChange,
         predictionsLoading,
@@ -75,6 +66,7 @@ function AssistPopup<NAME extends string | number | undefined>(props: Props<NAME
         recommendations,
         excerptShown = false,
         displayHorizontally = false,
+        footerActions,
     } = props;
 
     const allWidgets = useMemo(() => {
@@ -99,28 +91,7 @@ function AssistPopup<NAME extends string | number | undefined>(props: Props<NAME
             // heading="Assisted Tagging"
             headingSize="extraSmall"
             spacing="compact"
-            footerQuickActions={(
-                <>
-                    <QuickActionButton
-                        name={undefined}
-                        onClick={onEntryDiscardButtonClick}
-                        title="Discard Entry"
-                        variant="nlp-secondary"
-                    >
-                        <IoClose />
-                    </QuickActionButton>
-                    <QuickActionButton
-                        name={undefined}
-                        onClick={(predictionsErrored || !!messageText)
-                            ? onNormalEntryCreateButtonClick : onEntryCreateButtonClick}
-                        disabled={predictionsLoading}
-                        variant="nlp-primary"
-                        title="Create Entry"
-                    >
-                        <FiEdit2 />
-                    </QuickActionButton>
-                </>
-            )}
+            footerQuickActions={footerActions}
             contentClassName={styles.body}
         >
             {isMessageShown ? (

diff --git a/app/views/EntryEdit/LeftPane/AssistItem/index.tsx b/app/views/EntryEdit/LeftPane/AssistItem/index.tsx
@@ -18,6 +18,7 @@ import {
     Container,
 } from '@the-deep/deep-ui';
 import { IoClose } from 'react-icons/io5';
+import { FiEdit2 } from 'react-icons/fi';
 
 import { GeoArea } from '#components/GeoMultiSelectInput';
 import brainIcon from '#resources/img/brain.svg';
@@ -152,7 +153,11 @@ interface Props {
     className?: string;
     text: string;
     onAssistedEntryAdd: (
-        (newEntry: EntryInput, locations?: GeoArea[]) => void
+         (
+             newEntry: EntryInput,
+             locations?: GeoArea[],
+             selectCreatedEntry?: boolean,
+         ) => void
     ) | undefined;
     frameworkDetails?: Framework;
     leadId: string;
@@ -641,6 +646,7 @@ function AssistItem(props: Props) {
                             draftEntry: data?.project?.assistedTagging?.draftEntry?.id,
                         },
                         geoAreaOptions ?? undefined,
+                        true,
                     );
                 }
             },
@@ -746,9 +752,6 @@ function AssistItem(props: Props) {
                             leadId={leadId}
                             hints={allHints}
                             recommendations={allRecommendations}
-                            onEntryDiscardButtonClick={handleDiscardButtonClick}
-                            onEntryCreateButtonClick={handleEntryCreateButtonClick}
-                            onNormalEntryCreateButtonClick={handleNormalEntryCreateButtonClick}
                             geoAreaOptions={geoAreaOptions}
                             onGeoAreaOptionsChange={setGeoAreaOptions}
                             predictionsLoading={
@@ -758,6 +761,34 @@ function AssistItem(props: Props) {
                             }
                             predictionsErrored={!!fetchErrors || !!createErrors || isErrored}
                             messageText={messageText}
+                            footerActions={(
+                                <>
+                                    <QuickActionButton
+                                        name={undefined}
+                                        onClick={handleDiscardButtonClick}
+                                        title="Discard Entry"
+                                        variant="nlp-secondary"
+                                    >
+                                        <IoClose />
+                                    </QuickActionButton>
+                                    <QuickActionButton
+                                        name={undefined}
+                                        onClick={
+                                            (
+                                                (!!fetchErrors || !!createErrors || isErrored)
+                                                || !!messageText
+                                            )
+                                                ? handleNormalEntryCreateButtonClick
+                                                : handleEntryCreateButtonClick
+                                        }
+                                        disabled={predictionsLoading}
+                                        variant="nlp-primary"
+                                        title="Create Entry"
+                                    >
+                                        <FiEdit2 />
+                                    </QuickActionButton>
+                                </>
+                            )}
                         />
                     )}
                 </QuickActionDropdownMenu>