Skip to content

Commit

Permalink
fix: them all 2
Browse files Browse the repository at this point in the history
  • Loading branch information
@FrancescoBorzi
FrancescoBorzi committed Feb 5, 2020
1 parent d12247d commit f7b8917
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 21 deletions.
6 changes: 3 additions & 3 deletions src/app/features/item/item-template/item-template.component.html
View file
Expand Up @@ -522,7 +522,7 @@
<div class="col-12">
<label class="control-label" for="stat_type{{ i }}">type{{ i }}</label>
<app-single-value-selector-btn
[control]="editorService.form.get('stat_type' + i)"
[control]="editorService.form.controls['stat_type' + i]"
[config]="{ options: STAT_TYPE, name: 'stat_type' + i }"
[modalClass]="'modal-md'"
></app-single-value-selector-btn>
Expand Down Expand Up @@ -571,7 +571,7 @@
<div class="col-12">
<label class="control-label" for="dmg_type{{ i }}">type{{ i }}</label>
<app-single-value-selector-btn
[control]="editorService.form.get('dmg_type' + i)"
[control]="editorService.form.controls['dmg_type' + i]"
[config]="{ options: DAMAGE_TYPE, name: 'dmg_type' + i }"
[modalClass]="'modal-md'"
></app-single-value-selector-btn>
Expand Down Expand Up @@ -617,7 +617,7 @@
<div class="col-12">
<label class="control-label" for="socketColor_{{ i }}">Color_{{ i }}</label>
<app-flags-selector-btn
[control]="editorService.form.get('socketColor_' + i)"
[control]="editorService.form.controls['socketColor_' + i]"
[config]="{ flags: SOCKET_COLOR, name: 'socketColor_' + i }"
[modalClass]="'modal-md'"
></app-flags-selector-btn>
Expand Down
2 changes: 1 addition & 1 deletion src/app/features/quest/quest-offer-reward/quest-offer-reward.component.html
View file
Expand Up @@ -52,7 +52,7 @@
<div class="col-12">
<label class="control-label" for="Emote{{ i }}">Emote{{ i }}</label>
<app-single-value-selector-btn
[control]="editorService.form.get('Emote' + i)"
[control]="editorService.form.controls['Emote' + i]"
[config]="{ options: EMOTE, name: 'Emote' + i }"
[modalClass]="'modal-md'"
></app-single-value-selector-btn>
Expand Down
12 changes: 6 additions & 6 deletions src/app/features/quest/quest-template/quest-template.component.html
View file
Expand Up @@ -247,7 +247,7 @@
<div class="col-12">
<label class="control-label" for="RequiredItemId{{ i }}">RequiredItemId{{ i }}</label>
<app-item-selector-btn
[control]="editorService.form.get('RequiredItemId' + i)"
[control]="editorService.form.controls['RequiredItemId' + i]"
[config]="{ name: 'RequiredItemId' + i }"
></app-item-selector-btn>
<input [formControlName]="'RequiredItemId' + i" id="RequiredItemId{{ i }}" type="number" class="form-control form-control-sm">
Expand Down Expand Up @@ -293,7 +293,7 @@
>
<label class="control-label" for="RequiredFactionId{{ i }}">RequiredFactionId{{ i }}</label>
<app-single-value-selector-btn
[control]="editorService.form.get('RequiredFactionId' + i)"
[control]="editorService.form.controls['RequiredFactionId' + i]"
[config]="{ options: FACTIONS, name: 'RequiredFactionId' + i }"
[modalClass]="'modal-md'"
></app-single-value-selector-btn>
Expand Down Expand Up @@ -327,7 +327,7 @@
<div class="col-12">
<label class="control-label" for="ItemDrop{{ i }}">ItemDrop{{ i }}</label>
<app-item-selector-btn
[control]="editorService.form.get('ItemDrop' + i)"
[control]="editorService.form.controls['ItemDrop' + i]"
[config]="{ name: 'ItemDrop' + i }"
></app-item-selector-btn>
<input [formControlName]="'ItemDrop' + i" id="ItemDrop{{ i }}" type="number" class="form-control form-control-sm">
Expand Down Expand Up @@ -444,7 +444,7 @@
<div class="col-12">
<label class="control-label" for="RewardItem{{ i }}">RewardItem{{ i }}</label>
<app-item-selector-btn
[control]="editorService.form.get('RewardItem' + i)"
[control]="editorService.form.controls['RewardItem' + i]"
[config]="{ name: 'RewardItem' + i }"
></app-item-selector-btn>
<input [formControlName]="'RewardItem' + i" id="RewardItem{{ i }}" type="number" class="form-control form-control-sm">
Expand All @@ -469,7 +469,7 @@
<div class="col-12">
<label class="control-label" for="RewardChoiceItemID{{ i }}">RewardChoiceItemID{{ i }}</label>
<app-item-selector-btn
[control]="editorService.form.get('RewardChoiceItemID' + i)"
[control]="editorService.form.controls['RewardChoiceItemID' + i]"
[config]="{ name: 'RewardChoiceItemID' + i }"
></app-item-selector-btn>
<input [formControlName]="'RewardChoiceItemID' + i" id="RewardChoiceItemID{{ i }}" type="number" class="form-control form-control-sm">
Expand All @@ -496,7 +496,7 @@
<div class="col-12">
<label class="control-label" for="RewardFactionID{{ i }}">RewardFactionID{{ i }}</label>
<app-single-value-selector-btn
[control]="editorService.form.get('RewardFactionID' + i)"
[control]="editorService.form.controls['RewardFactionID' + i]"
[config]="{ options: FACTIONS, name: 'RewardFactionID' + i }"
[modalClass]="'modal-md'"
></app-single-value-selector-btn>
Expand Down
2 changes: 1 addition & 1 deletion src/app/shared/abstract/service/editors/editor.service.ts
View file
Expand Up @@ -49,7 +49,7 @@ export abstract class EditorService<T extends TableRow> extends SubscriptionHand
}

