Remove all references to editor role

Author: carrollsa

src/client/src/pages/UserManagement/Components/Dialog/NewUserDialog.jsx

@@ -103,7 +103,7 @@ export default function NewUserDialog(props) {
                         {...register("role")}
                         margin="dense"
                         id="role-input"
-                        label="Role - user/editor/admin"
+                        label="Role - user/admin"
                         onBlur={() => trigger("role")}
                         variant="standard"
                         fullWidth

src/client/src/pages/UserManagement/Components/Dialog/UpdateUserDialog.jsx

@@ -109,7 +109,7 @@ export default function UpdateUserDialog(props) {
                         defaultValue={role}
                         margin="dense"
                         id="role-input"
-                        label="Role - user/editor/admin"
+                        label="Role - user/admin"
                         onBlur={() => trigger("role")}
                         variant="standard"
                         fullWidth

src/client/src/pages/UserManagement/Validations.js

@@ -30,7 +30,7 @@ export const buildUsernameValidation = () => {
 export const buildRoleValidation = () => {
     return Yup.string()
         .trim()
-        .oneOf(["user", "editor", "admin"], "Role must be one of the following: user/editor/admin")
+        .oneOf(["user", "admin"], "Role must be one of the following: user/admin")
         .required("Role is required")
 }
 

src/server/api/user_api.py

@@ -266,7 +266,7 @@ def user_create():
     username : str  
     full_name : str  
     password : str  
-    role : str, one of `user`, `editor`, `admin`  
+    role : str, one of `user`, `admin`  
 
     Returns    
     ----------

src/server/db_setup/README.md

@@ -11,7 +11,7 @@ Form POST Parameters
 username : str  
 full_name : str  
 password : str  
-role : str, one of `user`, `editor`, `admin`  
+role : str, one of `user`, `admin`  
 
 Returns    
 ----------
@@ -28,6 +28,5 @@ Returns
 One header row of field names, one row per user  
 "['username', 'full_name', 'active', 'role'],  
 ['admin', None, 'Y', 'admin'],  
-['editor', None, 'Y', 'editor'],  
 ['steve11', 'Steve the User', 'Y', 'admin'],  
 ['user', None, 'Y', 'user'],"

src/server/db_setup/base_users.py

@@ -8,15 +8,14 @@
 
 
 try:   
-    from secrets_dict import BASEUSER_PW, BASEEDITOR_PW, BASEADMIN_PW
+    from secrets_dict import BASEUSER_PW, BASEADMIN_PW
 except ImportError:   
     # Not running locally
     logger.debug("Couldn't get BASE user PWs from file, trying environment **********")
     from os import environ
 
     try:
         BASEUSER_PW = environ['BASEUSER_PW']
-        BASEEDITOR_PW = environ['BASEEDITOR_PW']
         BASEADMIN_PW = environ['BASEADMIN_PW']
 
     except KeyError:
@@ -39,15 +38,14 @@ def create_base_roles():
         role_count = len(result.fetchall())
         if role_count == 0:
             connection.execute("INSERT into pdp_user_roles  values (1, 'user') ")
-            connection.execute("INSERT into pdp_user_roles  values (2, 'editor') ")
             connection.execute("INSERT into pdp_user_roles  values (9, 'admin') ")
 
         else:
             logger.debug("%d roles already present in DB, not creating", role_count)
 
 
 def create_base_users():  # TODO: Just call create_user for each
-    """ Creates three users (user, editor, admin) for testing
+    """ Creates two users (user, admin) for testing
         Password for each is user name with 'pw' appended """
     with engine.connect() as connection:
 
@@ -73,13 +71,6 @@ def create_base_users():  # TODO: Just call create_user for each
             )
             connection.execute(ins_stmt)
 
-            # editor
-            pw_hash = user_api.hash_password(BASEEDITOR_PW)
-            ins_stmt = pu.insert().values(
-                username="base_editor", full_name="Base Editor", password=pw_hash, active="Y", role=2,
-            )
-            connection.execute(ins_stmt)
-
             # admin
             pw_hash = user_api.hash_password(BASEADMIN_PW)
             ins_stmt = pu.insert().values(