ecoportal-api-graphql 2.0.0 → 3.0.0

data/lib/ecoportal/api/graphql/concerns/data_field_access.rb

@@ -1,71 +1,71 @@
-module Ecoportal
-  module API
-    class GraphQL
-      module Concerns
-        # Provides typed data field access on page models.
-        # Include in Interface::BasePage so all concrete page classes inherit it.
-        #
-        # Exposes:
-        #   page.components             — DataField::Collection (v2 compat alias for dataFields)
-        #   page.field_collection       — same, memoized
-        #   page.data_fields_updates    — [DataFieldInput, ...] for dirty fields
-        #   page.data_fields_additions  — [DataFieldInput, ...] for added fields
-        #   page.data_fields_deletions  — [field_id, ...] queued for deletion
-        module DataFieldAccess
-          # Returns a DataField::Collection wrapping raw dataFields from doc.
-          # Memoized — mutating a field object persists across calls.
-          def field_collection
-            @field_collection ||= Base::Page::DataField::Collection.from_doc(raw_data_fields)
-          end
-
-          # v2 compat alias — eco-helpers scripts call entry.components
-          def components
-            field_collection
-          end
-
-          # Returns a SectionCollection wrapping sections from doc.
-          # For BasicPage: doc['sections']. For PhasedPage: merged from stages (override in Phased).
-          def section_collection
-            @section_collection ||= Base::Page::SectionCollection.from_doc(raw_sections)
-          end
-
-          # v2 compat alias — eco-helpers scripts call entry.sections
-          def sections
-            section_collection
-          end
-
-          # Returns DataFieldInput hashes for modified existing fields (updates).
-          def data_fields_updates
-            field_collection.dirty_inputs
-          end
-
-          # Returns DataFieldInput hashes for newly added fields (via components.add).
-          def data_fields_additions
-            field_collection.dirty_additions
-          end
-
-          # Returns field IDs queued for deletion (via components.mark_for_deletion).
-          def data_fields_deletions
-            field_collection.dirty_deletions
-          end
-
-          def data_fields_dirty?
-            field_collection.dirty?
-          end
-
-          private
-
-          # Override in subclasses if fields live elsewhere (e.g. nested in stages).
-          def raw_data_fields
-            doc['dataFields'] || []
-          end
-
-          # Override in subclasses for different section sources.
-          def raw_sections
-            doc['sections'] || []
-          end
-        end
-      end
-    end
-  end
-end
+module Ecoportal
+  module API
+    class GraphQL
+      module Concerns
+        # Provides typed data field access on page models.
+        # Include in Interface::BasePage so all concrete page classes inherit it.
+        #
+        # Exposes:
+        #   page.components             — DataField::Collection (v2 compat alias for dataFields)
+        #   page.field_collection       — same, memoized
+        #   page.data_fields_updates    — [DataFieldInput, ...] for dirty fields
+        #   page.data_fields_additions  — [DataFieldInput, ...] for added fields
+        #   page.data_fields_deletions  — [field_id, ...] queued for deletion
+        module DataFieldAccess
+          # Returns a DataField::Collection wrapping raw dataFields from doc.
+          # Memoized — mutating a field object persists across calls.
+          def field_collection
+            @field_collection ||= Base::Page::DataField::Collection.from_doc(raw_data_fields)
+          end
+
+          # v2 compat alias — eco-helpers scripts call entry.components
+          def components
+            field_collection
+          end
+
+          # Returns a SectionCollection wrapping sections from doc.
+          # For BasicPage: doc['sections']. For PhasedPage: merged from stages (override in Phased).
+          def section_collection
+            @section_collection ||= Base::Page::SectionCollection.from_doc(raw_sections)
+          end
+
+          # v2 compat alias — eco-helpers scripts call entry.sections
+          def sections
+            section_collection
+          end
+
+          # Returns DataFieldInput hashes for modified existing fields (updates).
+          def data_fields_updates
+            field_collection.dirty_inputs
+          end
+
+          # Returns DataFieldInput hashes for newly added fields (via components.add).
+          def data_fields_additions
+            field_collection.dirty_additions
+          end
+
+          # Returns field IDs queued for deletion (via components.mark_for_deletion).
+          def data_fields_deletions
+            field_collection.dirty_deletions
+          end
+
+          def data_fields_dirty?
+            field_collection.dirty?
+          end
+
+          private
+
+          # Override in subclasses if fields live elsewhere (e.g. nested in stages).
+          def raw_data_fields
+            doc['dataFields'] || []
+          end
+
+          # Override in subclasses for different section sources.
+          def raw_sections
+            doc['sections'] || []
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ecoportal/api/graphql/concerns/fragment_definitions.rb

