add new visibility for org_staff

Author: kamicut

app/db/migrations/20220105182919_org_staff_visibility.js

@@ -0,0 +1,11 @@
+const constraintName = 'profile_keys_visibility_check'
+
+exports.up = async (knex) => {
+  await knex.raw(`ALTER TABLE profile_keys DROP CONSTRAINT IF EXISTS ${constraintName};`)
+  await knex.raw(`ALTER TABLE profile_keys ADD CONSTRAINT ${constraintName} CHECK (visibility = ANY (ARRAY['public'::text, 'team'::text, 'org'::text, 'org_staff'::text]))`)
+}
+
+exports.down = async (knex) => {
+  await knex.raw(`ALTER TABLE profile_keys DROP CONSTRAINT IF EXISTS ${constraintName};`)
+  await knex.raw(`ALTER TABLE profile_keys ADD CONSTRAINT ${constraintName} CHECK (visibility = ANY (ARRAY['public'::text, 'team'::text, 'org'::text]))`)
+}

app/lib/profile.js

@@ -1,6 +1,6 @@
 const db = require('../db')
 const { unpack, ValidationError, checkRequiredProperties, PropertyRequiredError } = require('../lib/utils')
-const { map, has, propEq, anyPass, forEach, mergeRight, prop, assoc, pick, keys } = require('ramda')
+const { map, has, propEq, anyPass, forEach, prop, assoc, pick, keys } = require('ramda')
 
 /**
  * Given the profile type return the db table
@@ -40,7 +40,8 @@ const profileTypeValid = anyPass([
 const visibilityValid = anyPass([
   propEq('visibility', 'public'),
   propEq('visibility', 'team'),
-  propEq('visibility', 'org')
+  propEq('visibility', 'org'),
+  propEq('visibility', 'org_staff')
 ])
 
 /**
@@ -51,7 +52,7 @@ const visibilityValid = anyPass([
  * @param {string} attribute.description Description of the attribute
  * @param {string} attribute.profileType enum: 'owner', 'user', 'team'
  * @param {boolean} attribute.required whether this attribute is required to be filled
- * @param {enum} attribute.visibility enum: 'owner', 'user', 'team'
+ * @param {enum} attribute.visibility enum: 'org_staff', 'org', 'user', 'team'
  */
 function checkProfileKey (attribute) {
   checkRequiredProperties(['name', 'profileType'], attribute)
@@ -61,7 +62,7 @@ function checkProfileKey (attribute) {
   }
 
   if (has('visibility', attribute) && !visibilityValid(attribute)) {
-    throw new ValidationError('visibility should be one of "public", "team" or "org"')
+    throw new ValidationError('visibility should be one of "public", "team", "org" or "org_staff"')
   }
 }
 
