From 1cf11e020fdc4bf056922e18663ae9c7aecdf598 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Mon, 19 Jun 2023 00:51:52 -0400 Subject: [PATCH] spelling: abstract Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com> --- packages/server/src/lib/DynamicFilter/DynamicFilter.ts | 4 ++-- ...ynamicFilterAbstructor.ts => DynamicFilterAbstractor.ts} | 2 +- .../src/lib/DynamicFilter/DynamicFilterFilterRoles.ts | 4 ++-- ...lterRoleAbstructor.ts => DynamicFilterRoleAbstractor.ts} | 2 +- .../server/src/lib/DynamicFilter/DynamicFilterSortBy.ts | 4 ++-- packages/server/src/lib/DynamicFilter/DynamicFilterViews.ts | 4 ++-- .../src/lib/ViewRolesBuilder/FilterRolesDynamicFilter.js | 4 ++-- .../src/services/DynamicListing/DynamicListAbstract.ts | 6 ++++++ .../src/services/DynamicListing/DynamicListAbstruct.ts | 6 ------ .../src/services/DynamicListing/DynamicListCustomView.ts | 4 ++-- .../src/services/DynamicListing/DynamicListFilterRoles.ts | 4 ++-- .../server/src/services/DynamicListing/DynamicListSearch.ts | 4 ++-- .../server/src/services/DynamicListing/DynamicListSortBy.ts | 4 ++-- .../src/containers/Customers/CustomerForm/CustomerForm.tsx | 2 +- 14 files changed, 27 insertions(+), 27 deletions(-) rename packages/server/src/lib/DynamicFilter/{DynamicFilterAbstructor.ts => DynamicFilterAbstractor.ts} (96%) rename packages/server/src/lib/DynamicFilter/{DynamicFilterRoleAbstructor.ts => DynamicFilterRoleAbstractor.ts} (99%) create mode 100644 packages/server/src/services/DynamicListing/DynamicListAbstract.ts delete mode 100644 packages/server/src/services/DynamicListing/DynamicListAbstruct.ts diff --git a/packages/server/src/lib/DynamicFilter/DynamicFilter.ts b/packages/server/src/lib/DynamicFilter/DynamicFilter.ts index 2af4d7c4f..b50391dc2 100644 --- a/packages/server/src/lib/DynamicFilter/DynamicFilter.ts +++ b/packages/server/src/lib/DynamicFilter/DynamicFilter.ts @@ -1,8 +1,8 @@ import { forEach, uniqBy } from 'lodash'; -import DynamicFilterAbstructor from './DynamicFilterAbstructor'; +import DynamicFilterAbstractor from './DynamicFilterAbstractor'; import { IDynamicFilter, IFilterRole, IModel } from '@/interfaces'; -export default class DynamicFilter extends DynamicFilterAbstructor{ +export default class DynamicFilter extends DynamicFilterAbstractor{ private model: IModel; private tableName: string; private dynamicFilters: IDynamicFilter[]; diff --git a/packages/server/src/lib/DynamicFilter/DynamicFilterAbstructor.ts b/packages/server/src/lib/DynamicFilter/DynamicFilterAbstractor.ts similarity index 96% rename from packages/server/src/lib/DynamicFilter/DynamicFilterAbstructor.ts rename to packages/server/src/lib/DynamicFilter/DynamicFilterAbstractor.ts index 3b3f6dee1..256333c68 100644 --- a/packages/server/src/lib/DynamicFilter/DynamicFilterAbstructor.ts +++ b/packages/server/src/lib/DynamicFilter/DynamicFilterAbstractor.ts @@ -1,5 +1,5 @@ -export default class DynamicFilterAbstructor { +export default class DynamicFilterAbstractor { /** * Extract relation table name from relation. * @param {String} column - diff --git a/packages/server/src/lib/DynamicFilter/DynamicFilterFilterRoles.ts b/packages/server/src/lib/DynamicFilter/DynamicFilterFilterRoles.ts index ae0502e7e..0bacf4d80 100644 --- a/packages/server/src/lib/DynamicFilter/DynamicFilterFilterRoles.ts +++ b/packages/server/src/lib/DynamicFilter/DynamicFilterFilterRoles.ts @@ -1,7 +1,7 @@ -import DynamicFilterRoleAbstructor from './DynamicFilterRoleAbstructor'; +import DynamicFilterRoleAbstractor from './DynamicFilterRoleAbstractor'; import { IFilterRole } from '@/interfaces'; -export default class FilterRoles extends DynamicFilterRoleAbstructor { +export default class FilterRoles extends DynamicFilterRoleAbstractor { private filterRoles: IFilterRole[]; /** diff --git a/packages/server/src/lib/DynamicFilter/DynamicFilterRoleAbstructor.ts b/packages/server/src/lib/DynamicFilter/DynamicFilterRoleAbstractor.ts similarity index 99% rename from packages/server/src/lib/DynamicFilter/DynamicFilterRoleAbstructor.ts rename to packages/server/src/lib/DynamicFilter/DynamicFilterRoleAbstractor.ts index 1dbc4f889..488f48919 100644 --- a/packages/server/src/lib/DynamicFilter/DynamicFilterRoleAbstructor.ts +++ b/packages/server/src/lib/DynamicFilter/DynamicFilterRoleAbstractor.ts @@ -6,7 +6,7 @@ import DynamicFilterQueryParser from './DynamicFilterQueryParser'; import { Lexer } from '../LogicEvaluation/Lexer'; import { COMPARATOR_TYPE, FIELD_TYPE } from './constants'; -export default abstract class DynamicFilterAbstructor +export default abstract class DynamicFilterAbstractor implements IDynamicFilter { protected filterRoles: IFilterRole[] = []; diff --git a/packages/server/src/lib/DynamicFilter/DynamicFilterSortBy.ts b/packages/server/src/lib/DynamicFilter/DynamicFilterSortBy.ts index f1ab6c7fc..d70ff3603 100644 --- a/packages/server/src/lib/DynamicFilter/DynamicFilterSortBy.ts +++ b/packages/server/src/lib/DynamicFilter/DynamicFilterSortBy.ts @@ -1,4 +1,4 @@ -import DynamicFilterRoleAbstructor from '@/lib/DynamicFilter/DynamicFilterRoleAbstructor'; +import DynamicFilterRoleAbstractor from '@/lib/DynamicFilter/DynamicFilterRoleAbstractor'; import { FIELD_TYPE } from './constants'; interface ISortRole { @@ -6,7 +6,7 @@ interface ISortRole { order: string; } -export default class DynamicFilterSortBy extends DynamicFilterRoleAbstructor { +export default class DynamicFilterSortBy extends DynamicFilterRoleAbstractor { private sortRole: ISortRole = {}; /** diff --git a/packages/server/src/lib/DynamicFilter/DynamicFilterViews.ts b/packages/server/src/lib/DynamicFilter/DynamicFilterViews.ts index 40e95c5b4..289e616ab 100644 --- a/packages/server/src/lib/DynamicFilter/DynamicFilterViews.ts +++ b/packages/server/src/lib/DynamicFilter/DynamicFilterViews.ts @@ -1,8 +1,8 @@ import { omit } from 'lodash'; import { IView, IViewRole } from '@/interfaces'; -import DynamicFilterRoleAbstructor from './DynamicFilterRoleAbstructor'; +import DynamicFilterRoleAbstractor from './DynamicFilterRoleAbstractor'; -export default class DynamicFilterViews extends DynamicFilterRoleAbstructor { +export default class DynamicFilterViews extends DynamicFilterRoleAbstractor { private viewSlug: string; private logicExpression: string; private filterRoles: IViewRole[]; diff --git a/packages/server/src/lib/ViewRolesBuilder/FilterRolesDynamicFilter.js b/packages/server/src/lib/ViewRolesBuilder/FilterRolesDynamicFilter.js index 978abb53d..c07af232b 100644 --- a/packages/server/src/lib/ViewRolesBuilder/FilterRolesDynamicFilter.js +++ b/packages/server/src/lib/ViewRolesBuilder/FilterRolesDynamicFilter.js @@ -1,10 +1,10 @@ -import DynamicFilterRoleAbstructor from '@/lib/DynamicFilter/DynamicFilterRoleAbstructor'; +import DynamicFilterRoleAbstractor from '@/lib/DynamicFilter/DynamicFilterRoleAbstractor'; import { validateViewRoles, buildFilterQuery, } from '@/lib/ViewRolesBuilder'; -export default class ViewRolesDynamicFilter extends DynamicFilterRoleAbstructor { +export default class ViewRolesDynamicFilter extends DynamicFilterRoleAbstractor { /** * Constructor method. * @param {*} filterRoles - diff --git a/packages/server/src/services/DynamicListing/DynamicListAbstract.ts b/packages/server/src/services/DynamicListing/DynamicListAbstract.ts new file mode 100644 index 000000000..216ace346 --- /dev/null +++ b/packages/server/src/services/DynamicListing/DynamicListAbstract.ts @@ -0,0 +1,6 @@ + + + +export default class DynamicListAbstract { + +} \ No newline at end of file diff --git a/packages/server/src/services/DynamicListing/DynamicListAbstruct.ts b/packages/server/src/services/DynamicListing/DynamicListAbstruct.ts deleted file mode 100644 index d7997966b..000000000 --- a/packages/server/src/services/DynamicListing/DynamicListAbstruct.ts +++ /dev/null @@ -1,6 +0,0 @@ - - - -export default class DynamicListAbstruct { - -} \ No newline at end of file diff --git a/packages/server/src/services/DynamicListing/DynamicListCustomView.ts b/packages/server/src/services/DynamicListing/DynamicListCustomView.ts index 7642bd4c4..a46f6ee98 100644 --- a/packages/server/src/services/DynamicListing/DynamicListCustomView.ts +++ b/packages/server/src/services/DynamicListing/DynamicListCustomView.ts @@ -1,5 +1,5 @@ import { Inject, Service } from 'typedi'; -import DynamicListAbstruct from './DynamicListAbstruct'; +import DynamicListAbstract from './DynamicListAbstract'; import DynamicFilterViews from '@/lib/DynamicFilter/DynamicFilterViews'; import { ServiceError } from '@/exceptions'; import HasTenancyService from '@/services/Tenancy/TenancyService'; @@ -7,7 +7,7 @@ import { ERRORS } from './constants'; import { IModel } from '@/interfaces'; @Service() -export default class DynamicListCustomView extends DynamicListAbstruct { +export default class DynamicListCustomView extends DynamicListAbstract { @Inject() tenancy: HasTenancyService; diff --git a/packages/server/src/services/DynamicListing/DynamicListFilterRoles.ts b/packages/server/src/services/DynamicListing/DynamicListFilterRoles.ts index 688b05b09..8f8485036 100644 --- a/packages/server/src/services/DynamicListing/DynamicListFilterRoles.ts +++ b/packages/server/src/services/DynamicListing/DynamicListFilterRoles.ts @@ -2,13 +2,13 @@ import { Service } from 'typedi'; import * as R from 'ramda'; import validator from 'is-my-json-valid'; import { IFilterRole, IModel } from '@/interfaces'; -import DynamicListAbstruct from './DynamicListAbstruct'; +import DynamicListAbstract from './DynamicListAbstract'; import DynamicFilterAdvancedFilter from '@/lib/DynamicFilter/DynamicFilterAdvancedFilter'; import { ERRORS } from './constants'; import { ServiceError } from '@/exceptions'; @Service() -export default class DynamicListFilterRoles extends DynamicListAbstruct { +export default class DynamicListFilterRoles extends DynamicListAbstract { /** * Validates filter roles schema. * @param {IFilterRole[]} filterRoles - Filter roles. diff --git a/packages/server/src/services/DynamicListing/DynamicListSearch.ts b/packages/server/src/services/DynamicListing/DynamicListSearch.ts index 517a15460..7dadaa897 100644 --- a/packages/server/src/services/DynamicListing/DynamicListSearch.ts +++ b/packages/server/src/services/DynamicListing/DynamicListSearch.ts @@ -1,11 +1,11 @@ import { Service } from 'typedi'; import { IFilterRole, IModel } from '@/interfaces'; -import DynamicListAbstruct from './DynamicListAbstruct'; +import DynamicListAbstract from './DynamicListAbstract'; import DynamicFilterFilterRoles from '@/lib/DynamicFilter/DynamicFilterFilterRoles'; import DynamicFilterSearch from '@/lib/DynamicFilter/DynamicFilterSearch'; @Service() -export default class DynamicListSearch extends DynamicListAbstruct { +export default class DynamicListSearch extends DynamicListAbstract { /** * Dynamic list filter roles. * @param {IModel} model diff --git a/packages/server/src/services/DynamicListing/DynamicListSortBy.ts b/packages/server/src/services/DynamicListing/DynamicListSortBy.ts index 594e1c141..0e236edb0 100644 --- a/packages/server/src/services/DynamicListing/DynamicListSortBy.ts +++ b/packages/server/src/services/DynamicListing/DynamicListSortBy.ts @@ -1,12 +1,12 @@ import { Service } from 'typedi'; -import DynamicListAbstruct from './DynamicListAbstruct'; +import DynamicListAbstract from './DynamicListAbstract'; import DynamicFilterSortBy from '@/lib/DynamicFilter/DynamicFilterSortBy'; import { IModel, ISortOrder } from '@/interfaces'; import { ServiceError } from '@/exceptions'; import { ERRORS } from './constants'; @Service() -export default class DynamicListSortBy extends DynamicListAbstruct { +export default class DynamicListSortBy extends DynamicListAbstract { /** * Dynamic list sort by. * @param {IModel} model diff --git a/packages/webapp/src/containers/Customers/CustomerForm/CustomerForm.tsx b/packages/webapp/src/containers/Customers/CustomerForm/CustomerForm.tsx index ceca8de2c..bcc7df75b 100644 --- a/packages/webapp/src/containers/Customers/CustomerForm/CustomerForm.tsx +++ b/packages/webapp/src/containers/Customers/CustomerForm/CustomerForm.tsx @@ -4,7 +4,7 @@ import { CustomerFormProvider } from './CustomerFormProvider'; import CustomerFormFormik from './CustomerFormFormik'; /** - * Abstructed customer form. + * Abstracted customer form. */ export default function CustomerForm({ customerId }) { return (