From 31dc1f193f5dd4c4e65514d3cc858762d96f1640 Mon Sep 17 00:00:00 2001 From: Aaryan Khandelwal Date: Fri, 7 Feb 2025 17:28:37 +0530 Subject: [PATCH] fix: merge conflicts resolved from preview --- .../command-palette/power-k/create-actions.ts | 8 +++----- .../issue/priorities-menu.tsx | 6 ++---- .../power-k/context-based-actions/issue/root.tsx | 6 +++--- .../components/command-palette/power-k/root.tsx | 15 +++++++++------ .../power-k/settings/workspace-settings.tsx | 13 +++++++++---- 5 files changed, 26 insertions(+), 22 deletions(-) diff --git a/web/ce/components/command-palette/power-k/create-actions.ts b/web/ce/components/command-palette/power-k/create-actions.ts index daa12a032d..d96807d658 100644 --- a/web/ce/components/command-palette/power-k/create-actions.ts +++ b/web/ce/components/command-palette/power-k/create-actions.ts @@ -1,13 +1,11 @@ import { FileText, FolderPlus, Layers, SquarePlus } from "lucide-react"; -// plane types +// plane imports +import { EUserPermissions, EUserPermissionsLevel } from "@plane/constants"; import { TPowerKCreateAction, TPowerKCreateActionKeys } from "@plane/types"; -// plane ui import { ContrastIcon, DiceIcon, LayersIcon } from "@plane/ui"; // lib import { TAppRouterInstance } from "@/lib/n-progress/AppProgressBar"; import { store } from "@/lib/store-context"; -// plane web constants -import { EUserPermissions, EUserPermissionsLevel } from "@/plane-web/constants"; export const commonCreateActions = ( router: TAppRouterInstance @@ -37,7 +35,7 @@ export const commonCreateActions = ( issue: { key: "issue", onClick: () => toggleCreateIssueModal(true), - label: "New issue", + label: "New work item", icon: LayersIcon, shortcut: "C", shouldRender: canCreateIssue, diff --git a/web/core/components/command-palette/power-k/context-based-actions/issue/priorities-menu.tsx b/web/core/components/command-palette/power-k/context-based-actions/issue/priorities-menu.tsx index a32f8ceba1..2e74e28125 100644 --- a/web/core/components/command-palette/power-k/context-based-actions/issue/priorities-menu.tsx +++ b/web/core/components/command-palette/power-k/context-based-actions/issue/priorities-menu.tsx @@ -3,12 +3,10 @@ import { Command } from "cmdk"; import { observer } from "mobx-react"; import { Check } from "lucide-react"; -// plane types +// plane imports +import { ISSUE_PRIORITIES } from "@plane/constants"; import { TIssue } from "@plane/types"; -// plane ui import { PriorityIcon } from "@plane/ui"; -// constants -import { ISSUE_PRIORITIES } from "@/constants/issue"; type Props = { handleClose: () => void; diff --git a/web/core/components/command-palette/power-k/context-based-actions/issue/root.tsx b/web/core/components/command-palette/power-k/context-based-actions/issue/root.tsx index 82292bf53f..fcbb80d86d 100644 --- a/web/core/components/command-palette/power-k/context-based-actions/issue/root.tsx +++ b/web/core/components/command-palette/power-k/context-based-actions/issue/root.tsx @@ -95,7 +95,7 @@ export const PowerKIssueActionsMenu: React.FC = observer((props) => { return ( <> {!activePage && ( - + = observer((props) => { handleClose(); }} /> - + { copyIssueUrlToClipboard(); handleClose(); diff --git a/web/core/components/command-palette/power-k/root.tsx b/web/core/components/command-palette/power-k/root.tsx index fa458a27d0..56c3d3bdd4 100644 --- a/web/core/components/command-palette/power-k/root.tsx +++ b/web/core/components/command-palette/power-k/root.tsx @@ -4,17 +4,16 @@ import React, { useCallback, useEffect, useState } from "react"; import { Command } from "cmdk"; import { observer } from "mobx-react"; import { useParams } from "next/navigation"; -// types +// plane imports +import { useTranslation } from "@plane/i18n"; import { IWorkspaceSearchResults, TPowerKPageKeys } from "@plane/types"; -// ui import { EModalPosition, EModalWidth, ModalCore } from "@plane/ui"; // components -import { EmptyState } from "@/components/empty-state"; -// constants -import { EmptyStateType } from "@/constants/empty-state"; +import { SimpleEmptyState } from "@/components/empty-state"; // hooks import { useCommandPalette } from "@/hooks/store"; import useDebounce from "@/hooks/use-debounce"; +import { useResolvedAssetPath } from "@/hooks/use-resolved-asset-path"; // plane web constants import { POWER_K_PLACEHOLDER_TEXT, PowerKContextBasedActions } from "@/plane-web/components/command-palette/power-k"; // plane web services @@ -56,7 +55,11 @@ export const PowerKModal: React.FC = observer(() => { const { workspaceSlug, projectId } = useParams(); // debounce const debouncedSearchTerm = useDebounce(searchTerm, 500); + // translation + const { t } = useTranslation(); + // derived values const activePage = pages.length > 0 ? pages[pages.length - 1] : undefined; + const resolvedPath = useResolvedAssetPath({ basePath: "/empty-state/search/search" }); const handleClose = () => { toggleCommandPaletteModal(false); @@ -167,7 +170,7 @@ export const PowerKModal: React.FC = observer(() => { )} {!isLoading && resultsCount === 0 && searchTerm !== "" && debouncedSearchTerm !== "" && (
- +
)} {(isLoading || isSearching) && } diff --git a/web/core/components/command-palette/power-k/settings/workspace-settings.tsx b/web/core/components/command-palette/power-k/settings/workspace-settings.tsx index e3770354ce..2278b352be 100644 --- a/web/core/components/command-palette/power-k/settings/workspace-settings.tsx +++ b/web/core/components/command-palette/power-k/settings/workspace-settings.tsx @@ -3,10 +3,13 @@ import { Command } from "cmdk"; import { observer } from "mobx-react"; import Link from "next/link"; import { useParams, useRouter } from "next/navigation"; +// plane imports +import { EUserPermissionsLevel, WORKSPACE_SETTINGS_LINKS } from "@plane/constants"; +import { useTranslation } from "@plane/i18n"; +// components +import { SettingIcon } from "@/components/icons"; // hooks import { useUserPermissions } from "@/hooks/store"; -// plane web constants -import { EUserPermissionsLevel, WORKSPACE_SETTINGS_LINKS } from "@/plane-web/constants"; // plane web helpers import { shouldRenderSettingLink } from "@/plane-web/helpers/workspace.helper"; @@ -19,6 +22,8 @@ export const PowerKWorkspaceSettingsMenu: React.FC = observer((props) => // navigation const { workspaceSlug } = useParams(); const router = useRouter(); + // translation + const { t } = useTranslation(); // store hooks const { allowPermissions } = useUserPermissions(); @@ -37,8 +42,8 @@ export const PowerKWorkspaceSettingsMenu: React.FC = observer((props) => className="focus:outline-none" > - - {setting.label} + + {t(setting.i18n_label)} )