From 579a9a4c5513ecb69539d66dff406aae2bbc5c98 Mon Sep 17 00:00:00 2001
From: Sebastian <sebastian@squidex.io>
Date: Tue, 19 Jan 2021 14:59:12 +0100
Subject: [PATCH] Use normal version.

---
 .../components/assets/asset-dialog.component.html      |  2 +-
 .../components/assets/asset-history.component.html     |  2 +-
 .../components/assets/asset-history.component.ts       | 10 ++++------
 .../app/shared/components/assets/asset.component.html  |  4 ++--
 frontend/app/shared/components/assets/pipes.ts         |  2 +-
 5 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/frontend/app/shared/components/assets/asset-dialog.component.html b/frontend/app/shared/components/assets/asset-dialog.component.html
index e3da7433e..14c89f471 100644
--- a/frontend/app/shared/components/assets/asset-dialog.component.html
+++ b/frontend/app/shared/components/assets/asset-dialog.component.html
@@ -92,7 +92,7 @@
 
                             <div class="row no-gutters">
                                 <div class="col">
-                                    <input readonly class="form-control" name="url" id="url" value="{{asset | sqxAssetUrl:asset.fileVersion:false}}" #inputUrl>
+                                    <input readonly class="form-control" name="url" id="url" value="{{asset | sqxAssetUrl:asset.version:false}}" #inputUrl>
                                 </div>
                                 <div class="col-auto">
                                     <button type="button" class="btn btn-text" [sqxCopy]="inputUrl">
diff --git a/frontend/app/shared/components/assets/asset-history.component.html b/frontend/app/shared/components/assets/asset-history.component.html
index f961121bf..ee1582006 100644
--- a/frontend/app/shared/components/assets/asset-history.component.html
+++ b/frontend/app/shared/components/assets/asset-history.component.html
@@ -12,7 +12,7 @@
             <div class="event-created">{{assetEvent.event.created | sqxFromNow}}</div>
     
             <ng-container *ngIf="assetEvent.canDownload">
-                <a class="event-load force" [href]="asset | sqxAssetUrl:assetEvent.fileVersion" sqxExternalLink="noicon">{{ 'assets.downloadVersion' | sqxTranslate }}</a> 
+                <a class="event-load force" [href]="asset | sqxAssetUrl:assetEvent.version" sqxExternalLink="noicon">{{ 'assets.downloadVersion' | sqxTranslate }}</a> 
             </ng-container>
         </div>
     </div>
diff --git a/frontend/app/shared/components/assets/asset-history.component.ts b/frontend/app/shared/components/assets/asset-history.component.ts
index 26de215f6..38459505c 100644
--- a/frontend/app/shared/components/assets/asset-history.component.ts
+++ b/frontend/app/shared/components/assets/asset-history.component.ts
@@ -10,7 +10,7 @@ import { AppsState, AssetDto, HistoryEventDto, HistoryService } from '@app/share
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-interface AssetEvent { event: HistoryEventDto; fileVersion: number; canDownload: boolean; }
+interface AssetEvent { event: HistoryEventDto; version: number; canDownload: boolean; }
 
 @Component({
     selector: 'sqx-asset-history',
@@ -35,18 +35,16 @@ export class AssetHistoryComponent implements OnChanges {
         this.assetEvents =
             this.historyService.getHistory(this.appsState.appName, channel).pipe(
                 map(events => {
-                    let fileVersion = -1;
+                    let version = -1;
 
                     return events.map(event => {
                         const canDownload =
                             event.eventType === 'AssetUpdatedEventV2' ||
                             event.eventType === 'AssetCreatedEventV2';
 
-                        if (canDownload) {
-                            fileVersion++;
-                        }
+                        version++;
 
-                        return { event, fileVersion, canDownload };
+                        return { event, version, canDownload };
                     });
                 }));
     }
diff --git a/frontend/app/shared/components/assets/asset.component.html b/frontend/app/shared/components/assets/asset.component.html
index 02c8dce47..b1573778d 100644
--- a/frontend/app/shared/components/assets/asset.component.html
+++ b/frontend/app/shared/components/assets/asset.component.html
@@ -30,7 +30,7 @@
                             <i class="icon-pencil"></i>
                         </a>
 
-                        <a class="file-download ml-2" [href]="asset | sqxAssetUrl:asset.fileVersion:false" sqxStopClick sqxExternalLink="noicon">
+                        <a class="file-download ml-2" [href]="asset | sqxAssetUrl:asset.version:false" sqxStopClick sqxExternalLink="noicon">
                             <i class="icon-download"></i>
                         </a>
 
@@ -139,7 +139,7 @@
                             <img class="user-picture" title="{{asset.lastModifiedBy | sqxUserNameRef}}" [src]="asset.lastModifiedBy | sqxUserPictureRef">
                         </td>
                         <td class="col-actions text-right">
-                            <a class="btn btn-text-secondary" [href]="asset | sqxAssetUrl:asset.fileVersion:false" sqxStopClick sqxExternalLink="noicon">
+                            <a class="btn btn-text-secondary" [href]="asset | sqxAssetUrl:asset.version:false" sqxStopClick sqxExternalLink="noicon">
                                 <i class="icon-download"></i>
                             </a>
 
diff --git a/frontend/app/shared/components/assets/pipes.ts b/frontend/app/shared/components/assets/pipes.ts
index cc7090617..10fe92dd8 100644
--- a/frontend/app/shared/components/assets/pipes.ts
+++ b/frontend/app/shared/components/assets/pipes.ts
@@ -47,7 +47,7 @@ export class AssetPreviewUrlPipe implements PipeTransform {
     public transform(asset: AssetDto): string {
         let url =  asset.fullUrl(this.apiUrl, this.authService);
 
-        url = StringHelper.appendToUrl(url, 'version', asset.fileVersion);
+        url = StringHelper.appendToUrl(url, 'version', asset.version);
 
         return url;
     }