added legend to charts

OpenCatalogi · Apr 24, 2024 · 668b02e · 668b02e
1 parent e29e311
commit 668b02e
Show file tree

Hide file tree

Showing 4 changed files with 297 additions and 122 deletions.
diff --git a/pwa/src/data/filters/softwareType.ts b/pwa/src/data/filters/softwareType.ts
@@ -1,4 +1,5 @@
 export const softwareTypes = [
+  { label: "Standalone", value: "standalone" },
   { label: "Standalone Mobile", value: "standalone/mobile" },
   { label: "Standalone IoT", value: "standalone/iot" },
   { label: "Standalone Desktop", value: "standalone/desktop" },

diff --git a/pwa/src/services/filtersToQueryParams.ts b/pwa/src/services/filtersToQueryParams.ts
@@ -17,6 +17,9 @@ export const filtersToQueryParams = (filters: any): string => {
         case "developmentStatus":
           value === "hideObsolete" ? (params += `&developmentStatus[ne]=obsolete`) : (params += `&${key}=${value}`);
           break;
+        case "softwareType":
+          value === "standalone" ? (params += `&softwareType[regex]=${value}`) : (params += `&${key}=${value}`);
+          break;
         case "componentsCurrentPage":
           params += "";
           break;
@@ -27,7 +30,12 @@ export const filtersToQueryParams = (filters: any): string => {
           break;
         case "ratingCommonground":
           window.sessionStorage.getItem("FILTER_RATING") === "Commonground"
-            ? (params += `&embedded.nl.embedded.commonground.rating[>%3D]=${filters.ratingCommonground}`)
+            ? value.includes("exact")
+              ? (params += `&embedded.nl.embedded.commonground.rating[int_compare]=${filters.ratingCommonground.replace(
+                  "exact",
+                  "",
+                )}`)
+              : (params += `&embedded.nl.embedded.commonground.rating[>%3D]=${filters.ratingCommonground}`)
             : (params += "");
           break;
         case "isForked":

diff --git a/pwa/src/templates/charts/CommongroundChartsTemplate.module.css b/pwa/src/templates/charts/CommongroundChartsTemplate.module.css
@@ -6,8 +6,30 @@
   display: grid;
   grid-template-columns: 1fr 1fr 1fr;
   row-gap: var(--web-app-size-xl);
+  column-gap: var(--web-app-size-md);
 }
 
 .chart {
   text-align: center;
 }
+
+.chartLegendContainer {
+  display: flex;
+  gap: var(--web-app-size-md);
+  align-items: center;
+}
+
+.legendTitle {
+  display: block;
+  width: 100px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  user-select: none;
+}
+
+.legend {
+  display: flex;
+  gap: 5px;
+  text-align: left;
+}