Merge branch 'master' of https://github.com/meshery/meshery

Mohith234 · Sep 15, 2023 · 5b47548 · 5b47548
2 parents 1906ae4 + 9f60249
commit 5b47548
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 7 deletions.
diff --git a/.github/workflows/integrations-updater.yml b/.github/workflows/integrations-updater.yml
@@ -38,7 +38,7 @@ jobs:
           token: ${{ secrets.GH_ACCESS_TOKEN }}
           path: meshery.io
       - name: Run utility
-        run: cd meshery/scripts/component_updater; go build main.go; ./main "https://docs.google.com/spreadsheets/d/e/2PACX-1vSgOXuiqbhUgtC9oNbJlz9PYpOEaFVoGNUFMIk4NZciFfQv1ewZg8ahdrWHKI79GkKK9TbmnZx8CqIe/pub?gid=0&single=true&output=csv" --system docs layer5/src/collections/integrations meshery.io/integrations --published-only
+        run: cd meshery/scripts/component_updater; go build main.go; ./main "https://docs.google.com/spreadsheets/d/e/2PACX-1vSgOXuiqbhUgtC9oNbJlz9PYpOEaFVoGNUFMIk4NZciFfQv1ewZg8ahdrWHKI79GkKK9TbmnZx8CqIe/pub?gid=0&single=true&output=csv" --system docs layer5/src/collections/integrations meshery.io/integrations docs/ --published-only
       - name: Commit changes to Layer5.io repo
         uses: stefanzweifel/git-auto-commit-action@v4
         with:

diff --git a/ui/components/Filters.js b/ui/components/Filters.js
@@ -1212,7 +1212,7 @@ function MesheryFilters({ updateProgress, user, classes, selectedK8sContexts, ca
           handleSubmit={handleImportFilter}
           title="Import Filter"
           submitBtnText="Import"
-          leftHeaderIcon={<Filter fill="#fff" style={{ height : "24px", width : "24px", fonSize : "1.45rem" }} />}
+          leftHeaderIcon={<Filter fill="#fff" style={{ ...iconMedium }} />}
           submitBtnIcon={<PublishIcon/>}
         />
         {/* REMOVE this with its deps <UploadImport open={importModal.open} handleClose={handleUploadImportClose} aria-label="URL upload button" handleUrlUpload={urlUploadHandler} handleUpload={uploadHandler} fetch={() => fetchFilters(page, pageSize, search, sortOrder) } configuration="Filter" /> */}

diff --git a/ui/public/static/img/drawer-icons/filter_svg.js b/ui/public/static/img/drawer-icons/filter_svg.js
@@ -1,5 +1,22 @@
-const Filter = ({ fill, className, ...rest }) => (
-    <svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 612 612"  className={className} {...rest}><g style={{opacity:.8}}><polygon points="454.2 383.2 436.5 462.7 491.6 462.7 471.2 383.2" class="st1"/><path d="M376,0c0,1.1,0,2.2,0,3.3c0,38.8-31.4,70.2-70.2,70.2c-38.8,0-70.2-31.4-70.2-70.2c0-1.1,0-2.2,0-3.3H0v612 h612V0H376z M292.2,546.5L262.4,399h-0.8l-31.9,147.5h-41l-46.5-216.7h40.6l27.7,147.5h0.5l33.3-147.5h37.9l30.1,149.3h0.6 l31.6-149.3h39.8l-51.7,216.7H292.2z M515.5,546.5l-13.8-48.2h-72.8l-10.7,48.2h-40.8l52.5-216.7h63.9l63.5,216.7H515.5z" style={{opacity:.8}} fill={fill}/></g></svg>
-  )
-
-  export default Filter;
+const Filter = ({ fill, height, width, ...rest }) => (
+  <svg
+    xmlns="http://www.w3.org/2000/svg"
+    height={height}
+    width={width}
+    viewBox="0 0 50 50"
+    // className={className}
+    {...rest}>
+    <g>
+      <path d="M30.7 0C30.7 0.1 30.7 0.2 30.7 0.3C30.7 3.4 28.1 6 25 6C21.8 6 19.3 3.5 19.3 0.3C19.3 0.2 19.3 0.1 19.3 0H0V49.6H50V0H30.7ZM23.9 44.3L21.5 32.4H21.4L18.8 44.3H15.5L11.7 26.8H15L17.3 38.7L20 26.7H23L25.5 38.8L28.1 26.7H31.3L27.1 44.2L23.9 44.3ZM42.1 44.3L41 40.4H35L34.1 44.3H30.8L35.1 26.8H40.3L45.5 44.3H42.1Z" fill={fill} />
+      <path d="M35.6992 37.5L37.0992 31H38.4992L40.1992 37.5" fill={fill} />
+    </g>
+    <defs>
+      <clipPath>
+        <rect width={width} height={height} />
+      </clipPath>
+    </defs>
+
+  </svg>
+)
+
+export default Filter;