diff --git a/packages/etl/src/asana/etl/pull.ts b/packages/etl/src/asana/etl/pull.ts index 5924c4bb6f..906787ed06 100644 --- a/packages/etl/src/asana/etl/pull.ts +++ b/packages/etl/src/asana/etl/pull.ts @@ -143,14 +143,17 @@ export async function pullCustomFields(client: AsanaService, projectGid: string) limit: DEFAULT_PAGINATION_LIMIT, offset: "", }; - - do { - const response = await client.getProjectCustomFieldSettings(projectGid, pagination); - customFields.push(...response.data); - pagination.offset = response._response.next_page?.offset || ""; - } while (pagination.offset); - - return customFields; + try { + do { + const response = await client.getProjectCustomFieldSettings(projectGid, pagination); + customFields.push(...response.data); + pagination.offset = response._response.next_page?.offset || ""; + } while (pagination.offset); + } catch (error: any) { + console.log("error while fetching custom fields from asana", error?.message); + } finally { + return customFields; + } } export async function pullAttachments( diff --git a/packages/etl/src/asana/etl/transform.ts b/packages/etl/src/asana/etl/transform.ts index 7089aaeb88..5ed6400bf2 100644 --- a/packages/etl/src/asana/etl/transform.ts +++ b/packages/etl/src/asana/etl/transform.ts @@ -82,7 +82,7 @@ export const transformTask = ( attachments: targetAttachments as ExIssueAttachment[], // TODO: Fix this type state: targetState ? targetState.id : "", priority: targetPriority, - description_html: !task.html_notes || task.html_notes == "" ? "

" : task.html_notes, + description_html: !task.html_notes || task.html_notes == "" ? "

" : task.html_notes, start_date: getFormattedDate(task.start_on), target_date: getFormattedDate(task.due_on), created_at: task.created_at, diff --git a/web/ee/components/importers/asana/authentication/personal-access-token.tsx b/web/ee/components/importers/asana/authentication/personal-access-token.tsx index a6fd1f33c9..4fcd5b2b61 100644 --- a/web/ee/components/importers/asana/authentication/personal-access-token.tsx +++ b/web/ee/components/importers/asana/authentication/personal-access-token.tsx @@ -66,7 +66,7 @@ export const PersonalAccessTokenAuth: FC = observer(() => { className="text-custom-primary-100 hover:underline" rel="noreferrer" > - Asana Developer Settings. + Asana Security Settings. ), diff --git a/web/ee/components/importers/asana/steps/summary/root.tsx b/web/ee/components/importers/asana/steps/summary/root.tsx index dc55fc1d3c..2b26412996 100644 --- a/web/ee/components/importers/asana/steps/summary/root.tsx +++ b/web/ee/components/importers/asana/steps/summary/root.tsx @@ -1,11 +1,13 @@ "use client"; import { FC, useState } from "react"; +import { observer } from "mobx-react"; import useSWR from "swr"; // ui // silo import { AsanaConfig, AsanaSection } from "@plane/etl/asana"; import { E_JOB_STATUS, E_IMPORTER_KEYS } from "@plane/etl/core"; +import { useTranslation } from "@plane/i18n"; import { TImportJob } from "@plane/types"; import { Button, Loader } from "@plane/ui"; // plane web components @@ -14,9 +16,8 @@ import { AddSeatsAlertBanner, SkipUserImport, StepperNavigation } from "@/plane- import { useAsanaImporter, useWorkspaceSubscription } from "@/plane-web/hooks/store"; // plane web types import { E_IMPORTER_STEPS } from "@/plane-web/types/importers/asana"; -import { useTranslation } from "@plane/i18n"; -export const SummaryRoot: FC = () => { +export const SummaryRoot: FC = observer(() => { // hooks const { workspace, @@ -181,4 +182,4 @@ export const SummaryRoot: FC = () => { ); -}; +}); diff --git a/web/ee/components/importers/jira/authentication/personal-access-token.tsx b/web/ee/components/importers/jira/authentication/personal-access-token.tsx index dadf9bc584..89a7e4320b 100644 --- a/web/ee/components/importers/jira/authentication/personal-access-token.tsx +++ b/web/ee/components/importers/jira/authentication/personal-access-token.tsx @@ -67,7 +67,7 @@ export const PersonalAccessTokenAuth: FC = observer(() => { onChange: (e) => handleFormData("personalAccessToken", e.target.value), description: ( <> - {t("importers.token_helper")} + {t("importers.token_helper")}{" "} { +export const ImportUsersFromJira: FC = observer(() => { // hooks const { user, @@ -90,7 +91,7 @@ export const ImportUsersFromJira: FC = () => { ); const extraSeatRequired = additionalUsersData?.additionalUserCount - currentWorkspaceSubscriptionAvailableSeats; - const isNextButtonDisabled = Boolean(extraSeatRequired > 0 && !formData.userSkipToggle); + const isNextButtonDisabled = Boolean(extraSeatRequired > 0 && !formData.userSkipToggle) || Boolean(!formData.userSkipToggle && !formData.userData); return (
@@ -143,4 +144,4 @@ export const ImportUsersFromJira: FC = () => {
); -}; +}); diff --git a/web/ee/components/importers/jira/steps/import-users-from-jira/upload-csv.tsx b/web/ee/components/importers/jira/steps/import-users-from-jira/upload-csv.tsx index 1c440a1678..162aec9e80 100644 --- a/web/ee/components/importers/jira/steps/import-users-from-jira/upload-csv.tsx +++ b/web/ee/components/importers/jira/steps/import-users-from-jira/upload-csv.tsx @@ -5,8 +5,8 @@ import Papa from "papaparse"; import Dropzone, { Accept } from "react-dropzone"; import { TriangleAlert, CircleCheck, X, Loader } from "lucide-react"; // helpers -import { cn } from "@/helpers/common.helper"; import { useTranslation } from "@plane/i18n"; +import { cn } from "@/helpers/common.helper"; type TImportUsersFromJiraUploader = { handleValue: (value: string) => void; @@ -30,22 +30,22 @@ export const ImportUsersFromJiraUploader: FC = (pr processing: { className: "text-custom-text-200", icon: , - message: t("file_upload_status.processing"), + message: t("file_upload.processing"), }, error: { className: "text-red-500", icon: , - message: t("file_upload_status.invalid"), + message: t("file_upload.invalid"), }, "missing-fields": { className: "text-yellow-500", icon: , - message: t("file_upload_status.missing_fields"), + message: t("file_upload.missing_fields"), }, success: { className: "text-green-500", icon: , - message: t("file_upload_status.success", { fileName: "CSV" }), + message: t("file_upload.success", { fileName: "CSV" }), }, }; diff --git a/web/ee/components/importers/linear/authentication/personal-access-token.tsx b/web/ee/components/importers/linear/authentication/personal-access-token.tsx index 197383615c..aa82aaa622 100644 --- a/web/ee/components/importers/linear/authentication/personal-access-token.tsx +++ b/web/ee/components/importers/linear/authentication/personal-access-token.tsx @@ -60,15 +60,15 @@ export const PersonalAccessTokenAuth: FC = observer(() => { onChange: (e) => handleFormData("personalAccessToken", e.target.value), description: ( <> - You will get this from your{" "} + {t("importers.token_helper")}{" "} - Linear Security settings. + Linear Security Settings. ),