Merge pull request #629 from fiji-flo/group-trust

enable group trust

Author: fiji-flo

src/assets/js/scope.js

@@ -32,6 +32,16 @@ class Scope {
       'group_creators' in (mozilliansorgGroups || {}) ||
       'group_admins' in (mozilliansorgGroups || {});
   }
+
+  hasTrust(trust) {
+    if (this.isStaff) {
+      return true;
+    }
+    if (this.isNdaed) {
+      return trust !== 'Staff';
+    }
+    return trust === 'Authenticated';
+  }
 }
 
 export default Scope;

src/components/access_group/AccessGroupCreate.vue

@@ -55,14 +55,14 @@
         >
           <template v-slot:content>
             <div class="content-area__row">
-              <div
+              <label
                 class="radio-control"
                 v-for="(type, idx) in groupTypes"
                 :key="idx"
               >
                 <input type="radio" :value="type" v-model="groupType" />
                 {{ type }}
-              </div>
+              </label>
             </div>
             <div class="content-area__row radio-control__description">
               <label class="description-label">{{
@@ -82,6 +82,32 @@
             </div>
           </template>
         </AccessGroupEditPanel>
+        <AccessGroupEditPanel :title="fluent('access-group_trust')">
+          <template v-slot:content>
+            <div class="content-area__row">
+              <label
+                class="radio-control"
+                v-for="[k, trust] in groupTrustLevels"
+                :key="k"
+              >
+                <input type="radio" :value="trust" v-model="groupTrust" />
+                {{ fluent('access-group_trust', trust) }}
+              </label>
+            </div>
+            <div
+              v-for="[k, trust] in groupTrustLevels"
+              :key="k"
+              class="content-area__row radio-control__description"
+            >
+              <label class="description-label">{{
+                fluent('access-group_trust', trust)
+              }}</label>
+              <p class="description-content">
+                <Fluent id="access-group_trust" :attr="`${trust}-content`" />
+              </p>
+            </div>
+          </template>
+        </AccessGroupEditPanel>
         <AccessGroupEditPanel :title="fluent('access-group_expiration')">
           <template v-slot:content>
             <div class="content-area__row group-expiration">
@@ -177,6 +203,7 @@ import { ACCESS_GROUP_PAGE, ACCESS_GROUP_INDEX_PAGE } from '@/router.js';
 import {
   TYPE_INDEX,
   ACCESS_GROUP_TYPES,
+  ACCESS_GROUP_TRUST,
   MEMBER_EXPIRATION_ONE_YEAR,
 } from '@/view_models/AccessGroupViewModel.js';
 
@@ -197,10 +224,12 @@ export default {
       highlightError: false,
       groupNamePattern: '[a-z0-9\\-_]*',
       groupDescription: '',
+      groupTrust: ACCESS_GROUP_TRUST.ndaed,
       groupType: ACCESS_GROUP_TYPES[TYPE_INDEX.closed],
       groupName: '',
       groupTermsRequiredData: false,
       groupTermsData: '',
+      groupTypes: ACCESS_GROUP_TYPES.filter((type) => type !== 'Open'),
       selectedExpiration: MEMBER_EXPIRATION_ONE_YEAR,
       lastMarkdownCollapsed: true,
       accessGroupListRoute: ACCESS_GROUP_INDEX_PAGE,
@@ -210,8 +239,8 @@ export default {
     ...mapGetters({
       loading: 'getLoading',
     }),
-    groupTypes() {
-      return ACCESS_GROUP_TYPES.filter((type) => type !== 'Open');
+    groupTrustLevels() {
+      return Object.entries(ACCESS_GROUP_TRUST);
     },
   },
   methods: {
@@ -237,6 +266,7 @@ export default {
               type: this.groupType,
               description: this.groupDescription,
               group_expiration: this.selectedExpiration,
+              trust: this.groupTrust,
             },
           });
           this.completeLoading();
@@ -251,6 +281,7 @@ export default {
           this.$root.$emit('toast', {
             content: this.fluent('ag_api_errors', e.message),
           });
+          this.completeLoading();
         }
       }
     },

src/components/access_group/AccessGroupDescription.vue

@@ -122,7 +122,10 @@ export default {
       return this.isMember;
     },
     showRequest() {
-      return this.groupInformation.group.type === 'Reviewed';
+      return (
+        this.groupInformation.group.type === 'Reviewed' &&
+        this.scope.hasTrust(this.groupInformation.group.trust)
+      );
     },
   },
   methods: {

src/components/access_group/AccessGroupDetails.vue

@@ -21,6 +21,20 @@
         )} ${groupCreatedDate}`
       }}
     </p>
+    <p class="primary-data-row">
+      {{
+        `${fluent('access-group_details', 'typ')}: ${
+          groupInformation.group.type
+        }`
+      }}
+    </p>
+    <p class="primary-data-row">
+      {{
+        `${fluent('access-group_details', 'trust')}: ${
+          groupInformation.group.trust
+        }`
+      }}
+    </p>
   </div>
 </template>
 

src/components/access_group/AccessGroupInformationEdit.vue

@@ -75,6 +75,18 @@
         >
       </template>
     </AccessGroupEditPanel>
+    <AccessGroupEditPanel :title="fluent('access-group_trust')">
+      <template v-slot:content>
+        <div class="content-area__row radio-control__description">
+          <label class="description-label">{{
+            fluent('access-group_trust', groupTrust)
+          }}</label>
+          <p class="description-content">
+            <Fluent id="access-group_trust" :attr="`${groupTrust}-content`" />
+          </p>
+        </div>
+      </template>
+    </AccessGroupEditPanel>
     <AccessGroupEditPanel
       form="termsForm"
       :handler="handleTermsUpdate"
@@ -200,6 +212,10 @@ import TextArea from '@/components/ui/TextArea.vue';
 import Button from '@/components/ui/Button.vue';
 import AccessGroupEditPanel from '@/components/access_group/AccessGroupEditPanel.vue';
 import AccessGroupMarkdownGuide from '@/components/access_group/AccessGroupMarkdownGuide.vue';
+import {
+  ACCESS_GROUP_TYPES,
+  ACCESS_GROUP_TRUST,
+} from '@/view_models/AccessGroupViewModel.js';
 
 export default {
   name: 'AccessGroupInformationEdit',
@@ -225,6 +241,8 @@ export default {
       groupTermsDirty: false,
       groupTypeData: this.groupInformation.group.type,
       groupTypeDirty: false,
+      groupTypes: ACCESS_GROUP_TYPES.filter((type) => type !== 'Open'),
+      groupTrust: this.groupInformation.group.trust,
       enableDelete: false,
       emailInviteText: '',
       emailInviteTextEnabled: Boolean(this.emailInviteText),

src/locales/en-US/strings.ftl

@@ -458,6 +458,8 @@ access-group_details = Group Details
   .name = Group name
   .description = Group description
   .update-details = Update details
+  .typ = Group type
+  .trust = Trust level
 access-groups_membership = -
   .since = Joined
   .expires = Expires
@@ -524,6 +526,13 @@ access-group_type = Group type
   .closed-heading = Closed
   .closed-content = "Closed" groups provide more tight control over a group. Mozillians cannot request membership, and can only be invited to join the group by Group Curators. Group Curators can, of course, remove people from the group if needed. Avoid using this group type unless you are absolutely sure it is necessary.
   .update-type = Update type
+access-group_trust = Group Trust Level
+  .Authenticated = Authenticated
+  .Authenticated-content = Any authenticated user can be a member of this group.
+  .Ndaed = NDA'd
+  .Ndaed-content = One must be a ndaed Mozillian or Mozilla staff in order to be member of this group.
+  .Staff = Staff
+  .Staff-content = Only Mozilla staff can be a member on this group. 
 access-group_terms = Membership terms
   .heading = Terms and Conditions
   .terms-required = New members should accept terms
@@ -610,4 +619,4 @@ ag_errors = Something is wrong :/
   .number_gt_0 = x > 0
 ag_api_errors = Something went wrong :/
  .invalid_group_name = Minimum length is 3, allowed characters are: a-z, 0-9, _ and -.
- .group_name_exists = Group name already exists
+ .group_name_exists = Group name already exists

src/main.js

@@ -54,9 +54,6 @@ Promise.all([
       scope() {
         return this.$store.state.scope;
       },
-      groupTypes() {
-        return ACCESS_GROUP_TYPES.filter((type) => type !== 'Open');
-      },
     },
     methods: {
       fluent(...args) {

src/view_models/AccessGroupViewModel.js

@@ -246,6 +246,11 @@ export const TYPE_INDEX = {
   open: 2,
 };
 export const ACCESS_GROUP_TYPES = ['Closed', 'Reviewed', 'Open'];
+export const ACCESS_GROUP_TRUST = {
+  authenticated: 'Authenticated',
+  ndaed: 'Ndaed',
+  staff: 'Staff',
+};
 
 export class AbbGroupViewModel {
   constructor(data) {
@@ -288,6 +293,7 @@ export class GroupViewModel {
     this.expiration = MEMBER_EXPIRATION_NONE;
     this.error = false;
     this.created = '';
+    this.trust = '';
     this.processData(data);
   }
 
@@ -300,6 +306,7 @@ export class GroupViewModel {
       this.terms = data.terms;
       this.expiration = data.expiration;
       this.created = data.created;
+      this.trust = data.trust;
     } catch (e) {
       this.error = e.message;
       console.error('Group data error: ', e.message);