Merge pull request #379 from OpenCatalogi/development

Development to main, week 44
OpenCatalogi · Nov 7, 2023 · 2386b9b · 2386b9b
2 parents 67bccf9 + 46a759c
commit 2386b9b
Show file tree

Hide file tree

Showing 45 changed files with 793 additions and 549 deletions.
diff --git a/pwa/package-lock.json b/pwa/package-lock.json
diff --git a/pwa/package.json b/pwa/package.json
@@ -25,8 +25,8 @@
     "prepare": "cd .. && husky install"
   },
   "dependencies": {
-    "@conduction/components": "2.2.20",
-    "@conduction/theme": "1.0.50",
+    "@conduction/components": "2.2.24",
+    "@conduction/theme": "1.0.52",
     "@fortawesome/fontawesome-svg-core": "^6.1.1",
     "@fortawesome/free-brands-svg-icons": "6.4.2",
     "@fortawesome/free-regular-svg-icons": "6.4.2",

diff --git a/pwa/src/apiService/resources/components.ts b/pwa/src/apiService/resources/components.ts
@@ -11,7 +11,7 @@ export default class Component {
   }
 
   public getOne = async (id: string): Promise<any> => {
-    const { data } = await Send(this._instance, "GET", `/components/${id}`);
+    const { data } = await Send(this._instance, "GET", `/components/${id}?extend[]=all`);
 
     return data;
   };

diff --git a/pwa/src/apiService/resources/organization.ts b/pwa/src/apiService/resources/organization.ts
@@ -1,7 +1,6 @@
 import { Send } from "../apiService";
 import { AxiosInstance } from "axios";
 import { IFiltersContext } from "../../context/filters";
-import { filtersToQueryParams } from "../../services/filtersToQueryParams";
 
 export default class Organization {
   private _instance: AxiosInstance;
@@ -34,8 +33,8 @@ export default class Organization {
     return data;
   };
 
-  public getCount = async (filters: IFiltersContext): Promise<any> => {
-    const { data } = await Send(this._instance, "GET", `/organizations?limit=1${filtersToQueryParams(filters)}`);
+  public getCount = async (): Promise<any> => {
+    const { data } = await Send(this._instance, "GET", `/organizations?limit=1`);
 
     return data.total;
   };

diff --git a/pwa/src/components/buttonLink/ButtonLink.tsx b/pwa/src/components/buttonLink/ButtonLink.tsx
diff --git a/pwa/src/components/categoryCard/CategoryCard.tsx b/pwa/src/components/categoryCard/CategoryCard.tsx
@@ -12,11 +12,12 @@ export interface CategoryCardProps {
   description: string | JSX.Element;
   icon: JSX.Element;
   domain?: boolean;
+  titleHrefOnly?: boolean;
 }
 
-export const CategoryCard: React.FC<CategoryCardProps> = ({ title, description, icon, domain }) => {
+export const CategoryCard: React.FC<CategoryCardProps> = ({ title, description, icon, domain, titleHrefOnly }) => {
   return (
-    <CardWrapper className={styles.container} onClick={() => navigate(title.href)}>
+    <CardWrapper className={styles.container} onClick={() => !titleHrefOnly && navigate(title.href)}>
       <CardHeader>
         <CardHeaderTitle>
           <Link className={styles.titleLink} onClick={() => navigate(title.href)}>

diff --git a/pwa/src/components/index.ts b/pwa/src/components/index.ts
@@ -1,6 +1,4 @@
 export * from "./applicationCard/ApplicationCard";
-export * from "./buttonLink/ButtonLink";
 export * from "./categoryCard/CategoryCard";
 export * from "./componentCard/ComponentCard";
 export * from "./organizationCard/OrganizationCard";
-export * from "./resultsDisplaySwitch/ResultsDisplaySwitch";
diff --git a/pwa/src/components/resultsDisplaySwitch/ResultsDisplaySwitch.module.css b/pwa/src/components/resultsDisplaySwitch/ResultsDisplaySwitch.module.css
diff --git a/pwa/src/components/resultsDisplaySwitch/ResultsDisplaySwitch.tsx b/pwa/src/components/resultsDisplaySwitch/ResultsDisplaySwitch.tsx