update

public/index.html

@@ -17,7 +17,9 @@
     <link rel="canonical" href="https://assayo.online/demo/">
 
     <script type="text/javascript">
-      var report = [];
+      var r = [];
+      var report = r;
+      var f = String.raw.bind(String);
     </script>
     <link rel="icon" href="%PUBLIC_URL%/favicon.svg" />
     <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />

src/ts/components/DropZone/helpers/index.ts

@@ -8,22 +8,28 @@
 //   onChange('meta', { byTaskId });
 // }
 
+function getGlobalValue() { // @ts-ignore
+  return window.r || window.report;
+}
+
+function setGlobalValue(value?: any) { // @ts-ignore
+  window.r = value || []; // @ts-ignore
+  window.report = window.r;
+}
+
 export function getStringsForParser(text: string) {
-  // @ts-ignore
+  let temp = getGlobalValue();
-  let temp = window.report; // @ts-ignore
+  setGlobalValue([]);
-  window.report = [];
   const firstText = text.slice(0, 12);
   if (firstText === 'report.push(') {
     try {
       eval(text);
     } catch (e) {
-      // error(`Файл отчёта содержит запрещенный символ.\nОткройте его в редакторе и проверьте.\n${e.stack}`)
+      setGlobalValue(temp);
-      // @ts-ignore
-      window.report = temp;
       return;
     }
-  } else { // @ts-ignore
+  } else {
-    window.report = text.split('\n');
+    setGlobalValue(text.split('\n'));
   }
 
   // @ts-ignore

src/ts/helpers/DataGrip/components/author.ts

@@ -3,6 +3,7 @@ import IHashMap from 'ts/interfaces/HashMap';
 
 import { ONE_DAY } from 'ts/helpers/formatter';
 import { increment } from 'ts/helpers/Math';
+import getCompany from '../helpers/getCompany';
 
 import userSettings from 'ts/store/UserSettings';
 
@@ -119,8 +120,6 @@ export default class DataGripByAuthor {
     };
   }
 
-
-
   static getDefaultCommitsByDayAndHour() {
     return (new Array(7)).fill(1).map(() => (new Array(24)).fill(0));
   }
@@ -187,6 +186,7 @@ export default class DataGripByAuthor {
           daysForTask: isStaff ? 0 : workDays / tasks.length,
           taskInDay: isStaff ? 0 : tasks.length / workDays,
           changesForTask: DataGripByAuthor.getMiddleValue(tasksSize),
+          company: getCompany(dot.author, dot.lastCommit.email),
 
           days: workDays,
           money: isStaff ? 0 : moneyWorked,

src/ts/helpers/DataGrip/helpers/getCompany.ts

@@ -0,0 +1,51 @@
+const PUBLIC_SERVICES = [
+  'icloud',
+  'google',
+  'yahoo',
+  'aol',
+  'zoho',
+  'outlook',
+  'gmx',
+  'tutanota',
+  'vk',
+  'ok',
+  'ya',
+  'yandex',
+  'rambler',
+  'github',
+  'gitlab',
+];
+
+const isPublicService = Object.fromEntries(
+  Object.values(PUBLIC_SERVICES).map(key => [key.toUpperCase(), true]),
+);
+
+function getCompanyByName(author?: string): string {
+  const tags = (author || '')
+    .toUpperCase()
+    .match(/(\[[^\]]+])/gim) || [];
+
+  const companies = tags
+    .map(v => v.replace(/([\[\]]+)/gim, '').trim().split(','))
+    .flat(Infinity);
+
+  return companies.length
+    ? companies[0] as string
+    : '';
+}
+
+function getCompanyByEmail(email?: string) {
+  const domain = (email || '').split('@').pop() || '';
+  const company = domain.split('.').shift() || '';
+  return company.toUpperCase();
+}
+
+function getCompany(author?: string, email?: string) {
+  const company = getCompanyByName(author) || getCompanyByEmail(email) || '';
+  const isMailService = company.indexOf('MAIL') !== -1;
+  return isPublicService[company] || isMailService
+    ? ''
+    : company;
+}
+
+export default getCompany;

src/ts/helpers/RPC.ts

@@ -37,9 +37,9 @@ function loadJsLGlobal(url: string, callback: Function) {
       if (text[0] === 'r') {
         eval(text);
         return callback();
-      } else {
+      } else { // @ts-ignore
-        // @ts-ignore
+        window.r = text.split('\n'); // @ts-ignore
-        window.report = text.split('\n');
+        window.report = window.r;
       }
       callback();
     });