Fix load ipfs documents (#4087)

Fix load ipfs documents
hashgraph · Aug 27, 2024 · 8b04e1a · 8b04e1a
1 parent 02e7de1
commit 8b04e1a
Show file tree

Hide file tree

Showing 114 changed files with 5,173 additions and 4,596 deletions.
diff --git a/api-gateway/src/helpers/utils.ts b/api-gateway/src/helpers/utils.ts
@@ -3,6 +3,10 @@ import { IAuthUser, PinoLogger } from '@guardian/common';
 import { IOwner, PolicyHelper, UserRole } from '@guardian/interfaces';
 import { PolicyEngine } from './policy-engine.js';
 
+interface MessageError extends Error {
+    code: number;
+}
+
 /**
  * Find all field values in object by field name
  * @param obj
@@ -91,14 +95,18 @@ export const ONLY_SR = ' Only users with the Standard Registry role are allowed
  * @param error
  * @param logger
  */
-export async function InternalException(error: HttpException | Error | string, logger: PinoLogger) {
+export async function InternalException(error: HttpException | string | MessageError, logger: PinoLogger) {
     await logger.error(error, ['API_GATEWAY']);
     if (error instanceof HttpException) {
         throw error;
     } else if (typeof error === 'string') {
         throw new HttpException(error, HttpStatus.INTERNAL_SERVER_ERROR);
     } else {
-        throw new HttpException(error.message, HttpStatus.INTERNAL_SERVER_ERROR);
+        if (error.code) {
+            throw new HttpException(error.message, error.code);
+        } else {
+            throw new HttpException(error.message, HttpStatus.INTERNAL_SERVER_ERROR);
+        }
     };
 }
 

diff --git a/frontend/src/app/modules/common/separate-stepper/separate-stepper.component.scss b/frontend/src/app/modules/common/separate-stepper/separate-stepper.component.scss
@@ -6,7 +6,7 @@
 }
 
 .stepper-steps-container {
-  overflow: auto;
+    overflow: auto;
     position: relative;
 }
 
@@ -25,8 +25,8 @@
 //}
 
 .stepper-steps {
-  border-radius: 8px;
-  border: 1px solid var(--color-grey-3);
+    border-radius: 8px;
+    border: 1px solid var(--color-grey-3);
 }
 
 .stepper-view-container {
@@ -35,17 +35,17 @@
     display: flex;
     align-items: center;
     flex-direction: column;
-  margin-left: 24px;
+    margin-left: 24px;
 }
 
 .stepper-view-content {
     width: 100%;
     overflow-y: scroll;
     position: relative;
     box-sizing: border-box;
-  padding: 24px;
-  border-radius: 8px;
-  border: 1px solid var(--color-grey-3);
+    padding: 24px;
+    border-radius: 8px;
+    border: 1px solid var(--color-grey-3);
 }
 
 .stepper-view-header {
@@ -68,12 +68,12 @@
 }
 
 .title-label {
-  color: var(--color-grey-black-1);
-  font-family: Merriweather Sans, sans-serif;
+    color: var(--color-grey-black-1);
+    font-family: Merriweather Sans, sans-serif;
     font-size: 24px;
-  font-style: normal;
-  font-weight: 700;
-  line-height: 32px;
+    font-style: normal;
+    font-weight: 700;
+    line-height: 32px;
 }
 
 .step-action-buttons {
@@ -91,5 +91,5 @@
 }
 
 .step-action-prev-btn {
-  border: 1px solid rgba(0, 0, 0, 0.12);
-}
+    border: 1px solid rgba(0, 0, 0, 0.12);
+}
diff --git a/...src/app/modules/policy-engine/policy-viewer/blocks/action-block/action-block.component.ts b/...src/app/modules/policy-engine/policy-viewer/blocks/action-block/action-block.component.ts
@@ -1,3 +1,4 @@
+import { HttpErrorResponse } from '@angular/common/http';
 import { Component, Input, OnInit } from '@angular/core';
 import { PolicyEngineService } from 'src/app/services/policy-engine.service';
 import { PolicyHelper } from 'src/app/services/policy-helper.service';
