Skip to content

Don't show comment indication if you don't have permissions #4266

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 19 commits into from
Jun 1, 2020
Merged

Don't show comment indication if you don't have permissions #4266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
690a97b
Added p5js icon
May 30, 2020
a2b90f7
Remove unnecessary fill property
CompuIves May 31, 2020
de269f8
fix: setting undefined in URL (#4244)
jyash97 May 30, 2020
7ff7605
Remove pkg.json check (#4248)
CompuIves May 30, 2020
d7ab05e
Add support for dynamic webpack loaders (#4245)
CompuIves May 31, 2020
5c2e0da
Fix eslint (#4259)
CompuIves May 31, 2020
6ad161e
Resolve ESModules by default (#4191)
CompuIves May 31, 2020
e390c1f
Fix links
CompuIves May 31, 2020
a41e152
Don't allow the sidebar to render if currentSandbox is not available …
CompuIves May 31, 2020
4cbdd1e
fix: check for vue router v4 (#4203)
posva May 31, 2020
03f4a0b
Fix esm var changes (#4262)
CompuIves May 31, 2020
379935a
fix: typo in method isInsideVue (#4263)
posva May 31, 2020
c6a6314
Fix transforming properties like toString
CompuIves May 31, 2020
6588506
Add comments data
CompuIves May 31, 2020
62e5035
Use unique id
CompuIves May 31, 2020
c2e6faf
Fix typo in reference
CompuIves May 31, 2020
d0904ee
Merge branch 'master' into p5js
CompuIves May 31, 2020
8463b03
Don't show comment indication if you don't have permission
CompuIves Jun 1, 2020
8a041a3
Merge branch 'master' into fix/comment-indication
CompuIves Jun 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 10 additions & 12 deletions packages/app/src/app/overmind/effects/vscode/ModelsHandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,18 +154,16 @@ export class ModelsHandler {
}

public clearComments() {
if (this.sandbox.featureFlags.comments) {
Object.values(this.moduleModels).forEach(moduleModel => {
if (!moduleModel.model) {
return;
}
moduleModel.comments = [];
moduleModel.currentCommentDecorations = moduleModel.model.deltaDecorations(
moduleModel.currentCommentDecorations,
[]
);
});
}
Object.values(this.moduleModels).forEach(moduleModel => {
Copy link
Member Author

@CompuIves CompuIves Jun 1, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one didn't really need a feature flag check.

if (!moduleModel.model) {
return;
}
moduleModel.comments = [];
moduleModel.currentCommentDecorations = moduleModel.model.deltaDecorations(
moduleModel.currentCommentDecorations,
[]
);
});
}

public isModuleOpened(module: Module) {
Expand Down
7 changes: 6 additions & 1 deletion packages/app/src/app/overmind/effects/vscode/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import * as childProcess from 'node-services/lib/child_process';
import { TextOperation } from 'ot';
import { json } from 'overmind';
import io from 'socket.io-client';
import { hasPermission } from '@codesandbox/common/lib/utils/permission';

import { EXTENSIONS_LOCATION, VIM_EXTENSION_ID } from './constants';
import {
Expand Down Expand Up @@ -1202,7 +1203,11 @@ export class VSCodeEffect {

this.modelCursorPositionListener = activeEditor.onDidChangeCursorPosition(
cursor => {
if (sandbox?.featureFlags.comments) {
if (
sandbox &&
sandbox.featureFlags.comments &&
hasPermission(sandbox.authorization, 'comment')
) {
const model = activeEditor.getModel();

this.modelsHandler.updateLineCommentIndication(
Expand Down