Skip to content

Commit 3661eff

Browse files
committed
build: migrate to typed reactive form
1 parent f16bd05 commit 3661eff

File tree

2 files changed

+100
-74
lines changed

2 files changed

+100
-74
lines changed

src/app/moder/items/item-meta-form/item-meta-form.component.html

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*ngIf="item$ | async as item"
77
[formGroup]="form"
88
>
9-
<div class="mb-3 row" *ngIf="form.get('name') as name">
9+
<div class="mb-3 row" *ngIf="form.controls.name as name">
1010
<label class="col-md-2 col-form-label" i18n>Name</label>
1111
<div class="col-md-10">
1212
<input
@@ -24,7 +24,7 @@
2424
></p>
2525
</div>
2626
</div>
27-
<div class="mb-3 row" *ngIf="form.get('full_name') as fullName">
27+
<div class="mb-3 row" *ngIf="form.controls.full_name as fullName">
2828
<label class="col-md-2 col-form-label" i18n>Full name</label>
2929
<div class="col-md-10">
3030
<input
@@ -43,7 +43,7 @@
4343
></p>
4444
</div>
4545
</div>
46-
<div class="mb-3 row" *ngIf="form.get('catname') as catname">
46+
<div class="mb-3 row" *ngIf="form.controls.catname as catname">
4747
<label class="col-md-2 col-form-label" i18n>Catname</label>
4848
<div class="col-md-10">
4949
<input
@@ -62,7 +62,7 @@
6262
></p>
6363
</div>
6464
</div>
65-
<div class="mb-3 row" *ngIf="form.get('body') as body">
65+
<div class="mb-3 row" *ngIf="form.controls.body as body">
6666
<label class="col-md-2 col-form-label" i18n>Body number</label>
6767
<div class="col-md-10">
6868
<input
@@ -80,7 +80,7 @@
8080
></p>
8181
</div>
8282
</div>
83-
<div class="mb-3 row" *ngIf="form.get('spec_id') as specID">
83+
<div class="mb-3 row" *ngIf="form.controls.spec_id as specID">
8484
<label class="col-md-2 col-form-label" i18n>Spec</label>
8585
<div class="col-md-10">
8686
<select
@@ -103,7 +103,7 @@
103103
></p>
104104
</div>
105105
</div>
106-
<div class="mb-3 row" *ngIf="form.get('vehicle_type_id') as vehicleTypeID">
106+
<div class="mb-3 row" *ngIf="form.controls.vehicle_type_id as vehicleTypeID">
107107
<label class="col-md-2 col-form-label" i18n>Type</label>
108108
<div class="col-md-10">
109109
<ng-container *ngFor="let typeID of vehicleTypeID.value">
@@ -129,11 +129,11 @@
129129
<div>{{'...'.repeat(data.deep)}}{{data.nameTranslated}}</div>
130130
</script>
131131
</div>
132-
<div class="mb-3 row" *ngIf="form.get('model_years') as modelYears" formGroupName="model_years">
132+
<div class="mb-3 row" *ngIf="form.controls.model_years as modelYears" formGroupName="model_years">
133133
<label class="col-md-2 col-form-label" i18n>Model years</label>
134134
<div class="col-md-10">
135135
<div class="row">
136-
<div class="col-md-2 col-sm-4 mb-0" *ngIf="modelYears.get('begin_year') as beginYear">
136+
<div class="col-md-2 col-sm-4 mb-0" *ngIf="modelYears.controls.begin_year as beginYear">
137137
<input
138138
type="number"
139139
[class.is-invalid]="
@@ -148,7 +148,7 @@
148148
maxlength="4"
149149
/>
150150
</div>
151-
<div class="col-md-1 col-sm-2 mb-0" *ngIf="modelYears.get('begin_year_fraction') as beginYearFraction">
151+
<div class="col-md-1 col-sm-2 mb-0" *ngIf="modelYears.controls.begin_year_fraction as beginYearFraction">
152152
<select
153153
class="form-control"
154154
[class.is-invalid]="
@@ -163,7 +163,7 @@
163163
</option>
164164
</select>
165165
</div>
166-
<div class="col-md-2 col-sm-4 mb-0" *ngIf="modelYears.get('end_year') as endYear">
166+
<div class="col-md-2 col-sm-4 mb-0" *ngIf="modelYears.controls.end_year as endYear">
167167
<input
168168
type="number"
169169
[class.is-invalid]="
@@ -178,7 +178,7 @@
178178
maxlength="4"
179179
/>
180180
</div>
181-
<div class="col-md-1 col-sm-2 mb-0" *ngIf="modelYears.get('end_year') as endYearFraction">
181+
<div class="col-md-1 col-sm-2 mb-0" *ngIf="modelYears.controls.end_year as endYearFraction">
182182
<select
183183
class="form-control"
184184
[class.is-invalid]="
@@ -206,11 +206,11 @@
206206
></p>
207207
</div>
208208
</div>
209-
<div class="mb-3 row" *ngIf="form.get('begin') as begin" formGroupName="begin">
209+
<div class="mb-3 row" *ngIf="form.controls.begin as begin" formGroupName="begin">
210210
<label class="col-md-2 col-form-label" i18n>Begin</label>
211211
<div class="col-md-10">
212212
<div class="row">
213-
<div class="col-md-2 col-sm-2 mb-0" *ngIf="begin.get('year') as beginYear">
213+
<div class="col-md-2 col-sm-2 mb-0" *ngIf="begin.controls.year as beginYear">
214214
<input
215215
type="number"
216216
[class.is-invalid]="
@@ -225,7 +225,7 @@
225225
formControlName="year"
226226
/>
227227
</div>
228-
<div class="col-md-4 col-sm-7 mb-0" *ngIf="begin.get('month') as beginMonth">
228+
<div class="col-md-4 col-sm-7 mb-0" *ngIf="begin.controls.month as beginMonth">
229229
<select
230230
name="begin_month"
231231
[class.is-invalid]="
@@ -253,11 +253,11 @@
253253
></p>
254254
</div>
255255
</div>
256-
<div class="mb-3 row" *ngIf="form.get('end') as end" formGroupName="end">
256+
<div class="mb-3 row" *ngIf="form.controls.end as end" formGroupName="end">
257257
<label class="col-md-2 col-form-label" i18n>End</label>
258258
<div class="col-md-10">
259259
<div class="row">
260-
<div class="col-md-2 col-sm-2 mb-0" *ngIf="end.get('year') as endYear">
260+
<div class="col-md-2 col-sm-2 mb-0" *ngIf="end.controls.year as endYear">
261261
<input
262262
type="number"
263263
[class.is-invalid]="
@@ -271,7 +271,7 @@
271271
formControlName="year"
272272
/>
273273
</div>
274-
<div class="col-md-4 col-sm-7 mb-0" *ngIf="end.get('month') as endMonth">
274+
<div class="col-md-4 col-sm-7 mb-0" *ngIf="end.controls.month as endMonth">
275275
<select
276276
name="end_month"
277277
[class.is-invalid]="
@@ -285,7 +285,7 @@
285285
<option *ngFor="let month of monthOptions" [ngValue]="month.value">{{ month.name }}</option>
286286
</select>
287287
</div>
288-
<div class="col-md-4 col-sm-3 mb-0" *ngIf="end.get('today') as today">
288+
<div class="col-md-4 col-sm-3 mb-0" *ngIf="end.controls.today as today">
289289
<select
290290
name="today"
291291
[class.is-invalid]="
@@ -317,11 +317,11 @@
317317
></p>
318318
</div>
319319
</div>
320-
<div class="mb-3 row" *ngIf="form.get('produced') as produced" formGroupName="produced">
320+
<div class="mb-3 row" *ngIf="form.controls.produced as produced" formGroupName="produced">
321321
<label class="col-md-2 col-form-label" i18n>Produced</label>
322322
<div class="col-md-10">
323323
<div class="row">
324-
<div class="col-md-2 col-sm-2 mb-0" *ngIf="produced.get('count') as count">
324+
<div class="col-md-2 col-sm-2 mb-0" *ngIf="produced.controls.count as count">
325325
<input
326326
type="number"
327327
[class.is-invalid]="
@@ -336,7 +336,7 @@
336336
formControlName="count"
337337
/>
338338
</div>
339-
<div class="col-md-4 col-sm-4 mb-0" *ngIf="produced.get('exactly') as exactly">
339+
<div class="col-md-4 col-sm-4 mb-0" *ngIf="produced.controls.exactly as exactly">
340340
<select
341341
name="produced_exactly"
342342
[class.is-invalid]="
@@ -362,7 +362,7 @@
362362
></p>
363363
</div>
364364
</div>
365-
<div class="mb-3 row" *ngIf="form.get('is_concept') as isConcept">
365+
<div class="mb-3 row" *ngIf="form.controls.is_concept as isConcept">
366366
<label class="col-md-2 col-form-label" i18n>Concept (prototype)</label>
367367
<div class="col-md-10">
368368
<select
@@ -383,7 +383,7 @@
383383
></p>
384384
</div>
385385
</div>
386-
<div class="mb-3 row" *ngIf="form.get('is_group') as isGroup">
386+
<div class="mb-3 row" *ngIf="form.controls.is_group as isGroup">
387387
<div class="col-md-2"></div>
388388
<div class="col-md-10">
389389
<div class="checkbox">
@@ -402,27 +402,27 @@
402402
</div>
403403
</div>
404404
</div>
405-
<div class="mb-3 row" *ngIf="form.get('point') as point">
405+
<div class="mb-3 row" *ngIf="form.controls.point as point">
406406
<label class="col-md-2 col-form-label">Point</label>
407407
<div class="col-md-10 coords">
408408
<app-map-point formControlName="point"></app-map-point>
409409
</div>
410410
</div>
411-
<div class="mb-3 row" *ngIf="form.get('items') as control">
411+
<div class="mb-3 row" *ngIf="form.controls.items as control">
412412
<label class="col-md-2 col-form-label text-end" i18n>Vehicles</label>
413413
<div class="col-md-10" *ngIf="items$ | async as items">
414-
<div class="checkbox" *ngFor="let child of items; let idx = index">
414+
<div class="checkbox" *ngFor="let child of items">
415415
<label>
416416
<input type="checkbox" [value]="child.id" (change)="onCheckboxChange($event, control)" />
417417
<span [innerHTML]="child.name_html"></span>
418418
</label>
419419
</div>
420420
</div>
421421
</div>
422-
<div class="mb-3 row" *ngIf="form.get('pictures') as control">
422+
<div class="mb-3 row" *ngIf="form.controls.pictures as control">
423423
<label class="col-md-2 col-form-label text-end" i18n>Pictures</label>
424424
<div class="col-md-10 multicheckbox-pictures row" *ngIf="pictures$ | async as data">
425-
<div *ngFor="let picture of data; let idx = index" class="col-md-3 mb-4">
425+
<div *ngFor="let picture of data" class="col-md-3 mb-4">
426426
<label
427427
class="btn btn-secondary"
428428
[class.btn-success]="picture.selected"

0 commit comments

Comments
 (0)