From 8d889df4f1ce55b455784128073fac14dacac544 Mon Sep 17 00:00:00 2001
From: valvals <148640806+valvals@users.noreply.github.com>
Date: Mon, 22 Jul 2024 15:28:05 +0300
Subject: [PATCH] 114 plotly version constant (#115)

---
 common_utils/common_constants.cpp |  8 ++++----
 davis_one/davis.cpp               | 12 +++++++-----
 davis_one/davis.h                 |  8 ++++++++
 plotly_maker/html_parts.cpp       |  2 +-
 plotly_maker/html_parts.h         |  8 ++++++++
 plotly_maker/plotly_maker.cpp     |  4 +++-
 6 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/common_utils/common_constants.cpp b/common_utils/common_constants.cpp
index ec081fa..7c1fe21 100644
--- a/common_utils/common_constants.cpp
+++ b/common_utils/common_constants.cpp
@@ -1,12 +1,12 @@
 #include "common_constants.h"
-
+#include "string"
 namespace dvs {
 //#START_GRAB_TO_DVS_NAMESPACE
 const char kAppName[] = "davis";
 const char kOutFolderName[] = "davis_htmls/";
-const char kPlotlyJsWorkPath[] = "./davis_htmls/plotly-2.27.0.min.js";
-const char kPlotlyJsName[] = "plotly-2.27.0.min.js";
-const char kPlotlyJsResourcePath[] = "plotly_maker/plotly-2.27.0.min.js";
+const char kPlotlyJsWorkPath[] = "./davis_htmls/plotly-2.32.0.min.js";
+const char kPlotlyJsName[] = "plotly-2.32.0.min.js";
+const char kPlotlyJsResourcePath[] = "plotly_maker/plotly-2.32.0.min.js";
 const char kWarningPagePath[] = "./davis_htmls/warning_js_absent.html";
 //#STOP_GRAB_TO_DVS_NAMESPACE
 }
diff --git a/davis_one/davis.cpp b/davis_one/davis.cpp
index 07eeeb9..3a68628 100644
--- a/davis_one/davis.cpp
+++ b/davis_one/davis.cpp
@@ -18,9 +18,9 @@
 namespace dvs {
 const char kAppName[] = "davis";
 const char kOutFolderName[] = "davis_htmls/";
-const char kPlotlyJsWorkPath[] = "./davis_htmls/plotly-2.27.0.min.js";
-const char kPlotlyJsName[] = "plotly-2.27.0.min.js";
-const char kPlotlyJsResourcePath[] = "plotly_maker/plotly-2.27.0.min.js";
+const char kPlotlyJsWorkPath[] = "./davis_htmls/plotly-2.32.0.min.js";
+const char kPlotlyJsName[] = "plotly-2.32.0.min.js";
+const char kPlotlyJsResourcePath[] = "plotly_maker/plotly-2.32.0.min.js";
 const char kWarningPagePath[] = "./davis_htmls/warning_js_absent.html";
 
 } // namespace dvs end
@@ -270,7 +270,7 @@ viewBox="0 0 11237.16 8236.39"
 </svg>
 </div>
 <div class ="dont_worry">
-<p class="worry_text">If you see this page it means that plotly-2.27.0.min.js
+<p class="worry_text">If you see this page it means that %2
 <br>file is absent...</br>
 </p>
 <div class="worry_text">But don't worry!</div>
@@ -776,7 +776,9 @@ void showWarningJsAbsentPage() {
 #elif __linux__
   davis_dir = "/davis_htmls";
 #endif
-  vector<string>args = {getCurrentPath() + davis_dir};
+  vector<string>args{ARGS_WARNING_PAGE_SIZE,""};
+  args[ARG_WORKING_FOLDER] = getCurrentPath() + davis_dir;
+  args[ARG_JS_VERSION] = kPlotlyJsName;
   make_string(kWarningJSLibAbsentPage, args, out);
   saveStringToFile(kWarningPagePath, out);
   openFileBySystem(kWarningPagePath);
diff --git a/davis_one/davis.h b/davis_one/davis.h
index 4320ba5..91781cd 100644
--- a/davis_one/davis.h
+++ b/davis_one/davis.h
@@ -118,6 +118,14 @@ enum ARGS_INDEX {
   // ADD NEW ENUM BEFORE THIS COMMENT
   ARGS_SIZE
 };
+
+enum ARGS_WARNING_PAGE_INDEX {
+  ARG_WORKING_FOLDER,
+  ARG_JS_VERSION,
+  // ADD NEW ENUM BEFORE THIS COMMENT
+  ARGS_WARNING_PAGE_SIZE
+};
+
 extern const char kHtmlModel[];
 extern const char kColorMapDefaultPart[];
 extern const char kColorMapSunnyPart[];
diff --git a/plotly_maker/html_parts.cpp b/plotly_maker/html_parts.cpp
index 9455c95..b55d244 100644
--- a/plotly_maker/html_parts.cpp
+++ b/plotly_maker/html_parts.cpp
@@ -246,7 +246,7 @@ viewBox="0 0 11237.16 8236.39"
 </svg>
 </div>
 <div class ="dont_worry">
-<p class="worry_text">If you see this page it means that plotly-2.27.0.min.js
+<p class="worry_text">If you see this page it means that %2
 <br>file is absent...</br>
 </p>
 <div class="worry_text">But don't worry!</div>
diff --git a/plotly_maker/html_parts.h b/plotly_maker/html_parts.h
index c2d5c84..03581ee 100644
--- a/plotly_maker/html_parts.h
+++ b/plotly_maker/html_parts.h
@@ -14,6 +14,14 @@ enum ARGS_INDEX {
   // ADD NEW ENUM BEFORE THIS COMMENT
   ARGS_SIZE
 };
+
+enum ARGS_WARNING_PAGE_INDEX {
+  ARG_WORKING_FOLDER,
+  ARG_JS_VERSION,
+  // ADD NEW ENUM BEFORE THIS COMMENT
+  ARGS_WARNING_PAGE_SIZE
+};
+
 extern const char kHtmlModel[];
 extern const char kColorMapDefaultPart[];
 extern const char kColorMapSunnyPart[];
diff --git a/plotly_maker/plotly_maker.cpp b/plotly_maker/plotly_maker.cpp
index 4bb74a4..f233925 100644
--- a/plotly_maker/plotly_maker.cpp
+++ b/plotly_maker/plotly_maker.cpp
@@ -263,7 +263,9 @@ void showWarningJsAbsentPage() {
 #elif __linux__
   davis_dir = "/davis_htmls";
 #endif
-  vector<string>args = {getCurrentPath() + davis_dir};
+  vector<string>args{ARGS_WARNING_PAGE_SIZE,""};
+  args[ARG_WORKING_FOLDER] = getCurrentPath() + davis_dir;
+  args[ARG_JS_VERSION] = kPlotlyJsName;
   make_string(kWarningJSLibAbsentPage, args, out);
   saveStringToFile(kWarningPagePath, out);
   openFileBySystem(kWarningPagePath);