bug fixes in composer

Author: danieltigse

electron_app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "criptext",
-  "version": "0.27.5",
+  "version": "0.28.0",
   "author": {
     "name": "Criptext Inc",
     "email": "[email protected]",

electron_app/src/__integrations__/Contact.integration.js

@@ -105,7 +105,7 @@ describe('Update data contact from Contact Table:', () => {
 
 describe('Load data contact from Contact Table:', () => {
   it('should load all contacts', async () => {
-    const contacts = await DBManager.getAllContacts({ accountId });
+    const contacts = await DBManager.getAllContacts();
     expect(contacts).toMatchSnapshot();
   });
 

electron_app/src/database/DBEmanager.js

@@ -242,17 +242,10 @@ const createContactsIfOrNotStore = async ({ accountId, contacts }, trx) => {
   return emailAddresses;
 };
 
-const getAllContacts = ({ accountId }) => {
+const getAllContacts = () => {
   return Contact()
     .findAll({
       attributes: ['name', 'email'],
-      include: [
-        {
-          model: AccountContact(),
-          attributes: [],
-          where: { accountId }
-        }
-      ],
       order: [['score', 'DESC'], ['name']]
     })
     .map(account => account.toJSON());

electron_app/src/ipc/database.js

@@ -98,12 +98,7 @@ ipc.answerRenderer('db-get-account-by-params', params =>
   dbManager.getAccountByParams(params)
 );
 
-ipc.answerRenderer('db-get-all-contacts', params => {
-  const data = params.accountId
-    ? params
-    : { ...params, accountId: myAccount.id };
-  return dbManager.getAllContacts(data);
-});
+ipc.answerRenderer('db-get-all-contacts', () => dbManager.getAllContacts());
 
 ipc.answerRenderer('db-get-all-feed-items', params => {
   const data = params.accountId

email_composer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "email_composer",
-  "version": "0.27.5",
+  "version": "0.28.0",
   "private": true,
   "dependencies": {
     "@criptext/electron-better-ipc": "^0.7.0-rc1-0.2",

email_composer/src/components/AutocompleteWrapper.js

@@ -21,7 +21,7 @@ const AutocompleteWrapper = ({ addTag, ...props }) => {
   const loadSuggestions = async () => {
     if (!people && !isConsulting) {
       isConsulting = true;
-      people = await getAllContacts({});
+      people = await getAllContacts();
       isConsulting = !people;
     }
   };
@@ -58,7 +58,7 @@ const AutocompleteWrapper = ({ addTag, ...props }) => {
   const inputValue = (props.value && props.value.trim().toLowerCase()) || '';
   const inputLength = inputValue.length;
   const getSuggestions = () => {
-    if (inputLength === 0) return [];
+    if (inputLength < 2) return [];
     if (
       lastTextValue.length > inputLength ||
       inputLength === 0 ||
@@ -76,7 +76,7 @@ const AutocompleteWrapper = ({ addTag, ...props }) => {
         : false;
       return emailHasMatches || nameHasMatches;
     });
-    return filtered;
+    return filtered.slice(0, 50);
   };
   state.filteredSuggestions = getSuggestions();
   const getSuggestionValue = suggestion => suggestion.email;

email_composer/src/utils/RegexUtils.js

@@ -1,5 +1,10 @@
 /* eslint no-useless-escape: 0 */
 export const emailRegex = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
 export const HTMLTagsRegex = /<[^>]*>?/g;
-export const contactsRegex = string =>
-  new RegExp(`(^${string}| ${string})`, 'i');
+export const contactsRegex = string => {
+  const escaped = escapeRegEx(string);
+  return new RegExp(`(^${escaped}| ${escaped})`, 'i');
+};
+const escapeRegEx = s => {
+  return s.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
+};

email_composer/src/utils/ipc.js

@@ -94,8 +94,8 @@ export const deleteSessionRecord = async params => {
   return await ipc.callMain('db-delete-session-record', params);
 };
 
-export const getAllContacts = async params => {
-  return await ipc.callMain('db-get-all-contacts', params);
+export const getAllContacts = async () => {
+  return await ipc.callMain('db-get-all-contacts');
 };
 
 export const getContactsByEmailId = async emailId => {

email_loading/package.json

@@ -1,6 +1,6 @@
 {
   "name": "email_loading",
-  "version": "0.27.5",
+  "version": "0.28.0",
   "private": true,
   "dependencies": {
     "@criptext/electron-better-ipc": "^0.7.0-rc1-0.2",

email_login/package.json

@@ -1,6 +1,6 @@
 {
   "name": "email_login",
-  "version": "0.27.5",
+  "version": "0.28.0",
   "private": true,
   "dependencies": {
     "@criptext/electron-better-ipc": "^0.7.0-rc1-0.2",