protected disableEntityIdField() {
this._form.get(this._entityIdField).disable();
this._form.controls[this._entityIdField].disable();
}

protected initForm() {
Expand Down
12 changes: 6 additions & 6 deletions src/app/shared/abstract/service/editors/multi-row-editor.service.spec.ts
View file
Expand Up @@ -196,9 +196,9 @@ describe('MultiRowEditorService', () => {

service.onRowSelection({ selected });

expect(service.form.get(MOCK_ID).value).toEqual(rows[0][MOCK_ID]);
expect(service.form.get(MOCK_ID_2).value).toEqual(rows[0][MOCK_ID_2]);
expect(service.form.get(MOCK_NAME).value).toEqual(rows[0][MOCK_NAME]);
expect(service.form.controls[MOCK_ID].value).toEqual(rows[0][MOCK_ID]);
expect(service.form.controls[MOCK_ID_2].value).toEqual(rows[0][MOCK_ID_2]);
expect(service.form.controls[MOCK_NAME].value).toEqual(rows[0][MOCK_NAME]);
expect(formResetSpy).toHaveBeenCalledTimes(1);
expect(formEnableSpy).toHaveBeenCalledTimes(1);
expect(service.loading).toBe(false);
Expand Down Expand Up @@ -315,17 +315,17 @@ describe('MultiRowEditorService', () => {
});

it('should return true when the form has a unique id', () => {
service.form.get(MOCK_ID_2).setValue(4);
service.form.controls[MOCK_ID_2].setValue(4);
expect(service.isFormIdUnique()).toBe(true);
});

it('should return false when the form has an already used id that is NOT the selected row', () => {
service.form.get(MOCK_ID_2).setValue(2);
service.form.controls[MOCK_ID_2].setValue(2);
expect(service.isFormIdUnique()).toBe(false);
});

it('should return true when the form has an already used id that is the selected row', () => {
service.form.get(MOCK_ID_2).setValue(2);
service.form.controls[MOCK_ID_2].setValue(2);
service['_selectedRowId'] = 2;
expect(service.isFormIdUnique()).toBe(true);
});
Expand Down
4 changes: 2 additions & 2 deletions src/app/shared/abstract/service/editors/multi-row-editor.service.ts
View file
Expand Up @@ -50,7 +50,7 @@ export abstract class MultiRowEditorService<T extends TableRow> extends EditorSe
if (this._form.dirty && this.isFormIdUnique()) {
this._newRows[this.getSelectedRowIndex()] = this._form.getRawValue();
this._newRows = [ ...this._newRows ];
this._selectedRowId = this.form.get(this._entitySecondIdField).value;
this._selectedRowId = this.form.controls[this._entitySecondIdField].value;
this.checkRowsCorrectness();
this.updateDiffQuery();
this.updateFullQuery();
Expand Down Expand Up @@ -207,7 +207,7 @@ export abstract class MultiRowEditorService<T extends TableRow> extends EditorSe
for (const row of this._newRows) {
if (
row[this._entitySecondIdField] !== this._selectedRowId
&& row[this._entitySecondIdField] === this._form.get(this._entitySecondIdField).value
&& row[this._entitySecondIdField] === this._form.controls[this._entitySecondIdField].value
) {
return false;
}
Expand Down
2 changes: 1 addition & 1 deletion src/app/shared/abstract/service/editors/single-row-editor.service.ts
View file
Expand Up @@ -99,7 +99,7 @@ export abstract class SingleRowEditorService<T extends TableRow> extends EditorS
protected updateFormAfterReload() {
this._loading = true;
for (const field of this.fields) {
const control = this._form.get(field);
const control = this._form.controls[field];
/* istanbul ignore else */
if (control) {
control.setValue(this._originalValue[field]);
Expand Down
2 changes: 1 addition & 1 deletion src/app/shared/modules/sai-editor/sai-top-bar/sai-top-bar.component.spec.ts
View file
Expand Up @@ -46,7 +46,7 @@ describe('SaiTopBarComponent', () => {
beforeEach(() => {
handler = TestBed.get(SaiHandlerService);
handler['_selected'] = JSON.stringify({ source_type: SAI_TYPES.SAI_TYPE_GAMEOBJECT, entryorguid });
querySpy = spyOn(TestBed.get(QueryService), 'query');
querySpy = spyOn(TestBed.get(QueryService), 'query').and.returnValue(of({ results: [] }));

fixture = TestBed.createComponent(TestHostComponent);
host = fixture.componentInstance;
Expand Down

0 comments on commit f7b8917

Please sign in to comment.