Skip to content

Commit bb4c6b2

Browse files
aweng98aweng98
committed
rebase and lint
1 parent f6d2f03 commit bb4c6b2

File tree

14 files changed

+693
-712
lines changed

14 files changed

+693
-712
lines changed

‎playwright-e2e/dsm/component/smid.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import {expect, Locator, Page} from '@playwright/test';
2-
import Button from 'dss/component/button';
32
import Input from 'dss/component/input';
43
import {waitForResponse} from 'utils/test-utils';
54
import Modal from './modal';
@@ -53,7 +52,7 @@ export default class SMID {
5352
}
5453

5554
/* Helper Functions */
56-
private isInputVisible(index: number): Promise<boolean> {
55+
private async isInputVisible(index: number): Promise<boolean> {
5756
return this.fields.nth(index).isVisible();
5857
}
5958

‎playwright-e2e/dsm/component/tables/onc-history-table.ts

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
import {expect, Locator, Page} from '@playwright/test';
22
import Table from 'dss/component/table';
3-
import DatePicker from '../date-picker';
3+
import DatePicker from 'dsm/component/date-picker';
44
import TextArea from 'dss/component/textarea';
55
import {
66
InputTypeEnum,
77
OncHistoryInputColumnsEnum,
88
OncHistorySelectRequestEnum
9-
} from '../tabs/enums/onc-history-input-columns-enum';
10-
import {OncHistoryInputs} from '../tabs/models/onc-history-inputs';
9+
} from 'dsm/component/tabs/enums/onc-history-input-columns-enum';
10+
import {OncHistoryInputs} from 'dsm/component/tabs/models/onc-history-inputs';
1111
import {
1212
OncHistoryInputsMapValue,
1313
OncHistoryInputsTypes
14-
} from '../tabs/interfaces/onc-history-inputs-types';
14+
} from 'dsm/component/tabs/interfaces/onc-history-inputs-types';
1515
import {waitForResponse} from 'utils/test-utils';
1616
import Select from 'dss/component/select';
17-
import TissueInformationPage from '../../pages/tissue-information-page/tissue-information-page';
17+
import TissueInformationPage from 'dsm/pages/tissue-information-page/tissue-information-page';
1818
import Button from 'dss/component/button';
19-
import {FillDate} from '../../pages/tissue-information-page/interfaces/tissue-information-interfaces';
19+
import {FillDate} from 'dsm/pages/tissue-information-page/interfaces/tissue-information-interfaces';
2020
import Input from 'dss/component/input';
2121
import Checkbox from 'dss/component/checkbox';
2222

@@ -40,7 +40,7 @@ export default class OncHistoryTable extends Table {
4040
}
4141