@@ -73,7 +74,7 @@ function checkProfileKey (attribute) {
  * @param {string} attributes[].description Description of the attribute
  * @param {string} attributes[].profileType enum: 'owner', 'user', 'team'
  * @param {boolean} attributes[].required whether this attribute is required to be filled
- * @param {enum} attributes[].visibility enum: 'owner', 'user', 'team'
+ * @param {enum} attributes[].visibility enum: 'org_staff', 'org', 'user', 'team'
  * @param {string} ownerType enum: 'owner', 'user', 'team'
  * @param {integer} ownerId iD in owner, user or team tables
  */
@@ -114,11 +115,11 @@ async function addProfileKeys (attributes, ownerType, ownerId) {
  * @param {integer} id id of key to modify
  * @param {string} attribute.description Description of the attribute
  * @param {boolean} attribute.required whether this attribute is required to be filled
- * @param {enum} attribute.visibility enum: 'owner', 'user', 'team'
+ * @param {enum} attribute.visibility enum: 'org_staff', 'org', 'user', 'team'
  */
 async function modifyProfileKey (id, attribute) {
   if (has('visibility', attribute) && !visibilityValid(attribute)) {
-    throw new ValidationError('visibility should be one of "public", "team" or "org"')
+    throw new ValidationError('visibility should be one of "public", "team", "org" or "org_staff"')
   }
 
   const conn = await db()
@@ -209,10 +210,11 @@ async function setProfile (attributeValues, profileType, id) {
   tags = pick(map(prop('id'), tagsInDB), tags)
 
   // Add the attribute values
-  tags = attributeValues.reduce(
-    (acc, curr) => mergeRight(acc, { [curr['key_id']]: curr['value'] }),
-    tags
-  )
+  attributeValues.forEach(tagPair => {
+    if (tagPair.key_id) {
+      tags[tagPair.key_id] = tagPair.value
+    }
+  })
 
   const table = getTableForProfileType(profileType)
 

app/manage/profiles.js

@@ -30,26 +30,42 @@ async function getUserOrgProfile (req, reply) {
 
     // Get org keys & visibility
     orgKeys = await profile.getProfileKeysForOwner('org', orgId, 'user')
-    requesterIsMemberOfOrg = await org.isMember(orgId, requesterId)
-    requesterIsManagerOfOrg = await org.isManager(orgId, requesterId)
-    requesterIsOwnerOfOrg = await org.isManager(orgId, requesterId)
 
-    // Get visibile keys
-    orgKeys.forEach((key) => {
-      const { visibility } = key
-      switch (visibility) {
-        case 'public': {
-          visibleKeys.push(key)
-          break
-        }
-        case 'org': {
-          if (requesterIsMemberOfOrg || requesterIsOwnerOfOrg || requesterIsManagerOfOrg) {
+    if (requesterId === osmId) {
+      const allIds = orgKeys.map(prop('id'))
+      const allValues = pick(allIds, tags)
+      const keysToSend = orgKeys.map(key => {
+        return assoc('value', allValues[key.id], key)
+      })
+      return reply.send(keysToSend)
+    } else {
+      requesterIsMemberOfOrg = await org.isMember(orgId, requesterId)
+      requesterIsManagerOfOrg = await org.isManager(orgId, requesterId)
+      requesterIsOwnerOfOrg = await org.isOwner(orgId, requesterId)
+
+      // Get visibile keys
+      orgKeys.forEach((key) => {
+        const { visibility } = key
+        switch (visibility) {
+          case 'public': {
             visibleKeys.push(key)
+            break
+          }
+          case 'org_staff': {
+            if (requesterIsOwnerOfOrg || requesterIsManagerOfOrg) {
+              visibleKeys.push(key)
+            }
+            break
+          }
+          case 'org': {
+            if (requesterIsMemberOfOrg || requesterIsOwnerOfOrg || requesterIsManagerOfOrg) {
+              visibleKeys.push(key)
+            }
+            break
           }
-          break
         }
-      }
-    })
+      })
+    }
 
     // Get values for keys
     const visibleKeyIds = visibleKeys.map(prop('id'))
@@ -82,6 +98,7 @@ async function getTeamProfile (req, reply) {
     let teamKeys = []
     let requesterIsMemberOfTeam = false
     let requesterIsMemberOfOrg = false
+    let requesterIsManagerOfOrg = false
     let requesterIsOwnerOfOrg = false
 
     const values = await profile.getProfile('team', teamId)
@@ -99,10 +116,11 @@ async function getTeamProfile (req, reply) {
 
     const isUserModerator = await team.isModerator(teamId, requesterId)
 
-    // Get team attributes
+    // Get team attributes from org
     teamKeys = await profile.getProfileKeysForOwner('org', associatedOrg.organization_id, 'team')
     requesterIsMemberOfTeam = await team.isMember(teamId, requesterId) // Is the requester part of this team?
-    requesterIsMemberOfOrg = await org.isMember(associatedOrg.organization_id, requesterId)
+    requesterIsMemberOfOrg = await org.isMemberOrStaff(associatedOrg.organization_id, requesterId)
+    requesterIsManagerOfOrg = await org.isManager(associatedOrg.organization_id, requesterId)
     requesterIsOwnerOfOrg = await org.isOwner(associatedOrg.organization_id, requesterId)
 
     if (isUserModerator || requesterIsOwnerOfOrg) {
@@ -128,6 +146,12 @@ async function getTeamProfile (req, reply) {
           }
           break
         }
+        case 'org_staff': {
+          if (requesterIsOwnerOfOrg || requesterIsManagerOfOrg) {
+            visibleKeys.push(key)
+          }
+          break
+        }
         case 'org': {
           if (requesterIsMemberOfOrg) {
             visibleKeys.push(key)

components/profile-attribute-form.js

@@ -46,7 +46,10 @@ export default function ProfileAttributeForm ({ onSubmit, initialValues = defaul
         const addAttributeText = `Submit ${isSubmitting ? ' 🕙' : ''}`
         let typeOption = <option value='team'>Team</option>
         if (formType === 'org') {
-          typeOption = <option value='org'>Organization</option>
+          typeOption = <>
+            <option value='org'>Organization</option>
+            <option value='org_staff'>Organization Staff</option>
+          </>
         }
 
         return (