@@ -1,68 +1,68 @@
-module Ecoportal
-  module API
-    class GraphQL
-      module Concerns
-        module FragmentDefinitions
-          class << self
-            private
-
-            def included(base)
-              super
-
-              base.send :include, Ecoportal::API::Common::GraphQL::ClassHelpers
-              base.extend ClassMethods
-              base.send :include, InstanceMethods
-            end
-          end
-
-          module ClassMethods
-            def fragment(sym, heredoc)
-              fragments[sym] = heredoc
-            end
-
-            def fragments
-              @fragments ||= {}
-            end
-
-            # Register a sub-namespace class whose fragments are visible via assemble.
-            def register_namespace(klass)
-              namespaces << klass
-            end
-
-            def namespaces
-              @namespaces ||= []
-            end
-
-            # Returns concatenated fragment definition strings for the given symbols.
-            # Searches own fragments and all registered sub-namespaces.
-            def assemble(*syms)
-              all = namespaces.reduce(fragments.dup) { |h, ns| h.merge(ns.fragments) }
-              syms.map { |sym| all[sym] }.compact.join("\n\n")
-            end
-          end
-
-          module InstanceMethods
-            attr_reader :client, :fragments
-
-            def initialize(client)
-              @client = client
-              parse
-            end
-
-            # Returns the raw fragment string for the given symbol.
-            # The namespace parameter is retained for API compatibility but has no effect.
-            def define(sym, heredoc, namespace: nil) # rubocop:disable Lint/UnusedMethodArgument
-              heredoc
-            end
-
-            private
-
-            def parse
-              @fragments = self.class.fragments.dup
-            end
-          end
-        end
-      end
-    end
-  end
-end
+module Ecoportal
+  module API
+    class GraphQL
+      module Concerns
+        module FragmentDefinitions
+          class << self
+            private
+
+            def included(base)
+              super
+
+              base.send :include, Ecoportal::API::Common::GraphQL::ClassHelpers
+              base.extend ClassMethods
+              base.send :include, InstanceMethods
+            end
+          end
+
+          module ClassMethods
+            def fragment(sym, heredoc)
+              fragments[sym] = heredoc
+            end
+
+            def fragments
+              @fragments ||= {}
+            end
+
+            # Register a sub-namespace class whose fragments are visible via assemble.
+            def register_namespace(klass)
+              namespaces << klass
+            end
+
+            def namespaces
+              @namespaces ||= []
+            end
+
+            # Returns concatenated fragment definition strings for the given symbols.
+            # Searches own fragments and all registered sub-namespaces.
+            def assemble(*syms)
+              all = namespaces.reduce(fragments.dup) { |h, ns| h.merge(ns.fragments) }
+              syms.map { |sym| all[sym] }.compact.join("\n\n")
+            end
+          end
+
+          module InstanceMethods
+            attr_reader :client, :fragments
+
+            def initialize(client)
+              @client = client
+              parse
+            end
+
+            # Returns the raw fragment string for the given symbol.
+            # The namespace parameter is retained for API compatibility but has no effect.
+            def define(sym, heredoc, namespace: nil) # rubocop:disable Lint/UnusedMethodArgument
+              heredoc
+            end
+
+            private
+
+            def parse
+              @fragments = self.class.fragments.dup
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ecoportal/api/graphql/concerns/snake_camel_access.rb

