From 801d2a8cee517c2225dbff05d34f55bd836ebb8a Mon Sep 17 00:00:00 2001
From: Maya Kirova <MKirova@infragistics.com>
Date: Fri, 10 Nov 2023 12:00:07 +0200
Subject: [PATCH] Additional fixes around versioning.

---
 src/assets/js/src/versioning/tag-versions.req.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/assets/js/src/versioning/tag-versions.req.js b/src/assets/js/src/versioning/tag-versions.req.js
index e52d1b9..82482f9 100644
--- a/src/assets/js/src/versioning/tag-versions.req.js
+++ b/src/assets/js/src/versioning/tag-versions.req.js
@@ -1,6 +1,6 @@
 (function () {
     const versionsJson = $('body').data('api-versions-json');
-    const defaultUrl = $('body').data('default-url');
+    const defaultUrl = $('body').attr('default-url');
     $.ajax({
         url: versionsJson,
         type: "get",
@@ -14,18 +14,19 @@
 
         folders = folders.reverse();
         folders.forEach(function (f) {
-            const versionUrl = defaultUrl.replace("typescript/latest'", f + "/typescript")
+            const versionUrl = defaultUrl.replace("typescript/latest", f + "/typescript");
             select.append($('<option>', {
                 value: versionUrl,
                 text: f
             }));
         });
 
-        const version = folders.filter(function(v){ return window.location.href.indexOf(v) >= 0;})[0];
+        const version = folders.filter(function(v){ return window.location.href.indexOf(v) >= 0;})[0] || folders[0];
+        const currentVersionUrl = defaultUrl.replace("typescript/latest", version + "/typescript");
         if (version) {
-            select.val(versionUrl);
+            select.val(currentVersionUrl);
         } else {
-            select.val(versionUrl);
+            select.val(currentVersionUrl);
         }
     });