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) Use document access for showing form buttons

Browse Source 
Summary:
Site access was being used to show or hide form widget buttons. This meant
that users granted owner access to a document couldn't see buttons to
publish/unpublish or share a form. Now, document access is used instead.

Test Plan: Manual.

Reviewers: paulfitz

Reviewed By: paulfitz

Subscribers: paulfitz

Differential Revision: https://phab.getgrist.com/D4207
This commit is contained in:
George Gevoian 2024-03-07 23:43:46 -05:00
parent a5099fc598
commit 14125b9b97
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/client/components/Forms/FormView.ts
View File

@ -24,6 +24,7 @@ import {cssButton} from 'app/client/ui2018/buttons';
import {icon} from 'app/client/ui2018/icons'; import {icon} from 'app/client/ui2018/icons';
import {confirmModal} from 'app/client/ui2018/modals'; import {confirmModal} from 'app/client/ui2018/modals';
import {INITIAL_FIELDS_COUNT} from 'app/common/Forms'; import {INITIAL_FIELDS_COUNT} from 'app/common/Forms';
import {isOwner} from 'app/common/roles';
import {Events as BackboneEvents} from 'backbone'; import {Events as BackboneEvents} from 'backbone';
import {Computed, dom, Holder, IDomArgs, MultiHolder, Observable} from 'grainjs'; import {Computed, dom, Holder, IDomArgs, MultiHolder, Observable} from 'grainjs';
import defaults from 'lodash/defaults'; import defaults from 'lodash/defaults';
@ -58,6 +59,7 @@ export class FormView extends Disposable {
private _remoteShare: AsyncComputed<{key: string}|null>; private _remoteShare: AsyncComputed<{key: string}|null>;
private _published: Computed<boolean>; private _published: Computed<boolean>;
private _showPublishedMessage: Observable<boolean>; private _showPublishedMessage: Observable<boolean>;
private _isOwner: boolean;
public create(gristDoc: GristDoc, viewSectionModel: ViewSectionRec) { public create(gristDoc: GristDoc, viewSectionModel: ViewSectionRec) {
BaseView.call(this as any, gristDoc, viewSectionModel, {'addNewRow': false}); BaseView.call(this as any, gristDoc, viewSectionModel, {'addNewRow': false});
@ -380,6 +382,8 @@ export class FormView extends Disposable {
true true
)); ));
this._isOwner = isOwner(this.gristDoc.docPageModel.currentDoc.get());
// Last line, build the dom. // Last line, build the dom.
this.viewPane = this.autoDispose(this.buildDom()); this.viewPane = this.autoDispose(this.buildDom());
} }
@ -640,7 +644,7 @@ export class FormView extends Disposable {
testId('link'), testId('link'),
dom('div', 'Copy Link'), dom('div', 'Copy Link'),
dom.prop('disabled', this._copyingLink), dom.prop('disabled', this._copyingLink),
dom.show(use => this.gristDoc.appModel.isOwner() && use(this._published)), dom.show(use => this._isOwner && use(this._published)),
dom.on('click', async (_event, element) => { dom.on('click', async (_event, element) => {
try { try {
this._copyingLink.set(true); this._copyingLink.set(true);
@ -662,14 +666,14 @@ export class FormView extends Disposable {
return published return published
? style.cssIconButton( ? style.cssIconButton(
dom('div', 'Unpublish'), dom('div', 'Unpublish'),
dom.show(this.gristDoc.appModel.isOwner()), dom.show(this._isOwner),
style.cssIconButton.cls('-warning'), style.cssIconButton.cls('-warning'),
dom.on('click', () => this._handleClickUnpublish()), dom.on('click', () => this._handleClickUnpublish()),
testId('unpublish'), testId('unpublish'),
) )
: style.cssIconButton( : style.cssIconButton(
dom('div', 'Publish'), dom('div', 'Publish'),
dom.show(this.gristDoc.appModel.isOwner()), dom.show(this._isOwner),
cssButton.cls('-primary'), cssButton.cls('-primary'),
dom.on('click', () => this._handleClickPublish()), dom.on('click', () => this._handleClickPublish()),
testId('publish'), testId('publish'),
@ -714,7 +718,7 @@ export class FormView extends Disposable {
this._showPublishedMessage.set(false); this._showPublishedMessage.set(false);
}), }),
), ),
dom.show(this.gristDoc.appModel.isOwner()), dom.show(this._isOwner),
); );
}); });
} }