Merge pull request #1527 from bogeorge/react-q-and-a-bug-fixes

This commit is contained in:
Hugo Bernier 2020-10-02 22:31:53 -04:00 committed by GitHub
commit 3335f66a72
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 49 additions and 53 deletions

View File

@ -1 +0,0 @@
{"version":3,"file":"MobilePreviewDeviceTypeSelector.d.ts","sourceRoot":"../../../../src/","sources":["components/mobilePreview/mobilePreviewHeaderBar/mobilePreviewDeviceTypeSelector/MobilePreviewDeviceTypeSelector.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAO/B,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAE/D,MAAM,WAAW,qCAAqC;IACpD,kBAAkB,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,IAAI,CAAC;CAChD;AAED,MAAM,CAAC,OAAO,OAAO,+BAAgC,SAAQ,KAAK,CAAC,SAAS,CACzE,qCAAqC,EAAE,EAAE,CAAC;IAEpC,MAAM,IAAI,KAAK,CAAC,YAAY,CAAC,EAAE,CAAC;CAmBxC"}

View File

@ -1,2 +0,0 @@
.mobilePreviewDeviceIcon_4e248641{color:#a19f9d;margin:auto;padding:auto;font-size:40px;line-height:50px}.mobilePreviewDeviceIcon_4e248641:hover{cursor:pointer;color:#767676}.navBarItemRight_4e248641{font-size:14px;padding:0;-webkit-box-sizing:border-box;box-sizing:border-box;display:block;height:40px;line-height:40px;position:relative;float:right;margin:0}
/*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNyYy9jb21wb25lbnRzL21vYmlsZVByZXZpZXcvbW9iaWxlUHJldmlld0hlYWRlckJhci9tb2JpbGVQcmV2aWV3RGV2aWNlVHlwZVNlbGVjdG9yL01vYmlsZVByZXZpZXdEZXZpY2VUeXBlU2VsZWN0b3IubW9kdWxlLnNjc3MiLCJub2RlX21vZHVsZXMvb2ZmaWNlLXVpLWZhYnJpYy1yZWFjdC9kaXN0L3Nhc3MvbWl4aW5zL19Db2xvci5NaXhpbnMuTURMMi5zY3NzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUtBLGtDQ3dNRSxNQUFBLFFEdE1BLE9BQUEsS0FDQSxRQUFBLEtBQ0EsVUFBQSxLQUNBLFlBQUEsS0FMRix3Q0FRSSxPQUFBLFFBQ0EsTUFBQSxRQUtKLDBCQUNFLFVBQUEsS0FDQSxRQUFBLEVBQ0EsbUJBQUEsV0FBQSxXQUFBLFdBQ0EsUUFBQSxNQUNBLE9BQUEsS0FDQSxZQUFBLEtBQ0EsU0FBQSxTQUNBLE1BQUEsTUFDQSxPQUFBIn0= */

View File

@ -1,6 +0,0 @@
declare const styles: {
mobilePreviewDeviceIcon: string;
navBarItemRight: string;
};
export default styles;
//# sourceMappingURL=MobilePreviewDeviceTypeSelector.module.scss.d.ts.map

View File

@ -1 +0,0 @@
{"version":3,"file":"MobilePreviewDeviceTypeSelector.module.scss.d.ts","sourceRoot":"../../../../src/","sources":["components/mobilePreview/mobilePreviewHeaderBar/mobilePreviewDeviceTypeSelector/MobilePreviewDeviceTypeSelector.module.scss.ts"],"names":[],"mappings":"AAEA,QAAA,MAAM,MAAM;;;CAGX,CAAC;AAEF,eAAe,MAAM,CAAC"}

View File

@ -1,9 +0,0 @@
/* tslint:disable */
require("./MobilePreviewDeviceTypeSelector.module.css");
var styles = {
mobilePreviewDeviceIcon: 'mobilePreviewDeviceIcon_4e248641',
navBarItemRight: 'navBarItemRight_4e248641'
};
export default styles;
/* tslint:enable */
//# sourceMappingURL=MobilePreviewDeviceTypeSelector.module.scss.js.map

View File

@ -3,7 +3,7 @@
"solution": {
"name": "Questions and Answers",
"id": "6feb4c2f-341b-499c-998c-9b2ebd95435c",
"version": "1.0.0.0",
"version": "1.0.1.0",
"skipFeatureDeployment": false,
"iconPath": "images/Feedback_Icon.png",
"includeClientSideAssets": true,

View File

@ -1,6 +1,6 @@
{
"name": "react-questions-and-answers",
"version": "1.0.0",
"version": "1.0.1",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

View File

@ -1,6 +1,6 @@
{
"name": "react-questions-and-answers",
"version": "1.0.0",
"version": "1.0.1",
"private": true,
"engines": {
"node": ">=0.10.0"

View File

@ -1,6 +1,11 @@
import { sp, PermissionKind, RoleType } from '@pnp/sp/presets/all';
import { sp } from '@pnp/sp';
import "@pnp/sp/webs";
import "@pnp/sp/site-groups/web";
import { PermissionKind } from "@pnp/sp/security";
import { BaseService } from './base.service';
import { LogHelper, ListTitles } from 'utilities';
import { RoleType } from '@pnp/sp/sharing';
import { _RoleAssignment, _RoleDefinition } from '@pnp/sp/security/types';
export class PermissionService extends BaseService {
@ -10,12 +15,22 @@ export class PermissionService extends BaseService {
LogHelper.verbose(this.constructor.name, 'canVisitorsAskQuestions', '');
let canAsk: boolean = false;
debugger;
let visitorGroup = await sp.web.associatedVisitorGroup();
let perms = await sp.web.lists.getByTitle(this.listTitle).getUserEffectivePermissions(visitorGroup.LoginName);
if(sp.web.hasPermissions(perms, PermissionKind.AddListItems)) {
canAsk = true;
console.log(visitorGroup.Id);
let roles = await sp.web.lists.getByTitle(this.listTitle).roleAssignments
.expand('Member', 'RoleDefinitionBindings')
.get();
let visitorRole: any = roles.find(r => r.PrincipalId === visitorGroup.Id);
if(visitorRole) {
for (let def of visitorRole.RoleDefinitionBindings) {
if (sp.web.hasPermissions(def.BasePermissions, PermissionKind.AddListItems)) {
canAsk = true;
}
}
}
return canAsk;