#92: User List and Profile Pages for Maintainers and Admin

web/src/components/NovelCondensateRequests.vue

@@ -103,7 +103,22 @@ export default {
         },
         {
           title: 'Submitted By',
-          data: 'attributes.submittedBy.data.attributes.username',
+          data: 'attributes.submittedBy',
+          className: 'whitespace-normal',
+          render: function (data, type, row, meta) {
+            if (data.data) {
+              return data.data.attributes.username;
+            } else {
+              return '';
+            }
+          },
+          fnCreatedCell: (nTd, sData, oData) => {
+            if(sData) {
+              // console.log(oData)
+              // $(nTd).html(`${oData.attributes.submittedBy.data.id}`);
+              $(nTd).html(`<a class='resource-link' href="/updateuser/${oData.attributes.submittedBy.data.id}">${sData.data.attributes.username}</a>`);
+            }
+          },
         },
         {
           title: 'Submitted At',

web/src/components/UpdateItemTable.vue

@@ -161,6 +161,13 @@ export default {
               return '';
             }
           },
+          fnCreatedCell: (nTd, sData, oData) => {
+            if(sData) {
+              // console.log(oData)
+              // $(nTd).html(`${oData.attributes.submittedBy.data.id}`);
+              $(nTd).html(`<a class='resource-link' href="/updateuser/${oData.attributes.submittedBy.data.id}">${sData.data.attributes.username}</a>`);
+            }
+          },
         },
         {
           title: 'Reviewer',

web/src/views/Profile.vue

@@ -443,7 +443,7 @@
       </fetch-profile>
 
       <fetch-users
-        v-if="getRole === 'Administrator'"
+        v-if="getRole === 'Administrator' || getRole === 'Maintainer' "
         :key="'users-' + updatedUsersKey"
       >
         <template slot-scope="{ response, loading }">

web/src/views/UpdateUser.vue

@@ -270,11 +270,14 @@ export default {
     const vm = this;
 
     const jwt = vm.jwt;
+
     if(jwt === null) {
       vm.$router.push('/login')
-    } else {
+    } else if(vm.userRole === 'Maintainer' || vm.userRole === 'Administrator') {
       vm.preload();
       vm.load(vm.user)
+    } else {
+      vm.$router.push('/profile')
     }
   },
   methods: {