fix: merge with develop

hashgraph · Apr 7, 2024 · 0c8b832 · 0c8b832
2 parents 0fec16a + c232d04
commit 0c8b832
Show file tree

Hide file tree

Showing 22 changed files with 66 additions and 92 deletions.
diff --git a/ai-service/package.json b/ai-service/package.json
@@ -1,11 +1,11 @@
 {
     "name": "ai-service",
-    "version": "2.23.0",
+    "version": "2.23.1",
     "main": "dist/app.js",
     "license": "Apache-2.0",
     "dependencies": {
-        "@guardian/common": "^2.23.0",
-        "@guardian/interfaces": "^2.23.0",
+        "@guardian/common": "^2.23.1",
+        "@guardian/interfaces": "^2.23.1",
         "@mikro-orm/core": "^6.1.11",
         "@mikro-orm/mongodb": "^6.1.11",
         "@nestjs/common": "^9.4.1",

diff --git a/analytics-service/package.json b/analytics-service/package.json
@@ -14,8 +14,8 @@
     },
     "author": "Envision Blockchain Solutions <info@envisionblockchain.com>",
     "dependencies": {
-        "@guardian/common": "^2.23.0",
-        "@guardian/interfaces": "^2.23.0",
+        "@guardian/common": "^2.23.1",
+        "@guardian/interfaces": "^2.23.1",
         "@nestjs/common": "^9.4.1",
         "@nestjs/core": "^9.4.1",
         "@nestjs/jwt": "^10.0.3",
@@ -82,7 +82,6 @@
         "start": "node dist/index.js",
         "test": "mocha tests/**/*.test.js --reporter mocha-junit-reporter --reporter-options mochaFile=../test_results/ui-service.xml"
     },
-
     "type": "module",
-    "version": "2.23.0"
+    "version": "2.23.1"
 }
diff --git a/api-gateway/package.json b/api-gateway/package.json
@@ -13,8 +13,8 @@
   },
   "author": "Envision Blockchain Solutions <info@envisionblockchain.com>",
   "dependencies": {
-    "@guardian/common": "^2.23.0",
-    "@guardian/interfaces": "^2.23.0",
+    "@guardian/common": "^2.23.1",
+    "@guardian/interfaces": "^2.23.1",
     "@nestjs/common": "^9.4.1",
     "@nestjs/core": "^9.4.1",
     "@nestjs/jwt": "^10.0.3",
@@ -84,5 +84,5 @@
     "test": "mocha tests/**/*.test.js --reporter mocha-junit-reporter --reporter-options mochaFile=../test_results/ui-service.xml"
   },
   "type": "module",
-  "version": "2.23.0"
-}
+  "version": "2.23.1"
+}
diff --git a/api-tests/package.json b/api-tests/package.json
@@ -1,6 +1,6 @@
 {
     "name": "api-tests",
-    "version": "2.23.0",
+    "version": "2.23.1",
     "description": "API Tests",
     "main": "index.js",
     "type": "module",

diff --git a/auth-service/package.json b/auth-service/package.json
@@ -11,8 +11,8 @@
     "@types/mime": "3.0.4"
   },
   "dependencies": {
-    "@guardian/common": "^2.23.0",
-    "@guardian/interfaces": "^2.23.0",
+    "@guardian/common": "^2.23.1",
+    "@guardian/interfaces": "^2.23.1",
     "@meeco/cryppo": "^2.0.2",
     "@mikro-orm/core": "^6.1.11",
     "@mikro-orm/mongodb": "^6.1.11",
@@ -76,5 +76,5 @@
     "test": "mocha tests/**/*.test.js --reporter mocha-junit-reporter --reporter-options mochaFile=../test_results/ui-service.xml"
   },
   "type": "module",
-  "version": "2.23.0"
-}
+  "version": "2.23.1"
+}
diff --git a/common/package.json b/common/package.json
@@ -5,7 +5,7 @@
         "@azure/identity": "^3.2.2",
         "@azure/keyvault-secrets": "^4.7.0",
         "@google-cloud/secret-manager": "^4.2.2",
-        "@guardian/interfaces": "^2.23.0",
+        "@guardian/interfaces": "^2.23.1",
         "@hashgraph/sdk": "2.34.1",
         "@mattrglobal/jsonld-signatures-bbs": "^1.1.2",
         "@meeco/cryppo": "^2.0.2",
@@ -88,5 +88,5 @@
         "test:stability": "mocha tests/stability.test.js"
     },
     "type": "module",
-    "version": "2.23.0"
+    "version": "2.23.1"
 }
diff --git a/frontend/package.json b/frontend/package.json
@@ -74,5 +74,5 @@
         "test": "ng test",
         "watch": "ng build --watch --configuration development --output-path ../www-data"
     },
-    "version": "2.23.0"
+    "version": "2.23.1"
 }
