Deploying to gh-pages from @ 22e83bf 🚀

iframe.html

@@ -363,4 +363,4 @@
 
 
 
-            window['STORIES'] = [{"titlePrefix":"","directory":"./.storybook/stories","files":"**/*.stories.mdx","importPathMatcher":"^\\.[\\\\/](?:\\.storybook\\/stories(?:\\/(?!\\.)(?:(?:(?!(?:^|\\/)\\.).)*?)\\/|\\/|$)(?!\\.)(?=.)[^/]*?\\.stories\\.mdx)$"},{"titlePrefix":"","directory":"./.storybook/stories","files":"**/*.stories.@(js|jsx|ts|tsx)","importPathMatcher":"^\\.[\\\\/](?:\\.storybook\\/stories(?:\\/(?!\\.)(?:(?:(?!(?:^|\\/)\\.).)*?)\\/|\\/|$)(?!\\.)(?=.)[^/]*?\\.stories\\.(js|jsx|ts|tsx))$"},{"titlePrefix":"","directory":"./src","files":"**/*.stories.mdx","importPathMatcher":"^\\.[\\\\/](?:src(?:\\/(?!\\.)(?:(?:(?!(?:^|\\/)\\.).)*?)\\/|\\/|$)(?!\\.)(?=.)[^/]*?\\.stories\\.mdx)$"},{"titlePrefix":"","directory":"./src","files":"**/*.stories.@(js|jsx|ts|tsx)","importPathMatcher":"^\\.[\\\\/](?:src(?:\\/(?!\\.)(?:(?:(?!(?:^|\\/)\\.).)*?)\\/|\\/|$)(?!\\.)(?=.)[^/]*?\\.stories\\.(js|jsx|ts|tsx))$"}];</script><script src="runtime~main.d29908dc.iframe.bundle.js"></script><script src="792.d8326fa2.iframe.bundle.js"></script><script src="main.7a3b483f.iframe.bundle.js"></script></body></html>
+            window['STORIES'] = [{"titlePrefix":"","directory":"./.storybook/stories","files":"**/*.stories.mdx","importPathMatcher":"^\\.[\\\\/](?:\\.storybook\\/stories(?:\\/(?!\\.)(?:(?:(?!(?:^|\\/)\\.).)*?)\\/|\\/|$)(?!\\.)(?=.)[^/]*?\\.stories\\.mdx)$"},{"titlePrefix":"","directory":"./.storybook/stories","files":"**/*.stories.@(js|jsx|ts|tsx)","importPathMatcher":"^\\.[\\\\/](?:\\.storybook\\/stories(?:\\/(?!\\.)(?:(?:(?!(?:^|\\/)\\.).)*?)\\/|\\/|$)(?!\\.)(?=.)[^/]*?\\.stories\\.(js|jsx|ts|tsx))$"},{"titlePrefix":"","directory":"./src","files":"**/*.stories.mdx","importPathMatcher":"^\\.[\\\\/](?:src(?:\\/(?!\\.)(?:(?:(?!(?:^|\\/)\\.).)*?)\\/|\\/|$)(?!\\.)(?=.)[^/]*?\\.stories\\.mdx)$"},{"titlePrefix":"","directory":"./src","files":"**/*.stories.@(js|jsx|ts|tsx)","importPathMatcher":"^\\.[\\\\/](?:src(?:\\/(?!\\.)(?:(?:(?!(?:^|\\/)\\.).)*?)\\/|\\/|$)(?!\\.)(?=.)[^/]*?\\.stories\\.(js|jsx|ts|tsx))$"}];</script><script src="runtime~main.d29908dc.iframe.bundle.js"></script><script src="792.a27ec283.iframe.bundle.js"></script><script src="main.ae025225.iframe.bundle.js"></script></body></html>

index.html

@@ -56,4 +56,4 @@
 
 
 
-            window['DOCS_MODE'] = false;</script><script src="runtime~main.a351fec40080f5c29fba.manager.bundle.js"></script><script src="312.a38e9adacebe814d33fb.manager.bundle.js"></script><script src="main.e509b04e2cf55ec299af.manager.bundle.js"></script></body></html>
+            window['DOCS_MODE'] = false;</script><script src="runtime~main.a351fec40080f5c29fba.manager.bundle.js"></script><script src="312.daccb0b2256fc94ed49e.manager.bundle.js"></script><script src="main.e509b04e2cf55ec299af.manager.bundle.js"></script></body></html>

