Merge branch 'bugfix/fix_defects' into 'develop'

bugfix/fix_defects

See merge request upm-inesdata/inesdata-connector-interface!38

Author: ralconada-gmv

package-lock.json

@@ -8,7 +8,7 @@ import { Vocabulary } from "../../../shared/models/vocabulary";
 import { NotificationService } from 'src/app/shared/services/notification.service';
 import { DATA_ADDRESS_TYPES, ASSET_TYPES } from 'src/app/shared/utils/app.constants';
 import { CKEDITOR_CONFIG } from 'src/app/shared/utils/ckeditor.utils';
-
+import { LoadingService } from 'src/app/shared/services/loading.service';
 import { createAjv } from '@jsonforms/core';
 import { angularMaterialRenderers } from '@jsonforms/angular-material';
 import * as jsonld from 'jsonld';
@@ -150,13 +150,16 @@ export class AssetCreateComponent implements OnInit {
     private vocabularyService: VocabularyService,
     private notificationService: NotificationService,
     @Inject('STORAGE_TYPES') public storageTypes: StorageType[],
-    private router: Router) {
+    private router: Router,
+    private loadingService: LoadingService) {
   }
 
   async onSave() {
+    this.loadingService.showLoading();
     // Check whether the asset is valid
     if (!this.checkVocabularyData() || !this.checkRequiredFields()) {
       this.notificationService.showError("Review the form fields");
+      this.loadingService.hideLoading();
       return;
     }
 
@@ -198,6 +201,7 @@ export class AssetCreateComponent implements OnInit {
       dataAddress = this.inesDataStoreAddress;
     } else {
       this.notificationService.showError("Incorrect destination value");
+      this.loadingService.hideLoading();
       return;
     }
 
@@ -208,9 +212,21 @@ export class AssetCreateComponent implements OnInit {
       dataAddress: dataAddress
     };
 
-    if (this.storageTypeId === DATA_ADDRESS_TYPES.inesDataStore) {
-      assetInput.file = this.inesDataStoreAddress?.file
-      assetInput.blob = new Blob([await assetInput?.file.arrayBuffer()])
+    if (this.storageTypeId === DATA_ADDRESS_TYPES.inesDataStore && this.inesDataStoreAddress?.file) {
+      const file = this.inesDataStoreAddress?.file;
+
+      const chunkSize = 1024 * 1024;
+      let offset = 0;
+      const chunks: Blob[] = [];
+
+      while (offset < file.size) {
+        const slice = file.slice(offset, offset + chunkSize);
+        const arrayBuffer = await slice.arrayBuffer();
+        chunks.push(new Blob([arrayBuffer]));
+        offset += chunkSize;
+      }
+
+      assetInput.blob = new Blob(chunks);
     }
 
     this.createAsset(assetInput)
@@ -363,6 +379,7 @@ private createAsset(asset: AssetInput){
           complete: () => {
             this.navigateToAsset()
             this.notificationService.showInfo("Successfully created");
+            this.loadingService.hideLoading();
           }
         })
       } else {
@@ -372,6 +389,7 @@ private createAsset(asset: AssetInput){
           complete: () => {
             this.navigateToAsset()
             this.notificationService.showInfo("Successfully created");
+            this.loadingService.hideLoading();
           }
         })
       }
