Merge pull request #3805 from OpenLiberty/staging

Update Prod
OpenLiberty · Jul 16, 2024 · b5caf31 · b5caf31
2 parents ffb8c3f + 272d94c
commit b5caf31
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 34 deletions.
diff --git a/Dockerfile b/Dockerfile
diff --git a/scripts/build/clone_guides.rb b/scripts/build/clone_guides.rb
@@ -58,16 +58,14 @@ def directory_exists?(repo_name)
     # Clone static & interactive guides that are ready to be published to openliberty.io
     if repo_name.start_with?('iguide') || repo_name.start_with?('guide')
         # Clone the guides, using the dev branch for travis and prod for all other environments.
-        `git clone https://github.com/OpenLiberty/#{repo_name}.git -b #{guide_branch} src/main/content/guides/#{repo_name}`
-
+        system("git","clone","https://github.com/OpenLiberty/#{repo_name}.git","-b","#{guide_branch}","src/main/content/guides/#{repo_name}")
         # # Clone the fallback branch if the guide_branch does not exist for this guide repo.
         if !(directory_exists?(repo_name))
-            `git clone https://github.com/OpenLiberty/#{repo_name}.git -b #{fallback_guide_branch} src/main/content/guides/#{repo_name}`
+            system("git","clone","https://github.com/OpenLiberty/#{repo_name}.git","-b","#{fallback_guide_branch}","src/main/content/guides/#{repo_name}")
         end
-
         # Clone the default branch if the fallback_guide_branch does not exist for this guide repo.
         if !(directory_exists?(repo_name))
-            `git clone https://github.com/OpenLiberty/#{repo_name}.git src/main/content/guides/#{repo_name}`
+            system("git","clone","https://github.com/OpenLiberty/#{repo_name}.git","src/main/content/guides/#{repo_name}")
         end
     end
     if ENV['DRAFT_SITE'] || ENV['GUIDES_DRAFT_SITE']

diff --git a/scripts/build/parse_features_toc.py b/scripts/build/parse_features_toc.py
@@ -297,22 +297,25 @@ def sort_versions_for(feature, high_to_low=True):
     print("Modifying the docs TOCs of version " + version + " to remove the duplicate feature versions.")
     feature_version_path = featurePath + version
     for root, dirs, files in os.walk(feature_version_path):
-        for basename in files:
-            if fnmatch.fnmatch(basename, "*.html"):
-                if(basename != "index.html"):
-                    href = path.join(root, basename)
-                    page = BeautifulSoup(open(href), "lxml")
-
-                    # Find the toc and replace it with the modified toc
-                    page_toc = page.find_all('ul', {'class': 'nav-list'})[0]
-                    if page_toc.find('span', text='Features') is not None:
-                        toc_to_replace = page_toc.find('span', text='Features').parent
-                    elif page_toc.find('a', text='Features') is not None:
-                        toc_to_replace = page_toc.find('a', text='Features').parent
-                    toc_to_replace.clear()
-                    toc_to_replace.append(featureTOC)
-                    with open(href, "w") as file:
-                        file.write(str(page))
+        if "../" not in root:
+            for basename in files:
+                if fnmatch.fnmatch(basename, "*.html"):
+                    if(basename != "index.html"):
+                        href = path.join(root, basename)
+                        page = BeautifulSoup(open(href), "lxml")
+
+                        # Find the toc and replace it with the modified toc
+                        page_toc = page.find_all('ul', {'class': 'nav-list'})[0]
+                        if page_toc.find('span', text='Features') is not None:
+                            toc_to_replace = page_toc.find('span', text='Features').parent
+                        elif page_toc.find('a', text='Features') is not None:
+                            toc_to_replace = page_toc.find('a', text='Features').parent
+                        toc_to_replace.clear()
+                        toc_to_replace.append(featureTOC)
+                        with open(href, "w") as file:
+                            file.write(str(page))
+        else:
+            print("Invalid path for root")
 
 timerEnd = time.time()
 print('Total execution time for parsing ToC Features: ', timerEnd - timerStart)
diff --git a/src/main/content/_assets/js/antora-redirect.js b/src/main/content/_assets/js/antora-redirect.js
@@ -19,7 +19,7 @@ $(document).ready(function () {
     if (hash.indexOf("#") === 0) {
       hash = hash.substring(1); // Remove hash
     }
-    window.location.replace(window.location.origin + "/docs/latest/" + hash);
+    window.location.href= window.location.origin + "/docs/latest/" + hash;
   } else if (
     path.indexOf("/docs/ref/feature/") > -1 ||
     path.indexOf("/docs/ref/config/") > -1 ||
@@ -48,13 +48,12 @@ $(document).ready(function () {
           break;
       }
     }
-    window.location.replace(
+    window.location.href =
       window.location.origin +
         "/docs/latest/reference/" +
         resource_type +
         "/" +
         page +
-        hash
-    );
+        hash;
   }
 });
diff --git a/src/main/content/_assets/js/guides.js b/src/main/content/_assets/js/guides.js
@@ -702,11 +702,11 @@ $(document).ready(function () {
       var total = $(this).find(".guide_column").length;
       // update num_guides
       if (showTotal) {
-        $("#" + $(this).attr("id").replace("_category", "_num_guides")).html(
+        $("#" + $(this).attr("id").replace("_category", "_num_guides")).text(
           "(" + count + "/" + total + " guides)"
         );
       } else {
-        $("#" + $(this).attr("id").replace("_category", "_num_guides")).html(
+        $("#" + $(this).attr("id").replace("_category", "_num_guides")).text(
           "(" + count + " guides)"
         );
       }