wip allow project sharing checkbox

Author: feliks-montez

src/Api/Model/Scriptureforge/Sfchecks/Command/SfchecksProjectCommands.php

@@ -21,7 +21,7 @@ class SfchecksProjectCommands
      * @throws \Exception
      * @return string projectId
      */
-    public static function updateProject($projectId, $userId, $object)
+    public static function updateSfChecksProject($projectId, $userId, $object)
     {
         $project = new SfchecksProjectModel($projectId);
         ProjectCommands::checkIfArchivedAndThrow($project);

src/Api/Model/Shared/Command/SessionCommands.php

@@ -71,13 +71,15 @@ public static function getSessionData($projectId, $userId, $website, $mockFilena
                 $sessionData['project']['ownerRef']['username'] = $ownerUserModel->username;
 
                 $sessionData['project']['userIsProjectOwner'] = $project->isOwner($userId);
+                $sessionData['project']['allowSharing'] = $project->allowSharing;
                 $sessionData['project']['slug'] = $project->databaseName();
                 $sessionData['project']['isArchived'] = $project->isArchived;
                 $sessionData['project']['interfaceLanguageCode'] = $project->interfaceLanguageCode;
                 $sessionData['project']['inviteToken']['token'] = $project->inviteToken->token;
                 $sessionData['project']['inviteToken']['defaultRole'] = $project->inviteToken->defaultRole;
                 $sessionData['userProjectRights'] = $project->getRightsArray($userId);
                 $sessionData['userProjectRole'] = $project->users[$userId]->role;
+                $sessionData['userIsProjectMember'] = $project->userIsMember($userId);
                 $sessionData['projectSettings'] = $project->getPublicSettings($userId);
             }
         }

src/Api/Model/Shared/ProjectModel.php

@@ -39,6 +39,8 @@ public function __construct($id = '')
             return new ProjectRoleModel();
         });
 
+        $this->allowSharing = false;
+
         $this->userJoinRequests = new MapOf(function() {
             return new ProjectRoleModel();
         });
@@ -109,6 +111,9 @@ public function __construct($id = '')
     /** @var ProjectUserPropertiesSettings */
     public $userProperties;
 
