fix: handle empty picture error

autowp · autowp · commit 65c91a2aaa79 · 2024-06-28T01:27:34.000+03:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -37,6 +37,7 @@
     "bootstrap-icons": "^1.10.3",
     "chart.js": "^4.2.1",
     "core-js": "^3.28.0",
+    "google-proto-files": "^4.2.0",
     "keycloak-angular": "^15",
     "keycloak-js": "^23",
     "leaflet": "^1.9.3",
diff --git a/src/app/catalogue/cars/cars.component.ts b/src/app/catalogue/cars/cars.component.ts
@@ -149,7 +149,7 @@ export class CatalogueCarsComponent {
           map((response) => {
             const items: CatalogueListItem[] = response.items.map((item) => {
               const pictures: CatalogueListItemPicture[] = item.preview_pictures.pictures.map((picture) => ({
-                picture: picture.picture ? picture.picture : null,
+                picture: picture?.picture ? picture.picture : null,
                 routerLink:
                   item.route && picture && picture.picture
                     ? item.route.concat(['pictures', picture.picture.identity])
diff --git a/src/app/catalogue/concepts/concepts.component.ts b/src/app/catalogue/concepts/concepts.component.ts
@@ -83,7 +83,7 @@ export class CatalogueConceptsComponent {
     map((response) => {
       const items: CatalogueListItem[] = response.items.map((item) => {
         const pictures: CatalogueListItemPicture[] = item.preview_pictures.pictures.map((picture) => ({
-          picture: picture.picture ? picture.picture : null,
+          picture: picture?.picture ? picture.picture : null,
           routerLink:
             item.route && picture && picture.picture ? item.route.concat(['pictures', picture.picture.identity]) : [],
           thumb: picture ? picture.thumb : null,
diff --git a/src/app/catalogue/engines/engines.component.ts b/src/app/catalogue/engines/engines.component.ts
@@ -86,7 +86,7 @@ export class CatalogueEnginesComponent {
         const routerLink = ['/', brand.catname, item.catname];
 
         const pictures: CatalogueListItemPicture[] = item.item.preview_pictures.pictures.map((picture) => ({
-          picture: picture.picture ? picture.picture : null,
+          picture: picture?.picture ? picture.picture : null,
           routerLink: picture && picture.picture ? routerLink.concat(['pictures', picture.picture.identity]) : [],
           thumb: picture ? picture.thumb : null,
         }));
diff --git a/src/app/catalogue/vehicles/vehicles.component.ts b/src/app/catalogue/vehicles/vehicles.component.ts
@@ -134,7 +134,7 @@ export class CatalogueVehiclesComponent {
               const itemRouterLink = [...routerLink, item.catname];
 
               const pictures: CatalogueListItemPicture[] = item.item.preview_pictures.pictures.map((picture) => ({
-                picture: picture.picture ? picture.picture : null,
+                picture: picture?.picture ? picture.picture : null,
                 routerLink:
                   picture && picture.picture ? itemRouterLink.concat(['pictures', picture.picture.identity]) : [],
                 thumb: picture ? picture.thumb : null,
@@ -234,7 +234,7 @@ export class CatalogueVehiclesComponent {
 
   private static convertItem(item: APIItem, routerLink: string[]): CatalogueListItem {
     const pictures: CatalogueListItemPicture[] = item.preview_pictures.pictures.map((picture) => ({
-      picture: picture.picture ? picture.picture : null,
+      picture: picture?.picture ? picture.picture : null,
       routerLink: picture && picture.picture ? routerLink.concat(['pictures', picture.picture.identity]) : [],
       thumb: picture ? picture.thumb : null,
     }));
diff --git a/src/app/cutaway/authors/authors.component.ts b/src/app/cutaway/authors/authors.component.ts
@@ -63,7 +63,7 @@ export class CutawayAuthorsComponent implements OnInit {
       itemRouterLink.push(item.id.toString());
 
       const pictures: CatalogueListItemPicture[] = item.preview_pictures.pictures.map((picture) => ({
-        picture: picture.picture ? picture.picture : null,
+        picture: picture?.picture ? picture.picture : null,
         routerLink: picture && picture.picture ? itemRouterLink.concat([picture.picture.identity]) : [],
         thumb: picture ? picture.thumb : null,
       }));
diff --git a/src/app/cutaway/brands/brands.component.ts b/src/app/cutaway/brands/brands.component.ts
@@ -62,7 +62,7 @@ export class CutawayBrandsComponent implements OnInit {
       const itemRouterLink = ['/cutaway/brands', item.catname];
 
       const pictures: CatalogueListItemPicture[] = item.preview_pictures.pictures.map((picture) => ({
-        picture: picture.picture ? picture.picture : null,
+        picture: picture?.picture ? picture.picture : null,
         routerLink: picture.picture ? ['/picture', picture.picture.identity] : undefined,
         thumb: picture ? picture.thumb : null,
       }));
diff --git a/src/app/factories/items/items.component.ts b/src/app/factories/items/items.component.ts
@@ -76,7 +76,7 @@ export class FactoryItemsComponent {
     map((data) => ({
       items: data.items.map((item) => {
         const pictures: CatalogueListItemPicture[] = item.preview_pictures.pictures.map((picture) => ({
-          picture: picture.picture ? picture.picture : null,
+          picture: picture?.picture ? picture.picture : null,
           routerLink:
             item.route && picture && picture.picture ? item.route.concat(['pictures', picture.picture.identity]) : [],
           thumb: picture ? picture.thumb : null,
diff --git a/src/app/index/specs-cars/specs-cars.component.ts b/src/app/index/specs-cars/specs-cars.component.ts
@@ -25,7 +25,7 @@ export class IndexSpecsCarsComponent {
       return chunkBy(
         response.items.map((item) => {
           const pictures: CatalogueListItemPicture[] = item.preview_pictures.pictures.map((picture) => ({
-            picture: picture.picture ? picture.picture : null,
+            picture: picture?.picture ? picture.picture : null,
             routerLink: picture && picture.picture ? [...item.route, 'pictures', picture.picture.identity] : [],
             thumb: picture ? picture.thumb : null,
           }));
diff --git a/src/app/moder/items/item-meta-form/item-meta-form.component.html b/src/app/moder/items/item-meta-form/item-meta-form.component.html
@@ -14,7 +14,7 @@
           [class.is-invalid]="(name.invalid && (name.dirty || name.touched)) || (invalidParams && invalidParams.name)"
           name="name"
           class="form-control"
-          formControlName="name"
+          [formControl]="name"
           required
         />
         <p
@@ -34,7 +34,7 @@
           type="text"
           name="full_name"
           class="form-control"
-          formControlName="full_name"
+          [formControl]="fullName"
         />
         <p
           *ngFor="let message of invalidParams | invalidParams: 'full_name'"
@@ -53,7 +53,7 @@
           type="text"
           name="catname"
           class="form-control"
-          formControlName="catname"
+          [formControl]="catname"
         />
         <p
           *ngFor="let message of invalidParams | invalidParams: 'catname'"
@@ -71,7 +71,7 @@
           name="body"
           style="width: 30%"
           class="form-control"
-          formControlName="body"
+          [formControl]="body"
         />
         <p
           *ngFor="let message of invalidParams | invalidParams: 'body'"
@@ -90,7 +90,7 @@
           name="spec_id"
           style="width: 30%"
           class="form-select"
-          formControlName="spec_id"
+          [formControl]="specID"
         >
           <option *ngFor="let spec of specs$ | async" [ngValue]="spec.id">
             {{ '…'.repeat(spec.deep) + spec.short_name }}
@@ -107,13 +107,7 @@
       <label class="col-md-2 col-form-label" i18n>Type</label>
       <div class="col-md-10">
         <ng-container *ngFor="let typeID of vehicleTypeID.value">
-          <input
-            type="checkbox"
-            name="vehicle_type_id"
-            formControlName="vehicle_type_id"
-            [value]="typeID"
-            class="d-none"
-          />
+          <input type="checkbox" name="vehicle_type_id" [formControl]="vehicleTypeID" [value]="typeID" class="d-none" />
           <button class="btn btn-sm btn-info" type="button" (click)="showVehicleTypesModal(vehicleTypeID)">
             {{ vehicleTypeName$(typeID) | async }}
           </button>
@@ -144,7 +138,7 @@
               placeholder="from"
               i18n-placeholder
               class="form-control"
-              formControlName="begin_year"
+              [formControl]="beginYear"
               maxlength="4"
             />
           </div>
@@ -156,7 +150,7 @@
                 (invalidParams && invalidParams.begin_model_year_fraction)
               "
               name="begin_model_year_fraction"
-              formControlName="begin_year_fraction"
+              [formControl]="beginYearFraction"
             >
               <option *ngFor="let option of modelYearFractionOptions" [ngValue]="option.value">
                 {{ option.name }}
@@ -174,7 +168,7 @@
               placeholder="to"
               i18n-placeholder
               class="form-control"
-              formControlName="end_year"
+              [formControl]="endYear"
               maxlength="4"
             />
           </div>
@@ -186,7 +180,7 @@
                 (invalidParams && invalidParams.end_model_year_fraction)
               "
               name="end_model_year_fraction"
-              formControlName="end_year_fraction"
+              [formControl]="endYearFraction"
             >
               <option *ngFor="let option of modelYearFractionOptions" [ngValue]="option.value">
                 {{ option.name }}
@@ -222,7 +216,7 @@
               i18n-placeholder
               class="form-control"
               [attr.maxlength]="4"
-              formControlName="year"
+              [formControl]="beginYear"
             />
           </div>
           <div class="col-md-4 col-sm-7 mb-0" *ngIf="begin.controls.month as beginMonth">
@@ -235,7 +229,7 @@
               title="month"
               i18n-title
               class="form-select"
-              formControlName="month"
+              [formControl]="beginMonth"
             >
               <option *ngFor="let month of monthOptions" [ngValue]="month.value">{{ month.name }}</option>
             </select>
@@ -268,7 +262,7 @@
               i18n-placeholder
               class="form-control"
               maxlength="4"
-              formControlName="year"
+              [formControl]="endYear"
             />
           </div>
           <div class="col-md-4 col-sm-7 mb-0" *ngIf="end.controls.month as endMonth">
@@ -280,7 +274,7 @@
               title="month"
               i18n-title
               class="form-select"
-              formControlName="month"
+              [formControl]="endMonth"
             >
               <option *ngFor="let month of monthOptions" [ngValue]="month.value">{{ month.name }}</option>
             </select>
@@ -291,7 +285,7 @@
               [class.is-invalid]="
                 (today.invalid && (today.dirty || today.touched)) || (invalidParams && invalidParams.today)
               "
-              formControlName="today"
+              [formControl]="today"
               title="today"
               i18n-title
               class="form-select"
@@ -333,7 +327,7 @@
               class="form-control"
               title="number"
               i18n-title
-              formControlName="count"
+              [formControl]="count"
             />
           </div>
           <div class="col-md-4 col-sm-4 mb-0" *ngIf="produced.controls.exactly as exactly">
@@ -344,7 +338,7 @@
                 (invalidParams && invalidParams.produced_exactly)
               "
               class="form-select"
-              formControlName="exactly"
+              [formControl]="exactly"
             >
               <option *ngFor="let option of producedOptions" [ngValue]="option.value">{{ option.name }}</option>
             </select>
@@ -372,7 +366,7 @@
           "
           style="width: 20%"
           class="form-select"
-          formControlName="is_concept"
+          [formControl]="isConcept"
         >
           <option *ngFor="let option of isConceptOptions$ | async" [ngValue]="option.value">{{ option.name }}</option>
         </select>
@@ -395,7 +389,7 @@
                 (isGroup.invalid && (isGroup.dirty || isGroup.touched)) || (invalidParams && invalidParams.is_group)
               "
               value="1"
-              formControlName="is_group"
+              [formControl]="isGroup"
             />
             <ng-container i18n>Group</ng-container>
           </label>
@@ -405,7 +399,7 @@
     <div class="mb-3 row" *ngIf="form.controls.point as point">
       <label class="col-md-2 col-form-label">Point</label>
       <div class="col-md-10 coords">
-        <app-map-point formControlName="point"></app-map-point>
+        <app-map-point [formControl]="point"></app-map-point>
       </div>
     </div>
     <div class="mb-3 row" *ngIf="form.controls.items as control">
diff --git a/src/app/moder/items/item-meta-form/item-meta-form.component.ts b/src/app/moder/items/item-meta-form/item-meta-form.component.ts
@@ -90,7 +90,7 @@ interface Form {
     year: FormControl<null | number>;
   }>;
   full_name?: FormControl<null | string>;
-  is_concept?: FormControl<boolean | null>;
+  is_concept?: FormControl<'inherited' | boolean | null>;
   is_group?: FormControl<boolean | null>;
   items?: FormArray<FormControl<string>>;
   model_years?: FormGroup<{
@@ -283,6 +283,7 @@ export class ItemMetaFormComponent {
     this.pictures$,
   ]).pipe(
     map(([item, vehicleTypeIDs, disableIsGroup, items, pictures]) => {
+      console.log(item);
       const elements: Form = {
         name: new FormControl(item.name, [Validators.required, Validators.maxLength(this.nameMaxlength)]),
       };
@@ -296,9 +297,15 @@ export class ItemMetaFormComponent {
         elements.body = new FormControl(item.body, Validators.maxLength(this.bodyMaxlength));
         elements.spec_id = new FormControl(item.spec_id);
         elements.model_years = new FormGroup({
-          begin_year: new FormControl(item.begin_model_year, [Validators.min(1800), Validators.max(this.modelYearMax)]),
+          begin_year: new FormControl(item.begin_model_year > 0 ? item.begin_model_year : null, [
+            Validators.min(1800),
+            Validators.max(this.modelYearMax),
+          ]),
           begin_year_fraction: new FormControl(item.begin_model_year_fraction),
-          end_year: new FormControl(item.end_model_year, [Validators.min(1800), Validators.max(this.modelYearMax)]),
+          end_year: new FormControl(item.end_model_year > 0 ? item.end_model_year : null, [
+            Validators.min(1800),
+            Validators.max(this.modelYearMax),
+          ]),
           end_year_fraction: new FormControl(item.end_model_year_fraction),
         });
         elements.produced = new FormGroup({
@@ -316,13 +323,19 @@ export class ItemMetaFormComponent {
       }
       if (item.item_type_id !== ItemType.ITEM_TYPE_COPYRIGHT) {
         elements.begin = new FormGroup({
-          month: new FormControl(item.begin_month),
-          year: new FormControl(item.begin_year, [Validators.min(1800), Validators.max(this.yearMax)]),
+          month: new FormControl(item.begin_month > 0 ? item.begin_month : null),
+          year: new FormControl(item.begin_year > 0 ? item.begin_year : null, [
+            Validators.min(1800),
+            Validators.max(this.yearMax),
+          ]),
         });
         elements.end = new FormGroup({
-          month: new FormControl(item.end_month),
+          month: new FormControl(item.end_month > 0 ? item.end_month : null),
           today: new FormControl(item.today),
-          year: new FormControl(item.end_year, [Validators.min(1800), Validators.max(this.yearMax)]),
+          year: new FormControl(item.end_year > 0 ? item.end_year : null, [
+            Validators.min(1800),
+            Validators.max(this.yearMax),
+          ]),
         });
       }
       if ([ItemType.ITEM_TYPE_FACTORY, ItemType.ITEM_TYPE_MUSEUM].includes(item.item_type_id)) {
diff --git a/src/app/moder/items/new/new.component.ts b/src/app/moder/items/new/new.component.ts
@@ -71,7 +71,7 @@ export class ModerItemsNewComponent {
           engine_vehicles_count: 0,
           full_name: '',
           id: 0,
-          is_concept: false,
+          is_concept: 'inherited',
           is_concept_inherit: true,
           is_group: false,
           item_language_count: 0,
@@ -92,7 +92,7 @@ export class ModerItemsNewComponent {
             large_format: false,
             pictures: [],
           },
-          produced: 0,
+          produced: null,
           produced_exactly: false,
           related_group_pictures: [],
           route: [],
diff --git a/src/app/services/item.ts b/src/app/services/item.ts
@@ -100,7 +100,7 @@ export interface APIItem {
 
   inbox_pictures_count?: number;
 
-  is_concept: boolean;
+  is_concept: 'inherited' | boolean | null;
   is_group: boolean;
   item_language_count: number;
   item_of_day_pictures: APIItemOfDayPicture[];
@@ -129,7 +129,7 @@ export interface APIItem {
     }[];
   };
 
-  produced: number;
+  produced: null | number;
 
   produced_exactly: boolean;
 
