Merge pull request #605 from berta-cms/fix-ts-strict-templates

Code quality improvements

Author: uldisrudzitis

_api_app/app/Http/Middleware/SetupMiddleware.php

@@ -58,6 +58,11 @@ protected function parseEnvFile($file)
         }
 
         $content = trim(file_get_contents(realpath($file)));
+
+        if (empty($content)) {
+            return $res;
+        }
+
         $rows = preg_split('/\s+/', $content);
         // Loop through given data
         foreach ((array) $rows as $key => $value) {

editor/src/app/inputs/file-input.component.ts

@@ -90,7 +90,6 @@ import { SettingModel } from '../shared/interfaces';
 })
 export class FileInputComponent implements OnInit {
   @Input() label: string;
-  @Input() templateSlug: string;
   @Input() property: string;
   @Input() value: string | File;
   @Input() accept: string;

editor/src/app/sites/media/entry-gallery-editor.component.ts

@@ -603,7 +603,7 @@ export class EntryGalleryEditorComponent implements OnInit {
     );
   }
 
-  openCropItemPage(event: PointerEvent, fileName: string) {
+  openCropItemPage(event: MouseEvent, fileName: string) {
     event.stopPropagation();
     const image_order = this.currentEntry.mediaCacheData.file.findIndex(
       (file) => file['@attributes'].src === fileName,
@@ -612,7 +612,7 @@ export class EntryGalleryEditorComponent implements OnInit {
     this.router.navigate([url], { queryParamsHandling: 'preserve' });
   }
 
-  deleteItem(event: PointerEvent, file: string) {
+  deleteItem(event: MouseEvent, file: string) {
     event.stopPropagation();
     this.popupService.showPopup({
       type: 'warn',

editor/src/app/sites/media/site-media.component.ts

@@ -12,6 +12,7 @@ import { SectionEntriesState } from '../sections/entries/entries-state/section-e
 import { ActivatedRoute } from '@angular/router';
 import { SitesState } from '../sites-state/sites.state';
 import { SiteStateModel } from '../sites-state/site-state.model';
+import { SectionEntry } from '../sections/entries/entries-state/section-entries-state.model';
 
 @Component({
   selector: 'berta-site-media',
@@ -108,6 +109,7 @@ export class SiteMediaComponent implements OnInit, OnDestroy {
   selectedSections: {
     section: SiteSectionStateModel;
     tags: any;
+    entries: SectionEntry[];
   }[];
   selectedTag: string | null;
   showAllSections: boolean;

editor/src/app/sites/sections/background-gallery-editor.component.ts

@@ -454,7 +454,7 @@ export class BackgroundGalleryEditorComponent implements OnInit {
     );
   }
 
-  deleteItem(event: PointerEvent, file: string) {
+  deleteItem(event: MouseEvent, file: string) {
     event.stopPropagation();
     this.popupService.showPopup({
       type: 'warn',

editor/src/app/sites/sections/section.component.ts

@@ -5,15 +5,13 @@ import { take, filter, switchMap, map } from 'rxjs/operators';
 import { Store } from '@ngxs/store';
 import { PopupService } from '../../popup/popup.service';
 import { SiteSectionStateModel } from './sections-state/site-sections-state.model';
-import {
-  SiteTemplateSectionTypesModel,
-  TemplateTranslationsModel,
-} from '../template-settings/site-templates.interface';
+import { TemplateTranslationsModel } from '../template-settings/site-templates.interface';
 import {
   DeleteSiteSectionAction,
   CloneSectionAction,
 } from './sections-state/site-sections.actions';
 import { AppState } from '../../app-state/app.state';
+import { SettingConfigModel } from '../../shared/interfaces';
 
 @Component({
   selector: 'berta-section',
@@ -152,7 +150,7 @@ export class SectionComponent implements OnInit {
   @Input('section') section: SiteSectionStateModel;
   @Input('isExpanded') isExpanded: boolean;
   @Input('templateSectionTypes')
-  templateSectionTypes: SiteTemplateSectionTypesModel;
+  templateSectionTypes: SettingConfigModel['values'];
   @Input('translations') translations: TemplateTranslationsModel;
   @Input('params') params: any[] = [];
 

editor/src/app/sites/sections/sections-state/site-sections-state.model.ts

@@ -25,6 +25,7 @@ export interface SiteSectionStateModel {
       autoplay?: 0 | 1;
       image_size?: string;
       animation?: string;
+      fade_content?: 'enabled' | 'disabled';
     };
   };
   '@attributes'?: {

editor/src/app/sites/shared/help-tooltip.component.ts

@@ -5,7 +5,7 @@ import { Component, Input } from '@angular/core';
   template: `
     <span
       [tooltipStr]="content"
-      showDelay="200"
+      [showDelay]="200"
       textColor="white"
       backgroundColor="black"
       borderColor="transparent"
@@ -39,7 +39,7 @@ import { Component, Input } from '@angular/core';
 export class HelpTooltipComponent {
   @Input() content: string;
 
-  onClick(e: PointerEvent) {
+  onClick(e: MouseEvent): boolean {
     e.stopPropagation();
     return false;
   }

editor/src/app/sites/shared/setting.component.ts

@@ -49,7 +49,6 @@ import { UpdateInputFocus } from '../../app-state/app.actions';
       @case ('icon') {
         <berta-file-input
           [label]="config.title"
-          [templateSlug]="templateSlug"
           [property]="setting.slug"
           [accept]="'image/png'"
           [value]="setting.value"
@@ -166,7 +165,6 @@ import { UpdateInputFocus } from '../../app-state/app.actions';
   standalone: false,
 })
 export class SettingComponent implements OnInit {
-  @Input('templateSlug') templateSlug: string;
   @Input('setting') setting: SettingModel;
   @Input('config') config: SettingConfigModel;
   @Input() disabled: boolean;

editor/src/app/sites/template-settings/site-template-settings.component.ts

@@ -59,7 +59,6 @@ import { AppState } from '../../app-state/app.state';
           <div>
             @for (setting of settingGroup.settings; track setting) {
               <berta-setting
-                [templateSlug]="settingGroup.templateSlug"
                 [setting]="setting.setting"
                 [config]="setting.config"
                 [disabled]="