@@ -67,18 +68,23 @@ export class ActionBlockComponent implements OnInit {
         } else {
             this.policyEngineService
                 .getBlockData(this.id, this.policyId)
-                .subscribe(
-                    (data: any) => {
-                        this.setData(data);
-                        setTimeout(() => {
-                            this.loading = false;
-                        }, 1000);
-                    },
-                    (e) => {
-                        console.error(e.error);
-                        this.loading = false;
-                    }
-                );
+                .subscribe(this._onSuccess.bind(this), this._onError.bind(this));
+        }
+    }
+
+    private _onSuccess(data: any) {
+        this.setData(data);
+        setTimeout(() => {
+            this.loading = false;
+        }, 500);
+    }
+
+    private _onError(e: HttpErrorResponse) {
+        console.error(e.error);
+        if (e.status === 503) {
+            this._onSuccess(null);
+        } else {
+            this.loading = false;
         }
     }
 
@@ -147,13 +153,12 @@ export class ActionBlockComponent implements OnInit {
         this.visible = this.options.findIndex((o: any) => o.value == this.value) == -1;
         this.policyEngineService
             .setBlockData(this.id, this.policyId, this.data)
-            .subscribe(
-                () => {},
-                (e) => {
-                    console.error(e.error);
-                    this.loading = false;
-                }
-            );
+            .subscribe(() => {
+
+            }, (e) => {
+                console.error(e.error);
+                this.loading = false;
+            });
     }
 
     setStatus(row: any, status: string) {
@@ -162,32 +167,26 @@ export class ActionBlockComponent implements OnInit {
         data.status = status;
         this.policyEngineService
             .setBlockData(this.id, this.policyId, data)
-            .subscribe(
-                () => {
-                    this.loadData();
-                },
-                (e) => {
-                    console.error(e.error);
-                    this.loading = false;
-                }
-            );
+            .subscribe(() => {
+                this.loadData();
+            }, (e) => {
+                console.error(e.error);
+                this.loading = false;
+            });
     }
 
     onDownload() {
         this.policyEngineService
             .setBlockData(this.id, this.policyId, this.data)
-            .subscribe(
-                (data) => {
-                    if (data) {
-                        this.downloadObjectAsJson(data.body, data.fileName);
-                    }
-                    this.loading = false;
-                },
-                (e) => {
-                    console.error(e.error);
-                    this.loading = false;
+            .subscribe((data) => {
+                if (data) {
+                    this.downloadObjectAsJson(data.body, data.fileName);
                 }
-            );
+                this.loading = false;
+            }, (e) => {
+                console.error(e.error);
+                this.loading = false;
+            });
     }
 
     downloadObjectAsJson(exportObj: any, exportName: string) {
@@ -207,12 +206,11 @@ export class ActionBlockComponent implements OnInit {
         this.setObjectValue(this.data, this.field, this.currentValue);
         this.policyEngineService
             .setBlockData(this.id, this.policyId, this.data)
-            .subscribe(
-                () => {},
-                (e) => {
-                    console.error(e.error);
-                    this.loading = false;
-                }
-            );
+            .subscribe(() => {
+
+            }, (e) => {
+                console.error(e.error);
+                this.loading = false;
+            });
     }
 }
diff --git a/...les/policy-engine/policy-viewer/blocks/button-block-addon/button-block-addon.component.ts b/...les/policy-engine/policy-viewer/blocks/button-block-addon/button-block-addon.component.ts
@@ -3,6 +3,7 @@ import { PolicyEngineService } from 'src/app/services/policy-engine.service';
 import { WebSocketService } from 'src/app/services/web-socket.service';
 import { ConfirmationDialog } from '../confirmation-dialog/confirmation-dialog.component';
 import { DialogService } from 'primeng/dynamicdialog';
+import { HttpErrorResponse } from '@angular/common/http';
 
 /**
  * Component for display block of 'buttonBlockAddon' type.
@@ -71,18 +72,23 @@ export class ButtonBlockAddonComponent implements OnInit {
         } else {
             this.policyEngineService
                 .getBlockData(this.id, this.policyId)
-                .subscribe(
-                    (data: any) => {
-                        this.setData(data);
-                        setTimeout(() => {
-                            this.loading = false;
-                        }, 1000);
-                    },
-                    (e) => {
-                        console.error(e.error);
-                        this.loading = false;
-                    }
-                );
+                .subscribe(this._onSuccess.bind(this), this._onError.bind(this));
+        }
+    }
+
+    private _onSuccess(data: any) {
+        this.setData(data);
+        setTimeout(() => {
+            this.loading = false;
+        }, 500);
+    }
+
+    private _onError(e: HttpErrorResponse) {
+        console.error(e.error);
+        if (e.status === 503) {
+            this._onSuccess(null);
+        } else {
+            this.loading = false;
         }
     }
 

diff --git a/...src/app/modules/policy-engine/policy-viewer/blocks/button-block/button-block.component.ts b/...src/app/modules/policy-engine/policy-viewer/blocks/button-block/button-block.component.ts
@@ -5,6 +5,7 @@ import { PolicyHelper } from 'src/app/services/policy-helper.service';
 import { WebSocketService } from 'src/app/services/web-socket.service';
 import { ConfirmationDialog } from '../confirmation-dialog/confirmation-dialog.component';
 import { DialogService } from 'primeng/dynamicdialog';
+import { HttpErrorResponse } from '@angular/common/http';
 
 /**
  * Component for display block of 'Buttons' type.
@@ -92,18 +93,23 @@ export class ButtonBlockComponent implements OnInit, AfterContentChecked {
         } else {
             this.policyEngineService
                 .getBlockData(this.id, this.policyId)
-                .subscribe(
-                    (data: any) => {
-                        this.setData(data);
-                        setTimeout(() => {
-                            this.loading = false;
-                        }, 1000);
-                    },
-                    (e) => {
-                        console.error(e.error);
-                        this.loading = false;
-                    }
-                );
+                .subscribe(this._onSuccess.bind(this), this._onError.bind(this));
+        }
+    }
+
+    private _onSuccess(data: any) {
+        this.setData(data);
+        setTimeout(() => {
+            this.loading = false;
+        }, 500);
+    }
+
+    private _onError(e: HttpErrorResponse) {
+        console.error(e.error);
+        if (e.status === 503) {
+            this._onSuccess(null);
+        } else {
+            this.loading = false;
         }
     }
 

diff --git a/...p/modules/policy-engine/policy-viewer/blocks/container-block/container-block.component.ts b/...p/modules/policy-engine/policy-viewer/blocks/container-block/container-block.component.ts
@@ -3,6 +3,7 @@ import { PolicyEngineService } from 'src/app/services/policy-engine.service';
 import { PolicyHelper } from 'src/app/services/policy-helper.service';
 import { WebSocketService } from 'src/app/services/web-socket.service';
 import { PolicyProgressService } from '../../../services/policy-progress.service';
+import { HttpErrorResponse } from '@angular/common/http';
 
 /**
  * Component for display block of 'interfaceContainerBlock' type.
@@ -88,18 +89,23 @@ export class ContainerBlockComponent implements OnInit, OnDestroy {
         } else {
             this.policyEngineService
                 .getBlockData(this.id, this.policyId)
-                .subscribe(
-                    (data: any) => {
-                        this.setData(data);
-                        setTimeout(() => {
-                            this.loading = false;
-                        }, 500);
-                    },
-                    (e) => {
-                        console.error(e.error);
-                        this.loading = false;
-                    }
-                );
+                .subscribe(this._onSuccess.bind(this), this._onError.bind(this));
+        }
+    }
+
+    private _onSuccess(data: any) {
+        this.setData(data);
+        setTimeout(() => {
+            this.loading = false;
+        }, 500);
+    }
+
+    private _onError(e: HttpErrorResponse) {
+        console.error(e.error);
+        if (e.status === 503) {
+            this._onSuccess(null);
+        } else {
+            this.loading = false;
         }
     }