feat(client): add group owners edition

cheminfo · Dec 9, 2016 · 2021a36 · 2021a36
1 parent 321e951
commit 2021a36
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 14 deletions.
diff --git a/src/client/actions/db.js b/src/client/actions/db.js
@@ -36,15 +36,17 @@ function updateGroup(groupName, type, value, method) {
         throw new Error('wrong method');
     }
     const groupUrl = `db/${dbManager.currentDb}/group/${groupName}`;
-    if (type === 'users') {
-        const url = `${groupUrl}/user/${value}`;
-        return updateGroupAction(apiFetchJSON(url, {method}).then(() => apiFetchJSON(groupUrl)));
+    let url;
+    if (type === 'owners') {
+        url = `${groupUrl}/_owner/${value}`;
+    } else if (type === 'users') {
+        url = `${groupUrl}/user/${value}`;
     } else if (type === 'rights') {
-        const url = `${groupUrl}/right/${value}`;
-        return updateGroupAction(apiFetchJSON(url, {method}).then(() => apiFetchJSON(groupUrl)));
+        url = `${groupUrl}/right/${value}`;
     } else {
         throw new Error('unreachable');
     }
+    return updateGroupAction(apiFetchJSON(url, {method}).then(() => apiFetchJSON(groupUrl)));
 }
 
 export const CREATE_GROUP = 'CREATE_GROUP';

diff --git a/src/client/components/GroupDataEditor.js b/src/client/components/GroupDataEditor.js
@@ -12,7 +12,7 @@ const GroupDataEditor = ({type, data, addValue, removeValue}) => (
             </tr>
         </thead>
         <tbody>
-            {data.map((value) => (<GroupDataElement key={value} value={value} removeValue={removeValue} />))}
+            {data.map((value, i) => (<GroupDataElement key={value} value={value} removeValue={removeValue} editable={i !== 0} />))}
             <tr>
                 <td>
                     <EnterTextField onSubmit={addValue} />

diff --git a/src/client/components/GroupDataElement.js b/src/client/components/GroupDataElement.js
@@ -1,14 +1,19 @@
 import React from 'react';
 
-const GroupDataElement = ({value, removeValue}) => (
+const GroupDataElement = ({value, removeValue, editable}) => (
     <tr>
         <td>
             {value}
         </td>
         <td className="td-action">
-            <button type="button" className="btn btn-danger btn-simple btn-xs" onClick={() => removeValue(value)}>
-                <i className="fa fa-times" />
-            </button>
+            {
+                editable ?
+                    <button type="button" className="btn btn-danger btn-simple btn-xs" onClick={() => removeValue(value)}>
+                        <i className="fa fa-times" />
+                    </button> :
+                    null
+            }
+
         </td>
     </tr>
 );

diff --git a/src/client/components/GroupEditor.js b/src/client/components/GroupEditor.js
@@ -15,15 +15,24 @@ const GroupEditor = ({group, addValueToGroup, removeValueFromGroup, removeGroup}
         <div className="content">
             <div className="container-fluid">
                 <div className="row">
-                    <div className="col-md-6">
+                    <div className="col-md-4">
+                        <GroupDataEditor
+                            type="owners"
+                            owners={true}
+                            data={group.$owners}
+                            addValue={(value) => addValueToGroup(group.name, 'owners', value)}
+                            removeValue={(value) => removeValueFromGroup(group.name, 'owners', value)}
+                        />
+                    </div>
+                    <div className="col-md-4">
                         <GroupDataEditor
                             type="users"
                             data={group.users}
                             addValue={(value) => addValueToGroup(group.name, 'users', value)}
                             removeValue={(value) => removeValueFromGroup(group.name, 'users', value)}
                         />
                     </div>
-                    <div className="col-md-6">
+                    <div className="col-md-4">
                         <GroupDataEditor
                             type="rights"
                             data={group.rights}

diff --git a/src/couch/doc.js b/src/couch/doc.js
@@ -38,7 +38,7 @@ const methods = {
     },
 
     async addOwnersToDoc(uuid, user, owners, type, options) {
-        debug.trace('addOwnersToDoc');
+        debug(`addOwnersToDoc (${uuid}, ${user})`);
         await this.open();
         owners = util.ensureOwnersArray(owners);
         const doc = await this.getDocByRights(uuid, user, 'owner', type, options);
@@ -47,7 +47,7 @@ const methods = {
     },
 
     async removeOwnersFromDoc(uuid, user, owners, type, options) {
-        debug.trace('removeOwnersFromDoc');
+        debug.trace(`removeOwnersFromDoc (${uuid}, ${user})`);
         await this.open();
         owners = util.ensureOwnersArray(owners);
         const doc = await this.getDocByRights(uuid, user, 'owner', type, options);