feat(GoalCreateForm): goal button improvements

taskany-inc · Jun 20, 2023 · e550f89 · e550f89
1 parent c73e738
commit e550f89
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/src/components/GoalCreateForm/GoalCreateForm.i18n/en.json b/src/components/GoalCreateForm/GoalCreateForm.i18n/en.json
@@ -3,7 +3,7 @@
     "Press key to create the goal": "Press {key} to create the goal.",
     "Create & Go": "Create & Go",
     "Create one more": "Create one more",
-    "Create": "Create",
+    "Create only": "Create only",
     "Create and go to the goal page": "Create and go to the goal page",
     "Create and open new form for the next goal": "Create and open new form for the next goal",
     "Create goal and close form": "Create goal and close form",

diff --git a/src/components/GoalCreateForm/GoalCreateForm.i18n/ru.json b/src/components/GoalCreateForm/GoalCreateForm.i18n/ru.json
@@ -3,7 +3,7 @@
     "Press key to create the goal": "Нажми {key}, чтобы создать цель.",
     "Create & Go": "Создать и перейти",
     "Create one more": "Создать еще",
-    "Create": "Создать",
+    "Create only": "Создать",
     "Create and go to the goal page": "Создать и перейти на страницу цели",
     "Create and open new form for the next goal": "Создать и открыть новую форму для следующей цели",
     "Create goal and close form": "Создать цель и закрыть форму",

diff --git a/src/components/GoalCreateForm/GoalCreateForm.tsx b/src/components/GoalCreateForm/GoalCreateForm.tsx
@@ -38,9 +38,9 @@ const GoalCreateForm: React.FC = () => {
     const [lastProjectCache, setLastProjectCache] = useLocalStorage('lastProjectCache');
     const [currentProjectCache] = useLocalStorage('currentProjectCache');
     const [recentProjectsCache, setRecentProjectsCache] = useLocalStorage('recentProjectsCache', {});
+    const [goalCreateFormActionCache, setGoalCreateFormActionCache] = useLocalStorage('goalCreateFormAction');
     const [busy, setBusy] = useState(false);
-    const [actionBtnText, setActionBtnText] = useState<string>(tr('Create & Go'));
-    const [createGoalType, setСreateGoalType] = useState<number>(1);
+    const [createGoalType, setСreateGoalType] = useState<number>(goalCreateFormActionCache || 3);
 
     const createOptions = [
         {
@@ -54,7 +54,7 @@ const GoalCreateForm: React.FC = () => {
             value: 2,
         },
         {
-            title: tr('Create'),
+            title: tr('Create only'),
             clue: tr('Create goal and close form'),
             value: 3,
         },
@@ -63,7 +63,6 @@ const GoalCreateForm: React.FC = () => {
     type CreateOptions = typeof createOptions;
     const onCreateTypeChange = useCallback((item: CreateOptions[number]) => {
         setСreateGoalType(item.value);
-        setActionBtnText(item.title);
     }, []);
     const createMutation = trpc.goal.create.useMutation();
     const createGoal = async (form: GoalCommon) => {
@@ -83,6 +82,7 @@ const GoalCreateForm: React.FC = () => {
             }
             setRecentProjectsCache(newRecentProjectsCache);
             setLastProjectCache(form.parent);
+            setGoalCreateFormActionCache(createGoalType);
 
             if (createGoalType === 1) {
                 router.goal(res._shortId);
@@ -121,7 +121,7 @@ const GoalCreateForm: React.FC = () => {
                             outline
                             type="submit"
                             brick="right"
-                            text={actionBtnText}
+                            text={createOptions[createGoalType - 1].title}
                         />
                         <Dropdown
                             placement="top-end"

diff --git a/src/hooks/useLocalStorage.ts b/src/hooks/useLocalStorage.ts
@@ -7,11 +7,13 @@ export type RecentProjectsCache = Record<
     string,
     { rate: number; cache: { id: string; title: string; flowId: string; description?: string | null } }
 >;
+export type GoalCreateFormAction = number | null;
 type SetValue<TValue> = (value: TValue | ((previousValue: TValue) => TValue)) => void;
 interface StorageKey {
     lastProjectCache: LastOrCurrentProject;
     currentProjectCache: LastOrCurrentProject;
     recentProjectsCache: RecentProjectsCache;
+    goalCreateFormAction: GoalCreateFormAction;
 }
 
 export function useLocalStorage<T extends keyof StorageKey>(