project.json

@@ -1 +1 @@
-{"generatedAt":1711647115208,"builder":{"name":"webpack5"},"hasCustomBabel":false,"hasCustomWebpack":false,"hasStaticDirs":true,"hasStorybookEslint":false,"refCount":0,"packageManager":{"type":"npm","version":"10.2.4"},"language":"javascript","storybookPackages":{},"framework":{},"addons":{"@storybook/addon-links":{"version":"6.5.16"},"@storybook/addon-essentials":{"options":{"backgrounds":false},"version":"6.5.16"}}}
+{"generatedAt":1712244101479,"builder":{"name":"webpack5"},"hasCustomBabel":false,"hasCustomWebpack":false,"hasStaticDirs":true,"hasStorybookEslint":false,"refCount":0,"packageManager":{"type":"npm","version":"10.2.4"},"language":"javascript","storybookPackages":{},"framework":{},"addons":{"@storybook/addon-links":{"version":"6.5.16"},"@storybook/addon-essentials":{"options":{"backgrounds":false},"version":"6.5.16"}}}

shared/services/rbacs/canUseService.js

@@ -24,6 +24,12 @@ export default class CanUse {
    * @returns {boolean}
    */
   static canRoleUseUiAction(user, rbacs, actionName) {
+    // Desktop action should always be driven by rbac
+    if (window.chrome?.webview) {
+      const rbac = rbacs.findRbacByActionName(actionName);
+      return this.getByRbacOrDefault(rbac, actionName);
+    }
+
     const role =  new RoleEntity(user.role);
     // Administrator action are not controlled by rbac.
     if (role.isAdmin()) {

shared/services/rbacs/canUseService.test.js

@@ -52,6 +52,20 @@ describe("CanUseService", () => {
       expect(CanUse.getByRbacOrDefault).toHaveBeenCalled();
     });
 
+    it('should return true for desktop action with RBAC control function', () => {
+      expect.assertions(3);
+      global.window.chrome = {webview: true};
+
+      jest.spyOn(rbacs, "findRbacByActionName");
+      jest.spyOn(GetControlFunctionService, "getByRbac");
+
+      const result = CanUse.canRoleUseUiAction(user, rbacs, uiActions.RESOURCES_EXPORT);
+
+      expect(result).toBe(true);
+      expect(rbacs.findRbacByActionName).toHaveBeenCalledWith(uiActions.RESOURCES_EXPORT);
+      expect(GetControlFunctionService.getByRbac).toHaveBeenCalled();
+    });
+
     it('should return false if rbac is Deny', () => {
       expect.assertions(1);
 

webAccessibleResources/shared/services/rbacs/canUseService.js

@@ -24,6 +24,12 @@ export default class CanUse {
    * @returns {boolean}
    */
   static canRoleUseUiAction(user, rbacs, actionName) {
+    // Desktop action should always be driven by rbac
+    if (window.chrome?.webview) {
+      const rbac = rbacs.findRbacByActionName(actionName);
+      return this.getByRbacOrDefault(rbac, actionName);
+    }
+
     const role =  new RoleEntity(user.role);
     // Administrator action are not controlled by rbac.
     if (role.isAdmin()) {

webAccessibleResources/shared/services/rbacs/canUseService.test.js

@@ -52,6 +52,20 @@ describe("CanUseService", () => {
       expect(CanUse.getByRbacOrDefault).toHaveBeenCalled();
     });
 
+    it('should return true for desktop action with RBAC control function', () => {
+      expect.assertions(3);
+      global.window.chrome = {webview: true};
+
+      jest.spyOn(rbacs, "findRbacByActionName");
+      jest.spyOn(GetControlFunctionService, "getByRbac");
+
+      const result = CanUse.canRoleUseUiAction(user, rbacs, uiActions.RESOURCES_EXPORT);
+
+      expect(result).toBe(true);
+      expect(rbacs.findRbacByActionName).toHaveBeenCalledWith(uiActions.RESOURCES_EXPORT);
+      expect(GetControlFunctionService.getByRbac).toHaveBeenCalled();
+    });
+
     it('should return false if rbac is Deny', () => {
       expect.assertions(1);