Skip to content
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: 0 additions & 4 deletions locale/defaultMessages.json
Original file line number Diff line number Diff line change
Expand Up @@ -5784,10 +5784,6 @@
"context": "edit attribute value",
"string": "Edit Value"
},
"XZR590": {
"context": "sale value",
"string": "Value"
},
"XZpRr8": {
"context": "btn label",
"string": "Go to all products"
Expand Down
2 changes: 1 addition & 1 deletion src/attributes/components/AttributeListPage/filters.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { IFilter } from "@dashboard/components/Filter";
import { IFilter } from "@dashboard/components/Filter/types";
import { commonMessages } from "@dashboard/intl";
import { FilterOpts } from "@dashboard/types";
import { createBooleanField } from "@dashboard/utils/filters/fields";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { DashboardCard } from "@dashboard/components/Card";
import ResponsiveTable from "@dashboard/components/ResponsiveTable";
import { SortableTableBody, SortableTableRow } from "@dashboard/components/SortableTable";
import TablePagination from "@dashboard/components/TablePagination";
import { TablePagination } from "@dashboard/components/TablePagination";
import TableRowLink from "@dashboard/components/TableRowLink";
import {
AttributeInputTypeEnum,
Expand Down
2 changes: 1 addition & 1 deletion src/attributes/views/AttributeList/filters.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {
AttributeFilterKeys,
AttributeListFilterOpts,
} from "@dashboard/attributes/components/AttributeListPage";
import { FilterElement } from "@dashboard/components/Filter";
import { FilterElement } from "@dashboard/components/Filter/types";
import { AttributeFilterInput } from "@dashboard/graphql";
import { parseBoolean } from "@dashboard/misc";

Expand Down
2 changes: 1 addition & 1 deletion src/collections/components/CollectionListPage/filters.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { IFilter } from "@dashboard/components/Filter";
import { IFilter } from "@dashboard/components/Filter/types";
import { CollectionPublished } from "@dashboard/graphql";
import { commonMessages } from "@dashboard/intl";
import { FilterOpts } from "@dashboard/types";
Expand Down
2 changes: 1 addition & 1 deletion src/collections/views/CollectionList/filters.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {
CollectionFilterKeys,
CollectionListFilterOpts,
} from "@dashboard/collections/components/CollectionListPage";
import { FilterElement, FilterElementRegular } from "@dashboard/components/Filter";
import { FilterElement, FilterElementRegular } from "@dashboard/components/Filter/types";
import { CollectionFilterInput, CollectionPublished } from "@dashboard/graphql";
import { findValueInEnum, maybe } from "@dashboard/misc";
import { Option } from "@saleor/macaw-ui-next";
Expand Down
2 changes: 1 addition & 1 deletion src/components/AppLayout/ListFilters/ListFilters.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { FilterErrorMessages, IFilter } from "@dashboard/components/Filter";
import { FilterErrorMessages, IFilter } from "@dashboard/components/Filter/types";
import { FilterProps, SearchPageProps } from "@dashboard/types";
import { Box } from "@saleor/macaw-ui-next";
import { ReactNode } from "react";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// @ts-strict-ignore
import { FilterContent } from "@dashboard/components/Filter/FilterContent/FilterContent";
import {
FilterContent,
FilterElement,
FilterErrorMessages,
IFilter,
InvalidFilters,
} from "@dashboard/components/Filter";
} from "@dashboard/components/Filter/types";
import useFilter from "@dashboard/components/Filter/useFilter";
import { extractInvalidFilters } from "@dashboard/components/Filter/utils";
import { ClickAwayListener, Grow, Popper } from "@material-ui/core";
Expand Down
2 changes: 1 addition & 1 deletion src/components/AppLayout/ListFilters/utils.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { FilterElement, IFilter } from "@dashboard/components/Filter";
import { FilterElement, IFilter } from "@dashboard/components/Filter/types";

import { getSelectedFilterAmount } from "./utils";

Expand Down
2 changes: 1 addition & 1 deletion src/components/AppLayout/ListFilters/utils.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { FilterElement, IFilter } from "@dashboard/components/Filter";
import { FilterElement, IFilter } from "@dashboard/components/Filter/types";

export const getSelectedFilterAmount = <TFilterKeys extends string = string>(
menu: IFilter<TFilterKeys>,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
// @ts-strict-ignore
import HorizontalSpacer from "@dashboard/components/HorizontalSpacer";
import { CollectionFragment } from "@dashboard/graphql";
import { ScrollableContent } from "@dashboard/plugins/components/PluginsList/PluginAvailabilityStatusPopup/ScrollableContent";
import { PillColor } from "@saleor/macaw-ui";
import { Text } from "@saleor/macaw-ui-next";
import { MessageDescriptor, useIntl } from "react-intl";

import { messages } from "../ChannelsAvailabilityDropdown/messages";
import { Pill } from "../Pill";
import { ScrollableContent } from "./PluginAvailabilityStatusPopup/ScrollableContent";
import { useStyles } from "./styles";

interface ChannelsAvailabilityMenuContentProps {
Expand Down
177 changes: 0 additions & 177 deletions src/components/Filter/Filter.tsx

This file was deleted.

11 changes: 5 additions & 6 deletions src/components/Filter/FilterContent/FilterContent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import { useState } from "react";
import { FilterAutocompleteDisplayValues } from "../FilterAutocompleteField";
import { FilterReducerAction } from "../reducer";
import { FieldType, FilterElement, FilterErrorMessages, IFilter, InvalidFilters } from "../types";
import FilterContentBody, { FilterContentBodyProps } from "./FilterContentBody";
import FilterContentBodyNameField from "./FilterContentBodyNameField";
import FilterContentHeader from "./FilterContentHeader";
import FilterErrorsList from "./FilterErrorsList";
import { FilterContentBody, FilterContentBodyProps } from "./FilterContentBody";
import { FilterContentBodyNameField } from "./FilterContentBodyNameField";
import { FilterContentHeader } from "./FilterContentHeader";
import { FilterErrorsList } from "./FilterErrorsList";

const useExpanderStyles = makeStyles(
theme => ({
Expand Down Expand Up @@ -69,7 +69,7 @@ interface FilterContentProps<K extends string = string> {
errorMessages?: FilterErrorMessages<K>;
}

const FilterContent = ({
export const FilterContent = ({
currencySymbol,
errors,
errorMessages,
Expand Down Expand Up @@ -240,4 +240,3 @@ const FilterContent = ({
};

FilterContent.displayName = "FilterContent";
export default FilterContent;
4 changes: 1 addition & 3 deletions src/components/Filter/FilterContent/FilterContentBody.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export interface FilterContentBodyProps<K extends string> {
setAutocompleteDisplayValues: React.Dispatch<React.SetStateAction<Record<string, Option[]>>>;
}

const FilterContentBody = <K extends string = string>({
export const FilterContentBody = <K extends string = string>({
filter,
children,
currencySymbol,
Expand Down Expand Up @@ -164,5 +164,3 @@ const FilterContentBody = <K extends string = string>({
</div>
);
};

export default FilterContentBody;
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ interface FilterContentBodyNameFieldProps<K extends string = string> {
onFilterPropertyChange: FilterDispatchFunction<K>;
}

const FilterContentBodyNameField = ({
export const FilterContentBodyNameField = ({
filter,
onFilterPropertyChange,
}: FilterContentBodyNameFieldProps) => {
Expand Down Expand Up @@ -50,5 +50,3 @@ const FilterContentBodyNameField = ({
</div>
);
};

export default FilterContentBodyNameField;
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ interface FilterContentHeaderProps {
onClear: () => void;
}

const FilterContentHeader = ({ onClear }: FilterContentHeaderProps) => {
export const FilterContentHeader = ({ onClear }: FilterContentHeaderProps) => {
const classes = useStyles({});

return (
Expand All @@ -55,5 +55,3 @@ const FilterContentHeader = ({ onClear }: FilterContentHeaderProps) => {
</div>
);
};

export default FilterContentHeader;
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// @ts-strict-ignore
import { FieldType, FilterFieldBaseProps } from "@dashboard/components/Filter";

import Arrow from "@dashboard/components/Filter/Arrow";
import { FieldType, FilterFieldBaseProps } from "@dashboard/components/Filter/types";
import { splitDateTime } from "@dashboard/misc";
import { TextField } from "@material-ui/core";
import { FormattedMessage } from "react-intl";
Expand Down
4 changes: 1 addition & 3 deletions src/components/Filter/FilterContent/FilterErrorsList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ interface FilterErrorsListProps<T extends string = string> {
errorMessages?: FilterErrorMessages<T>;
}

const FilterErrorsList = ({
export const FilterErrorsList = ({
filter: { dependencies },
errors = [],
errorMessages,
Expand Down Expand Up @@ -79,5 +79,3 @@ const FilterErrorsList = ({
</div>
);
};

export default FilterErrorsList;
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { FieldType, FilterFieldBaseProps } from "@dashboard/components/Filter";
import Arrow from "@dashboard/components/Filter/Arrow";
import { FieldType, FilterFieldBaseProps } from "@dashboard/components/Filter/types";
import { TextField } from "@material-ui/core";
import { FormattedMessage } from "react-intl";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// @ts-strict-ignore
import { FilterFieldBaseProps, FilterType } from "@dashboard/components/Filter";
import { getIsFilterMultipleChoices } from "@dashboard/components/Filter/FilterContent/utils";
import { FilterFieldBaseProps, FilterType } from "@dashboard/components/Filter/types";
import FormSpacer from "@dashboard/components/FormSpacer";
import { Select } from "@dashboard/components/Select";
import { useIntl } from "react-intl";
Expand Down
2 changes: 0 additions & 2 deletions src/components/Filter/FilterContent/index.tsx

This file was deleted.

4 changes: 0 additions & 4 deletions src/components/Filter/index.ts

This file was deleted.

Loading
Loading