fix: Opening yaml upload in create mode asks to discard changes (#4126)

* fix: opening yaml upload in create mode asks to discard changes

* refactor: extract duplicated code to a new function

Author: awoloszyn22

src/command-pallette/CommandPalletteUI/CommandPaletteUI.tsx

@@ -2,7 +2,7 @@ import { ReactNode, useEffect, useRef, useState } from 'react';
 import { useRecoilValue } from 'recoil';
 import { useAtomValue } from 'jotai';
 import { useEventListener } from 'hooks/useEventListener';
-import { addHistoryEntry, getHistoryEntries } from './search-history';
+import { getHistoryEntries } from './search-history';
 import { activeNamespaceIdState } from 'state/activeNamespaceIdAtom';
 import {
   CommandPalletteHelp,
@@ -19,6 +19,7 @@ import { SCREEN_SIZE_BREAKPOINT_M } from './types';
 import { useFormNavigation } from 'shared/hooks/useFormNavigation';
 
 import './CommandPaletteUI.scss';
+import { activateResult, isResultGoingToRedirect } from './helpers';
 
 function Background({
   hide,
@@ -150,10 +151,11 @@ export function CommandPaletteUI({
     if (key === 'Enter' && results[0]) {
       // choose current entry
       e.preventDefault();
-      navigateSafely(() => {
-        addHistoryEntry(results[0].query);
-        results[0].onActivate();
-      });
+      if (isResultGoingToRedirect(results[0].query)) {
+        navigateSafely(() =>
+          activateResult(results[0].query, results[0].onActivate),
+        );
+      } else activateResult(results[0].query, results[0].onActivate);
     } else if (key === 'Tab') {
       e.preventDefault();
       // fill search with active history entry

src/command-pallette/CommandPalletteUI/ResultsList/ResultsList.tsx

@@ -2,11 +2,11 @@ import { useEffect, useRef } from 'react';
 import { useEventListener } from 'hooks/useEventListener';
 import { Result } from './Result';
 import { Spinner } from 'shared/components/Spinner/Spinner';
-import { addHistoryEntry } from '../search-history';
 import './ResultsList.scss';
 import { useTranslation } from 'react-i18next';
 import { LOADING_INDICATOR } from '../types';
 import { useFormNavigation } from 'shared/hooks/useFormNavigation';
+import { activateResult, isResultGoingToRedirect } from '../helpers';
 
 function scrollInto(element: Element) {
   element.scrollIntoView({
@@ -38,6 +38,22 @@ export function ResultsList({
   //todo 2
   const isLoading = results.find((r: any) => r.type === LOADING_INDICATOR);
   results = results.filter((r: any) => r.type !== LOADING_INDICATOR);
+
+  const activateResultWithSafeNavigation = () => {
+    if (isResultGoingToRedirect(results[activeIndex].query)) {
+      navigateSafely(() =>
+        activateResult(
+          results[activeIndex].query,
+          results[activeIndex].onActivate,
+        ),
+      );
+    } else
+      activateResult(
+        results[activeIndex].query,
+        results[activeIndex].onActivate,
+      );
+  };
+
   useEffect(() => {
     if (results?.length <= activeIndex) {
       setActiveIndex(0);
@@ -65,10 +81,7 @@ export function ResultsList({
         scrollInto(listRef.current!.children[activeIndex - 1]);
       } else if (key === 'Enter' && results?.[activeIndex]) {
         e.preventDefault();
-        navigateSafely(() => {
-          addHistoryEntry(results[activeIndex].query);
-          results[activeIndex].onActivate();
-        });
+        activateResultWithSafeNavigation();
       }
     },
     [activeIndex, results, isHistoryMode],
@@ -85,10 +98,7 @@ export function ResultsList({
             activeIndex={activeIndex}
             setActiveIndex={setActiveIndex}
             onItemClick={() => {
-              navigateSafely(() => {
-                addHistoryEntry(result.query);
-                result.onActivate();
-              });
+              activateResultWithSafeNavigation();
             }}
           />
         ))

src/command-pallette/CommandPalletteUI/helpers.ts

@@ -0,0 +1,18 @@
+import { addHistoryEntry } from './search-history';
+
+export const activateResult = (query: string, activateCallback: () => void) => {
+  addHistoryEntry(query);
+  activateCallback();
+};
+
+export const isResultGoingToRedirect = (resultQuery: string) => {
+  switch (resultQuery) {
+    case 'preferences':
+    case 'prefs':
+    case 'upload':
+    case 'up':
+      return false;
+    default:
+      return true;
+  }
+};