From 73c375b9c800a81e4a1cbe38d81355a5445ee230 Mon Sep 17 00:00:00 2001
From: maria-hambardzumian <maria_hambardzumyan@epam.com>
Date: Fri, 24 Jan 2025 19:51:44 +0400
Subject: [PATCH] EPMRPP-98999 || Updated lib & fixed the order of tabs

---
 app/package-lock.json                         |  8 +--
 app/package.json                              |  2 +-
 .../analyzerContainer/analyzerContainer.jsx   | 60 +++++++++----------
 3 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/app/package-lock.json b/app/package-lock.json
index 03409e99e9..810a3342c4 100644
--- a/app/package-lock.json
+++ b/app/package-lock.json
@@ -12,7 +12,7 @@
         "@formatjs/intl-pluralrules": "1.3.9",
         "@formatjs/intl-relativetimeformat": "4.5.1",
         "@formatjs/intl-utils": "1.6.0",
-        "@reportportal/ui-kit": "^0.0.1-alpha.38",
+        "@reportportal/ui-kit": "^0.0.1-alpha.40",
         "axios": "1.6.4",
         "c3": "0.7.20",
         "chart.js": "2.9.4",
@@ -3677,9 +3677,9 @@
       "integrity": "sha512-/RVXdLvJxLg4QKvMoM5WlwNR9ViO9z8B/qPcc+C0Sa/teJY7QG7kJ441DwzOjMYEY7GmU4dj5EcGHIkKZiQZCA=="
     },
     "node_modules/@reportportal/ui-kit": {
-      "version": "0.0.1-alpha.38",
-      "resolved": "https://registry.npmjs.org/@reportportal/ui-kit/-/ui-kit-0.0.1-alpha.38.tgz",
-      "integrity": "sha512-v3q8v1EkCmF4VY4QEpVesIzzUU6DZ5ZCX7r5G8H921IM0onO2awrdBS8Oqm0Dsc/Ww4eTKs6Wpn1sXJ1GllQ4A==",
+      "version": "0.0.1-alpha.40",
+      "resolved": "https://registry.npmjs.org/@reportportal/ui-kit/-/ui-kit-0.0.1-alpha.40.tgz",
+      "integrity": "sha512-ndgvmw64g9Mruozy2hQb8ds7FnaCf2zqe6kUTg++cJgT6xW2H69r6onLC0PRqr3U1yfj2WWsnB/XV1/YmWwFpg==",
       "dependencies": {
         "@floating-ui/react": "^0.26.16",
         "@floating-ui/react-dom": "^2.0.1",
diff --git a/app/package.json b/app/package.json
index 7a970ef390..19e4275ca0 100644
--- a/app/package.json
+++ b/app/package.json
@@ -25,7 +25,7 @@
     "@formatjs/intl-pluralrules": "1.3.9",
     "@formatjs/intl-relativetimeformat": "4.5.1",
     "@formatjs/intl-utils": "1.6.0",
-    "@reportportal/ui-kit": "^0.0.1-alpha.38",
+    "@reportportal/ui-kit": "^0.0.1-alpha.40",
     "axios": "1.6.4",
     "c3": "0.7.20",
     "chart.js": "2.9.4",
diff --git a/app/src/pages/inside/projectSettingsPageContainer/content/analyzerContainer/analyzerContainer.jsx b/app/src/pages/inside/projectSettingsPageContainer/content/analyzerContainer/analyzerContainer.jsx
index 10dd9f8249..0d59c9de87 100644
--- a/app/src/pages/inside/projectSettingsPageContainer/content/analyzerContainer/analyzerContainer.jsx
+++ b/app/src/pages/inside/projectSettingsPageContainer/content/analyzerContainer/analyzerContainer.jsx
@@ -149,8 +149,26 @@ export const AnalyzerContainer = ({ setHeaderNodes }) => {
     }
   };
 
-  const tabsConfig = useMemo(() => {
-    const config = {
+  const tabsConfig = useMemo(
+    () => ({
+      ...(hasPermission
+        ? {
+            [INDEX_SETTINGS]: {
+              name: formatMessage(messages.indexSettings),
+              link: createTabLink(INDEX_SETTINGS),
+              component: (
+                <IndexSettings
+                  analyzerConfig={analyzerConfig}
+                  indexingRunning={indexingRunning}
+                  isAnalyzerServiceAvailable={isAnalyzerServiceAvailable}
+                  analyzerUnavailableTitle={analyzerUnavailableTitle}
+                  onFormSubmit={updateProjectConfig}
+                  hasPermission={hasPermission}
+                />
+              ),
+            },
+          }
+        : {}),
       [AUTO_ANALYSIS]: {
         name: formatMessage(messages.autoAnalysis),
         link: createTabLink(AUTO_ANALYSIS),
@@ -188,34 +206,16 @@ export const AnalyzerContainer = ({ setHeaderNodes }) => {
           />
         ),
       },
-    };
-
-    if (hasPermission) {
-      config[INDEX_SETTINGS] = {
-        name: formatMessage(messages.indexSettings),
-        link: createTabLink(INDEX_SETTINGS),
-        component: (
-          <IndexSettings
-            analyzerConfig={analyzerConfig}
-            indexingRunning={indexingRunning}
-            isAnalyzerServiceAvailable={isAnalyzerServiceAvailable}
-            analyzerUnavailableTitle={analyzerUnavailableTitle}
-            onFormSubmit={updateProjectConfig}
-            hasPermission={hasPermission}
-          />
-        ),
-      };
-    }
-
-    return config;
-  }, [
-    analyzerConfig,
-    createTabLink,
-    hasPermission,
-    analyzerUnavailableTitle,
-    isAnalyzerServiceAvailable,
-    indexingRunning,
-  ]);
+    }),
+    [
+      analyzerConfig,
+      createTabLink,
+      hasPermission,
+      analyzerUnavailableTitle,
+      isAnalyzerServiceAvailable,
+      indexingRunning,
+    ],
+  );
 
   useEffect(() => {
     setHeaderNodes(