From 090870b03efb8c99a142a74f1df0b9bc01831809 Mon Sep 17 00:00:00 2001 From: Nikhil <118773738+pablohashescobar@users.noreply.github.com> Date: Mon, 17 Jul 2023 16:09:30 +0530 Subject: [PATCH 1/3] fix: created_by notifications (#1534) * chore: add triggered by details for notifications * dev: update issue activity json to include extra fields * dev: remove unused imports and improve the filtering * dev: fix unread filter * dev: fix created_by none when updating the field --- apiserver/plane/api/serializers/notification.py | 1 - apiserver/plane/api/views/issue.py | 1 - apiserver/plane/api/views/notification.py | 3 +++ apiserver/plane/bgtasks/issue_activites_task.py | 10 +++++++--- apiserver/plane/db/models/issue.py | 1 - 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/apiserver/plane/api/serializers/notification.py b/apiserver/plane/api/serializers/notification.py index 56dcc0dd8..b6a4f3e4a 100644 --- a/apiserver/plane/api/serializers/notification.py +++ b/apiserver/plane/api/serializers/notification.py @@ -4,7 +4,6 @@ from .user import UserLiteSerializer from plane.db.models import Notification class NotificationSerializer(BaseSerializer): - triggered_by_details = UserLiteSerializer(read_only=True, source="triggered_by") class Meta: diff --git a/apiserver/plane/api/views/issue.py b/apiserver/plane/api/views/issue.py index 476fd4c5a..aab926fd2 100644 --- a/apiserver/plane/api/views/issue.py +++ b/apiserver/plane/api/views/issue.py @@ -45,7 +45,6 @@ from plane.api.serializers import ( IssueLiteSerializer, IssueAttachmentSerializer, IssueSubscriberSerializer, - ProjectMemberSerializer, ProjectMemberLiteSerializer, ) from plane.api.permissions import ( diff --git a/apiserver/plane/api/views/notification.py b/apiserver/plane/api/views/notification.py index 802cbb03f..86cc74d3f 100644 --- a/apiserver/plane/api/views/notification.py +++ b/apiserver/plane/api/views/notification.py @@ -216,6 +216,7 @@ class UnreadNotificationEndpoint(BaseAPIView): watching_notification_count = Notification.objects.filter( workspace__slug=slug, receiver_id=request.user.id, + read_at__isnull=True, entity_identifier__in=IssueSubscriber.objects.filter( workspace__slug=slug, subscriber_id=request.user.id ).values_list("issue_id", flat=True), @@ -225,6 +226,7 @@ class UnreadNotificationEndpoint(BaseAPIView): my_issues_count = Notification.objects.filter( workspace__slug=slug, receiver_id=request.user.id, + read_at__isnull=True, entity_identifier__in=IssueAssignee.objects.filter( workspace__slug=slug, assignee_id=request.user.id ).values_list("issue_id", flat=True), @@ -234,6 +236,7 @@ class UnreadNotificationEndpoint(BaseAPIView): created_issues_count = Notification.objects.filter( workspace__slug=slug, receiver_id=request.user.id, + read_at__isnull=True, entity_identifier__in=Issue.objects.filter( workspace__slug=slug, created_by=request.user ).values_list("pk", flat=True), diff --git a/apiserver/plane/bgtasks/issue_activites_task.py b/apiserver/plane/bgtasks/issue_activites_task.py index abbbb5f5f..2a7c6eddc 100644 --- a/apiserver/plane/bgtasks/issue_activites_task.py +++ b/apiserver/plane/bgtasks/issue_activites_task.py @@ -1028,10 +1028,14 @@ def issue_activity( actor = User.objects.get(pk=actor_id) project = Project.objects.get(pk=project_id) - issue = Issue.objects.filter(pk=issue_id).first() - if issue is not None: + + try: + issue = Issue.objects.get(pk=issue_id) issue.updated_at = timezone.now() - issue.save() + issue.save(update_fields=["updated_at"]) + except Exception as e: + pass + if subscriber: # add the user to issue subscriber diff --git a/apiserver/plane/db/models/issue.py b/apiserver/plane/db/models/issue.py index f301d4191..3e9da02d5 100644 --- a/apiserver/plane/db/models/issue.py +++ b/apiserver/plane/db/models/issue.py @@ -28,7 +28,6 @@ class IssueManager(models.Manager): | models.Q(issue_inbox__status=2) | models.Q(issue_inbox__isnull=True) ) - .filter(archived_at__isnull=True) .exclude(archived_at__isnull=False) ) From 538d67dbd9e6aa75a58de07bd4ae2e003f66f755 Mon Sep 17 00:00:00 2001 From: Aaryan Khandelwal <65252264+aaryan610@users.noreply.github.com> Date: Mon, 17 Jul 2023 16:28:23 +0530 Subject: [PATCH 2/3] fix: theming colors (#1533) * chore: update border colors * chore: loading screens bg color, custom theming default values * chore: remove unnecessary images * chore: update static colors * chore: update old variable names * chore: update issue activity icon colors * chore: update user activity icon colors --- .../components/account/email-code-form.tsx | 2 + .../account/email-password-form.tsx | 2 + .../account/email-reset-password-form.tsx | 1 + .../create-update-analytics-modal.tsx | 2 +- .../custom-analytics/graph/custom-tooltip.tsx | 2 +- .../analytics/custom-analytics/sidebar.tsx | 2 +- .../analytics/custom-analytics/table.tsx | 8 +- .../components/analytics/project-modal.tsx | 6 +- .../analytics/scope-and-demand/demand.tsx | 4 +- .../scope-and-demand/leaderboard.tsx | 2 +- .../analytics/scope-and-demand/scope.tsx | 6 +- .../scope-and-demand/year-wise-issues.tsx | 4 +- .../auth-screens/not-authorized-view.tsx | 2 +- .../auth-screens/project/join-project.tsx | 2 +- apps/app/components/breadcrumbs/index.tsx | 4 +- .../command-palette/command-pallette.tsx | 4 +- .../command-palette/shortcuts-modal.tsx | 14 ++-- .../core/board-view/single-issue.tsx | 6 +- .../core/calendar-view/calendar-header.tsx | 8 +- .../core/calendar-view/calendar.tsx | 2 +- .../core/calendar-view/single-date.tsx | 4 +- .../core/calendar-view/single-issue.tsx | 8 +- apps/app/components/core/feeds.tsx | 53 +++++------- .../core/filters/due-date-filter-modal.tsx | 2 +- .../components/core/filters/filters-list.tsx | 6 +- .../core/filters/issues-view-filter.tsx | 8 +- .../components/core/image-picker-popover.tsx | 6 +- apps/app/components/core/issues-view.tsx | 2 +- .../core/list-view/single-issue.tsx | 8 +- .../core/modals/bulk-delete-issues-modal.tsx | 4 +- .../modals/existing-issues-list-modal.tsx | 6 +- .../core/modals/gpt-assistant-modal.tsx | 2 +- .../core/modals/image-upload-modal.tsx | 4 +- .../core/sidebar/progress-chart.tsx | 2 +- .../core/sidebar/sidebar-progress-stats.tsx | 8 +- .../core/spreadsheet-view/single-issue.tsx | 22 ++--- .../spreadsheet-view/spreadsheet-view.tsx | 8 +- .../core/theme/color-picker-input.tsx | 2 +- .../core/theme/custom-theme-selector.tsx | 10 +-- .../components/core/theme/theme-switch.tsx | 5 +- .../cycles/active-cycle-details.tsx | 18 ++-- .../components/cycles/active-cycle-stats.tsx | 6 +- .../cycles/cycles-list-gantt-chart.tsx | 7 +- apps/app/components/cycles/cycles-view.tsx | 4 +- .../components/cycles/delete-cycle-modal.tsx | 2 +- apps/app/components/cycles/form.tsx | 2 +- apps/app/components/cycles/gantt-chart.tsx | 4 +- apps/app/components/cycles/modal.tsx | 2 +- apps/app/components/cycles/select.tsx | 2 +- apps/app/components/cycles/sidebar.tsx | 12 +-- .../components/cycles/single-cycle-card.tsx | 4 +- .../cycles/transfer-issues-modal.tsx | 2 +- .../components/emoji-icon-picker/index.tsx | 8 +- .../create-update-estimate-modal.tsx | 2 +- .../estimates/delete-estimate-modal.tsx | 2 +- .../components/gantt-chart/blocks/index.tsx | 4 +- .../components/gantt-chart/chart/bi-week.tsx | 8 +- apps/app/components/gantt-chart/chart/day.tsx | 8 +- .../components/gantt-chart/chart/hours.tsx | 8 +- .../components/gantt-chart/chart/index.tsx | 14 ++-- .../components/gantt-chart/chart/month.tsx | 8 +- .../components/gantt-chart/chart/quarter.tsx | 8 +- .../app/components/gantt-chart/chart/week.tsx | 8 +- .../app/components/gantt-chart/chart/year.tsx | 8 +- .../components/inbox/accept-issue-modal.tsx | 2 +- .../components/inbox/decline-issue-modal.tsx | 2 +- .../components/inbox/delete-issue-modal.tsx | 2 +- .../app/components/inbox/filters-dropdown.tsx | 2 +- apps/app/components/inbox/filters-list.tsx | 4 +- .../components/inbox/inbox-action-headers.tsx | 8 +- .../app/components/inbox/inbox-issue-card.tsx | 6 +- .../components/inbox/inbox-main-content.tsx | 2 +- .../components/inbox/issues-list-sidebar.tsx | 2 +- .../app/components/inbox/select-duplicate.tsx | 4 +- .../integration/delete-import-modal.tsx | 2 +- .../components/integration/github/root.tsx | 6 +- apps/app/components/integration/guide.tsx | 6 +- .../integration/jira/import-users.tsx | 2 +- apps/app/components/integration/jira/root.tsx | 10 +-- .../integration/single-integration-card.tsx | 2 +- apps/app/components/issues/activity.tsx | 54 +++++------- .../components/issues/attachment-upload.tsx | 2 +- apps/app/components/issues/attachments.tsx | 2 +- .../issues/comment/comment-card.tsx | 4 +- .../components/issues/delete-issue-modal.tsx | 7 +- apps/app/components/issues/form.tsx | 2 +- apps/app/components/issues/gantt-chart.tsx | 4 +- apps/app/components/issues/modal.tsx | 2 +- .../components/issues/my-issues-list-item.tsx | 12 +-- .../issues/parent-issues-list-modal.tsx | 2 +- apps/app/components/issues/select/date.tsx | 2 +- apps/app/components/issues/select/label.tsx | 6 +- .../issues/sidebar-select/blocked.tsx | 4 +- .../issues/sidebar-select/blocker.tsx | 4 +- .../issues/sidebar-select/cycle.tsx | 2 +- .../issues/sidebar-select/module.tsx | 2 +- .../issues/sidebar-select/parent.tsx | 2 +- apps/app/components/issues/sidebar.tsx | 2 +- .../components/issues/view-select/label.tsx | 2 +- .../issues/view-select/priority.tsx | 2 +- .../labels/create-update-label-inline.tsx | 2 +- .../components/labels/delete-label-modal.tsx | 2 +- .../components/labels/labels-list-modal.tsx | 2 +- .../components/labels/single-label-group.tsx | 4 +- apps/app/components/labels/single-label.tsx | 2 +- .../modules/delete-module-modal.tsx | 2 +- apps/app/components/modules/form.tsx | 2 +- apps/app/components/modules/gantt-chart.tsx | 4 +- apps/app/components/modules/modal.tsx | 2 +- apps/app/components/modules/sidebar.tsx | 14 ++-- .../components/modules/single-module-card.tsx | 2 +- .../components/onboarding/join-workspaces.tsx | 2 +- apps/app/components/pages/create-block.tsx | 2 +- .../pages/create-update-block-inline.tsx | 2 +- .../pages/create-update-page-modal.tsx | 2 +- .../components/pages/delete-page-modal.tsx | 2 +- apps/app/components/pages/pages-view.tsx | 6 +- .../pages/single-page-detailed-item.tsx | 2 +- .../pages/single-page-list-item.tsx | 2 +- .../project/create-project-modal.tsx | 2 +- .../project/delete-project-modal.tsx | 2 +- .../project/send-project-invitation-modal.tsx | 4 +- .../project/settings/single-label.tsx | 2 +- .../project/single-integration-card.tsx | 2 +- .../app/components/rich-text-editor/index.tsx | 6 +- .../toolbar/float-tool-tip.tsx | 4 +- apps/app/components/search-listbox/index.tsx | 2 +- apps/app/components/states/single-state.tsx | 2 +- apps/app/components/ui/avatar.tsx | 4 +- .../ui/buttons/secondary-button.tsx | 4 +- apps/app/components/ui/context-menu.tsx | 4 +- apps/app/components/ui/custom-menu.tsx | 4 +- .../components/ui/custom-search-select.tsx | 6 +- apps/app/components/ui/custom-select.tsx | 6 +- apps/app/components/ui/date.tsx | 2 +- apps/app/components/ui/datepicker.tsx | 2 +- apps/app/components/ui/empty-space.tsx | 2 +- apps/app/components/ui/index.ts | 1 - apps/app/components/ui/input/index.tsx | 2 +- apps/app/components/ui/labels-list.tsx | 2 +- apps/app/components/ui/multi-input.tsx | 78 ------------------ .../components/ui/multi-level-dropdown.tsx | 2 +- apps/app/components/ui/multi-level-select.tsx | 4 +- .../components/ui/product-updates-modal.tsx | 4 +- apps/app/components/ui/range-datepicker.tsx | 2 +- apps/app/components/ui/text-area/index.tsx | 2 +- apps/app/components/ui/toggle-switch.tsx | 2 +- .../components/views/delete-view-modal.tsx | 2 +- apps/app/components/views/gantt-chart.tsx | 4 +- apps/app/components/views/modal.tsx | 2 +- .../workspace/completed-issues-graph.tsx | 4 +- .../workspace/create-workspace-form.tsx | 2 +- .../workspace/delete-workspace-modal.tsx | 2 +- .../app/components/workspace/help-section.tsx | 4 +- apps/app/components/workspace/issues-list.tsx | 2 +- .../components/workspace/issues-pie-chart.tsx | 4 +- .../app/components/workspace/issues-stats.tsx | 10 +-- .../components/workspace/sidebar-dropdown.tsx | 4 +- .../workspace/single-invitation.tsx | 2 +- .../workspace/upgrade-to-pro-modal.tsx | 2 +- apps/app/constants/themes.ts | 2 +- apps/app/layouts/app-layout/app-header.tsx | 4 +- apps/app/layouts/app-layout/app-sidebar.tsx | 2 +- .../project-authorization-wrapper.tsx | 31 +++---- .../workspace-authorization-wrapper.tsx | 6 +- apps/app/layouts/settings-navbar.tsx | 2 +- apps/app/pages/[workspaceSlug]/analytics.tsx | 4 +- apps/app/pages/[workspaceSlug]/index.tsx | 10 +-- .../pages/[workspaceSlug]/me/my-issues.tsx | 4 +- .../archived-issues/[archivedIssueId].tsx | 4 +- .../[projectId]/archived-issues/index.tsx | 4 +- .../projects/[projectId]/cycles/index.tsx | 2 +- .../projects/[projectId]/inbox/[inboxId].tsx | 2 +- .../projects/[projectId]/issues/[issueId].tsx | 4 +- .../projects/[projectId]/issues/index.tsx | 6 +- .../projects/[projectId]/pages/[pageId].tsx | 6 +- .../projects/[projectId]/pages/index.tsx | 2 +- .../[projectId]/settings/estimates.tsx | 2 +- .../[projectId]/settings/features.tsx | 2 +- .../projects/[projectId]/settings/index.tsx | 2 +- .../projects/[projectId]/settings/members.tsx | 2 +- .../projects/[projectId]/settings/states.tsx | 4 +- .../projects/[projectId]/views/index.tsx | 2 +- .../[workspaceSlug]/settings/billing.tsx | 2 +- .../[workspaceSlug]/settings/members.tsx | 2 +- apps/app/pages/invitations.tsx | 2 +- apps/app/pages/reset-password.tsx | 2 + .../app/pages/workspace-member-invitation.tsx | 2 +- apps/app/public/auth/join-project.svg | 52 ------------ apps/app/public/empty-state/empty-inbox.svg | 57 ------------- apps/app/public/logo-with-text.png | Bin 46527 -> 0 bytes apps/app/public/sign-in-bg.png | Bin 201792 -> 0 bytes apps/app/public/site-image.png | Bin 8682 -> 0 bytes apps/app/public/vercel.svg | 4 - apps/app/styles/globals.css | 8 +- apps/app/tailwind.config.js | 4 +- 196 files changed, 442 insertions(+), 648 deletions(-) delete mode 100644 apps/app/components/ui/multi-input.tsx delete mode 100644 apps/app/public/auth/join-project.svg delete mode 100644 apps/app/public/empty-state/empty-inbox.svg delete mode 100644 apps/app/public/logo-with-text.png delete mode 100644 apps/app/public/sign-in-bg.png delete mode 100644 apps/app/public/site-image.png delete mode 100644 apps/app/public/vercel.svg diff --git a/apps/app/components/account/email-code-form.tsx b/apps/app/components/account/email-code-form.tsx index e6b3eeac3..29891f624 100644 --- a/apps/app/components/account/email-code-form.tsx +++ b/apps/app/components/account/email-code-form.tsx @@ -136,6 +136,7 @@ export const EmailCodeForm = ({ handleSignIn }: any) => { }} error={errors.email} placeholder="Enter your email address..." + className="border-custom-border-300" /> @@ -151,6 +152,7 @@ export const EmailCodeForm = ({ handleSignIn }: any) => { }} error={errors.token} placeholder="Enter code..." + className="border-custom-border-300" />