CruGlobal · caleballdrin · Jun 20, 2024 · Jun 13, 2024 · Jun 13, 2024 · Jun 13, 2024
diff --git a/pages/accountLists/[accountListId]/tools/tntConnect.page.tsx b/pages/accountLists/[accountListId]/tools/tntConnect.page.tsx
@@ -0,0 +1,33 @@
+import Head from 'next/head';
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+import { loadSession } from 'pages/api/utils/pagePropsHelpers';
+import Loading from 'src/components/Loading';
+import TntConnect from 'src/components/Tool/TntConnect/TntConnect';
+import { useAccountListId } from 'src/hooks/useAccountListId';
+import useGetAppSettings from 'src/hooks/useGetAppSettings';
+
+const TntConnectPage: React.FC = () => {
+  const { t } = useTranslation();
+  const accountListId = useAccountListId();
+  const { appName } = useGetAppSettings();
+
+  return (
+    <>
+      <Head>
+        <title>
+          {appName} | {t('Import Tnt')}
+        </title>
+      </Head>
+      {accountListId ? (
+        <TntConnect accountListId={accountListId} />
+      ) : (
+        <Loading loading />
+      )}
+    </>
+  );
+};
+
+export const getServerSideProps = loadSession;
+
+export default TntConnectPage;
diff --git a/pages/api/upload-person-avatar.page.ts → .../api/uploads/upload-person-avatar.page.ts b/pages/api/upload-person-avatar.page.ts → .../api/uploads/upload-person-avatar.page.ts
diff --git a/pages/api/uploads/upload-tnt-connect-import.page.ts b/pages/api/uploads/upload-tnt-connect-import.page.ts
@@ -0,0 +1,89 @@
+import { readFile } from 'fs/promises';
+import { NextApiRequest, NextApiResponse } from 'next';
+import formidable, { IncomingForm } from 'formidable';
+import { getToken } from 'next-auth/jwt';
+import fetch, { File, FormData } from 'node-fetch';
+
+export const config = {
+  api: {
+    bodyParser: false,
+  },
+};
+
+const parseBody = async (
+  req: NextApiRequest,
+): Promise<{ fields: formidable.Fields; files: formidable.Files }> => {
+  return new Promise((resolve, reject) => {
+    const form = new IncomingForm();
+    form.parse(req, (err, fields, files) => {
+      if (err) {
+        reject(err);
+      } else {
+        resolve({ fields, files });
+      }
+    });
+  });
+};
+
+const uploadTntConnect = async (
+  req: NextApiRequest,
+  res: NextApiResponse,
+): Promise<void> => {
+  try {
+    if (req.method !== 'POST') {
+      res.status(405).send('Method Not Found');
+      return;
+    }
+
+    const jwt = await getToken({
+      req,
+      secret: process.env.JWT_SECRET,
+    });
+    const apiToken = jwt?.apiToken;
+    if (!apiToken) {
+      res.status(401).send('Unauthorized');
+      return;
+    }
+
+    const {
+      fields: { override, selectedTags, accountListId },
+      files: { file },
+    } = await parseBody(req);
+    if (typeof override !== 'string') {
+      res.status(400).send('Missing override');
+      return;
+    }
+    if (!file || Array.isArray(file)) {
+      res.status(400).send('Missing file');
+      return;
+    }
+
+    const fileUpload = new File(
+      [await readFile(file.filepath)],
+      file.originalFilename ?? 'tntConnectUpload',
+    );
+    const form = new FormData();
+    form.append('data[type]', 'imports');
+    form.append('data[attributes][override]', override);
+    form.append(
+      'data[attributes][tag_list]',
+      Array.isArray(selectedTags) ? selectedTags.join(',') : selectedTags,
+    );
+    form.append('data[attributes][file]', fileUpload);
+    const fetchRes = await fetch(
+      `${process.env.REST_API_URL}account_lists/${accountListId}/imports/tnt`,
+      {
+        method: 'POST',
+        headers: {
+          authorization: `Bearer ${apiToken}`,
+        },
+        body: form,
+      },
+    );
+    res.status(fetchRes.status).json({ success: fetchRes.status === 201 });
+  } catch (err) {
+    res.status(500).json({ success: false, error: err });
+  }
+};
+
+export default uploadTntConnect;
diff --git a/pages/api/uploads/upload-tnt-connect-import.test.ts b/pages/api/uploads/upload-tnt-connect-import.test.ts
@@ -0,0 +1,48 @@
+import { getToken } from 'next-auth/jwt';
+import { createMocks } from 'node-mocks-http';
+import uploadTntConnect from './upload-tnt-connect-import.page';
+import 'node-fetch';
+
+jest.mock('node-fetch', () => jest.fn());
+
+jest.mock('next-auth/jwt', () => ({ getToken: jest.fn() }));
+jest.mock('src/lib/apollo/ssrClient', () => jest.fn());
+
+const accountListId = 'accountListId';
+const file = new File(['contents1'], 'tnt1.xml', {
+  type: 'text/xml',
+});
+const override = 'false';
+const tag_list = 'tag1';
+
+describe('upload-tnt-connect-import', () => {
+  it('responds with error if unauthorized', async () => {
+    const { req, res } = createMocks({
+      method: 'POST',
+      body: {
+        override: override,
+        file,
+        tag_list,
+        accountListId,
+      },
+    });
+
+    await uploadTntConnect(req, res);
+
+    expect(res._getStatusCode()).toBe(401);
+  });
+
+  it('responds with error if not sent with POST', async () => {
+    (getToken as jest.Mock).mockReturnValue({
+      apiToken: 'accessToken',
+      userID: 'sessionUserID',
+    });
+    const { req, res } = createMocks({
+      method: 'GET',
+    });
+
+    await uploadTntConnect(req, res);
+
+    expect(res._getStatusCode()).toBe(405);
+  });
+});
diff --git a/...onents/Contacts/ContactDetails/ContactDetailsTab/People/Items/PersonModal/uploadAvatar.ts b/...onents/Contacts/ContactDetails/ContactDetailsTab/People/Items/PersonModal/uploadAvatar.ts
@@ -52,7 +52,7 @@ export const uploadAvatar = async ({
   form.append('personId', personId);
   form.append('avatar', file);
 
-  const res = await fetch(`/api/upload-person-avatar`, {
+  const res = await fetch(`/api/uploads/upload-person-avatar`, {
     method: 'POST',
     body: form,
   }).catch(() => {

diff --git a/src/components/Contacts/ContactDetails/ContactDetailsTab/Tags/ContactTags.tsx b/src/components/Contacts/ContactDetails/ContactDetailsTab/Tags/ContactTags.tsx
@@ -146,11 +146,9 @@ export const ContactTags: React.FC<ContactTagsProps> = ({
               <Autocomplete
                 multiple
                 freeSolo
-                autoSelect
                 autoHighlight
                 fullWidth
                 loading={loading}
-                popupIcon={<ContactTagIcon />}
                 filterSelectedOptions
                 value={tagList}
                 options={unusedTags || []}

diff --git a/src/components/Loading/Loading.tsx b/src/components/Loading/Loading.tsx
@@ -11,7 +11,7 @@ const useStyles = makeStyles()((theme: Theme) => ({
     left: '50%',
     marginLeft: '-28px',
     marginTop: '-28px',
-    zIndex: 10,
+    zIndex: 1000,
     opacity: 0,
     transition: theme.transitions.create(['opacity', 'visibility'], {
       duration: theme.transitions.duration.short,

diff --git a/src/components/Tags/Tags.tsx b/src/components/Tags/Tags.tsx
@@ -15,18 +15,7 @@ export const ContactTagInput = styled(TextField)(({ theme }) => ({
     borderBottom: `2px solid ${theme.palette.divider}`,
   },
   '&& .MuiInputBase-input': {
-    minWidth: '200px',
-  },
-  '& ::placeholder': {
-    color: theme.palette.info.main,
-    opacity: 1,
-  },
-  '& :hover::placeholder': {
-    textDecoration: 'underline',
-  },
-  '& :focus::placeholder': {
-    textDecoration: 'none',
-    color: theme.palette.cruGrayMedium.main,
+    minWidth: '150px',
   },
   margin: theme.spacing(1),
   marginLeft: '0',