Skip to content

Commit 8dabfad

Browse files
lucaslyllucaslyl
committed
Merge branch 'main' into CS-7896-try-to-change-loading-text-indicator-into-loadingindicatoricon
2 parents bec556c + aa9dfb7 commit 8dabfad

File tree

9 files changed

+376
-4
lines changed

9 files changed

+376
-4
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ First make sure to generate the host app's `dist/` output in order to support ca
283283
To run the `packages/realm-server/` workspace tests start:
284284

285285
1. `pnpm start:all` in the `packages/realm-server/` to serve _both_ the base realm and the realm that serves the test cards for node.
286-
2. Run `pnpm test` in the `packages/realm-server/` workspace to run the realm node tests
286+
2. Run `pnpm test` in the `packages/realm-server/` workspace to run the realm node tests. `TEST_MODULE=realm-endpoints-test.ts pnpm test-module` is an example of how to run a single test module.
287287

288288
### Boxel UI
289289

‎packages/boxel-ui/addon/src/components/select/index.gts

+6-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,12 @@ const BoxelSelect: TemplateOnlyComponent<Signature> = <template>
4343
@matchTriggerWidth={{@matchTriggerWidth}}
4444
@eventType='click'
4545
@searchEnabled={{@searchEnabled}}
46-
@beforeOptionsComponent={{component BeforeOptions autofocus=false}}
46+
@beforeOptionsComponent={{if
47+
@beforeOptionsComponent
48+
@beforeOptionsComponent
49+
(component BeforeOptions autofocus=false)
50+
}}
51+
@afterOptionsComponent={{@afterOptionsComponent}}
4752
...attributes
4853
as |item|
4954
>

‎packages/experiments-realm/crm/account.gts

+35
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import {
1111
linksToMany,
1212
StringField,
1313
} from 'https://cardstack.com/base/card-api';
14+
import { FieldContainer } from '@cardstack/boxel-ui/components';
1415
import { Address as AddressField } from '../address';
1516
import { Company } from './company';
1617
import { Contact } from './contact';
@@ -43,6 +44,39 @@ const taskSource = {
4344
name: 'CRMTask',
4445
};
4546

47+
class EditTemplate extends Component<typeof Account> {
48+
<template>
49+
<div class='account-form'>
50+
<FieldContainer @label='Company Name'>
51+
<@fields.company />
52+
</FieldContainer>
53+
<FieldContainer @label='Primary Contact'>
54+
<@fields.primaryContact />
55+
</FieldContainer>
56+
<FieldContainer @label='Contacts'>
57+
<@fields.contacts />
58+
</FieldContainer>
59+
<FieldContainer @label='Shipping Address'>
60+
<@fields.shippingAddress />
61+
</FieldContainer>
62+
<FieldContainer @label='Billing Address'>
63+
<@fields.billingAddress />
64+
</FieldContainer>
65+
<FieldContainer @label='Urgency Tag'>
66+
<@fields.urgencyTag />
67+
</FieldContainer>
68+
</div>
69+
<style scoped>
70+
.account-form {
71+
display: flex;
72+
flex-direction: column;
73+
gap: var(--boxel-sp-lg);
74+
padding: var(--boxel-sp-xl);
75+
}
76+
</style>
77+
</template>
78+
}
79+
4680
class IsolatedTemplate extends Component<typeof Account> {
4781
get hasCompanyInfo() {
4882
return this.args.model?.website || this.args.model?.headquartersAddress;
@@ -1270,6 +1304,7 @@ export class Account extends CardDef {
12701304
},
12711305
});
12721306

1307+
static edit = EditTemplate;
12731308
static isolated = IsolatedTemplate;
12741309
static embedded = EmbeddedTemplate;
12751310
static fitted = FittedTemplate;

‎packages/experiments-realm/crm/company.gts

+35
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,42 @@ import {
1010
field,
1111
contains,
1212
} from 'https://cardstack.com/base/card-api';
13+
import { FieldContainer } from '@cardstack/boxel-ui/components';
1314
import BuildingIcon from '@cardstack/boxel-icons/building';
1415