@@ -1,60 +1,60 @@
-module Ecoportal
-  module API
-    class GraphQL
-      module Concerns
-        # Provides snake_case access to camelCase methods on GraphQL model objects.
-        # eco-helpers scripts (and v2 models) use snake_case, GraphQL uses camelCase.
-        #
-        # Converts any snake_case method call to its camelCase equivalent and delegates.
-        # Works for both readers (external_id → externalId) and writers (time_zone= → timeZone=).
-        #
-        # Examples:
-        #   page.external_id        → page.externalId
-        #   page.patch_ver          → page.patchVer
-        #   page.source_template_id → page.sourceTemplateId
-        #   page.other_tags = ['x'] → page.otherTags = ['x']
-        module SnakeCamelAccess
-          def method_missing(method_name, *args, &block)
-            str    = method_name.to_s
-            setter = str.end_with?('=')
-            base   = setter ? str[0..-2] : str
-            camel  = snake_to_camel(base)
-
-            # Only intercept if conversion actually changed something and target exists
-            if camel != base
-              target = setter ? :"#{camel}=" : camel.to_sym
-              return send(target, *args, &block) if respond_to?(target)
-            end
-
-            super
-          end
-
-          def respond_to_missing?(method_name, include_private = false)
-            str    = method_name.to_s
-            setter = str.end_with?('=')
-            base   = setter ? str[0..-2] : str
-            camel  = snake_to_camel(base)
-
-            if camel != base
-              target = setter ? :"#{camel}=" : camel.to_sym
-              return true if respond_to?(target, include_private)
-            end
-
-            super
-          end
-
-          private
-
-          # Convert snake_case to lowerCamelCase.
-          # external_id → externalId, source_template_id → sourceTemplateId
-          def snake_to_camel(snake_str)
-            parts = snake_str.split('_')
-            return snake_str if parts.length < 2
-
-            parts[0] + parts[1..].map(&:capitalize).join
-          end
-        end
-      end
-    end
-  end
-end
+module Ecoportal
+  module API
+    class GraphQL
+      module Concerns
+        # Provides snake_case access to camelCase methods on GraphQL model objects.
+        # eco-helpers scripts (and v2 models) use snake_case, GraphQL uses camelCase.
+        #
+        # Converts any snake_case method call to its camelCase equivalent and delegates.
+        # Works for both readers (external_id → externalId) and writers (time_zone= → timeZone=).
+        #
+        # Examples:
+        #   page.external_id        → page.externalId
+        #   page.patch_ver          → page.patchVer
+        #   page.source_template_id → page.sourceTemplateId
+        #   page.other_tags = ['x'] → page.otherTags = ['x']
+        module SnakeCamelAccess
+          def method_missing(method_name, *args, &block)
+            str    = method_name.to_s
+            setter = str.end_with?('=')
+            base   = setter ? str[0..-2] : str
+            camel  = snake_to_camel(base)
+
+            # Only intercept if conversion actually changed something and target exists
+            if camel != base
+              target = setter ? :"#{camel}=" : camel.to_sym
+              return send(target, *args, &block) if respond_to?(target)
+            end
+
+            super
+          end
+
+          def respond_to_missing?(method_name, include_private = false)
+            str    = method_name.to_s
+            setter = str.end_with?('=')
+            base   = setter ? str[0..-2] : str
+            camel  = snake_to_camel(base)
+
+            if camel != base
+              target = setter ? :"#{camel}=" : camel.to_sym
+              return true if respond_to?(target, include_private)
+            end
+
+            super
+          end
+
+          private
+
+          # Convert snake_case to lowerCamelCase.
+          # external_id → externalId, source_template_id → sourceTemplateId
+          def snake_to_camel(snake_str)
+            parts = snake_str.split('_')
+            return snake_str if parts.length < 2
+
+            parts[0] + parts[1..].map(&:capitalize).join
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ecoportal/api/graphql/connection/preset_view.rb

@@ -1,11 +1,11 @@
-module Ecoportal
-  module API
-    class GraphQL
-      module Connection
-        class PresetView < Logic::Connection
-          class_resolver :item_class, 'Ecoportal::API::GraphQL::Model::PresetView'
-        end
-      end
-    end
-  end
-end
+module Ecoportal
+  module API
+    class GraphQL
+      module Connection
+        class PresetView < Logic::Connection
+          class_resolver :item_class, 'Ecoportal::API::GraphQL::Model::PresetView'
+        end
+      end
+    end
+  end
+end

data/lib/ecoportal/api/graphql/connection/template_change_log.rb

@@ -0,0 +1,19 @@
+module Ecoportal
+  module API
+    class GraphQL
+      module Connection
+        # `Template.commands` — a `PagesWorkflowCommandInterfaceConnection` carrying
+        # `totalCount` (added by `Types::CustomConnections::BaseConnection`), `pageInfo`
+        # and `nodes`.
+        #
+        # ★ A nil connection here means NOT PERMITTED, not "no changes" — see
+        # `Base::Template::ChangeLogEntry` for the two access caveats.
+        class TemplateChangeLog < Logic::Connection
+          # `nodes_of` (not `class_resolver :node_class`) — see Logic::Connection for why the
+          # shared dynamic collection poisons sibling connections otherwise.
+          nodes_of Model::Template::ChangeLogEntry
+        end
+      end
+    end
+  end
+end