@@ -384,6 +402,7 @@ private createAsset(asset: AssetInput){
   private showError(error: string, errorMessage: string) {
     this.notificationService.showError(errorMessage);
     console.error(error);
+    this.loadingService.hideLoading();
   }
 
   navigateToAsset(){

src/app/pages/assets/asset-create/asset-create.component.ts

@@ -18,16 +18,16 @@
         <mat-list dense>
           <mat-list-item>
             <mat-icon matListItemIcon>policy</mat-icon>
-            <div class="policy-name" matListItemTitle>Access policy</div>
+            <div class="bold-text" matListItemTitle>Access policy</div>
             <div matListItemLine>{{contractDefinition.accessPolicyId}}</div>
           </mat-list-item>
           <mat-list-item>
             <mat-icon matListItemIcon>policy</mat-icon>
-            <div class="policy-name" matListItemTitle>Contract policy</div>
+            <div class="bold-text" matListItemTitle>Contract policy</div>
             <div matListItemLine>{{contractDefinition.contractPolicyId}}</div>
           </mat-list-item>
-          <mat-list-item>
-            <div class="policy-assets" matListItemTitle>Assets</div>
+          <mat-list-item class="contract-assets">
+            <div class="bold-text" matListItemTitle>Assets</div>
             <mat-icon matListItemIcon>policy</mat-icon>
 
             <div matListItemLine *ngIf="contractDefinition.assetsSelector.length == 0; else elseBlock">All assets</div>

src/app/pages/contract-definitions/contract-definition-viewer/contract-definition-viewer.component.html

@@ -19,8 +19,7 @@
   margin-left: 0;
 }
 
-.policy-name,
-#policy-assets {
+.bold-text {
   font-weight: bold !important;
 }
 
@@ -34,3 +33,7 @@ mat-paginator {
   align-items: center;
   gap: 10px;
 }
+
+.contract-assets .mdc-list-item__secondary-text{
+  white-space: break-spaces;
+}

src/app/pages/contract-definitions/contract-definition-viewer/contract-definition-viewer.component.scss

@@ -9,7 +9,7 @@
       <mat-label>ID</mat-label>
       <input matInput autocomplete="newvalue" [formControl]="ctrl" />
       <mat-error *ngIf="ctrl.invalid && ctrl.errors?.pattern">{{
-        validationMessages.invalidWhitespacesOrColonsMessage
+        validationMessages.invalidSpecialCharactersMessage
       }}</mat-error>
     </mat-form-field>
 

src/app/pages/policies/new-policy/new-policy.component.html

@@ -5,7 +5,7 @@ import {
   PolicyDefinitionCreatePageFormValue,
 } from './policy-definition-create-page-form-model';
 import { ExpressionFormControls } from '../policy-editor/editor/expression-form-controls';
-import { noWhitespacesOrColonsValidator } from 'src/app/shared/validators/no-whitespaces-or-colons-validator';
+import { noSpecialCharactersValidator } from 'src/app/shared/validators/no-special-characters-validator';
 
 /**
  * Handles AngularForms for NewPolicyDialog
@@ -28,7 +28,7 @@ export class PolicyDefinitionCreatePageForm {
 
   buildFormGroup(): FormGroup<PolicyDefinitionCreatePageFormModel> {
     return this.formBuilder.nonNullable.group({
-      id: ['', [Validators.required, noWhitespacesOrColonsValidator]],
+      id: ['', [Validators.required, noSpecialCharactersValidator]],
       treeControls: this.expressionFormControls.formGroup,
     });
   }

src/app/pages/policies/new-policy/policy-definition-create-page-form.ts

@@ -19,6 +19,6 @@ export const buildTimespanRestriction = (
   return multi(
     'AND',
     evaluationTimeConstraint('GEQ', firstDay),
-    evaluationTimeConstraint('LT', addDays(lastDay, 1)),
+    evaluationTimeConstraint('LEQ', lastDay),
   );
 };

src/app/pages/policies/policy-editor/editor/recipes/timespan-restriction-dialog/timespan-restriction-expression.ts

@@ -1,6 +1,3 @@
-#wrapper {
-}
-
 :host ::ng-deep div.mat-expansion-panel-body {
   padding-left: 0 !important;
 }
@@ -31,6 +28,7 @@ button {
 
 mat-card {
   font-family: "Open Sans";
+  place-self: normal;
 }
 
 :host ::ng-deep policy-expression {
@@ -45,6 +43,14 @@ mat-card {
   height: 100%;
 }
 
-mat-card {
-  place-self: normal;
+.code {
+  word-wrap: break-word;
+}
+
+.mat-mdc-card-title {
+  padding-right: 30px !important;
+}
+
+:host ::ng-deep .mat-mdc-card-header-text{
+  width: 100%;
 }

src/app/pages/policies/policy-view/policy-view.component.scss

@@ -47,4 +47,5 @@
       </div>
     </mat-sidenav-content>
   </mat-sidenav-container>
+  <app-spinner></app-spinner>
 </div>

src/app/shared/components/navigation/navigation.component.html

@@ -0,0 +1,26 @@
+.overlay {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(25, 25, 25, 0.8);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  z-index: 1000;
+}
+
+.spinner {
+  border: 8px solid #f3f3f3;
+  border-top: 8px solid #03a9f4;
+  border-radius: 50%;
+  width: 60px;
+  height: 60px;
+  animation: spin 1s linear infinite;
+}
+
+@keyframes spin {
+  0% { transform: rotate(0deg); }
+  100% { transform: rotate(360deg); }
+}