Merge pull request #483 from DigitalExcellence/master

Merge master to develop after release

Author: niraymak

CHANGELOG.md

@@ -9,22 +9,36 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ### Added
 
-- Added icons to the call-to-action buttons - [#451](https://github.com/DigitalExcellence/dex-frontend/issues/451)
-
 ### Changed
 
-- Hide data sources that have the IsVisible property set to false - [#474](https://github.com/DigitalExcellence/dex-frontend/issues/474)
-
 ### Deprecated
 
 ### Removed
 
 ### Fixed
+
+### Security
+
+## Release v.1.3.0-beta - 05-05-2021
+
+### Added
+
+- Added icons to the call-to-action buttons - [#451](https://github.com/DigitalExcellence/dex-frontend/issues/451)
+
+### Changed
+
+- Hide data sources that have the IsVisible property set to false - [#474](https://github.com/DigitalExcellence/dex-frontend/issues/474)
+
+### Fixed
+
 - Fixed issue where the edit- & delete project would always be shown - [#458](https://github.com/DigitalExcellence/dex-frontend/issues/458)
 - Fixed issue where the privacy modal and alerts were not responsive - [#426](https://github.com/DigitalExcellence/dex-frontend/issues/426)
 - Fixed issue where the wizard would not import projects that missed a required property. [#471](https://github.com/DigitalExcellence/dex-frontend/issues/471)
 
-### Security
+### Hotfix
+
+- Fixed issue where icon were not being previewed in edit project overview. [Hotfix](https://github.com/DigitalExcellence/dex-frontend/pull/480)
+- Fixed issue where project was still being showed after deletion until refresh . [Hotfix](https://github.com/DigitalExcellence/dex-frontend/pull/481)
 
 ## Release v.1.2.0-beta - 15-04-2021
 

src/app/components/file-uploader/file-uploader.component.html

@@ -30,17 +30,6 @@
 </div>
 <p class="form-footnote">The recommended dimensions for an icon are atleast 512x512</p>
 <div *ngIf="showPreview" class="files-list">
-  <div class="single-file" *ngFor="let file of files; let i = index">
-    <div class="file-info">
-      <button type="button" class="btn btn-icon btn-danger" aria-label="error"
-              (click)="deleteFile(i)"><span aria-hidden="true">&times;</span>
-      </button>
-      <img alt="image-preview" class="file-icon" [src]=file?.preview>
-      <h4 class="file-name">
-        {{ file?.name }}
-      </h4>
-      <h4 class="file-size">
-<div class="files-list">
     <div class="single-file" *ngFor="let file of files; let i = index">
         <div class="file-info">
             <button type="button" class="btn btn-icon btn-danger" aria-label="error" (click)="deleteFile(i)"><span

src/app/components/file-uploader/file-uploader.component.ts

@@ -123,7 +123,6 @@ export class FileUploaderComponent {
         this.alertService.pushAlert(alertConfig);
         this.deleteFile(this.files.indexOf(file));
       }
-
     }
   }
 

src/app/error-handler/sentry.error-handler.ts

@@ -20,7 +20,7 @@ import {environment} from 'src/environments/environment';
 
 Sentry.init({
     dsn: environment.sentryDsnUrl,
-    release: 'dex-frontend@1.2.0-beta'
+    release: 'dex-frontend@1.3.0-beta'
 });
 
 /**

src/app/modules/project/edit/edit.component.html

@@ -76,18 +76,11 @@ <h3>Description*</h3>
             <div class="col-12">
               <div class="project-icon-picker">
                 <h3>Project icon</h3>
-                <app-file-uploader [acceptMultiple]="acceptMultiple" [acceptedTypes]="acceptedTypes">
+                <app-file-uploader [acceptMultiple]="acceptMultiple" [acceptedTypes]="acceptedTypes" [showPreview]="showPreview">
                 </app-file-uploader>
               </div>
             </div>
           </div>
-          <div class="row">
-            <div class="col-12">
-              <div>
-                <p class="form-footnote">The recommended dimensions for an icon are atleast 512x512</p>
-              </div>
-            </div>
-          </div>
         </form>
 
         <ng-container *ngIf="callToActionOptions.length > 1">
@@ -105,7 +98,7 @@ <h3>Text</h3>
                   </select>
                 </div>
               </div>
-      
+
               <div class="col-6">
                 <div>
                   <h3>Link</h3>
@@ -167,7 +160,7 @@ <h3>Collaborators</h3>
             <button type="button" class="btn btn-icon btn-danger" aria-label="error"
               (click)="onClickDeleteCollaborator(collaborator)"> <span aria-hidden="true"> &times; </span>
             </button>
-            
+
               <div class="collaborator-text-container w-100">
 
                 <div>
@@ -176,10 +169,10 @@ <h3>Collaborators</h3>
                 <p class="collaborator-text large dash">-</p>
                 <div>
                   <p class="collaborator-text large" [tooltip]="collaborator?.role" delay="300">{{collaborator?.role}}</p>
-                </div>     
+                </div>
 
               </div>
-            
+
             <hr class="dashed">
           </div>
         </div>

src/app/modules/project/edit/edit.component.ts

@@ -47,6 +47,7 @@ export class EditComponent implements OnInit  {
   @ViewChild(FileUploaderComponent) fileUploader: FileUploaderComponent;
   public acceptedTypes = ['image/png', 'image/jpg', 'image/jpeg'];
   public acceptMultiple = false;
+  public showPreview = true;
 
   /**
    * Formgroup for entering project details.

src/app/modules/project/overview/overview.component.ts

@@ -374,6 +374,7 @@ export class OverviewComponent implements OnInit, AfterContentInit {
           if (this.location.path().startsWith('/project/details')) {
             this.location.replaceState('/project/overview');
             this.updateSEOTags();
+            this.onInternalQueryChange();
           }
         }
         ));