Merge pull request #279 from 2sic/version/14

Version/14.12.03 LTS
2sic · Nov 29, 2022 · 43c1595 · 43c1595
2 parents bcc9821 + 09066b4
commit 43c1595
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "eav-ui",
   "// VERSION": "The version number is very important, as it's used for publishing the source maps",
-  "version": "14.12.01",
+  "version": "14.12.03",
   "license": "MIT",
   "repository": {
     "type": "git",

diff --git a/...ects/eav-ui/src/app/app-administration/app-configuration/app-configuration.component.html b/...ects/eav-ui/src/app/app-administration/app-configuration/app-configuration.component.html
@@ -373,7 +373,7 @@
       </div>
     </mat-card-header>
     <mat-card-content>
-      You can save / restore the app with data and configuration in <code>.data/app.xml</code>.
+      You can save / restore the app with data and configuration in <code>App_Data/app.xml</code>.
       This file can then also be versioned using git.
       <div *ngIf="appStateAdvanced">
         <br>

diff --git a/...-ui/src/app/edit/form/fields/hyperlink/hyperlink-default/hyperlink-default.component.html b/...-ui/src/app/edit/form/fields/hyperlink/hyperlink-default/hyperlink-default.component.html
@@ -79,8 +79,8 @@
             <a [href]="data.preview.url" target="_blank" [tippy]="data.preview.url" tippyPlacement="right"
               *ngIf="!data.preview.isImage">
               <div class="preview-icon-box">
-                <mat-icon *ngIf="data.preview.isKnownType">{{ data.preview.icon }}</mat-icon>
-                <mat-icon *ngIf="!data.preview.isKnownType">{{ data.preview.icon }}</mat-icon>
+                <mat-icon *ngIf="data.preview.isKnownType" [svgIcon]="data.preview.icon"></mat-icon>
+                <mat-icon *ngIf="!data.preview.isKnownType" [svgIcon]="data.preview.icon"></mat-icon>
               </div>
             </a>
           </div>

diff --git a/.../hyperlink-default-expandable-wrapper/hyperlink-default-expandable-wrapper.component.html b/.../hyperlink-default-expandable-wrapper/hyperlink-default-expandable-wrapper.component.html
@@ -60,12 +60,10 @@
       [ngStyle]="{ 'background-image': data.controlStatus.value && data.preview.isImage ? data.preview.thumbnailUrl : '' }"
       (click)="expandDialog()">
       <mat-icon *ngIf="data.controlStatus.value && !data.preview.isImage && data.preview.isKnownType"
-        [tippy]="data.preview.url" tippyPlacement="right">
-        {{ data.preview.icon }}
+        [tippy]="data.preview.url" tippyPlacement="right" [svgIcon]="data.preview.icon">
       </mat-icon>
       <mat-icon *ngIf="data.controlStatus.value && !data.preview.isImage && !data.preview.isKnownType"
-        [tippy]="data.preview.url" tippyPlacement="right">
-        {{ data.preview.icon }}
+        [tippy]="data.preview.url" tippyPlacement="right" [svgIcon]="data.preview.icon">
       </mat-icon>
     </div>
     <!-- field -->

diff --git a/...eav-ui/src/app/edit/shared/date-adapters/mat-dayjs-date-adapter/mat-dayjs-date-adapter.ts b/...eav-ui/src/app/edit/shared/date-adapters/mat-dayjs-date-adapter/mat-dayjs-date-adapter.ts
@@ -342,13 +342,15 @@ export class MatDayjsDateAdapter extends DateAdapter<Dayjs> {
    */
   private dayJs(input?: string | number | Date | Dayjs | null | undefined, format?: string, locale?: string): Dayjs {
     if (!this.shouldUseUtc) {
-      return dayjs(input, { format, locale }, locale);
+      return dayjs(input, format);
     }
-    return dayjs(
-      input,
-      { format, locale, utc: this.shouldUseUtc },
-      locale
-    ).utc();
+    // when user writes date
+    if (typeof (input) == "string") {
+      const date = new Date(dayjs(input, format).toDate());
+      return dayjs(new Date(Date.UTC(date.getFullYear(), date.getMonth(), date.getDate()))).utc();
+    }
+    // when user picks date in date picker
+    return dayjs(input, format).utc();
   }
 
   private range<T>(length: number, valueFunction: (index: number) => T): T[] {