diff --git a/apps/app/components/integration/delete-import-modal.tsx b/apps/app/components/integration/delete-import-modal.tsx index b1ae01cc8..8c5ab3803 100644 --- a/apps/app/components/integration/delete-import-modal.tsx +++ b/apps/app/components/integration/delete-import-modal.tsx @@ -73,7 +73,7 @@ export const DeleteImportModal: React.FC = ({ isOpen, handleClose, data } leaveFrom="opacity-100" leaveTo="opacity-0" > -
+
@@ -87,12 +87,12 @@ export const DeleteImportModal: React.FC = ({ isOpen, handleClose, data } leaveFrom="opacity-100 translate-y-0 sm:scale-100" leaveTo="opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95" > - +
- + @@ -101,16 +101,19 @@ export const DeleteImportModal: React.FC = ({ isOpen, handleClose, data }
-

- Are you sure you want to delete project{" "} - {data?.service}? All of the - data related to the project will be permanently removed. This action cannot be - undone +

+ Are you sure you want to delete import from{" "} + + {data?.service} + + ? All of the data related to the import will be permanently removed. This + action cannot be undone.

-
-

- To confirm, type delete import below: +

+

+ To confirm, type{" "} + delete import below:

= ({
Configure
-
Set up your GitHub import.
+
Set up your GitHub import.
diff --git a/apps/app/components/integration/github/import-confirm.tsx b/apps/app/components/integration/github/import-confirm.tsx index 3e5ed5808..7b8c507fe 100644 --- a/apps/app/components/integration/github/import-confirm.tsx +++ b/apps/app/components/integration/github/import-confirm.tsx @@ -14,7 +14,7 @@ type Props = { export const GithubImportConfirm: FC = ({ handleStepChange, watch }) => (
-

+

You are about to import issues from {watch("github").full_name}. Click on {'"'}Confirm & Import{'" '} to complete the process. diff --git a/apps/app/components/integration/github/import-data.tsx b/apps/app/components/integration/github/import-data.tsx index 2b93017c1..18520f0f0 100644 --- a/apps/app/components/integration/github/import-data.tsx +++ b/apps/app/components/integration/github/import-data.tsx @@ -36,7 +36,7 @@ export const GithubImportData: FC = ({ handleStepChange, integration, con

Select Repository

-

+

Select the repository that you want the issues to be imported from.

@@ -49,7 +49,13 @@ export const GithubImportData: FC = ({ handleStepChange, integration, con Select Repository + ) + } onChange={onChange} characterLimit={50} /> @@ -61,7 +67,9 @@ export const GithubImportData: FC = ({ handleStepChange, integration, con

Select Project

-

Select the project to import the issues to.

+

+ Select the project to import the issues to. +

{projects && ( @@ -71,7 +79,13 @@ export const GithubImportData: FC = ({ handleStepChange, integration, con render={({ field: { value, onChange } }) => ( p.id === value)?.name : "Select Project"} + label={ + value ? ( + projects.find((p) => p.id === value)?.name + ) : ( + Select Project + ) + } onChange={onChange} options={options} optionsClassName="w-full" @@ -84,7 +98,9 @@ export const GithubImportData: FC = ({ handleStepChange, integration, con

Sync Issues

-

Set whether you want to sync the issues or not.

+

+ Set whether you want to sync the issues or not. +

= ({ handleStepChange, users, setUsers return (
-
-
Name
-
Import as...
+
+
Name
+
Import as...
{users.filter((u) => u.import !== false).length} users selected
diff --git a/apps/app/components/integration/github/repo-details.tsx b/apps/app/components/integration/github/repo-details.tsx index 61ca8dbb2..2a1d74e4f 100644 --- a/apps/app/components/integration/github/repo-details.tsx +++ b/apps/app/components/integration/github/repo-details.tsx @@ -64,20 +64,20 @@ export const GithubRepoDetails: FC = ({
Repository Details
-
Import completed. We have found:
+
Import completed. We have found:
-
-
+
+

{repoInfo.issue_count}

-
Issues
+
Issues
-
+

{repoInfo.labels}

-
Labels
+
Labels
-
+

{repoInfo.collaborators.length}

-
Users
+
Users
diff --git a/apps/app/components/integration/github/root.tsx b/apps/app/components/integration/github/root.tsx index 2c9e430db..b8bfb346b 100644 --- a/apps/app/components/integration/github/root.tsx +++ b/apps/app/components/integration/github/root.tsx @@ -175,15 +175,13 @@ export const GithubImporterRoot = () => {
-
-
- -
+
+
Cancel import & go back
-
+
GithubLogo @@ -194,12 +192,12 @@ export const GithubImporterRoot = () => {
{ key={index} className={`border-b px-7 ${ index <= activeIntegrationState() - 1 - ? `border-[#3F76FF]` - : `border-gray-300` + ? `border-brand-accent` + : `border-brand-base` }`} > {" "} diff --git a/apps/app/components/integration/github/select-repository.tsx b/apps/app/components/integration/github/select-repository.tsx index 306b1e90e..a925eced4 100644 --- a/apps/app/components/integration/github/select-repository.tsx +++ b/apps/app/components/integration/github/select-repository.tsx @@ -16,7 +16,7 @@ import { IWorkspaceIntegration } from "types"; type Props = { integration: IWorkspaceIntegration; value: any; - label: string; + label: string | JSX.Element; onChange: (repo: any) => void; characterLimit?: number; }; diff --git a/apps/app/components/integration/github/single-user-select.tsx b/apps/app/components/integration/github/single-user-select.tsx index ffb67d728..14f913bff 100644 --- a/apps/app/components/integration/github/single-user-select.tsx +++ b/apps/app/components/integration/github/single-user-select.tsx @@ -64,9 +64,9 @@ export const SingleUserSelect: React.FC = ({ collaborator, index, users, })) ?? []; return ( -
+
-
+
= ({ collaborator, index, users, setUsers(newUsers); }} placeholder="Enter email of the user" - className="py-1 border-gray-200 text-xs" + className="py-1 text-xs" /> )} {users[index].import === "map" && members && ( diff --git a/apps/app/components/integration/guide.tsx b/apps/app/components/integration/guide.tsx index ad9ffe559..e61d3ded5 100644 --- a/apps/app/components/integration/guide.tsx +++ b/apps/app/components/integration/guide.tsx @@ -52,10 +52,10 @@ const IntegrationGuide = () => { handleClose={() => setDeleteImportModal(false)} data={importToDelete} /> -
+
{!provider && ( <> -
+
Relocation Guide
@@ -72,7 +72,10 @@ const IntegrationGuide = () => {
{IMPORTERS_EXPORTERS_LIST.map((service) => ( -
+
{

{service.title}

-

{service.description}

+

{service.description}

{
))}
-
-

+
+

Previous Imports

) : ( -
No previous imports available.
+

+ No previous imports available. +

) ) : ( - + diff --git a/apps/app/components/integration/jira/confirm-import.tsx b/apps/app/components/integration/jira/confirm-import.tsx index 79c56bf4b..1945bb501 100644 --- a/apps/app/components/integration/jira/confirm-import.tsx +++ b/apps/app/components/integration/jira/confirm-import.tsx @@ -17,30 +17,30 @@ export const JiraConfirmImport: React.FC = () => {
-

Migrating

+

Migrating

-

{watch("data.total_issues")}

-

Issues

+

{watch("data.total_issues")}

+

Issues

-

{watch("data.total_states")}

-

States

+

{watch("data.total_states")}

+

States

-

{watch("data.total_modules")}

-

Modules

+

{watch("data.total_modules")}

+

Modules

-

{watch("data.total_labels")}

-

Labels

+

{watch("data.total_labels")}

+

Labels

-

+

{watch("data.users").filter((user) => user.import).length}

-

User

+

User

diff --git a/apps/app/components/integration/jira/give-details.tsx b/apps/app/components/integration/jira/give-details.tsx index fb4032b68..a47fc67fc 100644 --- a/apps/app/components/integration/jira/give-details.tsx +++ b/apps/app/components/integration/jira/give-details.tsx @@ -30,15 +30,11 @@ export const JiraGetImportDetail: React.FC = () => {
-

Jira Personal Access Token

-

+

Jira Personal Access Token

+

Get to know your access token by navigating to{" "} - + Atlassian Settings @@ -61,8 +57,8 @@ export const JiraGetImportDetail: React.FC = () => {

-

Jira Project Key

-

If XXX-123 is your issue, then enter XXX

+

Jira Project Key

+

If XXX-123 is your issue, then enter XXX

{
-

Jira Email Address

-

+

Jira Email Address

+

Enter the Gmail account that you use in Jira account

@@ -102,8 +98,8 @@ export const JiraGetImportDetail: React.FC = () => {
-

Jira Installation or Cloud Host Name

-

Enter your companies cloud host name

+

Jira Installation or Cloud Host Name

+

Enter your companies cloud host name

{
-

Import to project

-

Select which project you want to import to.

+

Import to project

+

+ Select which project you want to import to. +

{ onChange={onChange} label={ - {value && value !== "" - ? projects.find((p) => p.id === value)?.name - : "Select Project"} + {value && value !== "" ? ( + projects.find((p) => p.id === value)?.name + ) : ( + Select a project + )} } > @@ -151,7 +151,7 @@ export const JiraGetImportDetail: React.FC = () => { )) ) : ( -
+

You don{"'"}t have any project. Please create a project first.

)} @@ -162,7 +162,7 @@ export const JiraGetImportDetail: React.FC = () => { const event = new KeyboardEvent("keydown", { key: "p" }); document.dispatchEvent(event); }} - className="flex cursor-pointer select-none items-center space-x-2 truncate rounded px-1 py-1.5 text-gray-500" + className="flex cursor-pointer select-none items-center space-x-2 truncate rounded px-1 py-1.5 text-brand-secondary" > Create new project diff --git a/apps/app/components/integration/jira/import-users.tsx b/apps/app/components/integration/jira/import-users.tsx index fa48bc772..da14f7d15 100644 --- a/apps/app/components/integration/jira/import-users.tsx +++ b/apps/app/components/integration/jira/import-users.tsx @@ -52,11 +52,13 @@ export const JiraImportUsers: FC = () => { })) ?? []; return ( -
+
-

Users

-

Update, invite or choose not to invite assignee

+

Users

+

+ Update, invite or choose not to invite assignee +

{ {watch("data.invite_users") && (
-
Name
-
Import as
+
Name
+
Import as
diff --git a/apps/app/components/integration/jira/jira-project-detail.tsx b/apps/app/components/integration/jira/jira-project-detail.tsx index 48220a8c1..2e4061638 100644 --- a/apps/app/components/integration/jira/jira-project-detail.tsx +++ b/apps/app/components/integration/jira/jira-project-detail.tsx @@ -102,12 +102,12 @@ export const JiraProjectDetail: React.FC = (props) => { if (error) { return (
-

+

Something went wrong. Please{" "} {" "} @@ -121,37 +121,37 @@ export const JiraProjectDetail: React.FC = (props) => {

-

Import Data

-

Import Completed. We have found:

+

Import Data

+

Import Completed. We have found:

-

{projectInfo?.issues}

-

Issues

+

{projectInfo?.issues}

+

Issues

-

{projectInfo?.states}

-

States

+

{projectInfo?.states}

+

States

-

{projectInfo?.modules}

-

Modules

+

{projectInfo?.modules}

+

Modules

-

{projectInfo?.labels}

-

Labels

+

{projectInfo?.labels}

+

Labels

-

{projectInfo?.users?.length}

-

Users

+

{projectInfo?.users?.length}

+

Users

-

Import Epics

-

Import epics as modules

+

Import Epics

+

Import epics as modules

{ return (
-
+
@@ -114,7 +114,7 @@ export const JiraImporterRoot = () => {
-
+
jira logo @@ -131,14 +131,14 @@ export const JiraImporterRoot = () => { index > activeIntegrationState() + 1 || Boolean(index === activeIntegrationState() + 1 && disableTopBarAfter) } - className={`flex h-10 w-10 flex-shrink-0 items-center justify-center rounded-full border ${ + className={`flex h-10 w-10 flex-shrink-0 items-center justify-center rounded-full border border-brand-base ${ index <= activeIntegrationState() - ? `border-[#3F76FF] bg-[#3F76FF] text-white ${ + ? `border-brand-accent bg-brand-accent ${ index === activeIntegrationState() ? "border-opacity-100 bg-opacity-100" : "border-opacity-80 bg-opacity-80" }` - : "border-gray-300" + : "border-brand-base" }`} > {
{" "} @@ -177,7 +179,7 @@ export const JiraImporterRoot = () => { {currentStep?.state === "import-confirmation" && }
-
+
{currentStep?.state !== "import-configure" && ( { diff --git a/apps/app/components/integration/single-import.tsx b/apps/app/components/integration/single-import.tsx index bef5b7301..f513c391f 100644 --- a/apps/app/components/integration/single-import.tsx +++ b/apps/app/components/integration/single-import.tsx @@ -18,28 +18,28 @@ const importersList: { [key: string]: string } = { }; export const SingleImport: React.FC = ({ service, refreshing, handleDelete }) => ( -
+
-

+

Import from {importersList[service.service]} to{" "} {service.project_detail.name} {refreshing ? "Refreshing..." : service.status}

-
+
{renderShortDateWithYearFormat(service.created_at)}| Imported by{" "}