Merge branch 'meshery:master' into master

meshery · Jun 21, 2024 · b2fabaf · b2fabaf
2 parents c827505 + 5a7d722
commit b2fabaf
Show file tree

Hide file tree

Showing 10 changed files with 57 additions and 30 deletions.
diff --git a/.github/workflows/model-generator.yml b/.github/workflows/model-generator.yml
@@ -95,7 +95,9 @@ jobs:
             "Model Generator" <no-reply@meshery.io>
           to: developers@meshery.io
           body: |
-               Meshery's <a href="https://docs.meshery.io/concepts/logical/registry">Model Generator</a> <a href="https://github.com/meshery/meshery/actions/workflows/model-generator.yml">workflow</a> encountered one or more errors. Refer to the attached error log for details or review the [results of the failed workflow](https://github.com/meshery/meshery/actions/runs/${{ github.run_id }}).
+               The Model Generator workflow (https://github.com/meshery/meshery/actions/workflows/model-generator.yml) encountered one or more errors. Refer to the attached error log for details or review the results of the failed workflow - https://github.com/meshery/meshery/actions/runs/${{ github.run_id }}.
+
+               Learn more about the Meshery Registry - https://docs.meshery.io/concepts/logical/registry.
           attachments: .meshery/logs/registry/Errors
   update-components:
     if: github.repository == 'meshery/meshery'

diff --git a/docs/_includes/suggested-reading.html b/docs/_includes/suggested-reading.html
@@ -1,12 +1,12 @@
-<!-- {% if include.section-title != "false" %}
+{% if include.section-title != "false" %}
 {% if page.layout == "integration" %}
   <h2>Related Models in <b>{{ page['integrations-category'] }}</b></h2>
 {% else %}
 {% assign h2_text = include.h2_text | default: "Suggested Reading" %}
 <h2>{{ h2_text }}</h2>
 {% endif %}
 
-{% endif %} -->
+{% endif %}
 
 {% assign sorted_reading = include.reading | default: site.pages | sort: include.title %}
 

diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html
@@ -62,7 +62,7 @@ <h5>
             {% endfor %}
           </div>
           {% endif %}  
-          {% if page.suggested-reading != false and page.title and page.type and page.category and page.url %}
+          {% if page.suggested-reading != false and page.title and page.type and page.category and page.url and page.layout != "integration" %}
             {% include_cached suggested-reading.html  title=page.title type=page.type category=page.category url=page.url language="en" %} 
           {% endif %} 
           {% include_cached feedback.html %}

diff --git a/docs/_sass/elements.scss b/docs/_sass/elements.scss
@@ -5,14 +5,13 @@ a > * {
   color: var(--brand-color);
   text-decoration: none;
   background-color: transparent;
-
 }
 img {
   max-width: 100%;
   border-style: none;
 }
 img.center {
-  display:block;
+  display: block;
   margin-left: auto;
   margin-right: auto;
 }
@@ -64,7 +63,7 @@ h5,
 .h5 {
   font-size: 1.4rem;
   font-weight: 400;
-} 
+}
 h6 {
   font-size: 1.2rem;
   font-weight: 300;
@@ -82,7 +81,7 @@ pre {
 }
 
 label {
-  font-size: .9rem;
+  font-size: 0.9rem;
 }
 
 // LIST (UL,OL) ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -94,8 +93,9 @@ ol {
   font-size: 1rem;
   padding-inline-start: 2rem;
 
-  @media (max-width: 37.5em) {
-    font-size: 1.8rem;
+  @media (max-width: 320px) {
+    font-size: 0.8rem;
+    padding-inline-start: 0.5rem;
   }
 
   & li {
@@ -106,26 +106,26 @@ ul {
   font-size: 1rem;
   list-style: disc;
   > li {
-    color: var(--color-secondary-medium)
+    color: var(--color-secondary-medium);
   }
 }
 ol {
   list-style-type: decimal;
 }
 
-li:has(> a[href*="/installation/quick-start"]){
+li:has(> a[href*="/installation/quick-start"]) {
   list-style-type: none;
   margin-left: -2rem;
-} 
-li:has(> a[href*="/guides/tutorials"]){
+}
+li:has(> a[href*="/guides/tutorials"]) {
   list-style-type: none;
   margin-left: -2rem;
-} 
+}
 
-li:has(> a[href*="/extensions"]){
+li:has(> a[href*="/extensions"]) {
   list-style-type: none;
   margin-left: -2rem;
-} 
+}
 
 dt {
   font-weight: bold;

diff --git a/docs/_sass/mesheryctl.scss b/docs/_sass/mesheryctl.scss
@@ -24,7 +24,7 @@ div.prereqs {
     margin-top: 0;
   }
   color: #ddd;
-  margin: 20px;
+  margin: 0.5rem;
   padding: 15px;
   border-radius: 0.3rem;
 }

diff --git a/docs/_sass/overview.scss b/docs/_sass/overview.scss
@@ -10,7 +10,7 @@ div.overview {
   background: linear-gradient(337deg, $charcoal_rgba 0%, rgba(0, 179, 159, 0.861782212885154) 87%);
   color: #fff;
   font-size: 1.4rem;
-  padding: .65rem auto;
+  padding: 0.65rem auto;
   margin: 0.5rem;
   margin-right: 1rem;
   width: auto;
@@ -95,9 +95,15 @@ a > strong:hover {
   }
 }
 
+@media (max-width: 320px) {
+  div.overview {
+    min-width: 190px;
+  }
+}
 
 /*image align-right*/
 .image-right {
   float: right;
   padding-right: 10px;
 }
+
diff --git a/docs/_sass/td-content.scss b/docs/_sass/td-content.scss
@@ -15,6 +15,25 @@
     margin: 1.2rem 0 1.6rem;
     font-weight: 400;
   }
+
+  @media (max-width: 320px) {
+    & > h1 {
+      font-size: 1.5rem;
+    }
+
+    & > h2 {
+      font-size: 1.3rem;
+      margin: 1rem 0 1.2rem;
+    }
+
+    & > h3 {
+      font-size: 1.1rem;
+      margin: 0.8rem 0 1rem;
+    }
+    & > h4 {
+      font-size: 1rem;
+    }
+  }
 }
 
 ///////////////// Code Terminal /////////////////////////////
@@ -77,8 +96,8 @@
   left: 1.5rem;
   margin-bottom: -2rem;
   display: inline-block;
-  width: .85rem;
-  height: .85rem;
+  width: 0.85rem;
+  height: 0.85rem;
   border-radius: 50%;
   /* A little hack to display the window buttons in one pseudo element. */
   background: #d9515d;
@@ -89,10 +108,10 @@
 .clipboardjs::after {
   /* position: absolute; */
   color: var(--color-grey-medium);
-  margin-top: .75rem;
+  margin-top: 0.75rem;
   /* left: 0%; */
   width: 100%;
-  font-size: .9rem;
+  font-size: 0.9rem;
   text-align: center;
 }
 

diff --git a/ui/components/MesheryPlayComponent.js b/ui/components/MesheryPlayComponent.js
@@ -243,7 +243,7 @@ class MesheryPlayComponent extends React.Component {
                   select
                   id="adapter_id"
                   name="adapter_name"
-                  label="Select Service Mesh Type"
+                  label="Select Meshery Adapter"
                   data-cy="lifecycle-service-mesh-type"
                   fullWidth
                   value={adapter && adapter.adapter_location ? adapter.adapter_location : ''}

diff --git a/ui/cypress/e2e/e2e/service_mesh_lifecycle_settings_spec.js b/ui/cypress/e2e/e2e/service_mesh_lifecycle_settings_spec.js
@@ -37,7 +37,7 @@ describe('Lifecycle Service Mesh', () => {
       // Lifecycle > Service Mesh Page
       cy.visit('/management/service-mesh');
       selectServiceMeshType(ADAPTER_LOCATION);
-      // "Select Service Mesh Type" Dropdown
+      // "Select Meshery Adapter" Dropdown
       cy.get('[data-cy="lifecycle-service-mesh-type"]').should('contain.text', ADAPTER_LOCATION);
     });
 

diff --git a/ui/tests/e2e/service_mesh_lifecycle.spec.js b/ui/tests/e2e/service_mesh_lifecycle.spec.js
@@ -7,7 +7,7 @@ test.describe('Service Mesh Lifecycle Tests', () => {
     { adapterName: 'Consul', adapterPort: '10002', deploy: false },
   ];
 
-  mesheryAdapters.forEach(({ adapterName, adapterPort, deploy }) => {
+  mesheryAdapters.forEach(({ adapterName, adapterPort }) => {
     const ADAPTER_LOCATION = `localhost:${adapterPort}`;
     test(`Configure Existing ${adapterName} adapter through Mesh Adapter URL from Management page`, async ({
       page,
@@ -36,10 +36,10 @@ test.describe('Service Mesh Lifecycle Tests', () => {
       // Visit Lifecycle > Service Mesh Page
       await page.goto(`${ENV.MESHERY_SERVER_URL}/management/service-mesh`);
 
-      // Open "Select Service Mesh Type" Dropdown
+      // Open "Select Meshery Adapter" Dropdown
       const dropdown = page
         .locator('label')
-        .filter({ hasText: /Select Service Mesh Type/ })
+        .filter({ hasText: /Select Meshery Adapter/ })
         .locator('..');
       await dropdown.click();
 
@@ -54,10 +54,10 @@ test.describe('Service Mesh Lifecycle Tests', () => {
       // Visit Lifecycle > Service Mesh Page
       await page.goto(`${ENV.MESHERY_SERVER_URL}/management/service-mesh`);
 
-      // Open "Select Service Mesh Type" Dropdown
+      // Open "Select Meshery Adapter" Dropdown
       const dropdown = page
         .locator('label')
-        .filter({ hasText: /Select Service Mesh Type/ })
+        .filter({ hasText: /Select Meshery Adapter/ })
         .locator('..');
       await dropdown.click();