From 97b6055cfff7640085cfd6be027f31e1f5c6eca2 Mon Sep 17 00:00:00 2001
From: RekHoto <rek.hoto@gmail.com>
Date: Mon, 30 Oct 2023 19:01:53 +0400
Subject: [PATCH 1/3] env variables, removed cancel button while importing

---
 .env                                             |  7 +++++++
 src/modules/ImportMode/PointsFileUploadModal.jsx | 10 ++++++++++
 src/stores/auth.js                               | 11 ++++++++---
 src/stores/signin.js                             | 11 ++++++++---
 4 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/.env b/.env
index cf067ee..4857e2b 100644
--- a/.env
+++ b/.env
@@ -1 +1,8 @@
 VITE_API_URL=https://postnet.dev.selftech.ru
+VITE_MODE=development
+VITE_KEYCLOAK_CLIENT_ID=postnet
+VITE_KEYCLOAK_CLIENT_SECRET=K2yHweEUispkVeWn03VMk843sW2Moic5
+VITE_KEYCLOAK_URL=https://kk.dev.selftech.ru/
+VITE_KEYCLOAK_CLIENT_ID_DEV=postnet
+VITE_KEYCLOAK_CLIENT_SECRET_DEV=K2yHweEUispkVeWn03VMk843sW2Moic5
+VITE_KEYCLOAK_URL_DEV=https://kk.dev.selftech.ru/
diff --git a/src/modules/ImportMode/PointsFileUploadModal.jsx b/src/modules/ImportMode/PointsFileUploadModal.jsx
index 81a5bf2..b01bc72 100644
--- a/src/modules/ImportMode/PointsFileUploadModal.jsx
+++ b/src/modules/ImportMode/PointsFileUploadModal.jsx
@@ -68,6 +68,16 @@ export const PointsFileUploadModal = ({onClose, isOpened}) => {
         Просмотреть отчет
       </Button>
     ]
