Merge pull request #5129 from vishalvivekm/screenshots-fix

prevent-overwriting-of-screenshots
layer5io · Nov 21, 2023 · 09888ec · 09888ec
2 parents dbbdf02 + bc8c529
commit 09888ec
Show file tree

Hide file tree

Showing 39 changed files with 17 additions and 2 deletions.
diff --git a/gatsby-node.js b/gatsby-node.js
@@ -429,6 +429,7 @@ exports.createPages = async ({ actions, graphql, reporter }) => {
       component: integrationTemplate,
       context: {
         slug: integration.fields.slug,
+        name: "_images/" + integration.fields.slug.split("/")[2],
       },
     });
   });

diff --git a/...tions-runner-controller-designer-dark.png → ...tions-runner-controller-designer-dark.png b/...tions-runner-controller-designer-dark.png → ...tions-runner-controller-designer-dark.png
diff --git a/...ions-runner-controller-designer-light.png → ...ions-runner-controller-designer-light.png b/...ions-runner-controller-designer-light.png → ...ions-runner-controller-designer-light.png
diff --git a/...ons-runner-controller-visualizer-dark.png → ...ons-runner-controller-visualizer-dark.png b/...ons-runner-controller-visualizer-dark.png → ...ons-runner-controller-visualizer-dark.png
diff --git a/...ns-runner-controller-visualizer-light.png → ...ns-runner-controller-visualizer-light.png b/...ns-runner-controller-visualizer-light.png → ...ns-runner-controller-visualizer-light.png
diff --git a/...shmap-aws-load-balancer-designer-dark.png → ...shmap-aws-load-balancer-designer-dark.png b/...shmap-aws-load-balancer-designer-dark.png → ...shmap-aws-load-balancer-designer-dark.png
diff --git a/...hmap-aws-load-balancer-designer-light.png → ...hmap-aws-load-balancer-designer-light.png b/...hmap-aws-load-balancer-designer-light.png → ...hmap-aws-load-balancer-designer-light.png
diff --git a/...map-aws-load-balancer-visualizer-dark.png → ...map-aws-load-balancer-visualizer-dark.png b/...map-aws-load-balancer-visualizer-dark.png → ...map-aws-load-balancer-visualizer-dark.png
diff --git a/...ap-aws-load-balancer-visualizer-light.png → ...ap-aws-load-balancer-visualizer-light.png b/...ap-aws-load-balancer-visualizer-light.png → ...ap-aws-load-balancer-visualizer-light.png
diff --git a/...ap-aws-node-termination-designer-dark.png → ...ap-aws-node-termination-designer-dark.png b/...ap-aws-node-termination-designer-dark.png → ...ap-aws-node-termination-designer-dark.png
diff --git a/...p-aws-node-termination-designer-light.png → ...p-aws-node-termination-designer-light.png b/...p-aws-node-termination-designer-light.png → ...p-aws-node-termination-designer-light.png
diff --git a/...-aws-node-termination-visualizer-dark.png → ...-aws-node-termination-visualizer-dark.png b/...-aws-node-termination-visualizer-dark.png → ...-aws-node-termination-visualizer-dark.png
diff --git a/...aws-node-termination-visualizer-light.png → ...aws-node-termination-visualizer-light.png b/...aws-node-termination-visualizer-light.png → ...aws-node-termination-visualizer-light.png
diff --git a/...images/aws-target-group-designer-dark.png → ...inding/aws-target-group-designer-dark.png b/...images/aws-target-group-designer-dark.png → ...inding/aws-target-group-designer-dark.png
diff --git a/...mages/aws-target-group-designer-light.png → ...nding/aws-target-group-designer-light.png b/...mages/aws-target-group-designer-light.png → ...nding/aws-target-group-designer-light.png
diff --git a/...ages/aws-target-group-visualizer-dark.png → ...ding/aws-target-group-visualizer-dark.png b/...ages/aws-target-group-visualizer-dark.png → ...ding/aws-target-group-visualizer-dark.png
diff --git a/...ges/aws-target-group-visualizer-light.png → ...ing/aws-target-group-visualizer-light.png b/...ges/aws-target-group-visualizer-light.png → ...ing/aws-target-group-visualizer-light.png
diff --git a/...rations/_images/backstage_desgin_dark.png → ...mages/backstage/backstage_desgin_dark.png b/...rations/_images/backstage_desgin_dark.png → ...mages/backstage/backstage_desgin_dark.png
diff --git a/...integrations/_images/backstage_desing.png → ...ns/_images/backstage/backstage_desing.png b/...integrations/_images/backstage_desing.png → ...ns/_images/backstage/backstage_desing.png
diff --git a/...grations/_images/backstage_visuvalize.png → ...images/backstage/backstage_visuvalize.png b/...grations/_images/backstage_visuvalize.png → ...images/backstage/backstage_visuvalize.png
diff --git a/...ons/_images/backstage_visuvalize_dark.png → ...s/backstage/backstage_visuvalize_dark.png b/...ons/_images/backstage_visuvalize_dark.png → ...s/backstage/backstage_visuvalize_dark.png
diff --git a/..._images/meshmap-designer-camel-k-dark.png → ...camel-k/meshmap-designer-camel-k-dark.png b/..._images/meshmap-designer-camel-k-dark.png → ...camel-k/meshmap-designer-camel-k-dark.png
diff --git a/...ions/_images/meshmap-designer-camel-k.png → ...ages/camel-k/meshmap-designer-camel-k.png b/...ions/_images/meshmap-designer-camel-k.png → ...ages/camel-k/meshmap-designer-camel-k.png
diff --git a/...mages/meshmap-visualizer-camel-k-dark.png → ...mel-k/meshmap-visualizer-camel-k-dark.png b/...mages/meshmap-visualizer-camel-k-dark.png → ...mel-k/meshmap-visualizer-camel-k-dark.png
diff --git a/...ns/_images/meshmap-visualizer-camel-k.png → ...es/camel-k/meshmap-visualizer-camel-k.png b/...ns/_images/meshmap-visualizer-camel-k.png → ...es/camel-k/meshmap-visualizer-camel-k.png
diff --git a/...rations/_images/meshmap-designer-dark.png → ...peline-operator/meshmap-designer-dark.png b/...rations/_images/meshmap-designer-dark.png → ...peline-operator/meshmap-designer-dark.png
diff --git a/...ations/_images/meshmap-designer-light.png → ...eline-operator/meshmap-designer-light.png b/...ations/_images/meshmap-designer-light.png → ...eline-operator/meshmap-designer-light.png
diff --git a/...tions/_images/meshmap-visualizer-dark.png → ...line-operator/meshmap-visualizer-dark.png b/...tions/_images/meshmap-visualizer-dark.png → ...line-operator/meshmap-visualizer-dark.png
diff --git a/...ions/_images/meshmap-visualizer-light.png → ...ine-operator/meshmap-visualizer-light.png b/...ions/_images/meshmap-visualizer-light.png → ...ine-operator/meshmap-visualizer-light.png
diff --git a/...rations/_images/meshmap_dark_designer.png → .../_images/consul/meshmap_dark_designer.png b/...rations/_images/meshmap_dark_designer.png → .../_images/consul/meshmap_dark_designer.png
diff --git a/...tions/_images/meshmap_dark_visualizer.png → ...images/consul/meshmap_dark_visualizer.png b/...tions/_images/meshmap_dark_visualizer.png → ...images/consul/meshmap_dark_visualizer.png
diff --git a/...ations/_images/meshmap_light_designer.png → ..._images/consul/meshmap_light_designer.png b/...ations/_images/meshmap_light_designer.png → ..._images/consul/meshmap_light_designer.png
diff --git a/...ions/_images/meshmap_light_visualizer.png → ...mages/consul/meshmap_light_visualizer.png b/...ions/_images/meshmap_light_visualizer.png → ...mages/consul/meshmap_light_visualizer.png
diff --git a/...s/_images/meshmap-updated-design-dark.png → ...rossplane/meshmap-updated-design-dark.png b/...s/_images/meshmap-updated-design-dark.png → ...rossplane/meshmap-updated-design-dark.png
diff --git a/...ations/_images/meshmap-updated-design.png → ...ges/crossplane/meshmap-updated-design.png b/...ations/_images/meshmap-updated-design.png → ...ges/crossplane/meshmap-updated-design.png
diff --git a/...mages/meshmap-updated-visualizer-dark.png → ...plane/meshmap-updated-visualizer-dark.png b/...mages/meshmap-updated-visualizer-dark.png → ...plane/meshmap-updated-visualizer-dark.png
diff --git a/...ns/_images/meshmap-updated-visualizer.png → ...crossplane/meshmap-updated-visualizer.png b/...ns/_images/meshmap-updated-visualizer.png → ...crossplane/meshmap-updated-visualizer.png
diff --git a/src/sections/Meshery/Meshery-integrations/Individual-Integrations/index.js b/src/sections/Meshery/Meshery-integrations/Individual-Integrations/index.js
@@ -11,6 +11,9 @@ import RelatedIntegration from "../IntegrationsGrid";
 const IndividualIntegrations = ({ data }) => {
   const { frontmatter, body } = data.mdx;
 
+  const screenshotNodes = data.allFile.nodes;
+  const finalScreenshots = screenshotNodes.length === 0 ? frontmatter.workingSlides : screenshotNodes;
+
   return (
     <IntegrationPageWrapper>
       <section className="herosection">
@@ -45,7 +48,7 @@ const IndividualIntegrations = ({ data }) => {
           </section>
         </div>
       </section>
-      <HowIntegrationWorks name={frontmatter.title} howitworks={frontmatter.howItWorks} howitworksdetails={frontmatter.howItWorksDetails} slides={frontmatter.workingSlides} />
+      <HowIntegrationWorks name={frontmatter.title} howitworks={frontmatter.howItWorks} howitworksdetails={frontmatter.howItWorksDetails} slides={finalScreenshots} />
       <section className="integration-collection">
         <h2>Related Integrations</h2>
         <RelatedIntegration  category={frontmatter.category} />

diff --git a/src/templates/integrations.js b/src/templates/integrations.js
@@ -8,7 +8,7 @@ import IndividualIntegrations from "../sections/Meshery/Meshery-integrations/Ind
 
 
 export const query = graphql`
-  query IntegrationsBySlug($slug: String!) {
+  query IntegrationsBySlug($slug: String!, $name: String!) {
     mdx(fields:{slug:{eq: $slug}}) {
       body
       frontmatter {
@@ -35,6 +35,17 @@ export const query = graphql`
         }
       }
     }
+    allFile(
+      filter: {relativeDirectory: {eq: $name}, sourceInstanceName: {eq: "integrations"}}
+    ) {
+      nodes {
+        childImageSharp {
+          gatsbyImageData(layout: FULL_WIDTH)
+        }
+        extension
+        publicURL
+      }
+    }
   }
 `;
 const Integrations = ({ data }) => {