From 6a96531da546f0930a62ce778f037c837463ea51 Mon Sep 17 00:00:00 2001 From: Sagar Singh Negi <60314150+sagarsingh23@users.noreply.github.com> Date: Fri, 30 Jun 2023 09:36:01 +0530 Subject: [PATCH] fix: [CAL-1959] Removed duplicate value warnings on starting dev server(#1959) (#9596) Co-authored-by: Alan --- apps/web/public/static/locales/en/common.json | 10 +-- .../api-keys/components/ApiKeyDialogForm.tsx | 79 +++++++++---------- .../components/CreateANewOrganizationForm.tsx | 2 +- .../components/OrgUpgradeBanner.tsx | 2 +- .../teams/components/CreateANewTeamForm.tsx | 2 +- .../components/MemberInvitationModal.tsx | 6 +- .../teams/components/TeamsUpgradeBanner.tsx | 2 +- .../ee/workflows/components/EmptyScreen.tsx | 2 +- .../components/CheckedTeamSelect.tsx | 2 +- .../features/form-builder/FormBuilder.tsx | 2 +- .../settings/BookerLayoutSelector.tsx | 2 +- packages/ui/components/apps/AllApps.tsx | 4 +- 12 files changed, 52 insertions(+), 63 deletions(-) diff --git a/apps/web/public/static/locales/en/common.json b/apps/web/public/static/locales/en/common.json index 7005778695..08e3236024 100644 --- a/apps/web/public/static/locales/en/common.json +++ b/apps/web/public/static/locales/en/common.json @@ -127,10 +127,9 @@ "seat_options_doesnt_support_confirmation": "Seats option doesn't support confirmation requirement", "team_upgrade_seats_details": "Of the {{memberCount}} members in your team, {{unpaidCount}} seat(s) are unpaid. At ${{seatPrice}}/month per seat the estimated total cost of your membership is ${{totalCost}}/month.", "team_upgrade_banner_description": "Thank you for trialing our new team plan. We noticed your team \"{{teamName}}\" needs to be upgraded.", - "team_upgrade_banner_action": "Upgrade here", + "upgrade_banner_action": "Upgrade here", "team_upgraded_successfully": "Your team was upgraded successfully!", "org_upgrade_banner_description": "Thank you for trialing our Organization plan. We noticed your Organization \"{{teamName}}\" needs to be upgraded.", - "org_upgrade_banner_action": "Upgrade here", "org_upgraded_successfully": "Your Organization was upgraded successfully!", "use_link_to_reset_password": "Use the link below to reset your password", "hey_there": "Hey there,", @@ -241,7 +240,6 @@ "forgot": "Forgot?", "done": "Done", "all_done": "All done!", - "all_apps": "All", "all": "All", "yours": "Yours", "available_apps": "Available Apps", @@ -306,7 +304,6 @@ "success": "Success", "failed": "Failed", "password_has_been_reset_login": "Your password has been reset. You can now login with your newly created password.", - "bookerlayout_title": "Layout", "layout": "Layout", "bookerlayout_default_title": "Default view", "bookerlayout_description": "You can select multiple and your bookers can switch views.", @@ -554,8 +551,6 @@ "members": "Members", "organization_members": "Organization members", "member": "Member", - "number_member_one": "{{count}} member", - "number_member_other": "{{count}} members", "owner": "Owner", "admin": "Admin", "administrator_user": "Administrator user", @@ -1478,7 +1473,7 @@ "team_name_taken": "This name is already taken", "must_enter_team_name": "Must enter a team name", "team_url_required": "Must enter a team URL", - "team_url_taken": "This URL is already taken", + "url_taken": "This URL is already taken", "team_publish": "Publish team", "number_sms_notifications": "Phone number (SMS notifications)", "attendee_email_variable": "Attendee email", @@ -1869,7 +1864,6 @@ "organization_banner_title": "Manage organizations with multiple teams", "set_up_your_organization": "Set up your organization", "organizations_description": "Organizations are shared environments where teams can create shared event types, apps, workflows and more.", - "organization_url_taken": "This URL is already taken", "must_enter_organization_name": "Must enter an organization name", "must_enter_organization_admin_email": "Must enter your organization email address", "admin_email": "Your organization email address", diff --git a/packages/features/ee/api-keys/components/ApiKeyDialogForm.tsx b/packages/features/ee/api-keys/components/ApiKeyDialogForm.tsx index 58069f2da8..207837c929 100644 --- a/packages/features/ee/api-keys/components/ApiKeyDialogForm.tsx +++ b/packages/features/ee/api-keys/components/ApiKeyDialogForm.tsx @@ -6,18 +6,7 @@ import type { TApiKeys } from "@calcom/ee/api-keys/components/ApiKeyListItem"; import LicenseRequired from "@calcom/ee/common/components/LicenseRequired"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import { trpc } from "@calcom/trpc/react"; -import { - Button, - DatePicker, - DialogFooter, - Form, - Select, - showToast, - Switch, - TextField, - Tooltip, - SelectField, -} from "@calcom/ui"; +import { Button, DialogFooter, Form, showToast, Switch, TextField, Tooltip, SelectField } from "@calcom/ui"; import { Clipboard } from "@calcom/ui/components/icon"; export default function ApiKeyDialogForm({ @@ -42,7 +31,9 @@ export default function ApiKeyDialogForm({ }); type Option = { value: Date | null | undefined; label: string }; const [apiKey, setApiKey] = useState(""); - const [expiryDate,setExpiryDate]=useState(()=>(defaultValues?.expiresAt || dayjs().add(30, "day").toDate())) + const [expiryDate, setExpiryDate] = useState( + () => defaultValues?.expiresAt || dayjs().add(30, "day").toDate() + ); const [successfulNewApiKeyModal, setSuccessfulNewApiKeyModal] = useState(false); const [apiKeyDetails, setApiKeyDetails] = useState({ expiresAt: null as Date | null, @@ -59,7 +50,7 @@ export default function ApiKeyDialogForm({ }); const watchNeverExpires = form.watch("neverExpires"); - let expiresAtOptions: Option[] = [ + const expiresAtOptions: Option[] = [ { label: t("seven_days"), value: dayjs().add(7, "day").toDate(), @@ -182,35 +173,39 @@ export default function ApiKeyDialogForm({ { - const defaultValue = expiresAtOptions[1] - - return( - ({ - ...baseStyles, - fontSize: "14px", - }), - option: (baseStyles) => ({ - ...baseStyles, - fontSize: "14px", - }), - }} - isDisabled={watchNeverExpires || !!defaultValues} - containerClassName="data-testid-field-type" - options={expiresAtOptions} - onChange={(option) => { - if (!option) { - return; - } - onChange(option.value); - setExpiryDate(option.value) - }} - defaultValue={defaultValue} - /> - )}} + const defaultValue = expiresAtOptions[1]; + + return ( + ({ + ...baseStyles, + fontSize: "14px", + }), + option: (baseStyles) => ({ + ...baseStyles, + fontSize: "14px", + }), + }} + isDisabled={watchNeverExpires || !!defaultValues} + containerClassName="data-testid-field-type" + options={expiresAtOptions} + onChange={(option) => { + if (!option) { + return; + } + onChange(option.value); + setExpiryDate(option.value); + }} + defaultValue={defaultValue} + /> + ); + }} /> - {t("api_key_expires_on") } {dayjs(expiryDate).format('DD-MM-YYYY')} + + {t("api_key_expires_on")} + {dayjs(expiryDate).format("DD-MM-YYYY")} + )} diff --git a/packages/features/ee/organizations/components/CreateANewOrganizationForm.tsx b/packages/features/ee/organizations/components/CreateANewOrganizationForm.tsx index b89fcc9f36..b50980a1cf 100644 --- a/packages/features/ee/organizations/components/CreateANewOrganizationForm.tsx +++ b/packages/features/ee/organizations/components/CreateANewOrganizationForm.tsx @@ -177,7 +177,7 @@ export const CreateANewOrganizationForm = () => { message: t("email_already_used"), }); } else if (err.message === "organization_url_taken") { - newOrganizationFormMethods.setError("slug", { type: "custom", message: t("organization_url_taken") }); + newOrganizationFormMethods.setError("slug", { type: "custom", message: t("url_taken") }); } else { setServerErrorMessage(err.message); } diff --git a/packages/features/ee/organizations/components/OrgUpgradeBanner.tsx b/packages/features/ee/organizations/components/OrgUpgradeBanner.tsx index 11a5d25a2e..e37c417452 100644 --- a/packages/features/ee/organizations/components/OrgUpgradeBanner.tsx +++ b/packages/features/ee/organizations/components/OrgUpgradeBanner.tsx @@ -31,7 +31,7 @@ export function OrgUpgradeBanner() { onClick={() => { publishTeamMutation.mutate(); }}> - {t("org_upgrade_banner_action")} + {t("upgrade_banner_action")} } /> diff --git a/packages/features/ee/teams/components/CreateANewTeamForm.tsx b/packages/features/ee/teams/components/CreateANewTeamForm.tsx index 620ca0857a..b5f9fc03b3 100644 --- a/packages/features/ee/teams/components/CreateANewTeamForm.tsx +++ b/packages/features/ee/teams/components/CreateANewTeamForm.tsx @@ -44,7 +44,7 @@ export const CreateANewTeamForm = () => { }, onError: (err) => { if (err.message === "team_url_taken") { - newTeamFormMethods.setError("slug", { type: "custom", message: t("team_url_taken") }); + newTeamFormMethods.setError("slug", { type: "custom", message: t("url_taken") }); } else { setServerErrorMessage(err.message); } diff --git a/packages/features/ee/teams/components/MemberInvitationModal.tsx b/packages/features/ee/teams/components/MemberInvitationModal.tsx index a97d5e27dc..1bcdd228ab 100644 --- a/packages/features/ee/teams/components/MemberInvitationModal.tsx +++ b/packages/features/ee/teams/components/MemberInvitationModal.tsx @@ -283,7 +283,7 @@ export default function MemberInvitationModal(props: MemberInvitationModalProps) )} /> {props.token && ( -
+
-
- )} +
+ )}
diff --git a/packages/features/ee/teams/components/TeamsUpgradeBanner.tsx b/packages/features/ee/teams/components/TeamsUpgradeBanner.tsx index fff6dd339a..80d4458c07 100644 --- a/packages/features/ee/teams/components/TeamsUpgradeBanner.tsx +++ b/packages/features/ee/teams/components/TeamsUpgradeBanner.tsx @@ -31,7 +31,7 @@ export function TeamsUpgradeBanner() { onClick={() => { publishTeamMutation.mutate({ teamId: membership.team.id }); }}> - {t("team_upgrade_banner_action")} + {t("upgrade_banner_action")} } /> diff --git a/packages/features/ee/workflows/components/EmptyScreen.tsx b/packages/features/ee/workflows/components/EmptyScreen.tsx index d8a62e0b92..5881d654ae 100644 --- a/packages/features/ee/workflows/components/EmptyScreen.tsx +++ b/packages/features/ee/workflows/components/EmptyScreen.tsx @@ -74,7 +74,7 @@ export default function EmptyScreen(props: { isFilteredView: boolean }) {

{t("workflows")}

-

+

{t("no_workflows_description")}

diff --git a/packages/features/eventtypes/components/CheckedTeamSelect.tsx b/packages/features/eventtypes/components/CheckedTeamSelect.tsx index 6cdc1ff1d4..808a0d858e 100644 --- a/packages/features/eventtypes/components/CheckedTeamSelect.tsx +++ b/packages/features/eventtypes/components/CheckedTeamSelect.tsx @@ -46,7 +46,7 @@ export const CheckedTeamSelect = ({ key={option.value} className={`flex px-3 py-2 ${index === value.length - 1 ? "" : "border-subtle border-b"}`}> -

{option.label}

+

{option.label}

props.onChange(value.filter((item) => item.value !== option.value))} className="my-auto ml-auto h-4 w-4" diff --git a/packages/features/form-builder/FormBuilder.tsx b/packages/features/form-builder/FormBuilder.tsx index f772f25a18..c101476f5a 100644 --- a/packages/features/form-builder/FormBuilder.tsx +++ b/packages/features/form-builder/FormBuilder.tsx @@ -542,7 +542,7 @@ export const FormBuilder = function FormBuilder({ />
- + {t("cancel")}