Use dialog

PzYon · Jul 13, 2024 · dd438a2 · dd438a2
1 parent 915bc44
commit dd438a2
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 57 deletions.
diff --git a/app/src/components/details/scraps/QuickAddDialog.tsx b/app/src/components/details/scraps/QuickAddDialog.tsx
@@ -1,23 +1,24 @@
 import React, { useState } from "react";
-import { ScrapType } from "../../../serverApi/IScrapEntry";
 import { ScrapsJournalType } from "../../../journalTypes/ScrapsJournalType";
-import { styled, ToggleButton, ToggleButtonGroup } from "@mui/material";
-import { ListScrapIcon, MarkdownScrapIcon } from "./ScrapsViewPage";
+import { styled } from "@mui/material";
 import { JournalSelector } from "../../common/JournalSelector";
 import { Scrap } from "./Scrap";
 import { UserRole } from "../../../serverApi/UserRole";
 import { useAppContext } from "../../../AppContext";
 import { getPermissionsForUser } from "../../overview/journals/useJournalPermissions";
+import { ScrapType } from "../../../serverApi/IScrapEntry";
 
 export const QuickAddDialog: React.FC<{
   targetJournalId: string;
   onSuccess?: () => void;
 }> = ({ targetJournalId, onSuccess }) => {
   const { user } = useAppContext();
 
-  const [type, setType] = useState<ScrapType>(ScrapType.Markdown);
-
-  const scrap = ScrapsJournalType.createBlank(true, targetJournalId, type);
+  const scrap = ScrapsJournalType.createBlank(
+    true,
+    targetJournalId,
+    ScrapType.Markdown,
+  );
 
   const [journalId, setJournalId] = useState(scrap.parentId);
 
@@ -37,52 +38,22 @@ export const QuickAddDialog: React.FC<{
         onChange={(journal) => setJournalId(journal.id)}
         selectedJournalId={journalId}
       />
-      <ScrapTypeSelector>
-        <ToggleButtonGroup
-          value={type}
-          exclusive
-          sx={{ width: "100%", ".MuiButtonBase-root": { width: "50%" } }}
-          onChange={(_, value) => {
-            setType(
-              value !== null
-                ? value
-                : type === ScrapType.Markdown
-                  ? ScrapType.List
-                  : ScrapType.Markdown,
-            );
-          }}
-        >
-          <ToggleButton value={ScrapType.Markdown} color="primary">
-            <MarkdownScrapIcon />
-            &nbsp;Markdown
-          </ToggleButton>
-          <ToggleButton value={ScrapType.List} color="primary">
-            <ListScrapIcon />
-            &nbsp;List
-          </ToggleButton>
-        </ToggleButtonGroup>
-      </ScrapTypeSelector>
+
       <ScrapContainer>
         <Scrap
-          key={type}
           scrap={scrap}
           propsRenderStyle={"none"}
           actionsRenderStyle={"save-only"}
           onSuccess={onSuccess}
           isQuickAdd={true}
           targetJournalId={journalId}
+          changeTypeWithoutConfirmation={true}
         />
       </ScrapContainer>
     </>
   );
 };
 
-const ScrapTypeSelector = styled("div")`
-  padding-top: ${(p) => p.theme.spacing(2)};
-  display: flex;
-  justify-content: start;
-`;
-
 const ScrapContainer = styled("div")`
   padding-top: ${(p) => p.theme.spacing(2)};
   margin-top: ${(p) => p.theme.spacing(2)};

diff --git a/app/src/components/details/scraps/Scrap.tsx b/app/src/components/details/scraps/Scrap.tsx
@@ -17,6 +17,7 @@ export const Scrap: React.FC<{
   giveFocus?: () => void;
   isQuickAdd?: boolean;
   targetJournalId?: string;
+  changeTypeWithoutConfirmation?: boolean;
 }> = ({
   scrap: currentScrap,
   journal,
@@ -28,6 +29,7 @@ export const Scrap: React.FC<{
   giveFocus,
   isQuickAdd,
   targetJournalId,
+  changeTypeWithoutConfirmation,
 }) => {
   const [doRender, setDoRender] = useState(hasFocus);
 
@@ -52,6 +54,7 @@ export const Scrap: React.FC<{
         giveFocus={giveFocus}
         isQuickAdd={isQuickAdd}
         targetJournalId={targetJournalId}
+        changeTypeWithoutConfirmation={changeTypeWithoutConfirmation}
       >
         <ScrapInner />
       </ScrapContextProvider>

diff --git a/app/src/components/details/scraps/ScrapContextProvider.tsx b/app/src/components/details/scraps/ScrapContextProvider.tsx
@@ -32,6 +32,7 @@ export const ScrapContextProvider: React.FC<{
   giveFocus?: () => void;
   isQuickAdd?: boolean;
   targetJournalId?: string;
+  changeTypeWithoutConfirmation?: boolean;
 }> = ({
   children,
   currentScrap,
@@ -44,6 +45,7 @@ export const ScrapContextProvider: React.FC<{
   giveFocus,
   isQuickAdd,
   targetJournalId,
+  changeTypeWithoutConfirmation,
 }) => {
   const { setAppAlert } = useAppContext();
   const { renderDialog } = useDialogContext();
@@ -162,6 +164,23 @@ export const ScrapContextProvider: React.FC<{
     genericNotes: string[],
     targetType: ScrapType,
   ) {
+    function changeType() {
+      const newNotes = convertNotesToTargetType(targetType, genericNotes);
+
+      setNotes(newNotes);
+
+      setScrapToRender({
+        ...scrapToRender,
+        notes: newNotes,
+        scrapType: targetType,
+      });
+    }
+
+    if (changeTypeWithoutConfirmation) {
+      changeType();
+      return;
+    }
+
     renderDialog({
       title: "Are you sure?",
       render: (closeDialog) => {
@@ -179,19 +198,7 @@ export const ScrapContextProvider: React.FC<{
               <Button
                 variant={"outlined"}
                 onClick={() => {
-                  const newNotes = convertNotesToTargetType(
-                    targetType,
-                    genericNotes,
-                  );
-
-                  setNotes(newNotes);
-
-                  setScrapToRender({
-                    ...scrapToRender,
-                    notes: newNotes,
-                    scrapType: targetType,
-                  });
-
+                  changeType();
                   closeDialog();
                 }}
               >
@@ -284,23 +291,23 @@ export const ScrapContextProvider: React.FC<{
 
     await upsertEntryMutation.mutateAsync({
       command: {
-        id: currentScrap.id,
-        scrapType: currentScrap.scrapType,
+        id: scrapToRender.id,
+        scrapType: scrapToRender.scrapType,
         notes: notesToSave,
         title: parsedDate?.text ?? title,
         journalAttributeValues: {},
-        journalId: targetJournalId ?? currentScrap.parentId,
+        journalId: targetJournalId ?? scrapToRender.parentId,
         dateTime: new Date(),
         schedule: getScheduleDefinition(
           parsedDate,
-          currentScrap.parentId,
-          currentScrap?.id ?? "{0}",
+          scrapToRender.parentId,
+          scrapToRender?.id ?? "{0}",
         ),
       } as IUpsertScrapsEntryCommand,
     });
 
     AddNewScrapStorage.clearForJournal(
-      isQuickAdd ? "quick-add" : currentScrap.parentId,
+      isQuickAdd ? "quick-add" : scrapToRender.parentId,
     );
   }