fix(fdc3) - Fixed example applications, refactored channel handling, …

…added channel exception, separated user channel set reader * fix(fdc3) - joinUserChannel exception, triggering the fdc3Ready Event when we joined to the channel if the channel Id is defined * fix(app-channel) - Remove redundant check if the app channel has been created when calling the method, added exception * fix(fdc3) - Remove unnecessary property * fix(userchannelset) - Seperated user channel set reader, fixed example projects to act upon the fdc3Ready event
morganstanley · Sep 11, 2024 · 9ca098c · 9ca098c
1 parent 77de2de
commit 9ca098c
Show file tree

Hide file tree

Showing 32 changed files with 466 additions and 416 deletions.
diff --git a/examples/fdc3-chart-and-grid/js-chart/chart.js b/examples/fdc3-chart-and-grid/js-chart/chart.js
@@ -12,14 +12,11 @@ let currentChannel;
 
 NoDataToDisplay(Highcharts);
 
-window.addEventListener('load', function() {
+window.addEventListener('fdc3Ready', async() => {
   chart = Highcharts.chart('container', {
 
       chart: {
         type: 'column',
-        events: {
-          load: requestData
-        }
       },
       title: {
         text: 'Monthly Sales Data'
@@ -43,6 +40,8 @@ window.addEventListener('load', function() {
         data: []
       }]
     });
+
+    await requestData();
 });
 
 window.addEventListener('close', async function(){

diff --git a/examples/fdc3-chart-and-grid/js-datagrid/src/app/main-view/services/mock-data.service.ts b/examples/fdc3-chart-and-grid/js-datagrid/src/app/main-view/services/mock-data.service.ts
@@ -20,12 +20,15 @@ export class MockDataService{
 
   constructor(){
       this.market = new Market();
-      this.connecting = new Promise(async(resolve, reject) => {
-        try{
-          resolve(await this.checkFdc3Connection());
-        } catch(err) {
-          reject(err);
-        };
+
+      window.addEventListener('fdc3Ready', () => {
+        this.connecting = new Promise(async(resolve, reject) => {
+          try{
+            resolve(await this.checkFdc3Connection());
+          } catch(err) {
+            reject(err);
+          };
+        });
       });
 
       interval(1000).subscribe(() => {

diff --git a/examples/fdc3-pricing-and-chat/js-chat/chat.js b/examples/fdc3-pricing-and-chat/js-chat/chat.js
@@ -91,7 +91,7 @@ window.app = function () {
     }
 }();
 
-window.addEventListener('load', async function () {
+window.addEventListener('fdc3Ready', async function () {
     intentListener = await window.fdc3.addIntentListener("StartChat", window.app.handleChatIntent);
 
     await window.fdc3.joinUserChannel("fdc3.channel.1");

diff --git a/examples/fdc3-pricing-and-chat/js-pricing/pricing.js b/examples/fdc3-pricing-and-chat/js-pricing/pricing.js
@@ -14,7 +14,7 @@
 
 import "bootstrap/dist/css/bootstrap.css";
 
-window.addEventListener('load', async function () {
+window.addEventListener('fdc3Ready', async function () {
     const pricingForm = document.querySelector("#pricing");
     await this.window.fdc3.joinUserChannel("fdc3.channel.1");
     pricingForm.addEventListener('submit', app.submitPrice);

diff --git a/examples/fdc3-trade-simulator/js-order-book/package.json b/examples/fdc3-trade-simulator/js-order-book/package.json
@@ -20,6 +20,7 @@
     "@angular/platform-browser-dynamic": "^17.3.0",
     "@angular/router": "^17.3.0",
     "@finos/fdc3": "^2.0.0",
+    "material-icons": "^1.13.12",
     "rxjs": "~7.8.0",
     "tslib": "^2.3.0",
     "zone.js": "~0.14.3"