16+
class CompanyEditTemplate extends Component<typeof Company> {
17+
<template>
18+
<div class='company-form'>
19+
<FieldContainer @label='Name'>
20+
<@fields.name />
21+
</FieldContainer>
22+
<FieldContainer @label='Industry'>
23+
<@fields.industry />
24+
</FieldContainer>
25+
<FieldContainer @label='Headquarters Address'>
26+
<@fields.headquartersAddress />
27+
</FieldContainer>
28+
<FieldContainer @label='Phone Number'>
29+
<@fields.phone />
30+
</FieldContainer>
31+
<FieldContainer @label='Website'>
32+
<@fields.website />
33+
</FieldContainer>
34+
<FieldContainer @label='Stock Symbol'>
35+
<@fields.stockSymbol />
36+
</FieldContainer>
37+
</div>
38+
<style scoped>
39+
.company-form {
40+
display: flex;
41+
flex-direction: column;
42+
gap: var(--boxel-sp-lg);
43+
padding: var(--boxel-sp-xl);
44+
}
45+
</style>
46+
</template>
47+
}
48+
1549
class ViewCompanyTemplate extends Component<typeof Company> {
1650
<template>
1751
<div class='company-group'>
@@ -39,6 +73,7 @@ export class Company extends CardDef {
3973
},
4074
});
4175

76+
static edit = CompanyEditTemplate;
4277
static embedded = ViewCompanyTemplate;
4378
static atom = ViewCompanyTemplate;
4479
}

‎packages/experiments-realm/crm/contact.gts

+50-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
containsMany,
99
} from 'https://cardstack.com/base/card-api';
1010

11-
import { Avatar } from '@cardstack/boxel-ui/components';
11+
import { Avatar, FieldContainer } from '@cardstack/boxel-ui/components';
1212
import AvatarGroup from '../components/avatar-group';
1313

1414
import ContactIcon from '@cardstack/boxel-icons/contact';
@@ -48,6 +48,54 @@ export class SocialLinkField extends ContactLinkField {
4848
];
4949
}
5050

51+
class EditTemplate extends Component<typeof Contact> {
52+
<template>
53+
<div class='contact-form'>
54+
<FieldContainer @label='First Name'>
55+
<@fields.firstName />
56+
</FieldContainer>
57+
<FieldContainer @label='Last Name'>
58+
<@fields.lastName />
59+
</FieldContainer>
60+
<FieldContainer @label='Position'>
61+
<@fields.position />
62+
</FieldContainer>
63+
<FieldContainer @label='Company'>
64+
<@fields.company />
65+
</FieldContainer>
66+
<FieldContainer @label='Department'>
67+
<@fields.department />
68+
</FieldContainer>
69+
<FieldContainer @label='Primary Email'>
70+
<@fields.primaryEmail />
71+
</FieldContainer>
72+
<FieldContainer @label='Secondary Email'>
73+
<@fields.secondaryEmail />
74+
</FieldContainer>
75+
<FieldContainer @label='Phone Number'>
76+
<@fields.phoneMobile />
77+
</FieldContainer>
78+
<FieldContainer @label='Office Phone Number'>
79+
<@fields.phoneOffice />
80+
</FieldContainer>
81+
<FieldContainer @label='Social Links'>
82+
<@fields.socialLinks />
83+
</FieldContainer>
84+
<FieldContainer @label='Status'>
85+
<@fields.statusTag />
86+
</FieldContainer>
87+
</div>
88+
<style scoped>
89+
.contact-form {
90+
display: flex;
91+
flex-direction: column;
92+
gap: var(--boxel-sp-lg);
93+
padding: var(--boxel-sp-xl);
94+
}
95+
</style>
96+
</template>
97+
}
98+
5199
class EmbeddedTemplate extends Component<typeof Contact> {
52100
get hasSocialLinks() {
53101
return Boolean(this.args.model?.socialLinks?.length);
@@ -710,6 +758,7 @@ export class Contact extends CardDef {
710758
},
711759
});
712760

761+
static edit = EditTemplate;
713762
static embedded = EmbeddedTemplate;
714763
static fitted = FittedTemplate;
715764
static atom = AtomTemplate;

‎packages/experiments-realm/crm/deal.gts

+53
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import SummaryGridContainer from '../components/summary-grid-container';
1818
import {
1919
Pill,
2020
BoxelButton,
21+
FieldContainer,
2122
SkeletonPlaceholder,
2223
} from '@cardstack/boxel-ui/components';
2324
import { cn, not } from '@cardstack/boxel-ui/helpers';
@@ -58,6 +59,57 @@ const taskSource = {
5859
name: 'CRMTask',
5960
};
6061