data/lib/ecoportal/api/graphql/connection.rb

@@ -20,3 +20,4 @@ require_relative 'connection/activity_log'
 require_relative 'connection/auth_log'
 require_relative 'connection/person_member_changelog'
 require_relative 'connection/minimal_dashboard'
+require_relative 'connection/template_change_log'

data/lib/ecoportal/api/graphql/diff/change.rb

@@ -23,13 +23,18 @@ module Ecoportal
         # that parent_id alone cannot carry. Set for an ADDED :field (parent_id = its section id,
         # owner_id = its stage id) because addField requires BOTH sectionId and stageId (both
         # NON_NULL in the schema). nil for every other kind/op.
+        #
+        # value: for an ADDED :option, the select option's `value` (the schema's addSelectFieldOption
+        # requires it — see AddSelectFieldOptionInput, backend authority). Read from the source doc's
+        # option.value (VersionDiff#index_options); nil when the source doc did not carry one. NEVER
+        # defaulted to label/weight by the synthesiser — see CommandSynthesizer#option_command.
         Change = Struct.new(:op, :kind, :id, :label, :path, :attribute, :before, :after, :parent_id,
-                            :by_type, :owner_id, keyword_init: true) do
+                            :by_type, :owner_id, :value, keyword_init: true) do
           def to_h
             {
               op: op, kind: kind, id: id, label: label, path: path,
               attribute: attribute, before: before, after: after, parent_id: parent_id,
-              by_type: by_type, owner_id: owner_id
+              by_type: by_type, owner_id: owner_id, value: value
             }.compact
           end
 

data/lib/ecoportal/api/graphql/diff/command_synthesizer.rb

@@ -277,13 +277,31 @@ module Ecoportal
 
             field_ref = ref(field_id)
             case change.op
-            when :added   then build(:addSelectFieldOption, data_field_id: field_ref, label: change.label)
+            when :added   then add_option(change, field_ref)
             when :removed then build(:removeSelectFieldOption, data_field_id: field_ref, option_id: change.id)
             when :changed then edit_option(change, field_ref)
             else unsupported!(change)
             end
           end
 
+          # addSelectFieldOption requires `value` (backend: AddSelectFieldOptionInput, required: true
+          # — a real, distinct field from label/weight; see OptionType#value). NEVER default it to
+          # the label/weight (a numeric select field stores `value` as a number, so a label stand-in
+          # would silently persist wrong data). When the source doc's option carried no `value`
+          # (Change#value nil — see VersionDiff#index_options), raise loudly instead of guessing.
+          def add_option(change, field_ref)
+            if change.value.nil?
+              raise ArgumentError,
+                    "CommandSynthesizer: cannot build addSelectFieldOption for option " \
+                    "'#{change.label}' (field #{field_ref}) — Change#value is nil. The source doc's " \
+                    "option is missing `value` (VersionDiff#index_options reads it from " \
+                    "option['value']); supply it on the source doc, or on the Change directly when " \
+                    "hand-assembling one."
+            end
+
+            build(:addSelectFieldOption, data_field_id: field_ref, label: change.label, value: change.value)
+          end
+
           def edit_option(change, field_id)
             case change.attribute
             when 'label'  then build(:editSelectFieldOption, data_field_id: field_id, option_id: change.id, label: change.after)

data/lib/ecoportal/api/graphql/diff/version_diff.rb

@@ -91,8 +91,11 @@ module Ecoportal
           # addStageSection.stageId), threading through a placeholder when the parent is created in
           # the same batch. nil (default) means no parent id is known/recorded — the historical
           # behaviour, unchanged.
-          def diff_index(kind, before_idx, after_idx, label:, path:, parent: nil, owner: nil, &compare)
-            procs   = { label: label, path: path, parent: parent, owner: owner }
+          # `value:` (optional proc) is recorded on ADDED changes only — currently used for :option,
+          # whose addSelectFieldOption command requires the source doc's option.value (see
+          # Change#value). nil (default) means the kind has no `value` concept.
+          def diff_index(kind, before_idx, after_idx, label:, path:, parent: nil, owner: nil, value: nil, &compare)
+            procs   = { label: label, path: path, parent: parent, owner: owner, value: value }
             removed = (before_idx.keys - after_idx.keys).map { |id| removed_change(kind, id, before_idx[id], procs) }
             added   = (after_idx.keys - before_idx.keys).map { |id| added_change(kind, id, after_idx[id], procs) }
             matched = (before_idx.keys & after_idx.keys).flat_map { |id| Array(compare.call(id, before_idx[id], after_idx[id])) }
