3.1.1

Jenkinsfile

@@ -10,10 +10,28 @@ pipeline {
             steps {
                 sh 'node -v'
                 sh 'npm -v'
+                script {
+                    String tag = sh(returnStdout: true, script: 'git tag --contains').trim()
+                    String branchName = sh(returnStdout: true, script: 'git rev-parse --abbrev-ref HEAD').trim()
+                    String commit = sh(returnStdout: true, script: 'git log -1 --oneline').trim()
+                    String commitMsg = commit.substring(commit.indexOf(' ')).trim()
+
+                    if (tag) {
+                        currentBuild.displayName = "#${BUILD_NUMBER}, tag ${tag}"
+                    } else {
+                        currentBuild.displayName = "#${BUILD_NUMBER}, branch ${branchName}"
+                    }
+
+                    String author = sh(returnStdout: true, script: "git log -1 --pretty=format:'%an'").trim()
+                    currentBuild.description = "${author}<br />${commitMsg}"
+                    echo 'starting installing'
                     sh 'npm ci'
                 }
             }
+        }
 
+        stage('checks') {
+            parallel {
                 stage('eslint') {
                     steps {
                         sh 'npm run eslint'
@@ -25,6 +43,8 @@ pipeline {
                         sh 'npm run build'
                     }
                 }
+            }
+        }
 
         stage('clean-all') {
             steps {

index.d.ts

@@ -2,3 +2,5 @@ declare module '*.svg' {
     const src: string;
     export default src;
 }
+
+declare const __webpack_public_path__: string;

package-lock.json

@@ -1,12 +1,12 @@
 {
     "name": "journal.pl",
-    "version": "2.4.5",
+    "version": "3.1.1",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "journal.pl",
-            "version": "2.4.5",
+            "version": "3.1.1",
             "license": "MIT",
             "dependencies": {
                 "@brojs/cli": "^0.0.4-alpha.9",

package.json

@@ -1,6 +1,6 @@
 {
     "name": "journal.pl",
-    "version": "2.4.5",
+    "version": "3.1.1",
     "description": "bro-js platform journal ui repo",
     "main": "./src/index.tsx",
     "scripts": {

src/app.tsx

@@ -10,8 +10,7 @@ import { Dashboard } from './dashboard';
 
 dayjs.locale('ru', ruLocale);
 
-const App = ({ store }) => {
+const App = ({ store }) => (
-    return(
     <ChakraProvider>
         <BrowserRouter>
             <Helmet>
@@ -81,7 +80,6 @@ const App = ({ store }) => {
         </BrowserRouter>
     </ChakraProvider>
 )
-}
 
 export default App;
 

src/index.tsx

@@ -2,6 +2,7 @@ import React from 'react';
 import ReactDOM from 'react-dom/client';
   
 import App from './app';
+import './ym';
 import { keycloak } from "./__data__/kc";
 import { createStore } from "./__data__/store";
 
@@ -12,7 +13,7 @@ let rootElement: ReactDOM.Root
 export const mount = async (Сomponent, element = document.getElementById('app')) => {
   let user = null;
   try {
-    await keycloak.init({ onLoad: "login-required" }); // 'login-required' });
+    await keycloak.init({ onLoad: "login-required" });
     user = { ...(await keycloak.loadUserInfo()), ...keycloak.tokenParsed };
   } catch (error) {
     console.error("Failed to initialize adapter:", error);

src/ym.ts

@@ -0,0 +1,15 @@
+(function (m, e, t, r, i, k, a) {
+    m[i] = m[i] || function () { (m[i].a = m[i].a || []).push(arguments) };
+    // @ts-ignore
+    m[i].l = 1 * new Date();
+    for (var j = 0; j < document.scripts.length; j++) { if (document.scripts[j].src === r) { return; } }
+    k = e.createElement(t), a = e.getElementsByTagName(t)[0], k.async = 1, k.src = r, a.parentNode.insertBefore(k, a)
+})(window, document, "script", "https://mc.yandex.ru/metrika/tag.js", "ym");
+
+// @ts-ignore
+ym(98045358, "init", {
+    clickmap: true,
+    trackLinks: true,
+    accurateTrackBounce: true,
+    webvisor: true
+});