diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt index 3343f9c9..d958b066 100644 --- a/ayanova/devdocs/todo.txt +++ b/ayanova/devdocs/todo.txt @@ -47,9 +47,6 @@ CURRENT TODOs SHELL / NAV / MENUS / LAYOUT -CLIENT biz-role-rights.js no longer required as now have route to fetch role rights - - "http://localhost:7575/api/v8/AuthorizationRoles/list?AsJson=true" - - Put into STORE as temporary (not saved) value and update code to use that instead of biz-role-rights and then remove biz-role-rights CLIENT ROLE NAME CHANGE - "client" now "customer" diff --git a/ayanova/src/api/authorizationroles.js b/ayanova/src/api/authorizationroles.js index 409c7346..157be1cf 100644 --- a/ayanova/src/api/authorizationroles.js +++ b/ayanova/src/api/authorizationroles.js @@ -29,10 +29,10 @@ export default { SubContractorLimited: 512, ///SubContractorFull SubContractorFull: 1024, - ///ClientLimited - ClientLimited: 2048, - ///ClientFull - ClientFull: 4096, + ///CustomerLimited + CustomerLimited: 2048, + ///CustomerFull + CustomerFull: 4096, ///OpsAdminLimited OpsAdminLimited: 8192, ///OpsAdminFull diff --git a/ayanova/src/api/biz-role-rights.js b/ayanova/src/api/biz-role-rights.js index 9bd5fb0e..b79240ef 100644 --- a/ayanova/src/api/biz-role-rights.js +++ b/ayanova/src/api/biz-role-rights.js @@ -1,12 +1,12 @@ -var rights = JSON.parse( - //TODO CACHE THIS?? - '{"User":{"Change":2,"ReadFullRecord":1},"UserOptions":{"Change":2,"ReadFullRecord":1},"Widget":{"Change":34,"ReadFullRecord":17},"ServerState":{"Change":16384,"ReadFullRecord":131071},"License":{"Change":16386,"ReadFullRecord":8193},"LogFile":{"Change":0,"ReadFullRecord":24576},"JobOperations":{"Change":16384,"ReadFullRecord":8195},"AyaNova7Import":{"Change":16384,"ReadFullRecord":0},"Metrics":{"Change":0,"ReadFullRecord":24576},"Locale":{"Change":16386,"ReadFullRecord":131071},"DataListFilter":{"Change":2,"ReadFullRecord":131071},"DataListTemplate":{"Change":2,"ReadFullRecord":131071},"FormCustom":{"Change":2,"ReadFullRecord":131071}}' - //'{"User":{"Change":2,"ReadFullRecord":1},"UserOptions":{"Change":2,"ReadFullRecord":1},"Widget":{"Change":34,"ReadFullRecord":17},"ServerState":{"Change":16384,"ReadFullRecord":32767},"License":{"Change":16386,"ReadFullRecord":8193},"LogFile":{"Change":0,"ReadFullRecord":24576},"JobOperations":{"Change":16384,"ReadFullRecord":8195},"AyaNova7Import":{"Change":16384,"ReadFullRecord":0},"Metrics":{"Change":0,"ReadFullRecord":24576},"Locale":{"Change":16386,"ReadFullRecord":32767},"DataFilter":{"Change":2,"ReadFullRecord":32767},"FormCustom":{"Change":2,"ReadFullRecord":32767}}' -); -export default rights; /** * * Auto generated by BizRoles.cs in server project, update here whenever that changes * * */ + +var rights = JSON.parse( + '{"User":{"Change":2,"ReadFullRecord":1},"UserOptions":{"Change":2,"ReadFullRecord":1},"Widget":{"Change":34,"ReadFullRecord":17},"ServerState":{"Change":16384,"ReadFullRecord":131071},"License":{"Change":16386,"ReadFullRecord":8193},"LogFile":{"Change":0,"ReadFullRecord":24576},"JobOperations":{"Change":16384,"ReadFullRecord":8195},"AyaNova7Import":{"Change":16384,"ReadFullRecord":0},"Metrics":{"Change":0,"ReadFullRecord":24576},"Locale":{"Change":16386,"ReadFullRecord":131071},"DataListFilter":{"Change":2,"ReadFullRecord":131071},"DataListTemplate":{"Change":2,"ReadFullRecord":131071},"FormCustom":{"Change":2,"ReadFullRecord":131071}}' + //'{"User":{"Change":2,"ReadFullRecord":1},"UserOptions":{"Change":2,"ReadFullRecord":1},"Widget":{"Change":34,"ReadFullRecord":17},"ServerState":{"Change":16384,"ReadFullRecord":131071},"License":{"Change":16386,"ReadFullRecord":8193},"LogFile":{"Change":0,"ReadFullRecord":24576},"JobOperations":{"Change":16384,"ReadFullRecord":8195},"AyaNova7Import":{"Change":16384,"ReadFullRecord":0},"Metrics":{"Change":0,"ReadFullRecord":24576},"Locale":{"Change":16386,"ReadFullRecord":131071},"DataListFilter":{"Change":2,"ReadFullRecord":131071},"DataListTemplate":{"Change":2,"ReadFullRecord":131071},"FormCustom":{"Change":2,"ReadFullRecord":131071}}' +); +export default rights; diff --git a/ayanova/src/api/initialize.js b/ayanova/src/api/initialize.js index b73eeced..8a214e60 100644 --- a/ayanova/src/api/initialize.js +++ b/ayanova/src/api/initialize.js @@ -699,8 +699,8 @@ export default function initialize() { //****************** CUSTOMER USER / HEAD OFFICE USER UI if ( window.$gz.role.hasRole([ - window.$gz.role.AUTHORIZATION_ROLES.ClientFull, - window.$gz.role.AUTHORIZATION_ROLES.ClientLimited + window.$gz.role.AUTHORIZATION_ROLES.CustomerFull, + window.$gz.role.AUTHORIZATION_ROLES.CustomerLimited ]) ) { //clear sublevel array