Merge branch 'master' into fix-team-manager-permissions

Author: Mahesh-Nandigam

.github/workflows/build-and-preview-docs.yml

@@ -71,6 +71,7 @@ jobs:
       - name: Build PR preview
         if: github.event.action != 'closed'
         env:
+          BASE_URL: /pr-preview/pr-${{ github.event.pull_request.number }}/
           HUGO_PREVIEW: 'true'
         run: |
           npm run build:preview
@@ -145,7 +146,7 @@ jobs:
         with:
           header: pr-preview
           message: |
-            🚀 Preview deployment: https://${{ github.repository_owner }}.github.io/${{ github.event.repository.name }}/pr-preview/pr-${{ github.event.pull_request.number }}/
+            🚀 Preview deployment: https://docs.layer5.io/pr-preview/pr-${{ github.event.pull_request.number }}/
             > *Note: Preview may take a moment (GitHub Pages deployment in progress). Please wait and refresh. Track deployment [here](https://github.com/${{ github.repository }}/actions/workflows/pages/pages-build-deployment)*
 
       - name: Comment on pruned previews

Makefile

@@ -27,6 +27,9 @@ site: check-go
 build:
 	hugo
 
+docs-build-production:
+	npm run build:production
+
 ## Empty build cache and run docs.layer5.io on your local machine.
 clean: 
 	hugo --cleanDestinationDir
@@ -45,4 +48,4 @@ docker:
 
 ## Format code using Prettier
 format:
-	npm run format
+	npm run format

assets/js/offline-search.js

@@ -123,9 +123,10 @@
         } else {
           results.forEach((r) => {
             const doc = resultDetails.get(r.ref);
-            const href =
-              $searchInput.data('offline-search-base-href') +
-              r.ref.replace(/^\//, '');
+            const href = resolveSearchResultHref(
+              $targetSearchInput.data('offline-search-base-href'),
+              r.ref
+            );
 
             const $entry = $('<div>').addClass('mt-4');
 
@@ -165,6 +166,33 @@
         popover.show();
       };
 
+      const resolveSearchResultHref = (baseHref, ref) => {
+        if (!ref || typeof ref !== 'string') return ref;
+        if (/^(?:[a-z]+:)?\/\//i.test(ref)) return ref;
+        if (/^(?:data:|mailto:|tel:|#)/i.test(ref)) return ref;
+
+        const basePath = new URL(baseHref || '/', window.location.origin)
+          .pathname
+          .replace(/\/+$/, '/');
+
+        if (ref.startsWith('/')) {
+          const baseWithoutTrailingSlash = basePath.replace(/\/$/, '');
+
+          if (
+            basePath === '/' ||
+            ref === baseWithoutTrailingSlash ||
+            ref.startsWith(basePath)
+          ) {
+            return ref;
+          }
+
+          return `${basePath}${ref.replace(/^\//, '')}`;
+        }
+
+        const resolvedUrl = new URL(ref, new URL(basePath, window.location.origin));
+        return `${resolvedUrl.pathname}${resolvedUrl.search}${resolvedUrl.hash}`;
+      };
+
       //Bring focus to search bar
       $(document).on('keydown', function (event) {
         if (event.key === '/' && !(document.activeElement instanceof HTMLInputElement)) {

assets/scss/_content_project.scss

@@ -214,6 +214,11 @@ h6 {
   border-color: rgba(0, 179, 159, 0.33);
 }
 
+.td-initial + h2 {
+  margin-top: 3rem;
+  margin-bottom: 1rem;
+}
+
 .td-initial thead {
   display: table-header-group;
   vertical-align: bottom;
@@ -270,3 +275,43 @@ th {
   overflow-x: auto;
   max-width: 100%;
 }
+
+.td-content .permissions-tabpane {
+  max-width: 100%;
+  width: 100%;
+  overflow: visible;
+  margin-top: 1rem;
+
+  .nav-tabs,
+  .tab-content,
+  .tab-pane,
+  .csvtable-div,
+  table.csvtable {
+    width: 100%;
+    max-width: 100%;
+  }
+
+  table.csvtable {
+    th:nth-child(n+3),
+    td:nth-child(n+3) {
+      text-align: center;
+    }
+  }
+
+  .csvtable-div {
+    table.csvtable {
+      table-layout: fixed;
+
+      th:first-child,
+      td:first-child {
+        width: 25%;
+      }
+
+      th:nth-child(2),
+      td:nth-child(2) {
+        width: 75%;
+        max-width: none;
+      }
+    }
+  }
+}

assets/scss/_fonts_project.scss

@@ -1,147 +1,147 @@
 @font-face {
     font-family: "Qanelas Soft Black";
-    src: url('/fonts/qanelas-soft/QanelasSoftBlack.otf') format('opentype');
+    src: url("../fonts/qanelas-soft/QanelasSoftBlack.otf") format('opentype');
     font-weight: normal;
     font-display: swap;
 }
 
 @font-face {
     font-family: "Qanelas Soft Black Italic";
-    src: url('/fonts/qanelas-soft/QanelasSoftBlackItalic.otf') format('opentype');
+    src: url("../fonts/qanelas-soft/QanelasSoftBlackItalic.otf") format('opentype');
     font-style: italic;
     font-display: swap;
 }
 
 @font-face {
     font-family: "Qanelas Soft Heavy";
-    src: url('/fonts/qanelas-soft/QanelasSoftHeavy.otf') format('opentype');
+    src: url("../fonts/qanelas-soft/QanelasSoftHeavy.otf") format('opentype');
     font-weight: 900;
     font-display: swap;
 }
 
 @font-face {
     font-family: "Qanelas Soft Heavy Italic";
-    src: url('/fonts/qanelas-soft/QanelasSoftHeavyItalic.otf') format('opentype');
+    src: url("../fonts/qanelas-soft/QanelasSoftHeavyItalic.otf") format('opentype');
     font-weight: 900;
     font-style: italic;
     font-display: swap;
 }
 
 @font-face {
     font-family: "Qanelas Soft ExtraBold";
-    src: url('/fonts/qanelas-soft/QanelasSoftExtraBold.otf') format('opentype');
+    src: url("../fonts/qanelas-soft/QanelasSoftExtraBold.otf") format('opentype');
     font-weight: 800;
     font-display: swap;
 }
 
 @font-face {
     font-family: "Qanelas Soft ExtraBold Italic";
-    src: url('/fonts/qanelas-soft/QanelasSoftExtraBoldItalic.otf') format('opentype');
+    src: url("../fonts/qanelas-soft/QanelasSoftExtraBoldItalic.otf") format('opentype');
     font-weight: 800;
     font-style: italic;
     font-display: swap;
 }
 
 @font-face {
     font-family: "Qanelas Soft Bold";
-    src: url('/fonts/qanelas-soft/QanelasSoftBold.otf') format('opentype');
+    src: url("../fonts/qanelas-soft/QanelasSoftBold.otf") format('opentype');
     font-weight: bold;
     font-display: swap;
 }
 
 @font-face {
     font-family: "Qanelas Soft Bold Italic";
-    src: url('/fonts/qanelas-soft/QanelasSoftBoldItalic.otf') format('opentype');
+    src: url("../fonts/qanelas-soft/QanelasSoftBoldItalic.otf") format('opentype');
     font-weight: bold;
     font-style: italic;
     font-display: swap;
 }
 
 @font-face {
     font-family: "Qanelas Soft";
-    src: url('/fonts/qanelas-soft/QanelasSoftSemiBold.otf') format('opentype');
+    src: url("../fonts/qanelas-soft/QanelasSoftSemiBold.otf") format('opentype');
     font-weight: 600;
     font-display: swap;
 }
 
 @font-face {
     font-family: "Qanelas Soft SemiBold Italic";
-    src: url('/fonts/qanelas-soft/QanelasSoftSemiBoldItalic.otf') format('opentype');
+    src: url("../fonts/qanelas-soft/QanelasSoftSemiBoldItalic.otf") format('opentype');
     font-weight: 600;
     font-style: italic;
     font-display: swap;
 }
 
 @font-face {
     font-family: "Qanelas Soft Medium";
-    src: url('/fonts/qanelas-soft/QanelasSoftMedium.otf') format('opentype');
+    src: url("../fonts/qanelas-soft/QanelasSoftMedium.otf") format('opentype');
     font-weight: 500;
     font-display: swap;
 }
 
 @font-face {
     font-family: "Qanelas Soft Medium Italic";
-    src: url('/fonts/qanelas-soft/QanelasSoftMediumItalic.otf') format('opentype');
+    src: url("../fonts/qanelas-soft/QanelasSoftMediumItalic.otf") format('opentype');
     font-weight: 500;
     font-style: italic;
     font-display: swap;
 }
 
 @font-face {
     font-family: "Qanelas Soft";
-    src: url('/fonts/qanelas-soft/QanelasSoftRegular.otf') format('opentype');
+    src: url("../fonts/qanelas-soft/QanelasSoftRegular.otf") format('opentype');
     font-weight: 400;
     font-display: swap;
 }
 
 @font-face {
     font-family: "Qanelas Soft Regular Italic";
-    src: url('/fonts/qanelas-soft/QanelasSoftRegularItalic.otf') format('opentype');
+    src: url("../fonts/qanelas-soft/QanelasSoftRegularItalic.otf") format('opentype');
     font-weight: 400;
     font-style: italic;
     font-display: swap;
 }
 
 @font-face {
     font-family: "Qanelas Soft Light";
-    src: url('/fonts/qanelas-soft/QanelasSoftLight.otf') format('opentype');
+    src: url("../fonts/qanelas-soft/QanelasSoftLight.otf") format('opentype');
     font-weight: 300;
     font-display: swap;
 }
 
 @font-face {
     font-family: "Qanelas Soft Light Italic";
-    src: url('/fonts/qanelas-soft/QanelasSoftLightItalic.otf') format('opentype');
+    src: url("../fonts/qanelas-soft/QanelasSoftLightItalic.otf") format('opentype');
     font-weight: 300;
     font-style: italic;
     font-display: swap;
 }
 
 @font-face {
     font-family: "Qanelas Soft UltraLight";
-    src: url('/fonts/qanelas-soft/QanelasSoftUltraLight.otf') format('opentype');
+    src: url("../fonts/qanelas-soft/QanelasSoftUltraLight.otf") format('opentype');
     font-weight: 200;
     font-display: swap;
 }
 
 @font-face {
     font-family: "Qanelas Soft UltraLight Italic";
-    src: url('/fonts/qanelas-soft/QanelasSoftUltraLightItalic.otf') format('opentype');
+    src: url("../fonts/qanelas-soft/QanelasSoftUltraLightItalic.otf") format('opentype');
     font-weight: 200;
     font-style: italic;
     font-display: swap;
 }
 
 @font-face {
     font-family: "Qanelas Soft Thin";
-    src: url('/fonts/qanelas-soft/QanelasSoftThin.otf') format('opentype');
+    src: url("../fonts/qanelas-soft/QanelasSoftThin.otf") format('opentype');
     font-weight: 100;
     font-display: swap;
 }
 
 @font-face {
     font-family: "Qanelas Soft Thin Italic";
-    src: url('/fonts/qanelas-soft/QanelasSoftThinItalic.otf') format('opentype');
+    src: url("../fonts/qanelas-soft/QanelasSoftThinItalic.otf") format('opentype');
     font-weight: 100;
     font-style: italic;
     font-display: swap;

assets/scss/_landing_project.scss

@@ -81,10 +81,10 @@
 } 
 .playground-section {
   &.playground-logo {
-    background-image: url("/images/logos/black-semi-opaque.svg"), url("/images/logos/meshery-light-icon.svg");
+    background-image: url("../images/logos/black-semi-opaque.svg"), url("../images/logos/meshery-light-icon.svg");
   }
   &.video-play-logo {
-    background-image: url("/images/logos/black-semi-opaque.svg"), url("/images/video-play.svg");
+    background-image: url("../images/logos/black-semi-opaque.svg"), url("../images/video-play.svg");
   }
     &.playground-logo, &.video-play-logo {
     background-repeat: no-repeat;
@@ -102,13 +102,13 @@
 
 .catalog-section {
   &.catalog-logo {
-    background-image: url("/images/logos/black-semi-opaque.svg"), url("/images/logos/catalog.svg");
+    background-image: url("../images/logos/black-semi-opaque.svg"), url("../images/logos/catalog.svg");
   }
   &.academy-logo{
-    background-image: url("/images/logos/black-semi-opaque.svg"), url("/images/logos/academy.svg");
+    background-image: url("../images/logos/black-semi-opaque.svg"), url("../images/logos/academy.svg");
   }
   &.recognition-program-logo{
-    background-image: url("/images/logos/black-semi-opaque.svg"), url("/images/logos/recognition-program.png");
+    background-image: url("../images/logos/black-semi-opaque.svg"), url("../images/logos/recognition-program.png");
   }
   &.catalog-logo, &.academy-logo , &.recognition-program-logo {
     background-repeat: no-repeat;

assets/scss/_styles_project.scss

@@ -264,7 +264,7 @@ a:not([href]):not([class]):hover {
 // Left sidebar
 .td-sidebar-nav {
   max-height: none;
-  overflow: hidden;
+  overflow: visible;
   padding: 0px;
 
   &__section-title {

build/meshery-cloud.version

@@ -1 +1 @@
-v1.0.121
+v1.0.132

build/meshery-extensions.version

@@ -1 +1 @@
-v1.0.38-2
+v1.0.43-1