From 38cd6b156a78c493e369424c0e1edb2d3c2a1328 Mon Sep 17 00:00:00 2001 From: Richard Tan Date: Mon, 23 Dec 2024 14:16:53 +0800 Subject: [PATCH 1/5] Absolute urls on crm app --- packages/experiments-realm/crm-app.gts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/experiments-realm/crm-app.gts b/packages/experiments-realm/crm-app.gts index 12844a205c..1abf5043ca 100644 --- a/packages/experiments-realm/crm-app.gts +++ b/packages/experiments-realm/crm-app.gts @@ -130,7 +130,8 @@ class CrmAppTemplate extends Component { } const lastIndex = summary.id.lastIndexOf('/'); let cardRef = { - module: summary.id.substring(0, lastIndex), + module: new URL(summary.id.substring(0, lastIndex), import.meta.url) + .href, name: summary.id.substring(lastIndex + 1), }; filter.cardRef = cardRef; From 0b269b56cb0ece4027ed0167078ed3235908dd3b Mon Sep 17 00:00:00 2001 From: Richard Tan Date: Mon, 23 Dec 2024 14:39:33 +0800 Subject: [PATCH 2/5] Crm app clean up --- packages/experiments-realm/crm-app.gts | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/packages/experiments-realm/crm-app.gts b/packages/experiments-realm/crm-app.gts index 1abf5043ca..d11bd9b694 100644 --- a/packages/experiments-realm/crm-app.gts +++ b/packages/experiments-realm/crm-app.gts @@ -23,12 +23,7 @@ import { } from '@cardstack/boxel-ui/components'; import { IconPlus } from '@cardstack/boxel-ui/icons'; import { AppCard, Tab } from './app-card'; -import { - Query, - CardError, - SupportedMimeType, - codeRefWithAbsoluteURL, -} from '@cardstack/runtime-common'; +import { Query, CardError, SupportedMimeType } from '@cardstack/runtime-common'; import ContactIcon from '@cardstack/boxel-icons/contact'; import HeartHandshakeIcon from '@cardstack/boxel-icons/heart-handshake'; import TargetArrowIcon from '@cardstack/boxel-icons/target-arrow'; @@ -173,15 +168,6 @@ class CrmAppTemplate extends Component { return this.activeTab?.tabId ? this.activeTab.tabId.toLowerCase() : ''; } - get activeTabRef() { - if (!this.activeTab?.ref?.name || !this.activeTab.ref.module) { - return; - } - if (!this.currentRealm) { - return; - } - return codeRefWithAbsoluteURL(this.activeTab.ref, this.currentRealm); - } setTabs(tabs: Tab[]) { this.args.model.tabs = tabs ?? []; } From e3435d0cf45f9b13e6cb675dc73fb54c7ec4d9c1 Mon Sep 17 00:00:00 2001 From: Richard Tan Date: Mon, 23 Dec 2024 15:37:32 +0800 Subject: [PATCH 3/5] Absolute urls on crm app --- packages/experiments-realm/crm-app.gts | 6 ++++-- packages/experiments-realm/crm/deal.gts | 12 ++---------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/packages/experiments-realm/crm-app.gts b/packages/experiments-realm/crm-app.gts index d11bd9b694..6e301cea17 100644 --- a/packages/experiments-realm/crm-app.gts +++ b/packages/experiments-realm/crm-app.gts @@ -125,8 +125,10 @@ class CrmAppTemplate extends Component { } const lastIndex = summary.id.lastIndexOf('/'); let cardRef = { - module: new URL(summary.id.substring(0, lastIndex), import.meta.url) - .href, + module: new URL( + `./${summary.id.substring(0, lastIndex)}`, + import.meta.url, + ).href, name: summary.id.substring(lastIndex + 1), }; filter.cardRef = cardRef; diff --git a/packages/experiments-realm/crm/deal.gts b/packages/experiments-realm/crm/deal.gts index 89b0ec1c11..908e1e469b 100644 --- a/packages/experiments-realm/crm/deal.gts +++ b/packages/experiments-realm/crm/deal.gts @@ -55,7 +55,6 @@ class IsolatedTemplate extends Component { ); } get primaryContactName() { - console.log(this.args.fields.account?.primaryContact); return this.args.model.account?.primaryContact?.name; } @@ -84,10 +83,6 @@ class IsolatedTemplate extends Component { return this.args.model[realmURL]!; } - get realmHref() { - return this.realmURL.href; - } - get realmHrefs() { return [this.realmURL?.href]; } @@ -96,7 +91,7 @@ class IsolatedTemplate extends Component { return { filter: { type: { - module: `${this.realmHref}crm/deal`, + module: new URL('./crm/deal', import.meta.url).href, name: 'Deal', }, }, @@ -116,14 +111,11 @@ class IsolatedTemplate extends Component { (acc, deal: Deal) => acc + deal.computedValue.amount, 0, ); - nonZeroDeals.map((d) => console.log(d.computedValue.amount)); - console.log('totalDealRevenue', totalDealRevenue); let avgDealSize = totalDealRevenue / nonZeroDeals.length; - console.log('avgDealSize', avgDealSize); + if (this.args.model.computedValue?.amount) { let percentDiff = (this.args.model.computedValue?.amount - avgDealSize) / avgDealSize; - console.log('percentDiff', percentDiff); let positive = percentDiff >= 0 ? true : false; let summary = `${percentDiff.toFixed(2)}% ${ positive ? 'above' : 'below' From 8c973f4fa6d72c3bbdf377e199c01c9da76c8af3 Mon Sep 17 00:00:00 2001 From: Richard Tan Date: Thu, 26 Dec 2024 16:58:51 +0800 Subject: [PATCH 4/5] Revert filter need absolute url since app card handled --- packages/experiments-realm/crm-app.gts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/experiments-realm/crm-app.gts b/packages/experiments-realm/crm-app.gts index 6e301cea17..22069dcee9 100644 --- a/packages/experiments-realm/crm-app.gts +++ b/packages/experiments-realm/crm-app.gts @@ -125,10 +125,7 @@ class CrmAppTemplate extends Component { } const lastIndex = summary.id.lastIndexOf('/'); let cardRef = { - module: new URL( - `./${summary.id.substring(0, lastIndex)}`, - import.meta.url, - ).href, + module: summary.id.substring(0, lastIndex), name: summary.id.substring(lastIndex + 1), }; filter.cardRef = cardRef; From 22e030b419ea7f755a56e0d63d2662ead6eeb04a Mon Sep 17 00:00:00 2001 From: Richard Tan Date: Thu, 26 Dec 2024 16:59:03 +0800 Subject: [PATCH 5/5] Rename display name --- packages/experiments-realm/crm-app.gts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/experiments-realm/crm-app.gts b/packages/experiments-realm/crm-app.gts index 22069dcee9..cbe93db585 100644 --- a/packages/experiments-realm/crm-app.gts +++ b/packages/experiments-realm/crm-app.gts @@ -449,7 +449,7 @@ class CrmAppTemplate extends Component { } export class CrmApp extends AppCard { - static displayName = 'Crm App'; + static displayName = 'CRM App'; static prefersWideFormat = true; static headerColor = '#4D3FE8'; static isolated = CrmAppTemplate;