diff --git a/frontend/src/app/views/branding/branding.component.html b/frontend/src/app/views/branding/branding.component.html
@@ -80,10 +80,6 @@ <h4>Name and colors</h4>
                 <h4>Login Background</h4>
                 <ng-container [ngTemplateOutlet]="backgroundInfo"></ng-container>
             </div>
-            <div class="card">
-                <h4>Terms and Conditions</h4>
-                <ng-container [ngTemplateOutlet]="termsAndConditionsTpl"></ng-container>
-            </div>
         </div>
     </div>
 
@@ -212,17 +208,6 @@ <h4>Company Logo</h4>
     </div>
 </ng-template>
 
-<ng-template #termsAndConditionsTpl>
-    <div class="branding-container">
-        <div class="p-field">
-            <label class="p-field-label" for="companyName">Company Name</label>
-            <textarea [formControl]="termsAndConditions" class="p-field-input terms-input" placeholder="Enter text"
-                      rows="30" type="text"></textarea>
-            <small *ngIf="primaryHexColorControl.invalid" class="p-error">Company name is invalid</small>
-        </div>
-    </div>
-</ng-template>
-
 <p-dialog [(visible)]="initResetDialog" [closable]="true" [draggable]="false" [modal]="true">
     <ng-template pTemplate="header">
         <span class="modal-header">Reset Branding Settings</span>

diff --git a/frontend/src/app/views/login/login.component.ts b/frontend/src/app/views/login/login.component.ts
@@ -14,7 +14,6 @@ import { environment } from 'src/environments/environment';
 import { takeUntil } from 'rxjs/operators';
 import { BrandingService } from '../../services/branding.service';
 import { DialogService } from 'primeng/dynamicdialog';
-import { TermsConditionsComponent } from './register-dialogs/terms-conditions-dialog/terms-conditions.component';
 import { AccountTypeSelectorDialogComponent } from './register-dialogs/account-type-selector-dialog/account-type-selector-dialog.component';
 import { ForgotPasswordDialogComponent } from './forgot-password-dialog/forgot-password-dialog.component';
 import { RegisterDialogComponent } from './register-dialogs/register-dialog/register-dialog.component';
@@ -341,19 +340,11 @@ export class LoginComponent implements OnInit, OnDestroy {
             })
         }
 
-        this.dialogService.open(TermsConditionsComponent, {
-            header: 'Terms and Conditions',
-            width: '640px',
-            modal: true,
-        }).onClose.subscribe((submit) => {
-            if (submit) {
-                if (this.isMgsMode) {
-                    part2();
-                } else {
-                    part3(UserRole.USER)
-                }
-            }
-        });
+        if (this.isMgsMode) {
+            part2();
+        } else {
+            part3(UserRole.USER)
+        }
     }
 
     forgotPasswordInit() {

diff --git a/guardian-service/package.json b/guardian-service/package.json
@@ -17,8 +17,8 @@
     "@types/mime": "3.0.4"
   },
   "dependencies": {
-    "@guardian/common": "^2.23.0",
-    "@guardian/interfaces": "^2.23.0",
+    "@guardian/common": "^2.23.1",
+    "@guardian/interfaces": "^2.23.1",
     "@hashgraph/sdk": "2.34.1",
     "@mattrglobal/jsonld-signatures-bbs": "^1.1.2",
     "@meeco/cryppo": "^2.0.2",
@@ -100,5 +100,5 @@
     "test:stability": "mocha tests/stability.test.mjs"
   },
   "type": "module",
-  "version": "2.23.0"
-}
+  "version": "2.23.1"
+}
diff --git a/interfaces/package.json b/interfaces/package.json
@@ -33,9 +33,8 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "type": "module",
-  "version": "2.23.0",
-    "resolutions": {
-      "@types/mime": "3.0.4"
+  "version": "2.23.1",
+  "resolutions": {
+    "@types/mime": "3.0.4"
   }
 }
-
diff --git a/logger-service/package.json b/logger-service/package.json
@@ -6,10 +6,10 @@
     "@types/mime": "3.0.4"
   },
   "dependencies": {
+    "@guardian/common": "^2.23.1",
+    "@guardian/interfaces": "^2.23.1",
     "@mikro-orm/core": "^6.1.11",
     "@mikro-orm/mongodb": "^6.1.11",
-    "@guardian/common": "^2.23.0",
-    "@guardian/interfaces": "^2.23.0",
     "@nestjs/common": "^9.4.1",
     "@nestjs/core": "^9.4.1",
     "@nestjs/microservices": "^9.4.1",
@@ -55,5 +55,5 @@
     "watch": "nodemon src/index.ts"
   },
   "type": "module",
