diff --git a/apiserver/plane/api/views/integration/slack.py b/apiserver/plane/api/views/integration/slack.py index 863b6ba0c..6b1b47d37 100644 --- a/apiserver/plane/api/views/integration/slack.py +++ b/apiserver/plane/api/views/integration/slack.py @@ -59,6 +59,7 @@ class SlackProjectSyncViewSet(BaseViewSet): team_id=slack_response.get("team", {}).get("id"), team_name=slack_response.get("team", {}).get("name"), workspace_integration=workspace_integration, + project_id=project_id, ) _ = ProjectMember.objects.get_or_create( member=workspace_integration.actor, role=20, project_id=project_id diff --git a/web/components/integration/guide.tsx b/web/components/integration/guide.tsx index d083de590..e521ca8f5 100644 --- a/web/components/integration/guide.tsx +++ b/web/components/integration/guide.tsx @@ -1,11 +1,8 @@ import { useState } from "react"; - import Link from "next/link"; import Image from "next/image"; import { useRouter } from "next/router"; - import useSWR, { mutate } from "swr"; - // hooks import useUserAuth from "hooks/use-user-auth"; // services @@ -21,7 +18,7 @@ import { IImporterService } from "types"; // fetch-keys import { IMPORTER_SERVICES_LIST } from "constants/fetch-keys"; // constants -import { IMPORTERS_EXPORTERS_LIST } from "constants/workspace"; +import { IMPORTERS_LIST } from "constants/workspace"; // services const integrationService = new IntegrationService(); @@ -76,7 +73,7 @@ const IntegrationGuide = () => { */} - {IMPORTERS_EXPORTERS_LIST.map((service) => ( + {IMPORTERS_LIST.map((service) => (
= ({ service, refreshing, handleDelet

Import from{" "} - - {IMPORTERS_EXPORTERS_LIST.find((i) => i.provider === service.service)?.title} - {" "} - to {service.project_detail.name} + {IMPORTERS_LIST.find((i) => i.provider === service.service)?.title} to{" "} + {service.project_detail.name} = observer((props value: state.id, query: state.name, content: ( -
+
- {state.name} +
{state.name}
), })); @@ -94,7 +94,7 @@ export const IssuePropertyState: React.FC = observer((props
{value && } - {value?.name ?? "State"} + {value?.name ?? "State"}
); @@ -104,7 +104,7 @@ export const IssuePropertyState: React.FC = observer((props {workspaceSlug && projectId && ( { const selectedState = projectStates?.find((state) => state.id === data); @@ -159,7 +159,11 @@ export const IssuePropertyState: React.FC = observer((props {({ selected }) => ( <> {option.content} - {selected && } + {selected && ( +
+ +
+ )} )} diff --git a/web/components/issues/issue-layouts/roots/project-layout-root.tsx b/web/components/issues/issue-layouts/roots/project-layout-root.tsx index 0f5cac86b..9fa9bb986 100644 --- a/web/components/issues/issue-layouts/roots/project-layout-root.tsx +++ b/web/components/issues/issue-layouts/roots/project-layout-root.tsx @@ -32,10 +32,6 @@ export const ProjectLayoutRoot: React.FC = observer(() => { } ); - console.log("--"); - console.log("isLoading -- -->", isLoading); - console.log("--"); - const activeLayout = issueFilterStore.userDisplayFilters.layout; const issueCount = issueStore.getIssuesCount; diff --git a/web/constants/workspace.ts b/web/constants/workspace.ts index 084bdc68a..e442bf242 100644 --- a/web/constants/workspace.ts +++ b/web/constants/workspace.ts @@ -1,6 +1,6 @@ // services images import GithubLogo from "public/services/github.png"; -import JiraLogo from "public/services/jira.png"; +import JiraLogo from "public/services/jira.svg"; import CSVLogo from "public/services/csv.svg"; import ExcelLogo from "public/services/excel.svg"; import JSONLogo from "public/services/json.svg"; @@ -28,7 +28,7 @@ export const USER_ROLES = [ { value: "Other", label: "Other" }, ]; -export const IMPORTERS_EXPORTERS_LIST = [ +export const IMPORTERS_LIST = [ { provider: "github", type: "import", diff --git a/web/public/services/jira.png b/web/public/services/jira.png deleted file mode 100644 index ca9db1926..000000000 Binary files a/web/public/services/jira.png and /dev/null differ diff --git a/web/public/services/jira.svg b/web/public/services/jira.svg new file mode 100644 index 000000000..5e5cebc84 --- /dev/null +++ b/web/public/services/jira.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + +