Skip to content

refactor(web): add-utility-to-check-empty-strings-with-whitespaces #1725

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

Merged
merged 2 commits into from
Oct 23, 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
4 changes: 2 additions & 2 deletions web/src/components/CasesDisplay/Search.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { useDebounce } from "react-use";

import { Searchbar, DropdownCascader } from "@kleros/ui-components-library";

import { isUndefined } from "utils/index";
import { isEmpty, isUndefined } from "utils/index";
import { decodeURIFilter, encodeURIFilter, useRootPath } from "utils/uri";

import { rootCourtToItems, useCourtTree } from "queries/useCourtTree";
Expand Down Expand Up @@ -58,7 +58,7 @@ const Search: React.FC = () => {
const navigate = useNavigate();
useDebounce(
() => {
const newFilters = search === "" ? { ...filterObject } : { ...filterObject, id: search };
const newFilters = isEmpty(search) ? { ...filterObject } : { ...filterObject, id: search };
const encodedFilter = encodeURIFilter(newFilters);
navigate(`${location}/${page}/${order}/${encodedFilter}`);
},
Expand Down
4 changes: 2 additions & 2 deletions web/src/context/NewDisputeContext.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { Address } from "viem";
import { DEFAULT_CHAIN } from "consts/chains";
import { klerosCoreAddress } from "hooks/contracts/generated";
import { useLocalStorage } from "hooks/useLocalStorage";
import { isUndefined } from "utils/index";
import { isEmpty, isUndefined } from "utils/index";

export type Answer = {
id: string;
Expand Down Expand Up @@ -133,7 +133,7 @@ const constructDisputeTemplate = (disputeData: IDisputeData) => {
for (const answer of baseTemplate.answers) {
answer.id = "0x" + BigInt(answer.id).toString(16);
}
if (!isUndefined(baseTemplate.policyURI) && baseTemplate.policyURI === "") delete baseTemplate.policyURI;
if (!isUndefined(baseTemplate.policyURI) && isEmpty(baseTemplate.policyURI)) delete baseTemplate.policyURI;

baseTemplate.arbitratorAddress = klerosCoreAddress[DEFAULT_CHAIN];
baseTemplate.arbitratorChainID = DEFAULT_CHAIN.toString();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import React, { Dispatch, SetStateAction, useMemo, useEffect } from "react";
import styled from "styled-components";

import { Field } from "@kleros/ui-components-library";
import { isEmpty } from "src/utils";

const StyledLabel = styled.label`
display: flex;
Expand Down Expand Up @@ -47,7 +48,7 @@ const FormContact: React.FC<IForm> = ({
};

const fieldVariant = useMemo(() => {
if (contactInput === "" || !isEditing) {
if (!isEditing || isEmpty(contactInput)) {
return undefined;
}
return contactIsValid ? "success" : "error";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { wrapWithToast, OPTIONS as toastOptions } from "utils/wrapWithToast";

import EnsureAuth from "components/EnsureAuth";
import { EnsureChain } from "components/EnsureChain";
import { isUndefined } from "src/utils";
import { isEmpty } from "src/utils";

const StyledModal = styled(Modal)`
position: absolute;
Expand Down Expand Up @@ -65,7 +65,7 @@ const SubmitEvidenceModal: React.FC<{
const [file, setFile] = useState<File>();
const { uploadFile } = useAtlasProvider();

const isDisabled = useMemo(() => isSending || message.trim() === "" || isUndefined(message), [isSending, message]);
const isDisabled = useMemo(() => isSending || isEmpty(message), [isSending, message]);

const submitEvidence = useCallback(async () => {
try {
Expand Down
11 changes: 6 additions & 5 deletions web/src/pages/Resolver/NavigationButtons/NextButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { useLocation, useNavigate } from "react-router-dom";
import { Button } from "@kleros/ui-components-library";

import { useNewDisputeContext } from "context/NewDisputeContext";
import { isEmpty } from "src/utils";

interface INextButton {
nextRoute: string;
Expand All @@ -21,17 +22,17 @@ const NextButton: React.FC<INextButton> = ({ nextRoute }) => {
disputeData.answers.every((answer) => answer.title !== "" && answer.description !== "");

//check if any filled address or ens is invalid
const areFilledAddressesValid = disputeData?.aliasesArray?.every((alias) =>
alias.address === "" && alias.name === "" ? true : alias.isValid
);

const areAliasesValidOrEmpty = disputeData?.aliasesArray?.every((alias) => {
const isAliasEmpty = isEmpty(alias.address) && isEmpty(alias.name);
return isAliasEmpty || alias.isValid;
});
const isButtonDisabled =
(location.pathname.includes("/resolver/title") && !disputeData.title) ||
(location.pathname.includes("/resolver/description") && !disputeData.description) ||
(location.pathname.includes("/resolver/court") && !disputeData.courtId) ||
(location.pathname.includes("/resolver/jurors") && !disputeData.arbitrationCost) ||
(location.pathname.includes("/resolver/voting-options") && !areVotingOptionsFilled) ||
(location.pathname.includes("/resolver/notable-persons") && !areFilledAddressesValid) ||
(location.pathname.includes("/resolver/notable-persons") && !areAliasesValidOrEmpty) ||
(location.pathname.includes("/resolver/policy") && (isPolicyUploading || !disputeData.policyURI));

return <Button disabled={isButtonDisabled} onClick={() => navigate(nextRoute)} text="Next" />;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ import styled from "styled-components";
import { useNavigate } from "react-router-dom";

import { Button } from "@kleros/ui-components-library";
import { isEmpty } from "src/utils";

const StyledButton = styled(Button)<{ prevRoute: string }>`
display: ${({ prevRoute }) => (prevRoute === "" ? "none" : "flex")};
display: ${({ prevRoute }) => (isEmpty(prevRoute) ? "none" : "flex")};
`;

interface IReturnButton {
Expand Down
5 changes: 5 additions & 0 deletions web/src/utils/index.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
export const isUndefined = (maybeObject: any): maybeObject is undefined | null =>
typeof maybeObject === "undefined" || maybeObject === null;

/**
* Checks if a string is empty or contains only whitespace.
*/
export const isEmpty = (str: string): boolean => str.trim() === "";
Loading