Archives/gristlabs_grist-core
1
0
Fork 0
mirror of https://github.com/gristlabs/grist-core.git synced 2024-10-27 20:44:07 +00:00
Code Issues Projects Releases Wiki Activity

(core) set up a trialing list and a call scheduled flag for Grist SaaS

Browse Source 
Summary:
This adds support for the automation described in
https://grist.quip.com/rt3tAoEH4kuy/Automate-Sprouts-outreach-email

Test Plan: added tests; will need manual testing and iterative integration work

Reviewers: georgegevoian

Reviewed By: georgegevoian

Differential Revision: https://phab.getgrist.com/D3804
This commit is contained in:
Paul Fitzpatrick 2023-02-20 10:45:55 -05:00
parent bc43e16bc7
commit 3aba7f6208
4 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/client/models/AppModel.ts
View File

@ -101,6 +101,7 @@ export interface AppModel {
dismissedWelcomePopups: Observable<DismissedReminder[]>; dismissedWelcomePopups: Observable<DismissedReminder[]>;
pageType: Observable<PageType>; pageType: Observable<PageType>;
needsOrg: Observable<boolean>;
notifier: Notifier; notifier: Notifier;
planName: string|null; planName: string|null;
@ -253,6 +254,11 @@ export class AppModelImpl extends Disposable implements AppModel {
public readonly pageType: Observable<PageType> = Computed.create(this, urlState().state, public readonly pageType: Observable<PageType> = Computed.create(this, urlState().state,
(use, state) => (state.doc ? "doc" : (state.billing ? "billing" : (state.welcome ? "welcome" : "home")))); (use, state) => (state.doc ? "doc" : (state.billing ? "billing" : (state.welcome ? "welcome" : "home"))));
public readonly needsOrg: Observable<boolean> = Computed.create(
this, urlState().state, (use, state) => {
return !(Boolean(state.welcome) || state.billing === 'scheduled');
});
public readonly notifier = this.topAppModel.notifier; public readonly notifier = this.topAppModel.notifier;
public readonly behavioralPromptsManager: BehavioralPromptsManager = public readonly behavioralPromptsManager: BehavioralPromptsManager =

2
app/client/ui/AppUI.ts
View File

@ -53,7 +53,7 @@ export function createAppUI(topAppModel: TopAppModel, appObj: App): IDisposable
} }
function createMainPage(appModel: AppModel, appObj: App) { function createMainPage(appModel: AppModel, appObj: App) {
if (!appModel.currentOrg && appModel.pageType.get() !== 'welcome') { if (!appModel.currentOrg && appModel.needsOrg.get()) {
const err = appModel.orgError; const err = appModel.orgError;
if (err && err.status === 404) { if (err && err.status === 404) {
return createNotFoundPage(appModel); return createNotFoundPage(appModel);

2
app/common/BillingAPI.ts
View File

@ -4,7 +4,7 @@ import {StringUnion} from 'app/common/StringUnion';
import {addCurrentOrgToPath} from 'app/common/urlUtils'; import {addCurrentOrgToPath} from 'app/common/urlUtils';
import {BillingAccount, ManagerDelta, OrganizationWithoutAccessInfo} from 'app/common/UserAPI'; import {BillingAccount, ManagerDelta, OrganizationWithoutAccessInfo} from 'app/common/UserAPI';
export const BillingSubPage = StringUnion('payment'); export const BillingSubPage = StringUnion('payment', 'scheduled');
export type BillingSubPage = typeof BillingSubPage.type; export type BillingSubPage = typeof BillingSubPage.type;
export const BillingPage = StringUnion(...BillingSubPage.values, 'billing'); export const BillingPage = StringUnion(...BillingSubPage.values, 'billing');

6
app/gen-server/lib/HomeDBManager.ts
View File

@ -83,6 +83,8 @@ export const NotifierEvents = StringUnion(
'addBillingManager', 'addBillingManager',
'teamCreator', 'teamCreator',
'trialPeriodEndingSoon', 'trialPeriodEndingSoon',
'trialingSubscription',
'scheduledCall',
); );
export type NotifierEvent = typeof NotifierEvents.type; export type NotifierEvent = typeof NotifierEvents.type;
@ -467,6 +469,10 @@ export class HomeDBManager extends EventEmitter {
return await User.findOne({where: {apiKey}, relations: ["logins"]}) || undefined; return await User.findOne({where: {apiKey}, relations: ["logins"]}) || undefined;
} }
public async getUserByRef(ref: string): Promise<User|undefined> {
return await User.findOne({where: {ref}, relations: ["logins"]}) || undefined;
}
public async getUser(userId: number): Promise<User|undefined> { public async getUser(userId: number): Promise<User|undefined> {
return await User.findOne({where: {id: userId}, relations: ["logins"]}) || undefined; return await User.findOne({where: {id: userId}, relations: ["logins"]}) || undefined;
} }