Skip to content

Commit

Permalink
Renamed some files and classes
Browse files Browse the repository at this point in the history
  • Loading branch information
tsv2013 committed Apr 23, 2023
1 parent 375f903 commit 61aef17
Show file tree
Hide file tree
Showing 14 changed files with 19 additions and 19 deletions.
4 changes: 2 additions & 2 deletions sources/common/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export * from "./shared/field-types/currency";
export * from "./shared/field-types/date";
export * from "./shared/field-types/datetime";
export * from "./shared/field-types/number";
export * from "./shared/find";
export * from "./shared/filter";
export * from "./shared/editor";
export * from "./shared/data-provider/data-provider";
export * from "./shared/data-provider/array-data-provider";
Expand All @@ -32,7 +32,7 @@ export * from "./widgets/form";

export * from "./table/plugins/summary";
export * from "./table/plugins/search";
export * from "./table/plugins/filter/filter";
export * from "./table/plugins/filter";
export * from "./table/plugins/filter/column-filter";
export * from "./table/plugins/filter/column-filter-item";
export * from "./table/plugins/filter/filter-default";
Expand Down
2 changes: 1 addition & 1 deletion sources/common/shared/data-provider/array-data-provider.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { IFilterItem } from "../find";
import { IFilterItem } from "../filter";
import { IDataProvider } from "./data-provider";
import { FilterOwner } from "./filter-owner";

Expand Down
2 changes: 1 addition & 1 deletion sources/common/shared/data-provider/filter-owner.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { IFilterItem } from "../find";
import { IFilterItem } from "../filter";

export interface IFilterOwner {
addFilterProvider(filterProvider: IFilterProvider): void;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { IFilterItem } from "../find";
import { IFilterItem } from "../filter";
import { IDataProvider } from "./data-provider";
import { FilterOwner } from "./filter-owner";

Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion sources/common/table/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { SummaryPlugin } from "./plugins/summary";
import { InplaceEditorPlugin } from "./plugins/editor/editor-inplace";
import { RowEditorPlugin } from "./plugins/editor/editor-row";
import { SearchPlugin } from "./plugins/search";
import { FilterPlugin } from "./plugins/filter/filter";
import { FilterPlugin } from "./plugins/filter";

import * as Icons from "../icons";
import "./index.scss";
Expand Down
2 changes: 1 addition & 1 deletion sources/common/table/plugins/filter/column-filter-item.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Base } from "../../../shared/base";
import { property } from "../../../shared/property";
import { IFindOperation, operationsMap } from "../../../shared/find";
import { IFindOperation, operationsMap } from "../../../shared/filter";
import { ITableColumn } from "../../column";

export class FilterItemValue extends Base {
Expand Down
2 changes: 1 addition & 1 deletion sources/common/table/plugins/filter/column-filter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import * as Icons from "../../../icons";

import "./column-filter.scss";

export class FilterContext extends Base {
export class ColumnFilter extends Base {
constructor(public column: ITableColumn, private dataProviderOwner: IDataProviderOwner) {
super();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import { property } from "../../../shared/property";
import { ITableColumn } from "../../column";
import { ITableRow } from "../../row";
import { IFilterOwner, IFilterProvider } from "../../../shared/data-provider/filter-owner";
import { IFilterItem } from "../../../shared/find";
import { IFilterItem } from "../../../shared/filter";
import { IDataProvider } from "../../../shared/data-provider/data-provider";
import { FilterContext } from "./column-filter";
import { ColumnFilter } from "./column-filter";
import { FilterItemValue } from "./column-filter-item";
import { Localization } from "../../../localization";
import { filter } from "../../../icons";
Expand Down Expand Up @@ -40,7 +40,7 @@ export class FilterModel extends Base implements IFilterProvider {
}

@property({ defaultValue: false }) visible: boolean;
filters: Array<FilterContext> = [];
filters: Array<ColumnFilter> = [];
}

export class FilterPlugin implements ITablePlugin {
Expand Down Expand Up @@ -77,7 +77,7 @@ export class FilterPlugin implements ITablePlugin {
})];
}
onColumnCreated(column: ITableColumn): void {
this._filterModel.filters.push(new FilterContext(column, this._table));
this._filterModel.filters.push(new ColumnFilter(column, this._table));
this._filterModel.visible = <any>new ComputedUpdater(() => this._filterModel.filters.some(f => f.showFilter));
}
onRowCreated(row: ITableRow): void {
Expand Down
2 changes: 1 addition & 1 deletion sources/common/table/plugins/search.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { property } from "../../shared/property";
import { ITableColumn } from "../column";
import { ITableRow } from "../row";
import { IFilterOwner, IFilterProvider } from "../../shared/data-provider/filter-owner";
import { IFilterItem } from "../../shared/find";
import { IFilterItem } from "../../shared/filter";
import { IDataProvider } from "../../shared/data-provider/data-provider";
import { search } from "../../icons";

Expand Down
4 changes: 2 additions & 2 deletions sources/knockout/table/plugins/filter/column-filter.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import * as ko from "knockout";
import { FilterContext } from "../../../../common/table/plugins/filter/column-filter";
import { ColumnFilter } from "../../../../common/table/plugins/filter/column-filter";

var filterTemplate = require("./column-filter.html").default;

ko.components.register("table4js-column-filter", {
viewModel: {
createViewModel: function (params, componentInfo) {
return params.context as FilterContext;
return params.context as ColumnFilter;
}
},
template: filterTemplate
Expand Down
2 changes: 1 addition & 1 deletion sources/knockout/table/plugins/filter/filter.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as ko from "knockout";
import { FilterModel } from "../../../../common/table/plugins/filter/filter";
import { FilterModel } from "../../../../common/table/plugins/filter";

export var filterTemplate = require("./filter.html").default;

Expand Down
4 changes: 2 additions & 2 deletions sources/react/table/plugins/filter/column-filter.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import * as React from "react";
import { FilterContext } from "../../../../common/table/plugins/filter/column-filter";
import { ColumnFilter } from "../../../../common/table/plugins/filter/column-filter";
import { makeReactive } from "../../../reactivity";
import { Table4ColumnFilterItem } from "./column-filter-item";
import * as Icons from "../../../../common/icons";

export function Table4ColumnFilter({ context }: { context: FilterContext }) {
export function Table4ColumnFilter({ context }: { context: ColumnFilter }) {
makeReactive(context);
if (context.filterItems.length === 0) {
return null;
Expand Down
2 changes: 1 addition & 1 deletion sources/react/table/plugins/filter/filter.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as React from "react";
import { makeReactive } from "../../../reactivity";
import { registerComponent } from "../../../abris-component";
import { FilterModel } from "../../../../common/table/plugins/filter/filter";
import { FilterModel } from "../../../../common/table/plugins/filter";
import { Table4ColumnFilter } from "./column-filter";

export interface ITable4FilterProps {
Expand Down

0 comments on commit 61aef17

Please sign in to comment.