Skip to content

Commit 52f03f9

Browse files
committed
updated cleanup code
1 parent 3498c7c commit 52f03f9

File tree

3 files changed

+30
-450
lines changed
  • packages/components/src/components/hds/advanced-table
  • showcase/app/components/page-components/advanced-table

3 files changed

+30
-450
lines changed

packages/components/src/components/hds/advanced-table/index.ts

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -615,6 +615,7 @@ export default class HdsAdvancedTable extends Component<HdsAdvancedTableSignatur
615615

616616
@action
617617
setupTableModelData(): void {
618+
console.log('setting up table model data');
618619
const { columns, model, sortBy, sortOrder } = this.args;
619620

620621
this._tableModel.setupData({
@@ -678,9 +679,20 @@ export default class HdsAdvancedTable extends Component<HdsAdvancedTableSignatur
678679

679680
@action
680681
willDestroyRowCheckbox(selectionKey?: string): void {
681-
this._selectableRows = this._selectableRows.filter(
682-
(row) => row.selectionKey !== selectionKey
682+
if (selectionKey === undefined) {
683+
return;
684+
}
685+
686+
const index = this._selectableRows.findIndex(
687+
(row) => row.selectionKey === selectionKey
683688
);
689+
690+
if (index === -1) {
691+
return;
692+
}
693+
694+
this._selectableRows.splice(index, 1);
695+
684696
this.setSelectAllState();
685697
}
686698

showcase/app/components/page-components/advanced-table/index.gts

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,30 +7,28 @@ import { pageTitle } from 'ember-page-title';
77

88
import ShwTextH1 from 'showcase/components/shw/text/h1';
99

10-
import SubSectionTest from 'showcase/components/page-components/advanced-table/sub-sections/test';
11-
// import SubSectionBaseElements from 'showcase/components/page-components/advanced-table/sub-sections/base-elements';
12-
// import SubSectionBasic from 'showcase/components/page-components/advanced-table/sub-sections/basic';
13-
// import SubSectionCustomization from 'showcase/components/page-components/advanced-table/sub-sections/customization';
14-
// import SubSectionDemos from 'showcase/components/page-components/advanced-table/sub-sections/demos';
15-
// import SubSectionFunctionalExamples from 'showcase/components/page-components/advanced-table/sub-sections/functional-examples';
16-
// import SubSectionLayout from 'showcase/components/page-components/advanced-table/sub-sections/layout';
17-
// import SubSectionMultiSelect from 'showcase/components/page-components/advanced-table/sub-sections/multi-select';
18-
// import SubSectionNestedRows from 'showcase/components/page-components/advanced-table/sub-sections/nested-rows';
19-
// import SubSectionOverflow from 'showcase/components/page-components/advanced-table/sub-sections/overflow';
20-
// import SubSectionPinnableColumns from 'showcase/components/page-components/advanced-table/sub-sections/pinnable-column';
21-
// import SubSectionReorderableColumns from 'showcase/components/page-components/advanced-table/sub-sections/reorderable-columns';
22-
// import SubSectionResizableColumns from 'showcase/components/page-components/advanced-table/sub-sections/resizable-columns';
23-
// import SubSectionSorting from 'showcase/components/page-components/advanced-table/sub-sections/sorting';
24-
// import SubSectionTooltip from 'showcase/components/page-components/advanced-table/sub-sections/tooltip';
10+
import SubSectionBaseElements from 'showcase/components/page-components/advanced-table/sub-sections/base-elements';
11+
import SubSectionBasic from 'showcase/components/page-components/advanced-table/sub-sections/basic';
12+
import SubSectionCustomization from 'showcase/components/page-components/advanced-table/sub-sections/customization';
13+
import SubSectionDemos from 'showcase/components/page-components/advanced-table/sub-sections/demos';
14+
import SubSectionFunctionalExamples from 'showcase/components/page-components/advanced-table/sub-sections/functional-examples';
15+
import SubSectionLayout from 'showcase/components/page-components/advanced-table/sub-sections/layout';
16+
import SubSectionMultiSelect from 'showcase/components/page-components/advanced-table/sub-sections/multi-select';
17+
import SubSectionNestedRows from 'showcase/components/page-components/advanced-table/sub-sections/nested-rows';
18+
import SubSectionOverflow from 'showcase/components/page-components/advanced-table/sub-sections/overflow';
19+
import SubSectionPinnableColumns from 'showcase/components/page-components/advanced-table/sub-sections/pinnable-column';
20+
import SubSectionReorderableColumns from 'showcase/components/page-components/advanced-table/sub-sections/reorderable-columns';
21+
import SubSectionResizableColumns from 'showcase/components/page-components/advanced-table/sub-sections/resizable-columns';
22+
import SubSectionSorting from 'showcase/components/page-components/advanced-table/sub-sections/sorting';
23+
import SubSectionTooltip from 'showcase/components/page-components/advanced-table/sub-sections/tooltip';
2524

2625
const AdvancedTableIndex: TemplateOnlyComponent = <template>
2726
{{pageTitle "AdvancedTable Component"}}
2827

2928
<ShwTextH1>AdvancedTable</ShwTextH1>
3029

3130
<section data-test-percy>
32-
<SubSectionTest />
33-
{{! <SubSectionBasic />
31+
<SubSectionBasic />
3432
<SubSectionNestedRows />
3533
<SubSectionOverflow />
3634
<SubSectionSorting />
@@ -43,7 +41,7 @@ const AdvancedTableIndex: TemplateOnlyComponent = <template>
4341
<SubSectionCustomization />
4442
<SubSectionLayout />
4543
<SubSectionDemos />
46-
<SubSectionBaseElements /> }}
44+
<SubSectionBaseElements />
4745
</section>
4846
</template>;
4947

0 commit comments

Comments
 (0)