Skip to content

Fixing some lint errors in grid views #965

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
IvayloG merged 4 commits into from
Dec 14, 2021
Merged

Fixing some lint errors in grid views #965

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a2d6944
Fixing some lint errors in grid views
dafo Dec 10, 2021
9370280
Merge branch 'master' into amarinov/fixLint
dafo Dec 10, 2021
d21bf75
Fixing lint errors/disabling rules
dafo Dec 14, 2021
cc81f22
Merge branch 'master' into amarinov/fixLint
dafo Dec 14, 2021
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: 2 additions & 1 deletion ...lates/webcomponents/igc-ts/grid/grid-editing/files/src/app/__path__/DataGridSharedData.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable no-param-reassign */
export class DataGridSharedData {
public static getEmployees(count?: number): any[] {
if (count === undefined) {
Expand Down Expand Up @@ -102,7 +103,7 @@ export class DataGridSharedData {
const items = this.getRandomNumber(10, 80);
const value = price * items;
const margin = this.getRandomNumber(3, 10);
const profit = Math.round((price * margin / 100) * items);
const profit = Math.round((price * (margin / 100)) * items);
const country = this.getRandomItem(countries);
sales.push({
BundlePrice: price,
Expand Down
76 changes: 39 additions & 37 deletions ...templates/webcomponents/igc-ts/grid/grid-editing/files/src/app/__path__/__filePrefix__.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable import/extensions */
import {
IgcDataGridModule,
IgcGridColumnOptionsModule,
Expand Down Expand Up @@ -80,6 +81,11 @@ export default class $(ClassName) extends HTMLElement {
}

connectedCallback() {
const grid = document.getElementsByTagName('app-grid-editing')[0].shadowRoot!.getElementById('grid') as IgcDataGridComponent;
const commitButton = document.getElementsByTagName('app-grid-editing')[0].shadowRoot!.getElementById('commitClick') as HTMLButtonElement;
const undoButton = document.getElementsByTagName('app-grid-editing')[0].shadowRoot!.getElementById('undoClick') as HTMLButtonElement;
const redoButton = document.getElementsByTagName('app-grid-editing')[0].shadowRoot!.getElementById('redoClick') as HTMLButtonElement;

const onCommitClick = () => {
grid.commitEdits();
commitButton.disabled = true;
Expand Down Expand Up @@ -115,7 +121,35 @@ export default class $(ClassName) extends HTMLElement {
}
};

const onDeleteCellUpdating = (s: IgcTemplateColumnComponent, e: IgcTemplateCellUpdatingEventArgs) => {
if (commitButton !== null) {
commitButton.onclick = onCommitClick;
}
if (undoButton !== null) {
undoButton.onclick = onUndoClick;
}

if (redoButton !== null) {
redoButton.onclick = onRedoClick;
}

const onDeleteRowClick = (e: MouseEvent) => {
const button = e.srcElement as HTMLButtonElement;
const viewIndex = parseInt(button.id, 10);
const rowItem = grid.actualDataSource.getItemAtIndex(viewIndex);

if (grid.editMode === EditModeType.CellBatch || grid.editMode === EditModeType.Row) {
grid.removeItem(rowItem);
commitButton.disabled = !grid.canCommit;
redoButton.disabled = !grid.canRedo;
undoButton.disabled = !grid.canUndo;
} else if (grid.editMode === EditModeType.Cell) {
// delete grid row immediately
grid.removeItem(rowItem);
}
};

const onDeleteCellUpdating = (s: IgcTemplateColumnComponent,
e: IgcTemplateCellUpdatingEventArgs) => {
const content = e.content as HTMLDivElement;
if (content.childElementCount === 0) {
const button = document.createElement('button') as HTMLButtonElement;
Expand Down Expand Up @@ -143,22 +177,6 @@ export default class $(ClassName) extends HTMLElement {
grid.editModeClickAction = event.target.value;
};

const onDeleteRowClick = (e: MouseEvent) => {
const button = e.srcElement as HTMLButtonElement;
const viewIndex = parseInt(button.id);
const rowItem = grid.actualDataSource.getItemAtIndex(viewIndex);

if (grid.editMode === EditModeType.CellBatch || grid.editMode === EditModeType.Row) {
grid.removeItem(rowItem);
commitButton.disabled = !grid.canCommit;
redoButton.disabled = !grid.canRedo;
undoButton.disabled = !grid.canUndo;
} else if (grid.editMode === EditModeType.Cell) {
//delete grid row immediately
grid.removeItem(rowItem);
}
};

const onCellValueChanging = (s: IgcDataGridComponent, e: IgcGridCellValueChangingEventArgs) => {
if (s.editMode === EditModeType.CellBatch || grid.editMode === EditModeType.Row) {
commitButton.disabled = !grid.canCommit;
Expand All @@ -170,9 +188,8 @@ export default class $(ClassName) extends HTMLElement {
commitButton.disabled = true;
s.setEditError(e.editID, 'Error, cell is empty');
}
};
};

const grid = document.getElementsByTagName('app-$(path)')[0].shadowRoot!.getElementById('grid') as IgcDataGridComponent;
if (grid !== null) {
grid.dataSource = this.data;
grid.activationMode = GridActivationMode.Cell;
Expand All @@ -181,32 +198,17 @@ export default class $(ClassName) extends HTMLElement {
grid.cellValueChanging = onCellValueChanging;
}

const dropDown = document.getElementsByTagName('app-$(path)')[0].shadowRoot!.getElementById('editModeDropBox');
const dropDown = document.getElementsByTagName('app-grid-editing')[0].shadowRoot!.getElementById('editModeDropBox');
if (dropDown !== null) {
dropDown.onchange = editModeChanged;
}

const dropDown2 = document.getElementsByTagName('app-$(path)')[0].shadowRoot!.getElementById('editModeClickActionDropBox');
const dropDown2 = document.getElementsByTagName('app-grid-editing')[0].shadowRoot!.getElementById('editModeClickActionDropBox');
if (dropDown2 !== null) {
dropDown2.onchange = editModeClickActionChanged;
}

let commitButton = document.getElementsByTagName('app-$(path)')[0].shadowRoot!.getElementById('commitClick') as HTMLButtonElement;
if (commitButton !== null) {
commitButton.onclick = onCommitClick;
}

let undoButton = document.getElementsByTagName('app-$(path)')[0].shadowRoot!.getElementById('undoClick') as HTMLButtonElement;
if (undoButton !== null) {
undoButton.onclick = onUndoClick;
}

let redoButton = document.getElementsByTagName('app-$(path)')[0].shadowRoot!.getElementById('redoClick') as HTMLButtonElement;
if (redoButton !== null) {
redoButton.onclick = onRedoClick;
}

const deleteRowColumn = document.getElementsByTagName('app-$(path)')[0].shadowRoot!.getElementById('deleteRowColumn') as IgcTemplateColumnComponent;
const deleteRowColumn = document.getElementsByTagName('app-grid-editing')[0].shadowRoot!.getElementById('deleteRowColumn') as IgcTemplateColumnComponent;
if (deleteRowColumn !== null) {
deleteRowColumn.cellUpdating = onDeleteCellUpdating;
}
Expand Down
3 changes: 2 additions & 1 deletion ...tes/webcomponents/igc-ts/grid/grid-summaries/files/src/app/__path__/DataGridSharedData.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable no-param-reassign */
export class DataGridSharedData {
public static getEmployees(count?: number): any[] {
if (count === undefined) {
Expand Down Expand Up @@ -102,7 +103,7 @@ export class DataGridSharedData {
const items = this.getRandomNumber(10, 80);
const value = price * items;
const margin = this.getRandomNumber(3, 10);
const profit = Math.round((price * margin / 100) * items);
const profit = Math.round((price * (margin / 100)) * items);
const country = this.getRandomItem(countries);
sales.push({
BundlePrice: price,
Expand Down
11 changes: 7 additions & 4 deletions ...mplates/webcomponents/igc-ts/grid/grid-summaries/files/src/app/__path__/__filePrefix__.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable import/extensions, max-classes-per-file, class-methods-use-this */
import {
IgcDataGridModule,
IgcGridColumnOptionsModule,
Expand Down Expand Up @@ -62,6 +63,8 @@ export default class $(ClassName) extends HTMLElement {
}

connectedCallback() {
const grid = document.getElementsByTagName('app-grid-summaries')[0].shadowRoot!.getElementById('grid') as IgcDataGridComponent;

// Custom Calculator - calculates the count for all USA.
class CustomDomestic extends SummaryCalculator {
get displayName(): string {
Expand All @@ -81,13 +84,14 @@ export default class $(ClassName) extends HTMLElement {

public aggregate(a: any): void {
if (a.Countries === 'USA') {
this.usCountries += 1;
this.usCountries += 1;
}
}
}

const onProvideCalculator = (s: IgcColumnSummaryDescription, e: IgcProvideCalculatorEventArgs) => {
e.calculator = new CustomDomestic();
const onProvideCalculator = (s: IgcColumnSummaryDescription,
e: IgcProvideCalculatorEventArgs) => {
e.calculator = new CustomDomestic();
};

const onLoad = () => {
Expand Down Expand Up @@ -175,7 +179,6 @@ export default class $(ClassName) extends HTMLElement {
grid.summaryDescriptions.add(countries);
};

const grid = document.getElementsByTagName('app-grid-summaries')[0].shadowRoot!.getElementById('grid') as IgcDataGridComponent;
grid.dataSource = DataGridSharedData.getSales();

onLoad();
Expand Down
1 change: 1 addition & 0 deletions packages/cli/templates/webcomponents/igc-ts/projects/empty/files/src/app.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable no-return-assign */
import {
defineComponents,
IgcNavDrawerComponent,
Expand Down
1 change: 1 addition & 0 deletions packages/cli/templates/webcomponents/igc-ts/projects/empty/files/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable import/extensions, quotes, no-tabs, indent, comma-dangle */
import {
Route,
Router
Expand Down