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) Restoring GRIST_DEFAULT_PRODUCT functionality

Browse Source 
Summary: The GRIST_DEFAULT_PRODUCT wasn't used for grist-ee, now it is respected.

Test Plan:
I've build grist-ee docker image from github and run it using our instruction (both for recreating the issue and confirming it is fixed)
```
docker run -p 8484:8484 \
  -v $PWD:/persist \
  -e GRIST_SESSION_SECRET=invent-a-secret-here \
  -e GRIST_SINGLE_ORG=cool-beans
  -it gristlabs/grist-ee
```

For grist-core I recreated/confirmed it is fixed it just by `GRIST_SINGLE_ORG=team npm start` in the core folder.
I also created some team sites using stubbed UI and confirmed that they were using the GRIST_DEFAULT_PRODUCT product.

Reviewers: paulfitz

Reviewed By: paulfitz

Subscribers: paulfitz

Differential Revision: https://phab.getgrist.com/D4271
This commit is contained in:
Jarosław Sadziński 2024-06-14 12:12:24 +02:00
parent 40c87f4529
commit 1e2991519f
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -136,9 +136,11 @@ function buildTeamPage({
} }
await create(); await create();
} finally { } finally {
if (!disabled.isDisposed()) {
disabled.set(false); disabled.set(false);
} }
} }
}
const clickOnEnter = dom.onKeyPress({ const clickOnEnter = dom.onKeyPress({
Enter: () => click(), Enter: () => click(),
}); });

5
app/gen-server/entity/Product.ts
View File

@ -147,12 +147,11 @@ export const PRODUCTS: IProduct[] = [
*/ */
export function getDefaultProductNames() { export function getDefaultProductNames() {
const defaultProduct = process.env.GRIST_DEFAULT_PRODUCT; const defaultProduct = process.env.GRIST_DEFAULT_PRODUCT;
const personalFreePlan = PERSONAL_FREE_PLAN;
return { return {
// Personal site start off on a functional plan. // Personal site start off on a functional plan.
personal: defaultProduct || personalFreePlan, personal: defaultProduct || PERSONAL_FREE_PLAN,
// Team site starts off on a limited plan, requiring subscription. // Team site starts off on a limited plan, requiring subscription.
teamInitial: defaultProduct || 'stub', teamInitial: defaultProduct || STUB_PLAN,
// Team site that has been 'turned off'. // Team site that has been 'turned off'.
teamCancel: 'suspended', teamCancel: 'suspended',
// Functional team site. // Functional team site.

2
stubs/app/server/server.ts
View File

@ -7,7 +7,6 @@
import {commonUrls} from 'app/common/gristUrls'; import {commonUrls} from 'app/common/gristUrls';
import {isAffirmative} from 'app/common/gutil'; import {isAffirmative} from 'app/common/gutil';
import {HomeDBManager} from 'app/gen-server/lib/HomeDBManager'; import {HomeDBManager} from 'app/gen-server/lib/HomeDBManager';
import {TEAM_FREE_PLAN} from 'app/common/Features';
const debugging = isAffirmative(process.env.DEBUG) || isAffirmative(process.env.VERBOSE); const debugging = isAffirmative(process.env.DEBUG) || isAffirmative(process.env.VERBOSE);
@ -90,7 +89,6 @@ async function setupDb() {
}, { }, {
setUserAsOwner: false, setUserAsOwner: false,
useNewPlan: true, useNewPlan: true,
product: TEAM_FREE_PLAN
})); }));
} }
} }