mxrb 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 132cfec5b4d87e5d5efc2e9257d588952e7b8653b5fde7042dabadcd95da7ed0
-  data.tar.gz: d0e5191a8ad4f7f11a870ee7bd66d39b797a48326727d32e559827007724f462
+  metadata.gz: 80ac058134902cb839b9dacd80da635675e27fe0ac6fe3eb22dd833c551731ab
+  data.tar.gz: 291c3ce744371e4f89a9b0b63ae37200831d566a140285e26c0d3199482c6775
 SHA512:
-  metadata.gz: 309fd50dab116e2bd6c97ec070322e350147e9a360f93b22ed9c215309bc832a3241edc9dd1942af8b225da5b0e216fd3829a88be464d22f112506833dcd10b4
-  data.tar.gz: 8e99f2ebfaaef5b11956ad4c3698d7a03153a98c62c8bfb23915bc964a2128a7531ba8f54b2e92306aa3e59c742871f533da8e48b83db20c0220b95a2b5a0b0c
+  metadata.gz: 37566da77719ce1537886b96ed5189c080da1d8668aea9d7e4e5a3de7ffd18a81de67318ffbc005d5ab2a5b3dfbacf5e903439cf884c94b09c6c09b6148e1a75
+  data.tar.gz: f48190ec6af16e09d97246e7eb514f054ea7555b99560143766bb3df13f86fbcc47d8944a924bc3a70cd846410e14b845a4c64b5caec7e9f56866ec441b53355

data/lib/mxrb/compiler/gallery_bundle_compiler.rb

@@ -110,13 +110,14 @@ module Mxrb
         end
       end
 
-      def primitive(type, value) # rubocop:disable Metrics/CyclomaticComplexity
+      def primitive(type, value) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
         compiled = case type
                    when 'Boolean' then value['PrimitiveValue'] == 'true'
                    when 'Integer' then value['PrimitiveValue'].to_i
                    when 'Enumeration' then value['PrimitiveValue'].to_s
                    when 'TextTemplate' then raw(expression(translated_text(value['TextTemplate'])))
                    when 'Widgets' then [] if array(value['Widgets']).empty?
+                   when 'Object' then [] if array(value['Objects']).empty?
                    end
         compiled.nil? ? :undefined : compiled
       end

data/lib/mxrb/compiler/page_bundle_compiler.rb

@@ -1810,9 +1810,8 @@ module Mxrb
         (@generic_widgets || {}).sort.each do |name, path|
           imports.concat([
                            "import * as #{name}WidgetModule from \"../widgets/#{path}.mjs\";",
-                           "const #{name} = Object.getOwnPropertyDescriptor(#{name}WidgetModule, " \
-                           "#{JSON.generate(name)})?.value || " \
-                           "Object.getOwnPropertyDescriptor(#{name}WidgetModule, \"default\")?.value;"
+                           "const #{name} = #{name}WidgetModule[#{JSON.generate(name)}] || " \
+                           "#{name}WidgetModule.default;"
                          ])
           widgets << name
         end

data/lib/mxrb/compiler/web_operation_compiler.rb

@@ -241,7 +241,8 @@ module Mxrb
         {
           'operationId' => self.class.operation_id(page_name, widget['Name']),
           'operationType' => 'callMicroflow', 'parameters' => parameters,
-          'constants' => { 'MicroflowName' => name }, 'allowedUserRoleSets' => role_sets
+          'constants' => { 'MicroflowName' => name },
+          'allowedUserRoleSets' => microflow_operation_role_sets(role_sets, name)
         }
       end
 
@@ -276,7 +277,7 @@ module Mxrb
           'operationId' => self.class.operation_id(page_name, widget['Name']),
           'operationType' => 'retrieveByMicroflow', 'parameters' => microflow_parameters(source.microflow_name) || {},
           'constants' => data_source_constants(page_name, widget, source.microflow_name),
-          'allowedUserRoleSets' => role_sets
+          'allowedUserRoleSets' => microflow_operation_role_sets(role_sets, source.microflow_name)
         }
       end
 
@@ -340,7 +341,8 @@ module Mxrb
         {
           'operationId' => self.class.operation_id(page_name, widget['Name']),
           'operationType' => 'callMicroflow', 'parameters' => parameters,
-          'constants' => { 'MicroflowName' => name }, 'allowedUserRoleSets' => role_sets
+          'constants' => { 'MicroflowName' => name },
+          'allowedUserRoleSets' => microflow_operation_role_sets(role_sets, name)
         }
       end
 
@@ -352,7 +354,7 @@ module Mxrb
           'operationId' => self.class.operation_id(page_name, widget['Name']),
           'operationType' => 'retrieveByMicroflow', 'parameters' => parameters,
           'constants' => data_source_constants(page_name, widget, name),
-          'allowedUserRoleSets' => role_sets
+          'allowedUserRoleSets' => microflow_operation_role_sets(role_sets, name)
         }
       end
 
@@ -455,7 +457,9 @@ module Mxrb
         nested(document, 'Microflows$ActionActivity').filter_map do |activity|
           action = activity['Action'] || {}
           operation = nanoflow_server_operation(qualified_name, activity, action, entities)
-          operation&.merge('allowedUserRoleSets' => [])
+          name = operation&.dig('constants', 'MicroflowName')
+          role_sets = name ? microflow_operation_role_sets([], name) : []
+          operation&.merge('allowedUserRoleSets' => role_sets)
         end
       end
 
@@ -537,6 +541,15 @@ module Mxrb
         end
       end # rubocop:enable Metrics/AbcSize
 
+      def microflow_operation_role_sets(container_role_sets, qualified_name)
+        flow = qualified_unit('Microflows$Microflow', qualified_name)
+        flow_role_sets = flow ? allowed_user_role_sets(flow) : []
+        return container_role_sets if flow_role_sets.empty?
+        return flow_role_sets if container_role_sets.empty?
+
+        container_role_sets & flow_role_sets
+      end
+
       def constants(page_name, widget, constraint, entity)
         {
           'PageName' => page_name, 'WidgetName' => "#{page_name}.#{widget['Name']}",

data/lib/mxrb/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Mxrb
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mxrb
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Lucas Moura