From 0fa945163338a271039a5e46fb3547c6a547e5c6 Mon Sep 17 00:00:00 2001 From: guru_sainath Date: Tue, 2 May 2023 18:15:24 +0530 Subject: [PATCH 1/4] fix: workspace integration github repos issue resolved (#988) --- .../app/components/integration/github/select-repository.tsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/apps/app/components/integration/github/select-repository.tsx b/apps/app/components/integration/github/select-repository.tsx index a925eced4..b1781b70e 100644 --- a/apps/app/components/integration/github/select-repository.tsx +++ b/apps/app/components/integration/github/select-repository.tsx @@ -11,7 +11,7 @@ import { CustomSearchSelect } from "components/ui"; // helpers import { truncateText } from "helpers/string.helper"; // types -import { IWorkspaceIntegration } from "types"; +import { IWorkspaceIntegration, IGithubRepository } from "types"; type Props = { integration: IWorkspaceIntegration; @@ -54,7 +54,9 @@ export const SelectRepository: React.FC = ({ isValidating, } = useSWRInfinite(getKey, fetchGithubRepos); - const userRepositories = (paginatedData ?? []).map((data) => data.repositories).flat(); + let userRepositories = (paginatedData ?? []).map((data) => data.repositories).flat(); + userRepositories = userRepositories.filter((data) => data?.id); + const totalCount = paginatedData && paginatedData.length > 0 ? paginatedData[0].total_count : 0; const options = From 483c49d0ff15eec178992ff4ee47f33820947851 Mon Sep 17 00:00:00 2001 From: Anmol Singh Bhatia <121005188+anmolsinghbhatia@users.noreply.github.com> Date: Tue, 2 May 2023 20:00:33 +0530 Subject: [PATCH 2/4] fix: ui and bug fixes (#980) * style: sub issue theming * style: shortcut modal theming * style: blocking and blocked by modal theming * fix: filter labels dropdown width fix * style: display properties * chore: workspace invite * style: invite co workers theming * style: create workspace theming * style: attachment theming * style: workspace sidebar theming * style: issue property theming * style: create module modal lead icon * style: label list modal theming * delete attachment and member modal theming * style: transfer issue modal * style: delete estimate modal theming * style: module form status * style: delete state modal theming * style: shortcut modal * style: onboarding logo * style: onboarding command menu --- .../command-palette/shortcuts-modal.tsx | 28 ++++++++++++------ .../core/board-view/single-issue.tsx | 8 ++--- .../core/existing-issues-list-modal.tsx | 2 +- .../components/core/issues-view-filter.tsx | 2 +- .../core/list-view/single-issue.tsx | 8 ++--- .../cycles/transfer-issues-modal.tsx | 18 ++++++------ .../app/components/cycles/transfer-issues.tsx | 4 +-- .../estimates/delete-estimate-modal.tsx | 10 +++---- apps/app/components/icons/command-icon.tsx | 21 ++++++++++++++ apps/app/components/icons/index.ts | 5 ++-- apps/app/components/issues/attachments.tsx | 6 ++-- .../issues/delete-attachment-modal.tsx | 12 ++++---- .../issues/sidebar-select/blocked.tsx | 14 ++++----- .../issues/sidebar-select/blocker.tsx | 16 +++++----- .../app/components/issues/sub-issues-list.tsx | 8 ++--- .../components/labels/labels-list-modal.tsx | 8 ++--- apps/app/components/modules/select/lead.tsx | 6 ++-- apps/app/components/modules/select/status.tsx | 2 +- apps/app/components/onboarding/index.ts | 3 +- .../components/onboarding/onboarding-card.tsx | 5 +++- .../components/onboarding/onboarding-logo.tsx | 29 +++++++++++++++++++ apps/app/components/onboarding/workspace.tsx | 2 +- .../project/confirm-project-member-remove.tsx | 14 +++++---- apps/app/components/project/sidebar-list.tsx | 4 ++- .../components/states/delete-state-modal.tsx | 5 ++-- apps/app/components/ui/multi-input.tsx | 6 +++- .../components/ui/multi-level-dropdown.tsx | 4 +-- .../confirm-workspace-member-remove.tsx | 16 +++++----- .../workspace/create-workspace-form.tsx | 1 + apps/app/pages/onboarding.tsx | 14 +++++---- apps/app/public/onboarding/command-menu.svg | 1 - 31 files changed, 180 insertions(+), 102 deletions(-) create mode 100644 apps/app/components/icons/command-icon.tsx create mode 100644 apps/app/components/onboarding/onboarding-logo.tsx diff --git a/apps/app/components/command-palette/shortcuts-modal.tsx b/apps/app/components/command-palette/shortcuts-modal.tsx index af7f19b0a..8f946f5ea 100644 --- a/apps/app/components/command-palette/shortcuts-modal.tsx +++ b/apps/app/components/command-palette/shortcuts-modal.tsx @@ -4,7 +4,7 @@ import { Dialog, Transition } from "@headlessui/react"; // icons import { XMarkIcon } from "@heroicons/react/20/solid"; import { MagnifyingGlassIcon } from "@heroicons/react/24/outline"; -import { MacCommandIcon } from "components/icons"; +import { CommandIcon } from "components/icons"; // ui import { Input } from "components/ui"; @@ -123,17 +123,23 @@ export const ShortcutsModal: React.FC = ({ isOpen, setIsOpen }) => {
-

{shortcut.description}

+

+ {shortcut.description} +

{shortcut.keys.split(",").map((key, index) => ( {key === "Ctrl" ? ( - - + + + ) : key === "Ctrl" ? ( + + + ) : ( - - {key === "Ctrl" ? : key} + + {key} )} @@ -167,12 +173,16 @@ export const ShortcutsModal: React.FC = ({ isOpen, setIsOpen }) => { {keys.split(",").map((key, index) => ( {key === "Ctrl" ? ( - - + + + ) : key === "Ctrl" ? ( + + + ) : ( - {key === "Ctrl" ? : key} + {key} )} diff --git a/apps/app/components/core/board-view/single-issue.tsx b/apps/app/components/core/board-view/single-issue.tsx index e0ad96d1f..8007f3216 100644 --- a/apps/app/components/core/board-view/single-issue.tsx +++ b/apps/app/components/core/board-view/single-issue.tsx @@ -391,8 +391,8 @@ export const SingleBoardIssue: React.FC = ({ {properties.link && (
-
- +
+ {issue.link_count}
@@ -401,8 +401,8 @@ export const SingleBoardIssue: React.FC = ({ {properties.attachment_count && (
-
- +
+ {issue.attachment_count}
diff --git a/apps/app/components/core/existing-issues-list-modal.tsx b/apps/app/components/core/existing-issues-list-modal.tsx index 3a906b356..8ef6132ae 100644 --- a/apps/app/components/core/existing-issues-list-modal.tsx +++ b/apps/app/components/core/existing-issues-list-modal.tsx @@ -160,7 +160,7 @@ export const ExistingIssuesListModal: React.FC = ({ Select issues to add )} -