mirror of
https://github.com/gristlabs/grist-core.git
synced 2026-03-02 04:09:24 +00:00
(core) Redirect less often in welcomeNewUser
Summary: Instead of always redirecting new users to the home page or the (teams) welcome page, only redirect when the user signed in for the first time on a personal site, has access to other sites, and isn't already being redirected to a specific page on their personal site. Also tweaks how invalid Choice column values are displayed to match Choice List columns, and fixes a small CSS issue with select by in the page widget picker when there are options with long labels. Test Plan: Browser tests. Reviewers: paulfitz Reviewed By: paulfitz Differential Revision: https://phab.getgrist.com/D3461
This commit is contained in:
@@ -33,7 +33,6 @@ import {decodeObject} from 'app/plugin/objtypes';
|
||||
import {isList, isNumberType, isRefListType} from 'app/common/gristTypes';
|
||||
import {choiceToken} from 'app/client/widgets/ChoiceToken';
|
||||
import {ChoiceOptions} from 'app/client/widgets/ChoiceTextBox';
|
||||
import {cssInvalidToken} from 'app/client/widgets/ChoiceListCell';
|
||||
|
||||
interface IFilterMenuOptions {
|
||||
model: ColumnFilterMenuModel;
|
||||
@@ -455,9 +454,9 @@ function getRenderFunc(columnType: string, fieldOrColumn: ViewFieldRec|ColumnRec
|
||||
fontUnderline: choiceOptions[value.label]?.fontUnderline ?? false,
|
||||
fontItalic: choiceOptions[value.label]?.fontItalic ?? false,
|
||||
fontStrikethrough: choiceOptions[value.label]?.fontStrikethrough ?? false,
|
||||
invalid: !choiceSet.has(value.label),
|
||||
},
|
||||
dom.cls(cssToken.className),
|
||||
cssInvalidToken.cls('-invalid', !choiceSet.has(value.label)),
|
||||
testId('choice-token')
|
||||
);
|
||||
};
|
||||
|
||||
@@ -342,11 +342,11 @@ export class PageWidgetSelect extends Disposable {
|
||||
cssFooter(
|
||||
cssFooterContent(
|
||||
// If _selectByOptions exists and has more than then "NoLinkOption", show the selector.
|
||||
dom.maybe((use) => this._selectByOptions && use(this._selectByOptions).length > 1, () => [
|
||||
dom.maybe((use) => this._selectByOptions && use(this._selectByOptions).length > 1, () => cssSelectBy(
|
||||
cssSmallLabel('SELECT BY'),
|
||||
dom.update(cssSelect(this._value.link, this._selectByOptions!),
|
||||
testId('selectby'))
|
||||
]),
|
||||
)),
|
||||
dom('div', {style: 'flex-grow: 1'}),
|
||||
bigPrimaryButton(
|
||||
// TODO: The button's label of the page widget picker should read 'Close' instead when
|
||||
@@ -540,6 +540,12 @@ const cssSmallLabel = styled('span', `
|
||||
|
||||
const cssSelect = styled(select, `
|
||||
flex: 1 0 160px;
|
||||
width: 160px;
|
||||
`);
|
||||
|
||||
const cssSelectBy = styled('div', `
|
||||
display: flex;
|
||||
align-items: center;
|
||||
`);
|
||||
|
||||
// Returns a copy of array with its items sorted in the same order as they appear in other.
|
||||
|
||||
Reference in New Issue
Block a user