Skip to content

fix: Release blocker - ads migration #35285

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.

Sign up for GitHub

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
KelvinOm merged 2 commits into from
Jul 30, 2024
Merged

fix: Release blocker - ads migration #35285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92c2ae3
fix: Removed old toast
albinAppsmith Jul 30, 2024
b772f12
fix: AppIcon
KelvinOm Jul 30, 2024
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
5 changes: 2 additions & 3 deletions app/client/packages/design-system/ads-old/src/AppIcon/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,13 +426,12 @@ const IconWrapper = styled.a<AppIconProps & { styledProps: cssAttributes }>`
export type AppIconProps = CommonComponentProps & {
size?: Size;
name: AppIconName;
onClick?: (e: unknown) => void;
onClick?: (e: any) => void;
};

function AppIcon(props: AppIconProps) {
const styledProps = useMemo(
// @ts-expect-error Fix this the next time the file is edited
() => appSizeHandler(props.size != null || Size.medium),
() => appSizeHandler(props.size || Size.medium),
[props],
);

Expand Down
8 changes: 3 additions & 5 deletions app/client/packages/design-system/ads-old/src/FilePickerV2/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import Button, { Category, IconPositions, Size } from "../Button";
import type { IconName } from "../Icon";
import Icon, { IconSize } from "../Icon";
import Text, { TextType } from "../Text";
import { Toaster } from "../Toast";
import { toast } from "design-system";
import TooltipComponent from "../Tooltip";
import {
createMessage,
Expand All @@ -16,7 +16,6 @@ import {
} from "../constants/messages";
import { Classes } from "../constants/classes";
import { importSvg } from "../utils/icon-loadables";
import { Variant } from "../constants/variants";

const UploadSuccessIcon = importSvg(
async () => import("../assets/icons/ads/upload_success.svg"),
Expand Down Expand Up @@ -351,9 +350,8 @@ function FilePickerComponent(props: FilePickerProps) {
/* set form data and send api request */
fileUploader && fileUploader(file, setProgress, onUpload);
} else {
Toaster.show({
text: createMessage(ERROR_FILE_TOO_LARGE, "250 KB"),
variant: Variant.warning,
toast.show(createMessage(ERROR_FILE_TOO_LARGE, "250 KB"), {
kind: "warning",
});
}
}
Expand Down
269 changes: 0 additions & 269 deletions app/client/packages/design-system/ads-old/src/Toast/index.tsx
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions app/client/packages/design-system/ads-old/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,6 @@ export * from "./TextInput";
export { default as TooltipComponent } from "./Tooltip";
export * from "./Tooltip";

export * from "./Toast";

export { default as TreeDropdown } from "./TreeDropdown";
export * from "./TreeDropdown";

Expand Down
Loading