+    /** @var boolean When true, non-manager project members can access the sharing dialog */
+    public $allowSharing;
+
     /**
      * Specifies which site this project belongs to e.g. scriptureforge || languageforge, cf. Website class
      * @var string

src/Site/views/languageforge/container/languageforge.html.twig

@@ -103,7 +103,7 @@
                     <breadcrumbs id="top" class="breadcrumbs d-none d-md-block"></breadcrumbs>
                 </div>
                 <ul class="nav navbar-nav">
-                    <li class='nav-item' ng-if="$ctrl.header.settings.length > 0 && $ctrl.currentUserIsProjectManager">
+                    <li class='nav-item' ng-if="$ctrl.header.settings.length > 0 && $ctrl.displayShareButton">
                         <a id="shareBtn" class="btn btn-primary my-auto" title="Share" href="#"
                                          ng-click="$ctrl.openShareWithOthersModal()">
                             <i class="fa fa-share-alt iconPadding"></i><span>Share</span>

src/angular-app/bellows/core/navbar.controller.ts

@@ -2,12 +2,12 @@ import * as angular from 'angular';
 
 import {InterfaceConfig} from '../shared/model/interface-config.model';
 import {ProjectSettings} from '../shared/model/project-settings.model';
-import {ProjectRoles} from '../shared/model/project.model';
+import {ProjectRoles, Project} from '../shared/model/project.model';
 import {ProjectService, ProjectTypeNames} from './api/project.service';
 import {ApplicationHeaderService, HeaderData} from './application-header.service';
 import {ModalService} from './modal/modal.service';
 import {OfflineCacheUtilsService} from './offline/offline-cache-utils.service';
-import {SessionService} from './session.service';
+import {SessionService, Session} from './session.service';
 
 interface Rights {
   canCreateProject: boolean;
@@ -17,8 +17,10 @@ export class NavbarController implements angular.IController {
   rights: Rights = {} as Rights;
   projectTypesBySite: () => string[];
   header: HeaderData;
+  session: Session;
   interfaceConfig: InterfaceConfig;
   currentUserIsProjectManager: boolean;
+  displayShareButton: boolean;
   projectTypeNames: ProjectTypeNames;
   siteName: string;
 
@@ -36,6 +38,7 @@ export class NavbarController implements angular.IController {
     this.projectTypesBySite = this.projectService.data.projectTypesBySite;
     this.header = this.applicationHeaderService.data;
     this.sessionService.getSession().then(session => {
+      this.session = session;
       const defaultInterfaceConfig =
         {
           direction: 'ltr',
@@ -61,6 +64,9 @@ export class NavbarController implements angular.IController {
         }
       }
       this.currentUserIsProjectManager = session.data.userProjectRole === ProjectRoles.MANAGER.key;
+      const project: Project = this.session.data.project;
+      this.displayShareButton =
+        (this.currentUserIsProjectManager || (project.allowSharing && this.session.data.userIsProjectMember));
       this.rights.canCreateProject =
         session.hasSiteRight(this.sessionService.domain.PROJECTS, this.sessionService.operation.CREATE);
       this.siteName = session.baseSite();

src/angular-app/bellows/core/session.service.ts

@@ -67,6 +67,7 @@ class SessionData {
   userSiteRights: any;
   userProjectRights: any;
   userProjectRole: string;
+  userIsProjectMember: boolean;
   accessToken: string;
   version: string;
 }

src/angular-app/bellows/shared/model/project.model.ts

@@ -7,7 +7,7 @@ export interface Project {
   projectName: string;
   role: string;
   anonymousUserRole: string;
-  reusableInviteLinkRole: string;
+  allowSharing: boolean;
   siteName: string;
   type?: string;
   isArchived: boolean;

src/angular-app/languageforge/lexicon/shared/share-with-others/share-with-others.component.ts

@@ -1,6 +1,8 @@
 import * as angular from 'angular';
+import { ProjectService } from '../../../../bellows/core/api/project.service';
 import { Session, SessionService } from '../../../../bellows/core/session.service';
 import { Project } from '../../../../bellows/shared/model/project.model';
+import { LexiconProjectService } from '../../core/lexicon-project.service';
 
 export class ShareWithOthersModalInstanceController implements angular.IController {
   modalInstance: any;
@@ -9,8 +11,9 @@ export class ShareWithOthersModalInstanceController implements angular.IControll
   project: Project;
   session: Session;
 
-  static $inject = ['sessionService'];
-  constructor(private readonly sessionService: SessionService) {}
+  static $inject = ['lexProjectService', 'sessionService'];
+  constructor(private readonly lexProjectService: LexiconProjectService,
+              private readonly sessionService: SessionService) {}
 
   $onInit(): void {
     this.sessionService.getSession().then(session => {
@@ -20,7 +23,7 @@ export class ShareWithOthersModalInstanceController implements angular.IControll
   }
 
   setProjectSharability(): void {
-    console.log('TODO: actually set project.allowSharing = ' + this.allowSharing);
+    this.lexProjectService.updateProject({allowSharing: this.allowSharing});
   }
 
   setProjectListability(): void {

src/angular-app/languageforge/lexicon/shared/share-with-others/share-with-others.modal.html

@@ -6,20 +6,20 @@ <h3 class="modal-title">Share with Others</h3>
   <div class="modal-body">
     <user-management project="$ctrl.project" session="$ctrl.session"></user-management>
 
-    <!-- <div id="sharing-checkboxes" class="form-group">
+    <div id="sharing-checkboxes" class="form-group">
       <div class="form-check">
         <input class="form-check-input" type="checkbox" value="" id="sharing-check-1" ng-model="$ctrl.allowSharing" ng-change="$ctrl.setProjectSharability()">
         <label class="form-check-label" for="sharing-check-1">
           Allow others to share <i class="fa fa-share-alt"></i>
         </label>
       </div>
-      <div class="form-check">
+      <!-- <div class="form-check">
         <input class="form-check-input" type="checkbox" value="" id="sharing-check-2" ng-model="$ctrl.listProject" ng-change="$ctrl.setProjectListability()">
         <label class="form-check-label" for="sharing-check-2">
           Project is publicly listed on languageforge.org
         </label>
-      </div>
-    </div> -->
+      </div> -->
+    </div>
   </div>
   <div class="modal-footer d-block clearfix">
     <button class="btn btn-primary float-right" id="apply-sharing-config-button" ng-click="$ctrl.close()">