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
3 changes: 1 addition & 2 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@ module.exports = {
'testem.js',
'blueprints/*/index.js',
'config/**/*.js',
'tests/dummy/config/**/*.js',
'./.prettierrc.js'
'tests/dummy/config/**/*.js'
],
excludedFiles: ['addon/**', 'addon-test-support/**', 'app/**', 'tests/dummy/app/**'],
parserOptions: {
Expand Down
6 changes: 4 additions & 2 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
Related to : #<!-- enter issue number here -->

### What are the observable changes?

<!-- This question could be adequate with multiple use cases, for example: -->

<!-- Frontend: explain the feature created / updated, give instructions telling how to see the change in staging -->
Expand All @@ -15,8 +16,9 @@ Related to : #<!-- enter issue number here -->
### πŸ§‘β€πŸ’» Developer Heads Up

⚑ Since we are using [Ember Octane](https://blog.emberjs.com/octane-is-here/) now:
* Feel free to migrate existing components to Glimmer Components.
* Write new ones exclusively in it.

- Feel free to migrate existing components to Glimmer Components.
- Write new ones exclusively in it.

Useful Resource : [Ember Octane vs Classic Cheat Sheet](https://ember-learn.github.io/ember-octane-vs-classic-cheat-sheet/)

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v4
with:
version: 10
version: '${{ vars.PNPM_VERSION }}'
- uses: actions/setup-node@v3
with:
node-version: '${{ env.NODE_VERSION }}'
Expand All @@ -53,7 +53,7 @@ jobs:
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v4
with:
version: 10
version: '${{ vars.PNPM_VERSION }}'
- uses: actions/setup-node@v3
with:
node-version: '${{ env.NODE_VERSION }}'
Expand Down Expand Up @@ -87,7 +87,7 @@ jobs:
- uses: actions/checkout@v3
- uses: pnpm/action-setup@v4
with:
version: 10
version: '${{ vars.PNPM_VERSION }}'
- uses: actions/setup-node@v3
with:
node-version: '${{ env.NODE_VERSION }}'
Expand Down
21 changes: 0 additions & 21 deletions .prettierrc.js

This file was deleted.

2 changes: 1 addition & 1 deletion addon-test-support/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import TableManager from './table-manager';
import RowsFetcher, { AllRowsFetcher } from './rows-fetcher';
import { setupTable } from './setup-table';
import TableManager from './table-manager';

export { TableManager, RowsFetcher, AllRowsFetcher, setupTable };
3 changes: 2 additions & 1 deletion addon-test-support/setup-table.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import { type TestContext } from '@ember/test-helpers';

import sinon from 'sinon';

import TableHandler from '@upfluence/hypertable/core/handler';
import { TableManager, RowsFetcher } from '@upfluence/hypertable/test-support';
import sinon from 'sinon';

export function setupTable(hooks: NestedHooks): void {
hooks.beforeEach(function (this: TestContext) {
Expand Down
1 change: 1 addition & 0 deletions addon/components/hyper-table-v2/cell-renderers/date.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import Component from '@glimmer/component';

import moment from 'moment';

import TableHandler from '@upfluence/hypertable/core/handler';
Expand Down
4 changes: 2 additions & 2 deletions addon/components/hyper-table-v2/cell-renderers/text.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Component from '@glimmer/component';
import { computed, defineProperty } from '@ember/object';
import Component from '@glimmer/component';

import TableHandler from '@upfluence/hypertable/core/handler';
import { Column, Row } from '@upfluence/hypertable/core/interfaces';
Expand All @@ -18,7 +18,7 @@ export default class HyperTableV2CellRenderersText extends Component<HyperTableV
defineProperty(
this,
'value',
computed(`args.row.${args.column.definition.key}`, function() {
computed(`args.row.${args.column.definition.key}`, function () {
return this.args.row[this.args.column.definition.key];
})
);
Expand Down
2 changes: 1 addition & 1 deletion addon/components/hyper-table-v2/cell.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { action } from '@ember/object';
import Component from '@glimmer/component';
import { tracked } from '@glimmer/tracking';
import { action } from '@ember/object';

import TableHandler from '@upfluence/hypertable/core/handler';
import { Column, ResolvedRenderingComponent, Row } from '@upfluence/hypertable/core/interfaces';
Expand Down
4 changes: 2 additions & 2 deletions addon/components/hyper-table-v2/column.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Component from '@glimmer/component';
import { tracked } from '@glimmer/tracking';
import { action, computed } from '@ember/object';
import { guidFor } from '@ember/object/internals';
import Component from '@glimmer/component';
import { tracked } from '@glimmer/tracking';

import TableHandler from '@upfluence/hypertable/core/handler';
import { Column, FieldSize, ResolvedRenderingComponent } from '@upfluence/hypertable/core/interfaces';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Component from '@glimmer/component';
import { action, computed } from '@ember/object';
import Component from '@glimmer/component';

import TableHandler from '@upfluence/hypertable/core/handler';
import { Column } from '@upfluence/hypertable/core/interfaces';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import { action } from '@ember/object';
import Component from '@glimmer/component';
import { inject as service } from '@ember/service';
import Component from '@glimmer/component';
import { tracked } from '@glimmer/tracking';

import { IntlService } from 'ember-intl';

import TableHandler from '@upfluence/hypertable/core/handler';
import { Column, OrderDirection } from '@upfluence/hypertable/core/interfaces';
import { tracked } from '@glimmer/tracking';
import { IntlService } from 'ember-intl';

interface HyperTableV2FilteringRenderersExistenceArgs {
handler: TableHandler;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import Component from '@glimmer/component';
import { tracked } from '@glimmer/tracking';
import { action } from '@ember/object';
import { debounce } from '@ember/runloop';
import { inject as service } from '@ember/service';
import { isEmpty } from '@ember/utils';
import Component from '@glimmer/component';
import { tracked } from '@glimmer/tracking';

import { IntlService } from 'ember-intl';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import { action } from '@ember/object';
import Component from '@glimmer/component';
import { tracked } from '@glimmer/tracking';

import moment from 'moment';

import TableHandler from '@upfluence/hypertable/core/handler';
import { Column } from '@upfluence/hypertable/core/interfaces';
import { action } from '@ember/object';

interface HyperTableV2FilteringRenderersDateArgs {
handler: TableHandler;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import Component from '@glimmer/component';
import { tracked } from '@glimmer/tracking';
import { action, computed } from '@ember/object';
import { isTesting } from '@embroider/macros';

import { debounce } from '@ember/runloop';
import { isTesting } from '@embroider/macros';
import Component from '@glimmer/component';
import { tracked } from '@glimmer/tracking';

import TableHandler from '@upfluence/hypertable/core/handler';
import { Column, OrderDirection } from '@upfluence/hypertable/core/interfaces';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Component from '@glimmer/component';
import { action } from '@ember/object';
import Component from '@glimmer/component';

import TableHandler from '@upfluence/hypertable/core/handler';
import { Column } from '@upfluence/hypertable/core/interfaces';
Expand Down
8 changes: 4 additions & 4 deletions addon/components/hyper-table-v2/index.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import Component from '@glimmer/component';
import { tracked } from '@glimmer/tracking';
import { action, computed, set } from '@ember/object';
import { debounce, scheduleOnce } from '@ember/runloop';
import { isEmpty } from '@ember/utils';
import { htmlSafe } from '@ember/template';
import { isEmpty } from '@ember/utils';
import Component from '@glimmer/component';
import { tracked } from '@glimmer/tracking';

import TableHandler from '@upfluence/hypertable/core/handler';
import { Column, Row } from '@upfluence/hypertable/core/interfaces';
Expand Down Expand Up @@ -42,7 +42,7 @@ export default class HyperTableV2 extends Component<HyperTableV2Args> {
@tracked scrollableTable: boolean = false;
@tracked initialFetchColumnsDone: boolean = false;

private declare hypertableInstanceID: string;
declare private hypertableInstanceID: string;

constructor(owner: unknown, args: HyperTableV2Args) {
super(owner, args);
Expand Down
7 changes: 4 additions & 3 deletions addon/components/hyper-table-v2/manage-columns.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import { A } from '@ember/array';
import Component from '@glimmer/component';
import { tracked } from '@glimmer/tracking';
import { set, action } from '@ember/object';
import { later, next } from '@ember/runloop';
import { isEmpty } from '@ember/utils';
import Component from '@glimmer/component';
import { tracked } from '@glimmer/tracking';

import TableHandler from '@upfluence/hypertable/core/handler';
import { ColumnDefinition } from '@upfluence/hypertable/core/interfaces';
import { later, next } from '@ember/runloop';

type ManagedColumn = {
definition: ColumnDefinition;
Expand Down
7 changes: 4 additions & 3 deletions addon/components/hyper-table-v2/search.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import { action } from '@ember/object';
import { debounce } from '@ember/runloop';
import { inject as service } from '@ember/service';
import Component from '@glimmer/component';
import { tracked } from '@glimmer/tracking';
import { action } from '@ember/object';

import TableHandler from '@upfluence/hypertable/core/handler';
import { inject as service } from '@ember/service';
import { debounce } from '@ember/runloop';

interface HyperTableV2SearchArgs {
handler: TableHandler;
Expand Down
2 changes: 1 addition & 1 deletion addon/components/hyper-table-v2/selection.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Component from '@glimmer/component';
import { action } from '@ember/object';
import Component from '@glimmer/component';

interface HyperTableV2SelectionArgs {
selected: number;
Expand Down
2 changes: 1 addition & 1 deletion addon/components/hyper-table/cell-renderers/image.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Component from '@glimmer/component';
import { get } from '@ember/object';
import Component from '@glimmer/component';

export default class ImageCellRenderer extends Component {
get imageURL() {
Expand Down
1 change: 1 addition & 0 deletions addon/components/hyper-table/cell-renderers/list.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import Component from '@ember/component';
import { computed } from '@ember/object';

import CellRendererMixin from '@upfluence/hypertable/mixins/cell-renderer';

export default Component.extend(CellRendererMixin, {
Expand Down
2 changes: 1 addition & 1 deletion addon/components/hyper-table/cell-renderers/money.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import Component from '@ember/component';
import { computed } from '@ember/object';

import EditableMixin from '@upfluence/hypertable/mixins/editable';
import CellRendererMixin from '@upfluence/hypertable/mixins/cell-renderer';
import EditableMixin from '@upfluence/hypertable/mixins/editable';

export default Component.extend(EditableMixin, CellRendererMixin, {
amount: computed('value', 'value.cents', function () {
Expand Down
3 changes: 2 additions & 1 deletion addon/components/hyper-table/cell-renderers/numeric.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import Component from '@ember/component';
import EditableMixin from '@upfluence/hypertable/mixins/editable';

import CellRendererMixin from '@upfluence/hypertable/mixins/cell-renderer';
import EditableMixin from '@upfluence/hypertable/mixins/editable';

export default Component.extend(EditableMixin, CellRendererMixin);
3 changes: 2 additions & 1 deletion addon/components/hyper-table/cell-renderers/text.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import Component from '@ember/component';
import EditableMixin from '@upfluence/hypertable/mixins/editable';

import CellRendererMixin from '@upfluence/hypertable/mixins/cell-renderer';
import EditableMixin from '@upfluence/hypertable/mixins/editable';

export default Component.extend(EditableMixin, CellRendererMixin);
4 changes: 2 additions & 2 deletions addon/components/hyper-table/facetting.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Component from '@ember/component';
import { isEmpty } from '@ember/utils';
import { later } from '@ember/runloop';
import { set } from '@ember/object';
import { later } from '@ember/runloop';
import { isEmpty } from '@ember/utils';

export default Component.extend({
classNames: ['hypertable__facetting'],
Expand Down
3 changes: 2 additions & 1 deletion addon/components/hyper-table/filters-renderers/date.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { tracked } from '@glimmer/tracking';
import { action } from '@ember/object';
import { tracked } from '@glimmer/tracking';

import moment from 'moment';

import FiltersRenderer from '@upfluence/hypertable/components/hyper-table/filters-renderers';
Expand Down
2 changes: 1 addition & 1 deletion addon/components/hyper-table/filters-renderers/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Component from '@glimmer/component';
import { action } from '@ember/object';
import Component from '@glimmer/component';

export default class FiltersRenderer extends Component {
get _controlNamePrefix() {
Expand Down
3 changes: 2 additions & 1 deletion addon/components/hyper-table/filters-renderers/money.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import NumericFilterRenderer from '@upfluence/hypertable/components/hyper-table/filters-renderers/numeric';
import { isBlank } from '@ember/utils';

import NumericFilterRenderer from '@upfluence/hypertable/components/hyper-table/filters-renderers/numeric';

export default NumericFilterRenderer.extend({
_addRangeFilter() {
let filters = [];
Expand Down
4 changes: 2 additions & 2 deletions addon/components/hyper-table/views.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import Component from '@glimmer/component';
import { tracked } from '@glimmer/tracking';
import { action } from '@ember/object';
import { debounce } from '@ember/runloop';
import { isPresent } from '@ember/utils';
import Component from '@glimmer/component';
import { tracked } from '@glimmer/tracking';

const SEARCH_DEBOUNCE = 500;

Expand Down
3 changes: 2 additions & 1 deletion addon/components/hyper-table/views/view.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { action } from '@ember/object';
import { inject as service } from '@ember/service';
import Component from '@glimmer/component';
import { tracked } from '@glimmer/tracking';
import { inject as service } from '@ember/service';

import ToastService from '@upfluence/oss-components/services/toast';

interface ViewsViewComponentArgs {
Expand Down
5 changes: 3 additions & 2 deletions addon/core/handler.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import { tracked } from '@glimmer/tracking';
import { set } from '@ember/object';
import { addListener, sendEvent } from '@ember/object/events';
import { scheduleOnce } from '@ember/runloop';
import { isEmpty } from '@ember/utils';
import { tracked } from '@glimmer/tracking';

import Tether from 'tether';

import {
Expand All @@ -17,7 +19,6 @@ import {
FacetsResponse
} from './interfaces';
import BaseRenderingResolver from './rendering-resolver';
import { isEmpty } from '@ember/utils';

export type RowMutator = (row: Row) => boolean;

Expand Down
2 changes: 1 addition & 1 deletion addon/core/interfaces/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import {
FacetsResponse,
TableManager
} from './manager';
import { Row, RowsFetcherMetadata, RowsFetcherResponse, RowsFetcher } from './rows-fetcher';
import { ResolvedRenderingComponent, RendererResolver } from './rendering-resolver';
import { Row, RowsFetcherMetadata, RowsFetcherResponse, RowsFetcher } from './rows-fetcher';

export {
FieldSize,
Expand Down
1 change: 1 addition & 0 deletions addon/core/interfaces/rendering-resolver.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import GlimmerComponent from '@glimmer/component';

import { ColumnDefinition } from './column';

// Args can be useful to:
Expand Down
Loading
Loading