@@ -105,7 +108,8 @@ module Ecoportal
 
           def added_change(kind, id, info, procs)
             Change.new(op: :added, kind: kind, id: id, label: procs[:label].call(info), path: procs[:path].call(info),
-                       parent_id: procs[:parent]&.call(info), owner_id: procs[:owner]&.call(info))
+                       parent_id: procs[:parent]&.call(info), owner_id: procs[:owner]&.call(info),
+                       value: procs[:value]&.call(info))
           end
 
           def stage_changes
@@ -153,7 +157,7 @@ module Ecoportal
 
           def options_diff(field_id, path, before_field, after_field)
             diff_index(:option, index_options(before_field), index_options(after_field),
-                       label: ->(o) { o[:label] }, path: ->(_o) { path }) do |k, b, a|
+                       label: ->(o) { o[:label] }, path: ->(_o) { path }, value: ->(o) { o[:value] }) do |k, b, a|
               cmp = []
               cmp << changed(:option, k, a[:label], path, 'label', b[:label], a[:label], field_id) if b[:label] != a[:label]
               cmp << changed(:option, k, a[:label], path, 'weight', b[:weight], a[:weight], field_id) if b[:weight] != a[:weight]
@@ -294,13 +298,16 @@ module Ecoportal
           end
 
           # Options keyed by id when present, else by value (primary) / name (auxiliary) — the
-          # correct select-option identity (NOT genome).
+          # correct select-option identity (NOT genome). `value` is carried through separately from
+          # `label` (they are distinct schema fields — OptionType#value vs #label/#name) so an ADDED
+          # option's Change can supply the real value addSelectFieldOption requires, never a
+          # label/weight stand-in.
           def index_options(field)
             Array(field['options']).each_with_object({}) do |o, h|
               next unless o.is_a?(Hash)
 
               key = o['id'] || o['value'] || o['label'] || o['name']
-              h[key] = { label: o['label'] || o['name'] || o['value'], weight: o['weight'] }
+              h[key] = { label: o['label'] || o['name'] || o['value'], weight: o['weight'], value: o['value'] }
             end
           end
 

data/lib/ecoportal/api/graphql/error/locations_error/fetch_nested.rb

@@ -1,51 +1,51 @@
-module Ecoportal
-  module API
-    class GraphQL
-      module Error
-        class LocationsError < Logic::BaseModel
-          module FetchNested
-            def locations_error_doc
-              return unless locations_error?
-
-              if loc_err_conflicting_ids?
-                {
-                  conflictingIds: loc_err_conflicting_ids.doc
-                }
-              elsif validationErrors?
-                {
-                  validationErrors: validationErrors.doc
-                }
-              end
-            end
-
-            def locations_error?
-              return false if error.nil?
-
-              !error.empty?
-            end
-
-            def loc_err_conflicting_ids?
-              loc_err_conflicting_ids.any?
-            end
-
-            def validationErrors?
-              validationErrors.any?
-            end
-
-            def loc_err_conflicting_ids
-              return [] unless (err = error)
-
-              err.conflictingIds || []
-            end
-
-            def validationErrors
-              return [] unless (err = error)
-
-              err.validationErrors || []
-            end
-          end
-        end
-      end
-    end
-  end
-end
+module Ecoportal
+  module API
+    class GraphQL
+      module Error
+        class LocationsError < Logic::BaseModel
+          module FetchNested
+            def locations_error_doc
+              return unless locations_error?
+
+              if loc_err_conflicting_ids?
+                {
+                  conflictingIds: loc_err_conflicting_ids.doc
+                }
+              elsif validationErrors?
+                {
+                  validationErrors: validationErrors.doc
+                }
+              end
+            end
+
+            def locations_error?
+              return false if error.nil?
+
+              !error.empty?
+            end
+
+            def loc_err_conflicting_ids?
+              loc_err_conflicting_ids.any?
+            end
+
+            def validationErrors?
+              validationErrors.any?
+            end
+
+            def loc_err_conflicting_ids
+              return [] unless (err = error)
+
+              err.conflictingIds || []
+            end
+
+            def validationErrors
+              return [] unless (err = error)
+
+              err.validationErrors || []
+            end
+          end
+        end
+      end
+    end
+  end
+end