Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Remove duplication in search result + small UI fixes #516

Merged
merged 3 commits into from
Jan 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion explorer/src/pages/Home/components/Jumbotron/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { veraxLink } from "@/constants";
export const Jumbotron: React.FC = () => {
return (
<div className="w-full flex flex-col gap-6 relative">
<p className="self-stretch text-text-primary text-2xl not-italic font-medium leading-[102%] tracking-[-0.96px] md:text-4xl lg:text-[2.75rem] md:font-semibold dark:text-whiteDefault">
<p className="self-stretch text-text-primary text-[2rem] font-medium leading-[110%] lg:leading-[3rem] md:text-4xl lg:text-[2.75rem] md:font-semibold dark:text-whiteDefault">
{t("home.title")}
</p>
<p className="self-stretch text-text-tertiary text-base not-italic font-normal leading-[140%] max-w-[32.5rem]">
Expand Down
6 changes: 3 additions & 3 deletions explorer/src/pages/Module/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ export const Module = () => {
<a
href={`${links[chain.id].address}/${module.moduleAddress}`}
target="_blank"
className="cursor-pointer hover:underline overflow-hidden text-ellipsis sm:w-fit dark:text-text-secondaryDark flex items-center gap-2"
className="cursor-pointer hover:underline break-all sm:w-fit dark:text-text-secondaryDark flex items-center gap-2"
>
{module.moduleAddress}
<ArrowUpRight height="1rem" width="auto" />
<span className="flex-1">{module.moduleAddress}</span>
<ArrowUpRight height="auto" width="1rem" />
</a>
</div>
</section>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import AttestationDataMapper from "@verax-attestation-registry/verax-sdk/lib/typ
import { ITEMS_PER_PAGE_DEFAULT } from "@/constants";
import { ResultParseSearch } from "@/interfaces/components";
import { isNotNullOrUndefined } from "@/utils";
import { uniqMap } from "@/utils/searchUtils";

export const loadAttestationList = async (
attestation: AttestationDataMapper,
Expand Down Expand Up @@ -32,11 +33,12 @@ export const loadAttestationList = async (
? await attestation.findBy(ITEMS_PER_PAGE_DEFAULT, undefined, { schemaString: parsedString.schemaString })
: [];

const result = [
const results = [
...(listByIds || []),
...(listByAddress?.[0] || []),
...(listByAddress?.[1] || []),
...(listBySchemaString || []),
];
return result;

return uniqMap(results, "id");
};
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import ModuleDataMapper from "@verax-attestation-registry/verax-sdk/lib/types/sr
import { ITEMS_PER_PAGE_DEFAULT } from "@/constants";
import { ResultParseSearch } from "@/interfaces/components";
import { isNotNullOrUndefined } from "@/utils";
import { uniqMap } from "@/utils/searchUtils";

export const loadModuleList = async (module: ModuleDataMapper, parsedString: Partial<ResultParseSearch>) => {
const [listByName, listByDescription] = parsedString.nameOrDescription
Expand All @@ -20,7 +21,7 @@ export const loadModuleList = async (module: ModuleDataMapper, parsedString: Par
parsedString.address ? await Promise.all(parsedString.address.map((id) => module.findOneById(id))) : []
).filter(isNotNullOrUndefined);

const result = [...(listByIds || []), ...(listByName || []), ...(listByDescription || [])];
const results = [...(listByIds || []), ...(listByName || []), ...(listByDescription || [])];

return result;
return uniqMap(results, "id");
};
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import SchemaDataMapper from "@verax-attestation-registry/verax-sdk/lib/types/sr
import { ITEMS_PER_PAGE_DEFAULT } from "@/constants";
import { ResultParseSearch } from "@/interfaces/components";
import { isNotNullOrUndefined } from "@/utils";
import { uniqMap } from "@/utils/searchUtils";

export const loadSchemaList = async (schema: SchemaDataMapper, parsedString: Partial<ResultParseSearch>) => {
const [listByName, listByDescription] = parsedString.nameOrDescription
Expand Down Expand Up @@ -30,13 +31,13 @@ export const loadSchemaList = async (schema: SchemaDataMapper, parsedString: Par
)
: [];

const result = [
const results = [
...(listByIds || []),
...listBySchemaString,
...(listByName || []),
...(listByDescription || []),
...(listByContext || []),
];

return result;
return uniqMap(results, "id");
};
4 changes: 4 additions & 0 deletions explorer/src/utils/searchUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,3 +65,7 @@ export const parseSearch = (search: string | null): Partial<ResultParseSearch> =
schemaString,
};
};

export const uniqMap = <T>(array: T[], by: keyof T): T[] => [
...new Map(array.map((result) => [result[by], result])).values(),
];
Loading