4242
public async deleteRow(index: number): Promise<void> {
43-
const deleteRowBtn = await this.deleteRowButton(index);
43+
const deleteRowBtn = this.deleteRowButton(index);
4444
await expect(deleteRowBtn, 'Delete row button is not visible').toBeVisible();
4545
await deleteRowBtn.click();
4646
await waitForResponse(this.page, {uri: 'patch'});
@@ -56,26 +56,21 @@ export default class OncHistoryTable extends Table {
5656
let value: Promise<any>;
5757

5858
switch (inputType) {
59-
case InputTypeEnum.INPUT: {
59+
case InputTypeEnum.INPUT:
6060
value = new Input(this.page, {root: cell}).currentValue();
6161
break;
62-
}
63-
case InputTypeEnum.DATE: {
62+
case InputTypeEnum.DATE:
6463
value = new Input(this.page, {root: cell}).currentValue();
6564
break;
66-
}
67-
case InputTypeEnum.TEXTAREA: {
65+
case InputTypeEnum.TEXTAREA:
6866
value = new TextArea(this.page, {root: cell}).currentValue();
6967
break;
70-
}
71-
case InputTypeEnum.SELECT: {
68+
case InputTypeEnum.SELECT:
7269
value = new Select(this.page, {root: cell}).currentValue();
7370
break;
74-
}
7571
default:
7672
throw new Error(`Incorrect input type - ${inputType}`)
7773
}
78-
7974
return value;
8075
}
8176

@@ -202,7 +197,7 @@ export default class OncHistoryTable extends Table {
202197
const currentValue = await element.currentValue();
203198
const isDisabled = await element.isDisabled();
204199

205-
await expect(isDisabled, `Input field is disabled`).toBeFalsy();
200+
expect(isDisabled, `Input field is disabled`).toBeFalsy();
206201

207202
return currentValue?.trim();
208203
}

‎playwright-e2e/dsm/component/tabs/interfaces/onc-history-inputs-types.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import {InputTypeEnum, OncHistorySelectRequestEnum} from '../enums/onc-history-input-columns-enum';
2-
import {FillDate} from '../../../pages/tissue-information-page/interfaces/tissue-information-interfaces';
1+
import {InputTypeEnum, OncHistorySelectRequestEnum} from 'dsm/component/tabs/enums/onc-history-input-columns-enum';
2+
import {FillDate} from 'dsm/pages/tissue-information-page/interfaces/tissue-information-interfaces';
33

44
export interface OncHistoryInputsTypes {
55
value?: string | number;

‎playwright-e2e/dsm/component/tabs/models/onc-history-inputs.ts

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
import {InputTypeEnum, OncHistoryInputColumnsEnum} from '../enums/onc-history-input-columns-enum';
2-
import {OncHistoryInputsMapValue} from '../interfaces/onc-history-inputs-types';
1+
import {InputTypeEnum, OncHistoryInputColumnsEnum} from 'dsm/component/tabs/enums/onc-history-input-columns-enum';
2+
import {OncHistoryInputsMapValue} from 'dsm/component/tabs/interfaces/onc-history-inputs-types';
33

44
export const OncHistoryInputs = new Map<OncHistoryInputColumnsEnum, OncHistoryInputsMapValue>()
5-
.set(OncHistoryInputColumnsEnum.DATE_OF_PX, {type: InputTypeEnum.DATE, hasLookup: false})
6-
.set(OncHistoryInputColumnsEnum.TYPE_OF_PX, {type: InputTypeEnum.TEXTAREA, hasLookup: true})
7-
.set(OncHistoryInputColumnsEnum.LOCATION_OF_PX, {type: InputTypeEnum.INPUT, hasLookup: false})
8-
.set(OncHistoryInputColumnsEnum.HISTOLOGY, {type: InputTypeEnum.TEXTAREA, hasLookup: true})
9-
.set(OncHistoryInputColumnsEnum.ACCESSION_NUMBER, {type: InputTypeEnum.INPUT, hasLookup: false})
10-
.set(OncHistoryInputColumnsEnum.FACILITY, {type: InputTypeEnum.INPUT, hasLookup: true})
11-
.set(OncHistoryInputColumnsEnum.PHONE, {type: InputTypeEnum.INPUT, hasLookup: false})
12-
.set(OncHistoryInputColumnsEnum.FAX, {type: InputTypeEnum.INPUT, hasLookup: false})
13-
.set(OncHistoryInputColumnsEnum.DESTRUCTION_POLICY, {type: InputTypeEnum.INPUT, hasLookup: false})
14-
.set(OncHistoryInputColumnsEnum.TUMOR_SIZE, {type: InputTypeEnum.TEXTAREA, hasLookup: false})
15-
.set(OncHistoryInputColumnsEnum.SLIDES_TO_REQUEST, {type: InputTypeEnum.INPUT, hasLookup: false})
16-
.set(OncHistoryInputColumnsEnum.FACILITY_WHERE_SAMPLE_WAS_REVIEWED, {type: InputTypeEnum.INPUT, hasLookup: false})
17-
.set(OncHistoryInputColumnsEnum.TOTAL_NUMBER_SLIDES_MENTIONED, {type: InputTypeEnum.INPUT, hasLookup: false})
18-
.set(OncHistoryInputColumnsEnum.BLOCK_TO_REQUEST, {type: InputTypeEnum.INPUT, hasLookup: false})
19-
.set(OncHistoryInputColumnsEnum.EXTENSIVE_TREATMENT_EFFECT, {type: InputTypeEnum.INPUT, hasLookup: false})
20-
.set(OncHistoryInputColumnsEnum.VIABLE_TUMOR, {type: InputTypeEnum.INPUT, hasLookup: false})
21-
.set(OncHistoryInputColumnsEnum.NECROSIS, {type: InputTypeEnum.INPUT, hasLookup: false})
22-
.set(OncHistoryInputColumnsEnum.VOCAB_CHECK, {type: InputTypeEnum.INPUT, hasLookup: false})
23-
.set(OncHistoryInputColumnsEnum.ONC_HISTORY_DATE, {type: InputTypeEnum.DATE, hasLookup: false})
24-
.set(OncHistoryInputColumnsEnum.REQUEST, {type: InputTypeEnum.SELECT, hasLookup: false})
5+
.set(OncHistoryInputColumnsEnum.DATE_OF_PX, {type: InputTypeEnum.DATE, hasLookup: false})
6+
.set(OncHistoryInputColumnsEnum.TYPE_OF_PX, {type: InputTypeEnum.TEXTAREA, hasLookup: true})
7+
.set(OncHistoryInputColumnsEnum.LOCATION_OF_PX, {type: InputTypeEnum.INPUT, hasLookup: false})
8+
.set(OncHistoryInputColumnsEnum.HISTOLOGY, {type: InputTypeEnum.TEXTAREA, hasLookup: true})
9+
.set(OncHistoryInputColumnsEnum.ACCESSION_NUMBER, {type: InputTypeEnum.INPUT, hasLookup: false})
10+
.set(OncHistoryInputColumnsEnum.FACILITY, {type: InputTypeEnum.INPUT, hasLookup: true})
11+
.set(OncHistoryInputColumnsEnum.PHONE, {type: InputTypeEnum.INPUT, hasLookup: false})
12+
.set(OncHistoryInputColumnsEnum.FAX, {type: InputTypeEnum.INPUT, hasLookup: false})
13+
.set(OncHistoryInputColumnsEnum.DESTRUCTION_POLICY, {type: InputTypeEnum.INPUT, hasLookup: false})
14+
.set(OncHistoryInputColumnsEnum.TUMOR_SIZE, {type: InputTypeEnum.TEXTAREA, hasLookup: false})
15+
.set(OncHistoryInputColumnsEnum.SLIDES_TO_REQUEST, {type: InputTypeEnum.INPUT, hasLookup: false})
16+
.set(OncHistoryInputColumnsEnum.FACILITY_WHERE_SAMPLE_WAS_REVIEWED, {type: InputTypeEnum.INPUT, hasLookup: false})
17+
.set(OncHistoryInputColumnsEnum.TOTAL_NUMBER_SLIDES_MENTIONED, {type: InputTypeEnum.INPUT, hasLookup: false})
18+
.set(OncHistoryInputColumnsEnum.BLOCK_TO_REQUEST, {type: InputTypeEnum.INPUT, hasLookup: false})
19+
.set(OncHistoryInputColumnsEnum.EXTENSIVE_TREATMENT_EFFECT, {type: InputTypeEnum.INPUT, hasLookup: false})
20+
.set(OncHistoryInputColumnsEnum.VIABLE_TUMOR, {type: InputTypeEnum.INPUT, hasLookup: false})
21+
.set(OncHistoryInputColumnsEnum.NECROSIS, {type: InputTypeEnum.INPUT, hasLookup: false})
22+
.set(OncHistoryInputColumnsEnum.VOCAB_CHECK, {type: InputTypeEnum.INPUT, hasLookup: false})
23+
.set(OncHistoryInputColumnsEnum.ONC_HISTORY_DATE, {type: InputTypeEnum.DATE, hasLookup: false})
24+
.set(OncHistoryInputColumnsEnum.REQUEST, {type: InputTypeEnum.SELECT, hasLookup: false})

‎playwright-e2e/dsm/component/tabs/onc-history-tab.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import {expect, Locator, Page} from '@playwright/test';
2-
import OncHistoryTable from '../tables/onc-history-table';
3-
import {waitForResponse} from '../../../utils/test-utils';
4-
import Select from '../../../dss/component/select';
5-
import Button from '../../../dss/component/button';
2+
import OncHistoryTable from 'dsm/component/tables/onc-history-table';
3+
import {waitForResponse} from 'utils/test-utils';
4+
import Select from 'dss/component/select';
5+
import Button from 'dss/component/button';
66

77

88
export default class OncHistoryTab {

‎playwright-e2e/dsm/component/tissue.ts

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@ import {
66
TissueDynamicFieldsEnum,
77
TissueTypesEnum,
88
TumorTypesEnum
9-
} from '../pages/tissue-information-page/enums/tissue-information-enum';
9+
} from 'dsm/pages/tissue-information-page/enums/tissue-information-enum';
1010
import TextArea from 'dss/component/textarea';
1111
import {
1212
FillDate,
1313
TissueInputsMapValue
14-
} from '../pages/tissue-information-page/interfaces/tissue-information-interfaces';
14+
} from 'dsm/pages/tissue-information-page/interfaces/tissue-information-interfaces';
1515
import Select from 'dss/component/select';
1616
import DatePicker from './date-picker';
1717
import Input from 'dss/component/input';
18-
import {FillTissue} from '../pages/tissue-information-page/interfaces/fill-tissue-interface';
19-
import {tissueInputs} from '../pages/tissue-information-page/models/tissue-inputs';
18+
import {FillTissue} from 'dsm/pages/tissue-information-page/interfaces/fill-tissue-interface';
19+
import {tissueInputs} from 'dsm/pages/tissue-information-page/models/tissue-inputs';
2020
import {InputTypeEnum} from './tabs/enums/onc-history-input-columns-enum';
2121
import Button from 'dss/component/button';
2222
import SMID from './smid';
@@ -38,22 +38,18 @@ export default class Tissue {
3838
const inputLocator = await this.getField(dynamicField, byText);
3939

4040
switch (inputType) {
41-
case InputTypeEnum.INPUT: {
41+
case InputTypeEnum.INPUT:
4242
value = new Input(this.page, {root: inputLocator}).currentValue();
4343
break;
44-
}
45-
case InputTypeEnum.DATE: {
44+
case InputTypeEnum.DATE:
4645
value = new Input(this.page, {root: inputLocator}).currentValue();
4746
break;
48-
}
49-
case InputTypeEnum.TEXTAREA: {
47+
case InputTypeEnum.TEXTAREA:
5048
value = new TextArea(this.page, {root: inputLocator}).currentValue();
5149
break;
52-
}
53-
case InputTypeEnum.SELECT: {
50+
case InputTypeEnum.SELECT:
5451
value = new Select(this.page, {root: inputLocator}).currentValue();
5552
break;
56-
}
5753
default:
5854
throw new Error(`Incorrect input type - ${inputType}`)
5955
}
@@ -189,7 +185,7 @@ export default class Tissue {
189185
const currentValue = await element.currentValue();
190186
const isDisabled = await element.isDisabled();
191187

192-
await expect(isDisabled, `'${dynamicField}' is disabled`).toBeFalsy();
188+
expect(isDisabled, `'${dynamicField}' is disabled`).toBeFalsy();
193189

194190
return currentValue?.trim();
195191
}

0 commit comments

Comments
 (0)