62+
class EditTemplate extends Component<typeof Deal> {
63+
<template>
64+
<div class='deal-form'>
65+
<FieldContainer @label='Name'>
66+
<@fields.name />
67+
</FieldContainer>
68+
<FieldContainer @label='Account'>
69+
<@fields.account />
70+
</FieldContainer>
71+
<FieldContainer @label='Status'>
72+
<@fields.status />
73+
</FieldContainer>
74+
<FieldContainer @label='Priority'>
75+
<@fields.priority />
76+
</FieldContainer>
77+
<FieldContainer @label='Close Date'>
78+
<@fields.closeDate />
79+
</FieldContainer>
80+
<FieldContainer @label='Current Value'>
81+
<@fields.currentValue />
82+
</FieldContainer>
83+
<FieldContainer @label='Predicted Revenue'>
84+
<@fields.predictedRevenue />
85+
</FieldContainer>
86+
<FieldContainer @label='Primary Stakeholder'>
87+
<@fields.primaryStakeholder />
88+
</FieldContainer>
89+
<FieldContainer @label='Stakeholders'>
90+
<@fields.stakeholders />
91+
</FieldContainer>
92+
<FieldContainer @label='Value Breakdown'>
93+
<@fields.valueBreakdown />
94+
</FieldContainer>
95+
<FieldContainer @label='Health Score'>
96+
<@fields.healthScore />
97+
</FieldContainer>
98+
<FieldContainer @label='Event'>
99+
<@fields.event />
100+
</FieldContainer>
101+
</div>
102+
<style scoped>
103+
.deal-form {
104+
display: flex;
105+
flex-direction: column;
106+
gap: var(--boxel-sp-lg);
107+
padding: var(--boxel-sp-xl);
108+
}
109+
</style>
110+
</template>
111+
}
112+
61113
class IsolatedTemplate extends Component<typeof Deal> {
62114
get logoURL() {
63115
//We default to account thumbnail
@@ -1172,6 +1224,7 @@ export class Deal extends CardDef {
11721224
},
11731225
});
11741226

1227+
static edit = EditTemplate;
11751228
static isolated = IsolatedTemplate;
11761229
static fitted = FittedTemplate;
11771230
}

‎packages/experiments-realm/crm/task.gts

+53
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import {
88
linksToMany,
99
} from 'https://cardstack.com/base/card-api';
1010
import {
11+
FieldContainer,
1112
Pill,
1213
ProgressBar,
1314
ProgressRadial,
@@ -45,6 +46,57 @@ function shortenId(id: string): string {
4546
return decimal.toString(36).padStart(6, '0');
4647
}
4748

49+
class TaskEdit extends Component<typeof CRMTask> {
50+
<template>
51+
<div class='task-form'>
52+
<FieldContainer @label='Name'>
53+
<@fields.name />
54+
</FieldContainer>
55+
<FieldContainer @label='Crm App'>
56+
<@fields.crmApp />
57+
</FieldContainer>
58+
<FieldContainer @label='Assignee'>
59+
<@fields.assignee />
60+
</FieldContainer>
61+
<FieldContainer @label='Contact'>
62+
<@fields.contact />
63+
</FieldContainer>
64+
<FieldContainer @label='Account'>
65+
<@fields.account />
66+
</FieldContainer>
67+
<FieldContainer @label='Deal'>
68+
<@fields.deal />
69+
</FieldContainer>
70+
<FieldContainer @label='Status'>
71+
<@fields.status />
72+
</FieldContainer>
73+
<FieldContainer @label='Date Range'>
74+
<@fields.dateRange />
75+
</FieldContainer>
76+
<FieldContainer @label='Details'>
77+
<@fields.details />
78+
</FieldContainer>
79+
<FieldContainer @label='Priority'>
80+
<@fields.priority />
81+
</FieldContainer>
82+
<FieldContainer @label='Subtasks'>
83+
<@fields.subtasks />
84+
</FieldContainer>
85+
<FieldContainer @label='Tags'>
86+
<@fields.tags />
87+
</FieldContainer>
88+
</div>
89+
<style scoped>
90+
.task-form {
91+
display: flex;
92+
flex-direction: column;
93+
gap: var(--boxel-sp-lg);
94+
padding: var(--boxel-sp-xl);
95+
}
96+
</style>
97+
</template>
98+
}
99+
48100
class TaskIsolated extends Component<typeof CRMTask> {
49101
get taskTitle() {
50102
return this.args.model.name ?? 'No Task Title';
@@ -561,6 +613,7 @@ export class CRMTask extends Task {
561613
},
562614
});
563615

616+
static edit = TaskEdit;
564617
static isolated = TaskIsolated;
565618
static embedded = TaskEmbedded;
566619
}

0 commit comments

Comments
 (0)