Renamed roles and trans keys "Limited"->"Restricted" "Full" -> ""

ayanova/devdocs/test protocol.txt

@@ -70,9 +70,9 @@ EDGE desktop
 	- Rights work properly
 		- Test as manager
 		- Test widget form under full, edit own and readonly and no rights, confirm it works
-			- Roles: Change = AuthorizationRoles.BizAdminFull | AuthorizationRoles.InventoryFull,  EditOwn = AuthorizationRoles.TechFull, ReadFullRecord = AuthorizationRoles.BizAdminLimited | AuthorizationRoles.InventoryLimited
+			- Roles: Change = AuthorizationRoles.BizAdmin | AuthorizationRoles.Inventory,  EditOwn = AuthorizationRoles.Tech, ReadRecord = AuthorizationRoles.BizAdminRestricted | AuthorizationRoles.InventoryRestricted
 		- 401 redirect to login
-		- 403 should redirect to prior form (no rights SubContractorLimited)
+		- 403 should redirect to prior form (no rights SubContractorRestricted)
 	
 
 

ayanova/src/api/authorizationroles.js

@@ -7,40 +7,40 @@ export default {
   AUTHORIZATION_ROLES: {
     ///<summary>No role set</summary>
     NoRole: 0,
-    ///<summary>BizAdminLimited</summary>
+    ///<summary>BizAdminRestricted</summary>
-    BizAdminLimited: 1,
+    BizAdminRestricted: 1,
-    ///<summary>BizAdminFull</summary>
+    ///<summary>BizAdmin</summary>
-    BizAdminFull: 2,
+    BizAdmin: 2,
-    ///<summary>ServiceLimited</summary>
+    ///<summary>ServiceRestricted</summary>
-    ServiceLimited: 4,
+    ServiceRestricted: 4,
-    ///<summary>ServiceFull</summary>
+    ///<summary>Service</summary>
-    ServiceFull: 8,
+    Service: 8,
-    ///<summary>InventoryLimited</summary>
+    ///<summary>InventoryRestricted</summary>
-    InventoryLimited: 16,
+    InventoryRestricted: 16,
-    ///<summary>InventoryFull</summary>
+    ///<summary>Inventory</summary>
-    InventoryFull: 32,
+    Inventory: 32,
-    ///<summary>AccountingFull</summary>
+    ///<summary>Accounting</summary>
-    AccountingFull: 64, //No limited role, not sure if there is a need
+    Accounting: 64, //No restricted role, not sure if there is a need
-    ///<summary>TechLimited</summary>
+    ///<summary>TechRestricted</summary>
-    TechLimited: 128,
+    TechRestricted: 128,
-    ///<summary>TechFull</summary>
+    ///<summary>Tech</summary>
-    TechFull: 256,
+    Tech: 256,
-    ///<summary>SubContractorLimited</summary>
+    ///<summary>SubContractorRestricted</summary>
-    SubContractorLimited: 512,
+    SubContractorRestricted: 512,
-    ///<summary>SubContractorFull</summary>
+    ///<summary>SubContractor</summary>
-    SubContractorFull: 1024,
+    SubContractor: 1024,
-    ///<summary>CustomerLimited</summary>
+    ///<summary>CustomerRestricted</summary>
-    CustomerLimited: 2048,
+    CustomerRestricted: 2048,
-    ///<summary>CustomerFull</summary>
+    ///<summary>Customer</summary>
-    CustomerFull: 4096,
+    Customer: 4096,
-    ///<summary>OpsAdminLimited</summary>
+    ///<summary>OpsAdminRestricted</summary>
-    OpsAdminLimited: 8192,
+    OpsAdminRestricted: 8192,
-    ///<summary>OpsAdminFull</summary>
+    ///<summary>OpsAdmin</summary>
-    OpsAdminFull: 16384,
+    OpsAdmin: 16384,
-    ///<summary>SalesFull</summary>
+    ///<summary>Sales</summary>
-    SalesFull: 32768,
+    Sales: 32768,
-    ///<summary>SalesLimited</summary>
+    ///<summary>SalesRestricted</summary>
-    SalesLimited: 65536
+    SalesRestricted: 65536
   },
   //////////////////////////////////////////////////////////
   // Does current logged in user have role?

ayanova/src/api/dash-registry.js

@@ -5,10 +5,10 @@ export default {
     {
       id: "TestListWidgetsPriciest",
       roles: [
-        role.BizAdminFull,
+        role.BizAdmin,
-        role.BizAdminLimited,
+        role.BizAdminRestricted,
-        role.SalesFull,
+        role.Sales,
-        role.SalesLimited
+        role.SalesRestricted
       ],
       title: "Priciest widgets (all time) ",
       type: "GzDashTestListWidgetsPriciest"
@@ -16,10 +16,10 @@ export default {
     {
       id: "TestBarWidgetCountByUserType",
       roles: [
-        role.BizAdminFull,
+        role.BizAdmin,
-        role.BizAdminLimited,
+        role.BizAdminRestricted,
-        role.SalesFull,
+        role.Sales,
-        role.SalesLimited
+        role.SalesRestricted
       ],
       title: "Widgets by User type",
       type: "GzDashTestBarWidgetCountByUserType"
@@ -27,10 +27,10 @@ export default {
     {
       id: "TestLineWidgetMonthlyTotalPrice",
       roles: [
-        role.BizAdminFull,
+        role.BizAdmin,
-        role.BizAdminLimited,
+        role.BizAdminRestricted,
-        role.SalesFull,
+        role.Sales,
-        role.SalesLimited
+        role.SalesRestricted
       ],
       title: "Widget monthly total",
       type: "GzDashTestLineWidgetMonthlyTotalPrice"
@@ -38,10 +38,10 @@ export default {
     {
       id: "TestDayCalendarWidget",
       roles: [
-        role.BizAdminFull,
+        role.BizAdmin,
-        role.BizAdminLimited,
+        role.BizAdminRestricted,
-        role.SalesFull,
+        role.Sales,
-        role.SalesLimited
+        role.SalesRestricted
       ],
       title: "WO calendar",
       type: "GzDashTestDayCalendarWidget"

ayanova/src/api/gzmenu.js

@@ -168,11 +168,11 @@ export default {
       ctx.formData &&
       ctx.formData.formCustomTemplateKey != undefined &&
       window.$gz.role.hasRole([
-        window.$gz.role.AUTHORIZATION_ROLES.BizAdminFull,
+        window.$gz.role.AUTHORIZATION_ROLES.BizAdminRestricted,
-        window.$gz.role.AUTHORIZATION_ROLES.BizAdminLimited
+        window.$gz.role.AUTHORIZATION_ROLES.BizAdminRestricted
       ])
     ) {
-      //NOTE: BizAdminFull can edit, bizadminlimited can read only
+      //NOTE: BizAdmin can edit, BizAdminRestricted can read only
       //add customize menu item
       //DIVIDER
       //Insert the devider between       context and global items

ayanova/src/components/role-control.vue

@@ -26,7 +26,7 @@ export default {
       this.availableRoles = rawRoles;
     } else {
       if (this.limitSelectionTo == "inside") {
-        //CustomerLimited=2048, CustomerFull=4096
+        //CustomerRestricted=2048, Customer=4096
         this.availableRoles = rawRoles.filter(
           z => z.id != 2048 && z.id != 4096
         );

ayanova/src/store.js

@@ -37,7 +37,7 @@ export default new Vuex.Store({
     userType: 0,
     homePage: undefined,
     translationText: {},
-    enums: {}, //all enum values with translated text to match stored as key e.g. enums:={AuthorizationRoles:{0:"no role",1:"Limited role"},UserTypes:{0:"Technician",1:"Client user"}}
+    enums: {}, //all enum values with translated text to match stored as key
     userOptions: {
       languageOverride: "en-US",
       timeZoneOverride: null, //use browser tz by default
@@ -147,7 +147,7 @@ export default new Vuex.Store({
       state.globalSettings = data;
     },
     setEnum(state, data) {
-      state.enums[data.enumKey] = data.items; //{enumKey:"AuthorizationRoles",items:[{0:"no role"},{1:"Limited role"}]}
+      state.enums[data.enumKey] = data.items; //{enumKey:"AuthorizationRoles",items:[{0:"no role"},{1:"Restricted role"}]}
     },
     setAPIURL(state, data) {
       state.apiUrl = data;

ayanova/src/views/adm-import.vue

@@ -48,7 +48,7 @@
 const FORM_KEY = "adm-import";
 export default {
   async created() {
-    //NOTE: chose this because there is no general import but report covers bizadminfull and bizadminlimited
+    //NOTE: chose this because there is no general import but report covers bizadmin and bizadminrestricted
     this.rights = window.$gz.role.getRights(window.$gz.type.Report);
     window.$gz.eventBus.$on("menu-click", clickHandler);
     await fetchTranslatedText(this);

ayanova/src/views/home-review.vue

@@ -298,11 +298,11 @@ export default {
       rights: window.$gz.role.defaultRightsObject(),
       ayaType: window.$gz.type.Review,
       currentUserIsASupervisor: window.$gz.role.hasRole([
-        window.$gz.role.AUTHORIZATION_ROLES.BizAdminFull,
+        window.$gz.role.AUTHORIZATION_ROLES.BizAdmin,
-        window.$gz.role.AUTHORIZATION_ROLES.ServiceFull,
+        window.$gz.role.AUTHORIZATION_ROLES.Service,
-        window.$gz.role.AUTHORIZATION_ROLES.InventoryFull,
+        window.$gz.role.AUTHORIZATION_ROLES.Inventory,
-        window.$gz.role.AUTHORIZATION_ROLES.SalesFull,
+        window.$gz.role.AUTHORIZATION_ROLES.Sales,
-        window.$gz.role.AUTHORIZATION_ROLES.AccountingFull
+        window.$gz.role.AUTHORIZATION_ROLES.Accounting
       ]),
       name: null
     };
@@ -352,18 +352,18 @@ export default {
     hasSupervisorRole: function() {
       //mirrored from ReviewBiz.cs validation rule at server
       /*
-  CurrentUserRoles.HasFlag(AuthorizationRoles.BizAdminFull) ||
+  CurrentUserRoles.HasFlag(AuthorizationRoles.BizAdmin) ||
-            CurrentUserRoles.HasFlag(AuthorizationRoles.ServiceFull) ||
+            CurrentUserRoles.HasFlag(AuthorizationRoles.Service) ||
-            CurrentUserRoles.HasFlag(AuthorizationRoles.InventoryFull) ||
+            CurrentUserRoles.HasFlag(AuthorizationRoles.Inventory) ||
-            CurrentUserRoles.HasFlag(AuthorizationRoles.SalesFull) ||
+            CurrentUserRoles.HasFlag(AuthorizationRoles.Sales) ||
-            CurrentUserRoles.HasFlag(AuthorizationRoles.AccountingFull);
+            CurrentUserRoles.HasFlag(AuthorizationRoles.Accounting);
 */
       return window.$gz.role.hasRole([
-        window.$gz.role.AUTHORIZATION_ROLES.BizAdminFull,
+        window.$gz.role.AUTHORIZATION_ROLES.BizAdmin,
-        window.$gz.role.AUTHORIZATION_ROLES.ServiceFull,
+        window.$gz.role.AUTHORIZATION_ROLES.Service,
-        window.$gz.role.AUTHORIZATION_ROLES.InventoryFull,
+        window.$gz.role.AUTHORIZATION_ROLES.Inventory,
-        window.$gz.role.AUTHORIZATION_ROLES.SalesFull,
+        window.$gz.role.AUTHORIZATION_ROLES.Sales,
-        window.$gz.role.AUTHORIZATION_ROLES.AccountingFull
+        window.$gz.role.AUTHORIZATION_ROLES.Accounting
       ]);
     }
   },

ayanova/src/views/inv-purchase-order.vue

@@ -998,7 +998,7 @@ export default {
       },
       rights: window.$gz.role.defaultRightsObject(),
       canEditSerial: window.$gz.role.hasRole([
-        window.$gz.role.AUTHORIZATION_ROLES.BizAdminFull
+        window.$gz.role.AUTHORIZATION_ROLES.BizAdmin
       ]),
       ayaType: window.$gz.type.PurchaseOrder,
       currencyName: window.$gz.locale.getCurrencyName(),

ayanova/src/views/login.vue

@@ -267,33 +267,33 @@ export default {
           },
           {
             name: "Business admin",
-            l: "BizAdminFull",
+            l: "BizAdmin",
-            p: "BizAdminFull"
+            p: "BizAdmin"
           },
           {
-            name: "Business admin - limited",
+            name: "Business admin - restricted",
-            l: "BizAdminLimited",
+            l: "BizAdminRestricted",
-            p: "BizAdminLimited"
+            p: "BizAdminRestricted"
           },
           {
             name: "Customer",
-            l: "CustomerFull",
+            l: "Customer",
-            p: "CustomerFull"
+            p: "Customer"
           },
           {
-            name: "Customer - limited",
+            name: "Customer - restricted",
-            l: "CustomerLimited",
+            l: "CustomerRestricted",
-            p: "CustomerLimited"
+            p: "CustomerRestricted"
           },
           {
             name: "Service",
-            l: "ServiceFull",
+            l: "Service",
-            p: "ServiceFull"
+            p: "Service"
           },
           {
-            name: "Service - limited",
+            name: "Service - restricted",
-            l: "ServiceLimited",
+            l: "ServiceRestricted",
-            p: "ServiceLimited"
+            p: "ServiceRestricted"
           },
           {
             name: "Head office",
@@ -302,53 +302,53 @@ export default {
           },
           {
             name: "Inventory",
-            l: "InventoryFull",
+            l: "Inventory",
-            p: "InventoryFull"
+            p: "Inventory"
           },
           {
-            name: "Inventory - limited",
+            name: "Inventory - restricted",
-            l: "InventoryLimited",
+            l: "InventoryRestricted",
-            p: "InventoryLimited"
+            p: "InventoryRestricted"
           },
           {
             name: "Operations",
-            l: "OpsAdminFull",
+            l: "OpsAdmin",
-            p: "OpsAdminFull"
+            p: "OpsAdmin"
           },
           {
-            name: "Operations - limited",
+            name: "Operations - restricted",
-            l: "OpsAdminLimited",
+            l: "OpsAdminRestricted",
-            p: "OpsAdminLimited"
+            p: "OpsAdminRestricted"
           },
           {
             name: "Sales",
-            l: "SalesFull",
+            l: "Sales",
-            p: "SalesFull"
+            p: "Sales"
           },
           {
-            name: "Sales - limited",
+            name: "Sales - restricted",
-            l: "SalesLimited",
+            l: "SalesRestricted",
-            p: "SalesLimited"
+            p: "SalesRestricted"
           },
           {
             name: "Subcontractor",
-            l: "SubContractorFull",
+            l: "SubContractor",
-            p: "SubContractorFull"
+            p: "SubContractor"
           },
           {
-            name: "Subcontractor - limited",
+            name: "Subcontractor - restricted",
-            l: "SubContractorLimited",
+            l: "SubContractorRestricted",
-            p: "SubContractorLimited"
+            p: "SubContractorRestricted"
           },
           {
             name: "Technician",
-            l: "TechFull",
+            l: "Tech",
-            p: "TechFull"
+            p: "Tech"
           },
           {
-            name: "Technician - limited",
+            name: "Technician - restricted",
-            l: "TechLimited",
+            l: "TechRestricted",
-            p: "TechLimited"
+            p: "TechRestricted"
           },
           {
             name: "Translation - Deutsch / German",

ayanova/tests/e2e/OLD/gz-data-table.js

@@ -4,12 +4,12 @@ describe("GZ-DATA-TABLE", () => {
 
     cy.get("input[name=username]")
       .clear()
-      .type("BizAdminFull");
+      .type("BizAdmin");
 
     // {enter} causes the form to submit
     cy.get("input[name=password]")
       .clear()
-      .type("BizAdminFull{enter}");
+      .type("BizAdmin{enter}");
     //cy.url().should("include", "/home-dashboard");
     cy.visit("/widgets");
     cy.url().should("include", "/widgets");

ayanova/tests/e2e/specs/smoke.js

@@ -453,10 +453,10 @@ describe("SMOKE", () => {
     //CUSTOMER PAGES
     cy.get("input[name=username]")
       .clear()
-      .type("CustomerFull");
+      .type("Customer");
     cy.get("input[name=password]")
       .clear()
-      .type("CustomerFull{enter}");
+      .type("Customer{enter}");
 
     cy.url({ timeout: 10000 }).should("include", "/customer-csr");
     cy.get("[data-cy=underconstruction]");

ayanova/tests/e2e/specs/translation-about.js

@@ -95,15 +95,15 @@ describe("TRANSLATION", () => {
     cy.url().should("include", "/login");
 
     //-----------------------------------------------------
-    //ENGLISH - CustomerLimited
+    //ENGLISH - CustomerRestricted
     cy.get("input[name=username]")
       .clear()
-      .type("CustomerLimited");
+      .type("CustomerRestricted");
 
     // {enter} causes the form to submit
     cy.get("input[name=password]")
       .clear()
-      .type("CustomerLimited{enter}");
+      .type("CustomerRestricted{enter}");
 
     // we should be redirected to /customer-csr
     cy.url().should("include", "/customer-csr");