+    if (isImporting) return [
+      <Button
+        key="ok-button"
+        type="primary"
+        onClick={() => onImportPoints()}
+        disabled={!fileId || isImporting}
+      >
+        Импортировать
+      </Button>,
+    ]
     return [
       <Button
         key="close-button"
diff --git a/src/stores/auth.js b/src/stores/auth.js
index f868b29..e9a4d05 100644
--- a/src/stores/auth.js
+++ b/src/stores/auth.js
@@ -11,14 +11,19 @@ export const setAuth = action(isAuthorized$, "setAuth", (store, newValue) => {
 });
 
 export const refreshToken = () => {
+  const isDev = import.meta.env.VITE_MODE === "development";
+  const url = isDev ? import.meta.env.VITE_KEYCLOAK_URL_DEV : import.meta.env.VITE_KEYCLOAK_URL;
+  const clientId = isDev ? import.meta.env.VITE_KEYCLOAK_CLIENT_ID_DEV : import.meta.env.VITE_KEYCLOAK_CLIENT_ID;
+  const clientSecret = isDev ? import.meta.env.VITE_KEYCLOAK_CLIENT_SECRET_DEV : import.meta.env.VITE_KEYCLOAK_CLIENT_SECRET;
+
   return api.request({
     url: "/realms/SST/protocol/openid-connect/token",
-    baseURL: "https://kk.dev.selftech.ru/",
+    baseURL: url,
     method: "POST",
     data: {
       grant_type: "refresh_token",
-      client_id: "postnet",
-      client_secret: "K2yHweEUispkVeWn03VMk843sW2Moic5",
+      client_id: clientId,
+      client_secret: clientSecret,
       token_type: "bearer",
       refresh_token: localStorage.getItem("refresh_token")
     },
diff --git a/src/stores/signin.js b/src/stores/signin.js
index 3427e7f..d5ecfdf 100644
--- a/src/stores/signin.js
+++ b/src/stores/signin.js
@@ -31,15 +31,20 @@ export async function signin(values) {
   signinLoading$.set(true);
   signinError$.set("");
 
+  const isDev = import.meta.env.VITE_MODE === "development";
+  const url = isDev ? import.meta.env.VITE_KEYCLOAK_URL_DEV : import.meta.env.VITE_KEYCLOAK_URL;
+  const clientId = isDev ? import.meta.env.VITE_KEYCLOAK_CLIENT_ID_DEV : import.meta.env.VITE_KEYCLOAK_CLIENT_ID;
+  const clientSecret = isDev ? import.meta.env.VITE_KEYCLOAK_CLIENT_SECRET_DEV : import.meta.env.VITE_KEYCLOAK_CLIENT_SECRET;
+
   const auth = () => {
     return api.request({
       url: "/realms/SST/protocol/openid-connect/token",
-      baseURL: "https://kk.dev.selftech.ru/",
+      baseURL: url,
       method: "POST",
       data: {
         "grant_type": "password",
-        client_id: "postnet",
-        client_secret: "K2yHweEUispkVeWn03VMk843sW2Moic5",
+        client_id: clientId,
+        client_secret: clientSecret,
         username: values.login,
         password: values.password,
       },

From 3b655e8f041d048442a9832badadfbbba93af478 Mon Sep 17 00:00:00 2001
From: RekHoto <rek.hoto@gmail.com>
Date: Tue, 31 Oct 2023 13:33:48 +0400
Subject: [PATCH 2/3] env variables

---
 .env                 | 4 ----
 src/stores/auth.js   | 7 +++----
 src/stores/signin.js | 7 +++----
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/.env b/.env
index 4857e2b..91539c8 100644
--- a/.env
+++ b/.env
@@ -1,8 +1,4 @@
 VITE_API_URL=https://postnet.dev.selftech.ru
-VITE_MODE=development
 VITE_KEYCLOAK_CLIENT_ID=postnet
 VITE_KEYCLOAK_CLIENT_SECRET=K2yHweEUispkVeWn03VMk843sW2Moic5
 VITE_KEYCLOAK_URL=https://kk.dev.selftech.ru/
-VITE_KEYCLOAK_CLIENT_ID_DEV=postnet
-VITE_KEYCLOAK_CLIENT_SECRET_DEV=K2yHweEUispkVeWn03VMk843sW2Moic5
-VITE_KEYCLOAK_URL_DEV=https://kk.dev.selftech.ru/
diff --git a/src/stores/auth.js b/src/stores/auth.js
index e9a4d05..3c72f69 100644
--- a/src/stores/auth.js
+++ b/src/stores/auth.js
@@ -11,10 +11,9 @@ export const setAuth = action(isAuthorized$, "setAuth", (store, newValue) => {
 });
 
 export const refreshToken = () => {
-  const isDev = import.meta.env.VITE_MODE === "development";
-  const url = isDev ? import.meta.env.VITE_KEYCLOAK_URL_DEV : import.meta.env.VITE_KEYCLOAK_URL;
-  const clientId = isDev ? import.meta.env.VITE_KEYCLOAK_CLIENT_ID_DEV : import.meta.env.VITE_KEYCLOAK_CLIENT_ID;
-  const clientSecret = isDev ? import.meta.env.VITE_KEYCLOAK_CLIENT_SECRET_DEV : import.meta.env.VITE_KEYCLOAK_CLIENT_SECRET;
+  const url = import.meta.env.VITE_KEYCLOAK_URL;
+  const clientId = import.meta.env.VITE_KEYCLOAK_CLIENT_ID;
+  const clientSecret = import.meta.env.VITE_KEYCLOAK_CLIENT_SECRET;
 
   return api.request({
     url: "/realms/SST/protocol/openid-connect/token",
diff --git a/src/stores/signin.js b/src/stores/signin.js
index d5ecfdf..663c7e0 100644
--- a/src/stores/signin.js
+++ b/src/stores/signin.js
@@ -31,10 +31,9 @@ export async function signin(values) {
   signinLoading$.set(true);
   signinError$.set("");
 
-  const isDev = import.meta.env.VITE_MODE === "development";
-  const url = isDev ? import.meta.env.VITE_KEYCLOAK_URL_DEV : import.meta.env.VITE_KEYCLOAK_URL;
-  const clientId = isDev ? import.meta.env.VITE_KEYCLOAK_CLIENT_ID_DEV : import.meta.env.VITE_KEYCLOAK_CLIENT_ID;
-  const clientSecret = isDev ? import.meta.env.VITE_KEYCLOAK_CLIENT_SECRET_DEV : import.meta.env.VITE_KEYCLOAK_CLIENT_SECRET;
+  const url = import.meta.env.VITE_KEYCLOAK_URL;
+  const clientId = import.meta.env.VITE_KEYCLOAK_CLIENT_ID;
+  const clientSecret = import.meta.env.VITE_KEYCLOAK_CLIENT_SECRET;
 
   const auth = () => {
     return api.request({

From 420929ab915c0da2158c25ab634467790e1c5566 Mon Sep 17 00:00:00 2001
From: RekHoto <rek.hoto@gmail.com>
Date: Tue, 31 Oct 2023 13:59:48 +0400
Subject: [PATCH 3/3] env variables

---
 src/stores/auth.js   | 6 +++---
 src/stores/signin.js | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/stores/auth.js b/src/stores/auth.js
index 3c72f69..ac52517 100644
--- a/src/stores/auth.js
+++ b/src/stores/auth.js
@@ -11,9 +11,9 @@ export const setAuth = action(isAuthorized$, "setAuth", (store, newValue) => {
 });
 
 export const refreshToken = () => {
-  const url = import.meta.env.VITE_KEYCLOAK_URL;
-  const clientId = import.meta.env.VITE_KEYCLOAK_CLIENT_ID;
-  const clientSecret = import.meta.env.VITE_KEYCLOAK_CLIENT_SECRET;
+  const url = import.meta.env.VITE_KEYCLOAK_URL || 'https://kk.dev.selftech.ru/';
+  const clientId = import.meta.env.VITE_KEYCLOAK_CLIENT_ID || 'postnet';
+  const clientSecret = import.meta.env.VITE_KEYCLOAK_CLIENT_SECRET || 'K2yHweEUispkVeWn03VMk843sW2Moic5';
 
   return api.request({
     url: "/realms/SST/protocol/openid-connect/token",
diff --git a/src/stores/signin.js b/src/stores/signin.js
index 663c7e0..51f0d82 100644
--- a/src/stores/signin.js
+++ b/src/stores/signin.js
@@ -31,9 +31,9 @@ export async function signin(values) {
   signinLoading$.set(true);
   signinError$.set("");
 
-  const url = import.meta.env.VITE_KEYCLOAK_URL;
-  const clientId = import.meta.env.VITE_KEYCLOAK_CLIENT_ID;
-  const clientSecret = import.meta.env.VITE_KEYCLOAK_CLIENT_SECRET;
+  const url = import.meta.env.VITE_KEYCLOAK_URL || 'https://kk.dev.selftech.ru/';
+  const clientId = import.meta.env.VITE_KEYCLOAK_CLIENT_ID || 'postnet';
+  const clientSecret = import.meta.env.VITE_KEYCLOAK_CLIENT_SECRET || 'K2yHweEUispkVeWn03VMk843sW2Moic5';
 
   const auth = () => {
     return api.request({