Skip to content

Commit

Permalink
Merge pull request #401 from OpenCatalogi/feature/OP-132/review
Browse files Browse the repository at this point in the history
feature/OP-132/review
  • Loading branch information
remko48 authored Nov 21, 2023
2 parents c2a4a2c + 51bdf26 commit 6ec4d33
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 11 deletions.
8 changes: 0 additions & 8 deletions pwa/src/apiService/resources/search.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@ export default class Search {
endpoint += `&embedded.url.embedded.organisation.github=${process.env.GATSBY_GITHUB_ORGANIZATION_URL}`;
}

if (filters.isForked === true) {
endpoint += `&isBasedOn=IS NULL`;
}

const { data } = await Send(this._instance, "GET", endpoint);

return data;
Expand All @@ -35,10 +31,6 @@ export default class Search {
endpoint += `&embedded.url.embedded.organisation.github=${process.env.GATSBY_GITHUB_ORGANIZATION_URL}`;
}

if (filters.isForked === true) {
endpoint += `&isBasedOn=IS NULL`;
}

const { data } = await Send(this._instance, "GET", endpoint);

return data.total;
Expand Down
2 changes: 1 addition & 1 deletion pwa/src/services/filtersToQueryParams.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export const filtersToQueryParams = (filters: any): string => {
value === "hideObsolete" ? (params += `&developmentStatus[ne]=obsolete`) : (params += `&${key}=${value}`);
break;
case "isForked":
params += "";
params += "&isBasedOn=IS NULL";
break;
case "componentsCurrentPage":
params += "";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import * as React from "react";
import * as styles from "./CategoryDetailTemplate.module.css";
import clsx from "clsx";
import Skeleton from "react-loading-skeleton";
import { BadgeCounter, Heading, Icon, DataBadge, Link } from "@utrecht/component-library-react/dist/css-module";
import { Container, DisplaySwitch } from "@conduction/components";
Expand Down Expand Up @@ -97,7 +96,8 @@ export const CategoryDetailTemplate: React.FC<CategoryDetailTemplateProps> = ({
{resultDisplayLayout.catagoryDisplayLayout && (
<div className={styles.solutions}>
<div className={styles.solutionsHeader}>
<span className={clsx(0 >= 100 && styles.maxNumber)}>
<span>
{/* When actual data is used we this span must have a classname called maxNumber if the amount of solutions is equal or greater then 100 */}
<div className={styles.categoryTitle}>
<Heading level={3} className={styles.title}>
{t("Solutions")}
Expand Down

0 comments on commit 6ec4d33

Please sign in to comment.