chore: filter the deleted issue assignee

Merge branch 'preview' of github.com:makeplane/plane into preview
style: remove unnecessary bottom padding from the rich text editor (#5976 )
2024-11-11 18:52:00 +05:30 · 2024-11-11 18:47:56 +05:30 · 2024-11-11 16:11:34 +05:30 · 2024-11-11 16:11:10 +05:30 · 2024-11-11 16:10:47 +05:30 · 2024-11-11 16:10:27 +05:30
17 changed files with 136 additions and 104 deletions
@@ -429,6 +429,9 @@ class ProjectViewSet(BaseViewSet):
                )

            workspace = Workspace.objects.get(slug=slug)
+            intake_view = request.data.get(
+                "inbox_view", request.data.get("intake_view", False)
+            )

            project = Project.objects.get(pk=pk)
            current_instance = json.dumps(
@@ -442,14 +445,17 @@ class ProjectViewSet(BaseViewSet):

            serializer = ProjectSerializer(
                project,
-                data={**request.data},
+                data={
+                    **request.data,
+                    "intake_view": intake_view,
+                },
                context={"workspace_id": workspace.id},
                partial=True,
            )

            if serializer.is_valid():
                serializer.save()
-                if serializer.data["intake_view"] or request.data.get("inbox_view", False):
+                if intake_view:
                    intake = Intake.objects.filter(
                        project=project,
                        is_default=True,
@@ -1,4 +1,4 @@
-# Generated by Django 4.2.15 on 2024-11-08 13:30
+# Generated by Django 4.2.15 on 2024-11-08 14:24

 from django.db import migrations

@@ -6,7 +6,7 @@ from django.db import migrations
 class Migration(migrations.Migration):

    dependencies = [
-        ('db', '0084_remove_label_label_unique_name_project_when_deleted_at_null_and_more'),
+        ('db', '0085_intake_intakeissue_remove_inboxissue_created_by_and_more'),
    ]

    operations = [
@@ -233,6 +233,7 @@ def filter_assignees(params, issue_filter, method, prefix=""):
            and params.get("assignees") != "null"
        ):
            issue_filter[f"{prefix}assignees__in"] = params.get("assignees")
+    issue_filter[f"{prefix}issue_assignee__deleted_at__isnull"] = True
    return issue_filter


@@ -46,7 +46,7 @@ export const CoreEditorExtensionsWithoutProps = [
  CustomQuoteExtension,
  CustomHorizontalRule.configure({
    HTMLAttributes: {
-      class: "my-4 border-custom-border-400",
+      class: "py-4 border-custom-border-400",
    },
  }),
  CustomLinkExtension.configure({
@@ -78,7 +78,7 @@ export const CoreEditorExtensions = (args: TArguments) => {
    DropHandlerExtension(),
    CustomHorizontalRule.configure({
      HTMLAttributes: {
-        class: "my-4 border-custom-border-400",
+        class: "py-4 border-custom-border-400",
      },
    }),
    CustomKeymap,
@@ -67,7 +67,7 @@ export const CoreReadOnlyEditorExtensions = (props: Props) => {
    CustomQuoteExtension,
    CustomHorizontalRule.configure({
      HTMLAttributes: {
-        class: "my-4 border-custom-border-400",
+        class: "py-4 border-custom-border-400",
      },
    }),
    CustomLinkExtension.configure({
@@ -12,7 +12,7 @@
  cursor: text;
  font-family: var(--font-style);
  font-size: var(--font-size-regular);
-  line-height: 1.2;
+  font-weight: 400;
  color: inherit;
  -moz-box-sizing: border-box;
  box-sizing: border-box;
@@ -248,11 +248,6 @@ div[data-type="horizontalRule"] {
  }
 }

-/* image resizer */
-.moveable-control-box {
-  z-index: 10 !important;
-}
-
 /* Cursor styles for the inline code blocks */
@keyframes blink {
  49% {
@@ -314,13 +309,23 @@ ul[data-type="taskList"] ul[data-type="taskList"] {
 }
 /* end numbered, bulleted and to-do lists spacing */

+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+p {
+  margin: 0 !important;
+}
+
 /* tailwind typography */
 .prose :where(h1):not(:where([class~="not-prose"], [class~="not-prose"] *)) {
  &:not(:first-child) {
-    margin-top: 2rem;
+    padding-top: 28px;
  }

-  margin-bottom: 4px;
+  padding-bottom: 4px;
  font-size: var(--font-size-h1);
  line-height: var(--line-height-h1);
  font-weight: 600;
@@ -328,10 +333,10 @@ ul[data-type="taskList"] ul[data-type="taskList"] {

 .prose :where(h2):not(:where([class~="not-prose"], [class~="not-prose"] *)) {
  &:not(:first-child) {
-    margin-top: 1.4rem;
+    padding-top: 28px;
  }

-  margin-bottom: 1px;
+  padding-bottom: 4px;
  font-size: var(--font-size-h2);
  line-height: var(--line-height-h2);
  font-weight: 600;
@@ -339,10 +344,10 @@ ul[data-type="taskList"] ul[data-type="taskList"] {

 .prose :where(h3):not(:where([class~="not-prose"], [class~="not-prose"] *)) {
  &:not(:first-child) {
-    margin-top: 1rem;
+    padding-top: 28px;
  }

-  margin-bottom: 1px;
+  padding-bottom: 4px;
  font-size: var(--font-size-h3);
  line-height: var(--line-height-h3);
  font-weight: 600;
@@ -350,10 +355,10 @@ ul[data-type="taskList"] ul[data-type="taskList"] {

 .prose :where(h4):not(:where([class~="not-prose"], [class~="not-prose"] *)) {
  &:not(:first-child) {
-    margin-top: 1rem;
+    padding-top: 28px;
  }

-  margin-bottom: 1px;
+  padding-bottom: 4px;
  font-size: var(--font-size-h4);
  line-height: var(--line-height-h4);
  font-weight: 600;
@@ -361,10 +366,10 @@ ul[data-type="taskList"] ul[data-type="taskList"] {

 .prose :where(h5):not(:where([class~="not-prose"], [class~="not-prose"] *)) {
  &:not(:first-child) {
-    margin-top: 1rem;
+    padding-top: 20px;
  }

-  margin-bottom: 1px;
+  padding-bottom: 4px;
  font-size: var(--font-size-h5);
  line-height: var(--line-height-h5);
  font-weight: 600;
@@ -372,30 +377,40 @@ ul[data-type="taskList"] ul[data-type="taskList"] {

 .prose :where(h6):not(:where([class~="not-prose"], [class~="not-prose"] *)) {
  &:not(:first-child) {
-    margin-top: 1rem;
+    padding-top: 20px;
  }

-  margin-bottom: 1px;
+  padding-bottom: 4px;
  font-size: var(--font-size-h6);
  line-height: var(--line-height-h6);
  font-weight: 600;
 }

 .prose :where(p):not(:where([class~="not-prose"], [class~="not-prose"] *)) {
-  &:not(:first-child) {
-    margin-top: 0.25rem;
-  }
-
  &:first-child {
-    margin-top: 0;
+    padding-top: 0;
+  }
+
+  &:not(:first-child) {
+    padding-top: 4px;
+  }
+
+  &:last-child {
+    padding-bottom: 4px;
+  }
+
+  &:not(:last-child) {
+    padding-bottom: 8px;
  }

-  margin-bottom: 1px;
-  padding: 3px 0;
  font-size: var(--font-size-regular);
  line-height: var(--line-height-regular);
 }

+p + p {
+  padding-top: 8px !important;
+}
+
 .prose :where(ol):not(:where([class~="not-prose"], [class~="not-prose"] *)) li p,
 .prose :where(ul):not(:where([class~="not-prose"], [class~="not-prose"] *)) li p {
  font-size: var(--font-size-list);
@@ -432,11 +447,6 @@ ul[data-type="taskList"] ul[data-type="taskList"] {
 [data-text-color="purple"] {
  color: var(--editor-colors-purple-text);
 }
-/* [data-text-color="pink-blue-gradient"] {
-  background-clip: text;
-  color: transparent;
-  background-image: linear-gradient(90deg, #a961cd 50%, #e75962 100%);
-} */
 /* end text colors */

 /* background colors */
@@ -46,8 +46,8 @@
    --font-size-h5: 1.125rem;
    --font-size-h6: 1rem;
    --font-size-regular: 1rem;
+    --font-size-code: 0.85rem;
    --font-size-list: var(--font-size-regular);
-    --font-size-code: var(--font-size-regular);

    --line-height-h1: 2.25rem;
    --line-height-h2: 2rem;
@@ -56,8 +56,8 @@
    --line-height-h5: 1.5rem;
    --line-height-h6: 1.5rem;
    --line-height-regular: 1.5rem;
+    --line-height-code: 1.5rem;
    --line-height-list: var(--line-height-regular);
-    --line-height-code: var(--line-height-regular);
  }
  &.small-font {
    --font-size-h1: 1.4rem;
@@ -67,8 +67,8 @@
    --font-size-h5: 0.9rem;
    --font-size-h6: 0.8rem;
    --font-size-regular: 0.8rem;
+    --font-size-code: 0.8rem;
    --font-size-list: var(--font-size-regular);
-    --font-size-code: var(--font-size-regular);

    --line-height-h1: 1.8rem;
    --line-height-h2: 1.6rem;
@@ -77,8 +77,8 @@
    --line-height-h5: 1.2rem;
    --line-height-h6: 1.2rem;
    --line-height-regular: 1.2rem;
+    --line-height-code: 1.2rem;
    --line-height-list: var(--line-height-regular);
-    --line-height-code: var(--line-height-regular);
  }
  /* end font sizes and line heights */

@@ -54,7 +54,7 @@ export const RichTextEditor = forwardRef<EditorRefApi, RichTextEditorWrapperProp
        suggestions: mentionSuggestions,
      }}
      {...rest}
-      containerClassName={cn("relative pl-3 pb-3", containerClassName)}
+      containerClassName={cn("relative pl-3", containerClassName)}
    />
  );
 });
@@ -91,7 +91,7 @@ export const InboxIssueProperties: FC<TInboxIssueProperties> = observer((props)
      {/* labels */}
      <div className="h-7">
        <IssueLabelSelect
-          setIsOpen={() => { }}
+          setIsOpen={() => {}}
          value={data?.label_ids || []}
          onChange={(labelIds) => handleData("label_ids", labelIds)}
          projectId={projectId}
@@ -171,13 +171,13 @@ export const InboxIssueProperties: FC<TInboxIssueProperties> = observer((props)

      {/* add parent */}
      {isVisible && (
-        <>
+        <div className="h-7">
          {selectedParentIssue ? (
            <CustomMenu
              customButton={
                <button
                  type="button"
-                  className="flex cursor-pointer items-center justify-between gap-1 rounded border-[0.5px] border-custom-border-300 px-2 py-1.5 text-xs hover:bg-custom-background-80"
+                  className="flex cursor-pointer items-center justify-between gap-1 h-full rounded border-[0.5px] border-custom-border-300 px-2 py-0.5 text-xs hover:bg-custom-background-80"
                >
                  <LayoutPanelTop className="h-3 w-3 flex-shrink-0" />
                  <span className="whitespace-nowrap">
@@ -188,6 +188,8 @@ export const InboxIssueProperties: FC<TInboxIssueProperties> = observer((props)
                </button>
              }
              placement="bottom-start"
+              className="h-full w-full"
+              customButtonClassName="h-full"
              tabIndex={getIndex("parent_id")}
            >
              <>
@@ -208,7 +210,7 @@ export const InboxIssueProperties: FC<TInboxIssueProperties> = observer((props)
          ) : (
            <button
              type="button"
-              className="flex cursor-pointer items-center justify-between gap-1 rounded border-[0.5px] border-custom-border-300 px-2 py-1.5 text-xs hover:bg-custom-background-80"
+              className="flex cursor-pointer items-center justify-between gap-1 h-full rounded border-[0.5px] border-custom-border-300 px-2 py-0.5 text-xs hover:bg-custom-background-80"
              onClick={() => setParentIssueModalOpen(true)}
            >
              <LayoutPanelTop className="h-3 w-3 flex-shrink-0" />
@@ -226,7 +228,7 @@ export const InboxIssueProperties: FC<TInboxIssueProperties> = observer((props)
            projectId={projectId}
            issueId={undefined}
          />
-        </>
+        </div>
      )}
    </div>
  );
@@ -151,6 +151,7 @@ export const IssueDetailWidgetModals: FC<Props> = observer((props) => {
          data={createUpdateModalData}
          onClose={handleCreateUpdateModalClose}
          onSubmit={handleCreateUpdateModalOnSubmit}
+          isProjectSelectionDisabled
        />
      )}

@@ -162,7 +163,6 @@ export const IssueDetailWidgetModals: FC<Props> = observer((props) => {
          handleClose={handleExistingIssuesModalClose}
          searchParams={existingIssuesModalSearchParams}
          handleOnSubmit={handleExistingIssuesModalOnSubmit}
-          workspaceLevelToggle
        />
      )}

@@ -37,6 +37,7 @@ export const CreateUpdateIssueModalBase: React.FC<IssuesModalProps> = observer((
    moveToIssue = false,
    modalTitle,
    primaryButtonText,
+    isProjectSelectionDisabled = false,
  } = props;
  const issueStoreType = useIssueStoreType();

@@ -361,6 +362,7 @@ export const CreateUpdateIssueModalBase: React.FC<IssuesModalProps> = observer((
          moveToIssue={moveToIssue}
          isDuplicateModalOpen={isDuplicateModalOpen}
          handleDuplicateIssueModal={handleDuplicateIssueModal}
+          isProjectSelectionDisabled={isProjectSelectionDisabled}
        />
      ) : (
        <IssueFormRoot
@@ -383,6 +385,7 @@ export const CreateUpdateIssueModalBase: React.FC<IssuesModalProps> = observer((
          primaryButtonText={primaryButtonText}
          isDuplicateModalOpen={isDuplicateModalOpen}
          handleDuplicateIssueModal={handleDuplicateIssueModal}
+          isProjectSelectionDisabled={isProjectSelectionDisabled}
        />
      )}
    </ModalCore>
@@ -262,58 +262,62 @@ export const IssueDefaultProperties: React.FC<TIssueDefaultPropertiesProps> = ob
          )}
        />
      )}
-      {parentId ? (
-        <CustomMenu
-          customButton={
-            <button
-              type="button"
-              className="flex cursor-pointer items-center justify-between gap-1 rounded border-[0.5px] border-custom-border-300 px-2 py-1.5 text-xs hover:bg-custom-background-80"
-            >
-              {selectedParentIssue?.project_id && (
-                <IssueIdentifier
-                  projectId={selectedParentIssue.project_id}
-                  issueTypeId={selectedParentIssue.type_id}
-                  projectIdentifier={selectedParentIssue?.project__identifier}
-                  issueSequenceId={selectedParentIssue.sequence_id}
-                  textContainerClassName="text-xs"
-                />
-              )}
-            </button>
-          }
-          placement="bottom-start"
-          tabIndex={getIndex("parent_id")}
-        >
-          <>
-            <CustomMenu.MenuItem className="!p-1" onClick={() => setParentIssueListModalOpen(true)}>
-              Change parent issue
-            </CustomMenu.MenuItem>
-            <Controller
-              control={control}
-              name="parent_id"
-              render={({ field: { onChange } }) => (
-                <CustomMenu.MenuItem
-                  className="!p-1"
-                  onClick={() => {
-                    onChange(null);
-                    handleFormChange();
-                  }}
-                >
-                  Remove parent issue
-                </CustomMenu.MenuItem>
-              )}
-            />
-          </>
-        </CustomMenu>
-      ) : (
-        <button
-          type="button"
-          className="flex cursor-pointer items-center justify-between gap-1 rounded border-[0.5px] border-custom-border-300 px-2 py-1.5 text-xs hover:bg-custom-background-80"
-          onClick={() => setParentIssueListModalOpen(true)}
-        >
-          <LayoutPanelTop className="h-3 w-3 flex-shrink-0" />
-          <span className="whitespace-nowrap">Add parent</span>
-        </button>
-      )}
+      <div className="h-7">
+        {parentId ? (
+          <CustomMenu
+            customButton={
+              <button
+                type="button"
+                className="flex cursor-pointer items-center justify-between gap-1 h-full rounded border-[0.5px] border-custom-border-300 px-2 py-0.5 text-xs hover:bg-custom-background-80"
+              >
+                {selectedParentIssue?.project_id && (
+                  <IssueIdentifier
+                    projectId={selectedParentIssue.project_id}
+                    issueTypeId={selectedParentIssue.type_id}
+                    projectIdentifier={selectedParentIssue?.project__identifier}
+                    issueSequenceId={selectedParentIssue.sequence_id}
+                    textContainerClassName="text-xs"
+                  />
+                )}
+              </button>
+            }
+            placement="bottom-start"
+            className="h-full w-full"
+            customButtonClassName="h-full"
+            tabIndex={getIndex("parent_id")}
+          >
+            <>
+              <CustomMenu.MenuItem className="!p-1" onClick={() => setParentIssueListModalOpen(true)}>
+                Change parent issue
+              </CustomMenu.MenuItem>
+              <Controller
+                control={control}
+                name="parent_id"
+                render={({ field: { onChange } }) => (
+                  <CustomMenu.MenuItem
+                    className="!p-1"
+                    onClick={() => {
+                      onChange(null);
+                      handleFormChange();
+                    }}
+                  >
+                    Remove parent issue
+                  </CustomMenu.MenuItem>
+                )}
+              />
+            </>
+          </CustomMenu>
+        ) : (
+          <button
+            type="button"
+            className="flex cursor-pointer items-center justify-between gap-1 h-full rounded border-[0.5px] border-custom-border-300 px-2 py-0.5 text-xs hover:bg-custom-background-80"
+            onClick={() => setParentIssueListModalOpen(true)}
+          >
+            <LayoutPanelTop className="h-3 w-3 flex-shrink-0" />
+            <span className="whitespace-nowrap">Add parent</span>
+          </button>
+        )}
+      </div>
      <Controller
        control={control}
        name="parent_id"
@@ -38,6 +38,7 @@ export interface DraftIssueProps {
  };
  isDuplicateModalOpen: boolean;
  handleDuplicateIssueModal: (isOpen: boolean) => void;
+  isProjectSelectionDisabled?: boolean;
 }

 export const DraftIssueLayout: React.FC<DraftIssueProps> = observer((props) => {
@@ -58,6 +59,7 @@ export const DraftIssueLayout: React.FC<DraftIssueProps> = observer((props) => {
    primaryButtonText,
    isDuplicateModalOpen,
    handleDuplicateIssueModal,
+    isProjectSelectionDisabled = false,
  } = props;
  // states
  const [issueDiscardModal, setIssueDiscardModal] = useState(false);
@@ -179,6 +181,7 @@ export const DraftIssueLayout: React.FC<DraftIssueProps> = observer((props) => {
        primaryButtonText={primaryButtonText}
        isDuplicateModalOpen={isDuplicateModalOpen}
        handleDuplicateIssueModal={handleDuplicateIssueModal}
+        isProjectSelectionDisabled={isProjectSelectionDisabled}
      />
    </>
  );
@@ -71,6 +71,7 @@ export interface IssueFormProps {
  };
  isDuplicateModalOpen: boolean;
  handleDuplicateIssueModal: (isOpen: boolean) => void;
+  isProjectSelectionDisabled?: boolean;
 }

 export const IssueFormRoot: FC<IssueFormProps> = observer((props) => {
@@ -93,6 +94,7 @@ export const IssueFormRoot: FC<IssueFormProps> = observer((props) => {
    },
    isDuplicateModalOpen,
    handleDuplicateIssueModal,
+    isProjectSelectionDisabled = false,
  } = props;

  // states
@@ -336,7 +338,7 @@ export const IssueFormRoot: FC<IssueFormProps> = observer((props) => {
                <div className="flex items-center gap-x-1">
                  <IssueProjectSelect
                    control={control}
-                    disabled={!!data?.id || !!data?.sourceIssueId}
+                    disabled={!!data?.id || !!data?.sourceIssueId || isProjectSelectionDisabled}
                    handleFormChange={handleFormChange}
                  />
                  {projectId && (
@@ -27,6 +27,7 @@ export interface IssuesModalProps {
    default: string;
    loading: string;
  };
+  isProjectSelectionDisabled?: boolean;
 }

 export const CreateUpdateIssueModal: React.FC<IssuesModalProps> = observer(
@@ -25,9 +25,9 @@ export const PageEditorTitle: React.FC<Props> = observer((props) => {
  // page filters
  const { fontSize } = usePageFilters();
  // ui
-  const titleClassName = cn("bg-transparent tracking-[-2%] font-semibold", {
-    "text-[1.6rem] leading-[1.8rem]": fontSize === "small-font",
-    "text-[2rem] leading-[2.25rem]": fontSize === "large-font",
+  const titleClassName = cn("bg-transparent tracking-[-2%] font-bold", {
+    "text-[1.6rem] leading-[1.9rem]": fontSize === "small-font",
+    "text-[2rem] leading-[2.375rem]": fontSize === "large-font",
  });

  return (
Author	SHA1	Message	Date
NarayanBavisetti	70100a97e7	chore: filter the deleted issue assignee	2024-11-11 18:52:00 +05:30
NarayanBavisetti	05f26ef4ce	Merge branch 'preview' of github.com:makeplane/plane into preview	2024-11-11 18:47:56 +05:30
Aaryan KhandelwalandGitHub	7082f7014d	style: remove unnecessary bottom padding from the rich text editor (#5976 )	2024-11-11 16:11:34 +05:30
Anmol Singh BhatiaandGitHub	c7c729d81b	[WEB-2283] fix: create issue modal parent select ui (#5980 ) * fix: create issue modal parent select ui * chore: code refactor	2024-11-11 16:11:10 +05:30
Aaryan KhandelwalandGitHub	97eb8d43d4	style: updated margins and font styles for editor (#5978 ) * style: updated margins and font styles for editor * fix: code block font size in small font * fix: remove duplicate code	2024-11-11 16:10:47 +05:30
Anmol Singh BhatiaandGitHub	1217af1d5f	chore: restrict sub-issue to have different project id than parent (#5981 )	2024-11-11 16:10:27 +05:30
NarayanBavisetti	83af541f11	Merge branch 'preview' of github.com:makeplane/plane into preview	2024-11-09 17:39:52 +05:30
Bavisetti NarayanandGitHub	13083a77eb	chore: enable intake from project settings (#5977 )	2024-11-09 17:01:21 +05:30
NarayanBavisetti	66673279d1	chore: migration fixes	2024-11-08 19:54:40 +05:30