-  "version": "2.23.0"
-}
+  "version": "2.23.1"
+}
diff --git a/mrv-sender/package.json b/mrv-sender/package.json
@@ -6,7 +6,7 @@
     "@types/mime": "3.0.4"
   },
   "dependencies": {
-    "@guardian/common": "^2.23.0",
+    "@guardian/common": "^2.23.1",
     "@transmute/credentials-context": "0.7.0-unstable.80",
     "@transmute/did-context": "0.7.0-unstable.80",
     "@transmute/ed25519-signature-2018": "0.7.0-unstable.80",
@@ -45,5 +45,5 @@
     "start": "node dist/index.js"
   },
   "type": "module",
-  "version": "2.23.0"
-}
+  "version": "2.23.1"
+}
diff --git a/notification-service/package.json b/notification-service/package.json
@@ -6,10 +6,10 @@
     "@types/mime": "3.0.4"
   },
   "dependencies": {
+    "@guardian/common": "^2.23.1",
+    "@guardian/interfaces": "^2.23.1",
     "@mikro-orm/core": "^6.1.11",
     "@mikro-orm/mongodb": "^6.1.11",
-    "@guardian/common": "^2.23.0",
-    "@guardian/interfaces": "^2.23.0",
     "@nestjs/common": "^9.4.1",
     "@nestjs/core": "^9.4.1",
     "@nestjs/microservices": "^9.4.1",
@@ -54,5 +54,5 @@
     "watch": "nodemon src/index.ts"
   },
   "type": "module",
-  "version": "2.23.0"
-}
+  "version": "2.23.1"
+}
diff --git a/package.json b/package.json
@@ -19,7 +19,7 @@
     "ai-service",
     "notification-service"
   ],
-  "version": "2.23.0",
+  "version": "2.23.1",
   "devDependencies": {
     "detect-secrets": "^1.0.6"
   },

diff --git a/policy-service/package.json b/policy-service/package.json
@@ -16,8 +16,8 @@
         "@types/mime": "3.0.4"
     },
     "dependencies": {
-        "@guardian/common": "2.23.0",
-        "@guardian/interfaces": "2.23.0",
+        "@guardian/common": "2.23.1",
+        "@guardian/interfaces": "2.23.1",
         "@hashgraph/sdk": "2.34.1",
         "@mattrglobal/jsonld-signatures-bbs": "^1.1.2",
         "@meeco/cryppo": "2.0.2",
@@ -98,5 +98,5 @@
         "test:stability": "mocha tests/stability.test.js"
     },
     "type": "module",
-    "version": "2.23.0"
+    "version": "2.23.1"
 }
diff --git a/swagger-analytics.yaml b/swagger-analytics.yaml
@@ -208,7 +208,7 @@ info:
     the heart of the Guardian solution is a sophisticated Policy Workflow Engine
     (PWE) that enables applications to offer a requirements-based tokenization
     implementation.
-  version: 2.23.0
+  version: 2.23.1
   contact:
     name: API developer
     url: https://envisionblockchain.com

diff --git a/swagger.yaml b/swagger.yaml
@@ -9962,7 +9962,7 @@ info:
     the heart of the Guardian solution is a sophisticated Policy Workflow Engine
     (PWE) that enables applications to offer a requirements-based tokenization
     implementation.
-  version: 2.23.0
+  version: 2.23.1
   contact:
     name: API developer
     url: https://envisionblockchain.com

diff --git a/topic-viewer/package.json b/topic-viewer/package.json
@@ -30,7 +30,7 @@
         "start": "node dist/index.js"
     },
     "type": "module",
-    "version": "2.23.0",
+    "version": "2.23.1",
     "resolutions": {
         "@types/mime": "3.0.4"
     }

diff --git a/tree-viewer/package.json b/tree-viewer/package.json
@@ -27,8 +27,12 @@
         "dev": "tsc -w",
         "start": "node dist/index.js"
     },
+<<<<<<< HEAD
     "type": "module",
     "version": "2.23.0",
+=======
+    "version": "2.23.1",
+>>>>>>> develop
     "resolutions": {
         "@types/mime": "3.0.4"
     }

diff --git a/worker-service/package.json b/worker-service/package.json
@@ -2,8 +2,8 @@
     "author": "Envision Blockchain Solutions <info@envisionblockchain.com>",
     "dependencies": {
         "@filebase/client": "^0.0.5",
-        "@guardian/common": "^2.23.0",
-        "@guardian/interfaces": "^2.23.0",
+        "@guardian/common": "^2.23.1",
+        "@guardian/interfaces": "^2.23.1",
         "@hashgraph/sdk": "2.34.1",
         "@nestjs/common": "^9.4.1",
         "@nestjs/core": "^9.4.1",
@@ -65,7 +65,7 @@
     },
     "type": "module",
     "types": "dist/index.d.ts",
-    "version": "2.23.0",
+    "version": "2.23.1",
     "resolutions": {
         "@types/mime": "3.0.4"
     }