diff --git a/apiserver/plane/bgtasks/importer_task.py b/apiserver/plane/bgtasks/importer_task.py index b27787635..291b71be3 100644 --- a/apiserver/plane/bgtasks/importer_task.py +++ b/apiserver/plane/bgtasks/importer_task.py @@ -59,7 +59,9 @@ def service_importer(service, importer_id): [ send_welcome_email.delay( - user, True, f"{user.email} was imported to Plane from {service}" + str(user.id), + True, + f"{user.email} was imported to Plane from {service}", ) for user in new_users ] diff --git a/apiserver/plane/bgtasks/user_welcome_task.py b/apiserver/plane/bgtasks/user_welcome_task.py index cad2aed1a..c042d0a0b 100644 --- a/apiserver/plane/bgtasks/user_welcome_task.py +++ b/apiserver/plane/bgtasks/user_welcome_task.py @@ -10,9 +10,15 @@ from sentry_sdk import capture_exception from slack_sdk import WebClient from slack_sdk.errors import SlackApiError +# Module imports +from plane.db.models import User + + @shared_task -def send_welcome_email(instance, created, message): +def send_welcome_email(user_id, created, message): try: + instance = User.objects.get(pk=user_id) + if created and not instance.is_bot: first_name = instance.first_name.capitalize() to_email = instance.email 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 )} -