ecoportal-api-graphql 1.3.13 → 1.3.16

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

@@ -1,11 +1,11 @@
-module Ecoportal
-  module API
-    class GraphQL
-      module Connection
-        class ActionCategory < Logic::Connection
-          class_resolver :node_class, Base::ActionCategory
-        end
-      end
-    end
-  end
-end
+module Ecoportal
+  module API
+    class GraphQL
+      module Connection
+        class ActionCategory < Logic::Connection
+          class_resolver :node_class, Base::ActionCategory
+        end
+      end
+    end
+  end
+end

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

@@ -1,11 +1,11 @@
-module Ecoportal
-  module API
-    class GraphQL
-      module Connection
-        class ContractorEntity < Logic::Connection
-          class_resolver :node_class, Model::ContractorEntity
-        end
-      end
-    end
-  end
-end
+module Ecoportal
+  module API
+    class GraphQL
+      module Connection
+        class ContractorEntity < Logic::Connection
+          class_resolver :node_class, Model::ContractorEntity
+        end
+      end
+    end
+  end
+end

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

@@ -1,11 +1,11 @@
-module Ecoportal
-  module API
-    class GraphQL
-      module Connection
-        class Page < Logic::Connection
-          class_resolver :node_class, 'Ecoportal::API::GraphQL::Model::PageUnion'
-        end
-      end
-    end
-  end
-end
+module Ecoportal
+  module API
+    class GraphQL
+      module Connection
+        class Page < Logic::Connection
+          class_resolver :node_class, 'Ecoportal::API::GraphQL::Model::PageUnion'
+        end
+      end
+    end
+  end
+end

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

@@ -1,11 +1,11 @@
-module Ecoportal
-  module API
-    class GraphQL
-      module Connection
-        class PersonMemberConnection < Logic::Connection
-          class_resolver :node_class, Model::PersonMember
-        end
-      end
-    end
-  end
-end
+module Ecoportal
+  module API
+    class GraphQL
+      module Connection
+        class PersonMemberConnection < Logic::Connection
+          class_resolver :node_class, Model::PersonMember
+        end
+      end
+    end
+  end
+end

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

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

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

@@ -1,17 +1,17 @@
-module Ecoportal
-  module API
-    class GraphQL
-      module Connection
-      end
-    end
-  end
-end
-
-require_relative 'connection/person_member'
-require_relative 'connection/contractor_entity'
-require_relative 'connection/action_category'
-require_relative 'connection/action'
-require_relative 'connection/page'
-require_relative 'connection/preview_page'
-require_relative 'connection/preset_view'
-require_relative 'connection/pages_workflow_command'
+module Ecoportal
+  module API
+    class GraphQL
+      module Connection
+      end
+    end
+  end
+end
+
+require_relative 'connection/person_member'
+require_relative 'connection/contractor_entity'
+require_relative 'connection/action_category'
+require_relative 'connection/action'
+require_relative 'connection/page'
+require_relative 'connection/preview_page'
+require_relative 'connection/preset_view'
+require_relative 'connection/pages_workflow_command'

data/lib/ecoportal/api/graphql/file_upload/client.rb

@@ -22,7 +22,12 @@ module Ecoportal
         #   page.components.get_by_name('Attachment').file_container_ids = [container_id]
         #   api.pages.update(page)
         #
-        # Requires the gem to have been initialised with email/pass (OAuth Bearer token).
+        # Step 1 (GraphQL) authenticates via the gem's email/pass OAuth bearer token.
+        # Steps 3-4 (REST v2 `/s3/files`) require the gem to ALSO have been initialised
+        # with `api_key:` — `Ecoportal::API::GraphQL.new(email:, pass:, api_key:)` — since
+        # those endpoints authenticate via `X-ECOPORTAL-API-KEY`, not the GraphQL bearer
+        # token (mirrors `Ecoportal::API::Common::Content::Client#base_request` in
+        # ecoportal-api-v2).
         class Client
           POLL_INTERVAL = 2      # seconds between poll attempts
           POLL_MAX_WAIT = 120    # seconds before giving up
@@ -111,10 +116,16 @@ module Ecoportal
             end
           end
 
-          # --- REST helpers (v2 endpoints, Bearer token auth) ---
+          # --- REST helpers (v2 endpoints, X-ECOPORTAL-API-KEY auth) ---
 
-          def bearer_token
-            @bearer_token ||= @http_client.send(:key_token)
+          def api_key
+            @api_key ||= @http_client.api_key.tap do |key|
+              if key.nil? || key.to_s.strip.empty?
+                raise 'File upload requires an api_key: Ecoportal::API::GraphQL.new(email:, pass:, api_key:). ' \
+                      'The v2 REST endpoints used to register/poll an upload authenticate via ' \
+                      'X-ECOPORTAL-API-KEY, not the GraphQL OAuth bearer token.'
+              end
+            end
           end
 
           def upload_base_url
@@ -124,18 +135,18 @@ module Ecoportal
           def upload_get(path)
             uri     = URI("#{upload_base_url}#{path}")
             request = Net::HTTP::Get.new(uri)
-            request['Authorization'] = "Bearer #{bearer_token}"
-            request['Accept']        = 'application/json'
+            request['X-ECOPORTAL-API-KEY'] = api_key
+            request['Accept']              = 'application/json'
             Net::HTTP.start(uri.host, uri.port, use_ssl: true) { |http| http.request(request) }
           end
 
           def upload_post(path, body)
             uri     = URI("#{upload_base_url}#{path}")
             request = Net::HTTP::Post.new(uri)
-            request['Authorization'] = "Bearer #{bearer_token}"
-            request['Content-Type']  = 'application/json'
-            request['Accept']        = 'application/json'
-            request.body             = JSON.generate(body)
+            request['X-ECOPORTAL-API-KEY'] = api_key
+            request['Content-Type']        = 'application/json'
+            request['Accept']              = 'application/json'
+            request.body                   = JSON.generate(body)
             Net::HTTP.start(uri.host, uri.port, use_ssl: true) { |http| http.request(request) }
           end
 

data/lib/ecoportal/api/graphql/fragment/field_configuration.rb

@@ -0,0 +1,38 @@
+module Ecoportal
+  module API
+    class GraphQL
+      class Fragment
+        # `RegisterPresetView#fieldConfigurations` returns a FieldConfigurationUnion.
+        # Selections can't be made directly on a union (GraphQL error: "Selections can't
+        # be made directly on unions"); the common fields live on FieldConfigurationInterface,
+        # which every union member implements, so they're pulled via an inline fragment on
+        # the interface rather than repeated per concrete type. Verified against the real
+        # frontend fragment (RegisterDataGrid/api/fieldConfigurationFragments/
+        # fieldConfigurationFields.graphql) — kept to the interface surface + the same three
+        # concrete-type extras it selects; other concrete types fall back to interface-only
+        # fields (matches the frontend, which doesn't cover every member either).
+        fragment :FieldConfiguration, <<~GRAPHQL
+          fragment FieldConfiguration on FieldConfigurationUnion {
+            __typename
+            ... on FieldConfigurationInterface {
+              id
+              key
+              name
+              dataFieldLabel
+              weight
+            }
+            ... on DateFieldConfiguration {
+              showTime
+            }
+            ... on DisplayLocationsFieldConfiguration {
+              mode
+            }
+            ... on PageNameFieldConfiguration {
+              displayUid
+            }
+          }
+        GRAPHQL
+      end
+    end
+  end
+end

data/lib/ecoportal/api/graphql/fragment/force.rb

@@ -3,6 +3,17 @@ module Ecoportal
     class GraphQL
       class Fragment
         # Fields for a Force object, including all bindings needed for scripting.
+        #
+        # `Force.bindings` is `[BindingInterface]` (verified in the backend:
+        # `app/graphql/types/force_type.rb` + `types/forces/binding_interface.rb`), so its common
+        # fields are selected directly on the interface — no per-member inline fragments needed.
+        #
+        # ★ The interface exposes ONLY `name` and `referenceId` (+ `reference` per concrete type):
+        # there is NO `id` on a binding. The previous selection asked for `id` inside
+        # `... on DataFieldBinding` / `... on SectionBinding`, which makes the whole query invalid.
+        # Read/write asymmetry to be aware of: `WorkflowEditBindingInput` / `removeBinding` DO
+        # require a binding `id`, so `Force::Binding#id` (and `BindingCollection#delete!`) has no
+        # readable source for it — tracked as a shape-asymmetry finding, not fixable client-side.
         fragment :ForceFields, <<~GRAPHQL
           fragment ForceFields on Force {
             id
@@ -11,16 +22,9 @@ module Ecoportal
             customScript
             globalBindingIds
             bindings {
-              ... on DataFieldBinding {
-                id
-                name
-                referenceId
-              }
-              ... on SectionBinding {
-                id
-                name
-                referenceId
-              }
+              __typename
+              name
+              referenceId
             }
           }
         GRAPHQL

data/lib/ecoportal/api/graphql/fragment/location_node.rb

@@ -1,26 +1,26 @@
-module Ecoportal
-  module API
-    class GraphQL
-      class Fragment
-        fragment :LocationNode, <<~GRAPHQL
-          fragment LocationNode on LocationNodeInterface {
-            id
-            name
-            weight
-            archived
-            archivedToken
-            parent {
-              id
-              name
-            }
-            classifications {
-              active
-              id
-              name
-            }
-          }
-        GRAPHQL
-      end
-    end
-  end
-end
+module Ecoportal
+  module API
+    class GraphQL
+      class Fragment
+        fragment :LocationNode, <<~GRAPHQL
+          fragment LocationNode on LocationNodeInterface {
+            id
+            name
+            weight
+            archived
+            archivedToken
+            parent {
+              id
+              name
+            }
+            classifications {
+              active
+              id
+              name
+            }
+          }
+        GRAPHQL
+      end
+    end
+  end
+end

data/lib/ecoportal/api/graphql/fragment/page_task.rb

@@ -0,0 +1,39 @@
+module Ecoportal
+  module API
+    class GraphQL
+      class Fragment
+        # Fields of a page TASK (`TaskInterface`: CompletePage / InComment / ReviewPage).
+        #
+        # The review-task mutations (`approve/reject/restart/undoReviewPageTask`) return
+        # `item: TaskInterface` — NOT a page. They used to select `item { ...PageFields }`,
+        # which is invalid GraphQL ("Fragment PageFields on BasePageInterface can't be spread
+        # inside TaskInterface") and made every one of those mutations fail. The page the
+        # caller was after is reachable through `subject` (a `PageUnion`), so it is spread
+        # there — where `PageFields` is legal.
+        #
+        # Verified against the live schema (2026-07-30): TaskInterface exposes complete,
+        # completedAt, completedBy, completedByUser, createdAt, due, escalated, escalatedAt,
+        # escalationTimes, escalationsDetails, fromPublicTemplate, id, nextEscalationTime,
+        # overdue, relativeStatus, scheduledCallbacks, stageId, subject, taskNotes, users.
+        fragment :PageTaskFields, <<~GRAPHQL
+          fragment PageTaskFields on TaskInterface {
+            __typename
+            id
+            stageId
+            complete
+            overdue
+            escalated
+            relativeStatus
+            taskNotes
+            createdAt { dateTime }
+            completedAt { dateTime }
+            due { dateTime }
+            subject {
+              ...PageFields
+            }
+          }
+        GRAPHQL
+      end
+    end
+  end
+end

data/lib/ecoportal/api/graphql/fragment/template.rb

@@ -0,0 +1,51 @@
+module Ecoportal
+  module API
+    class GraphQL
+      class Fragment
+        # `createTemplateRelatedPage` / `destroyTemplateRelatedPage` return
+        # `item: RelatedPages` — a related-pages CONFIG entry, not a page. They used to select
+        # `item { ...PageFields }` (invalid: "can't be spread inside RelatedPages"), which made
+        # both mutations fail.
+        #
+        # Verified against the live schema (2026-07-30): RelatedPages exposes filters
+        # (StoredEsFilter), hasInaccessibleVariables, id, pages (PreviewPageConnection),
+        # register (MinimalRegister), registerId, title. Only the scalars are selected here —
+        # `pages` is a connection and `filters`/`register` are objects needing their own
+        # selections; query them explicitly when needed.
+        fragment :TemplateRelatedPages, <<~GRAPHQL
+          fragment TemplateRelatedPages on RelatedPages {
+            id
+            title
+            registerId
+            hasInaccessibleVariables
+          }
+        GRAPHQL
+
+        # `updateTemplateInformation` returns `UpdateInformationPayload { item: Template }`.
+        # ★ NOTE the type asymmetry: elsewhere in this gem a "template" is a PAGE
+        # (`Query::Templates` and the other template payloads legitimately resolve to
+        # `Model::PageUnion`, and validate clean), but THIS mutation returns the narrow
+        # `Template` type — hence `item { ...PageFields }` was invalid ("can't be spread
+        # inside Template").
+        #
+        # Verified against the live schema (2026-07-30): Template exposes active,
+        # aiDescription, commands (connection), creatorEditable, creatorEnabled, creatorFlags,
+        # description, folders, id, public, publicConfig, templateContainerUid, templateType.
+        fragment :TemplateInformation, <<~GRAPHQL
+          fragment TemplateInformation on Template {
+            id
+            description
+            aiDescription
+            templateType
+            templateContainerUid
+            active
+            public
+            folders
+            creatorEnabled
+            creatorEditable
+          }
+        GRAPHQL
+      end
+    end
+  end
+end

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

@@ -35,3 +35,6 @@ require_relative 'fragment/page'
 require_relative 'fragment/pages'
 require_relative 'fragment/force'
 require_relative 'fragment/pages_workflow'
+require_relative 'fragment/field_configuration'
+require_relative 'fragment/page_task'
+require_relative 'fragment/template'

data/lib/ecoportal/api/graphql/input/contractor_entity.rb

@@ -1,14 +1,14 @@
-module Ecoportal
-  module API
-    class GraphQL
-      module Input
-        module ContractorEntity
-        end
-      end
-    end
-  end
-end
-
-require_relative 'contractor_entity/create'
-require_relative 'contractor_entity/destroy'
-require_relative 'contractor_entity/update'
+module Ecoportal
+  module API
+    class GraphQL
+      module Input
+        module ContractorEntity
+        end
+      end
+    end
+  end
+end
+
+require_relative 'contractor_entity/create'
+require_relative 'contractor_entity/destroy'
+require_relative 'contractor_entity/update'

data/lib/ecoportal/api/graphql/input/preset_view/update.rb

@@ -1,16 +1,16 @@
-module Ecoportal
-  module API
-    class GraphQL
-      module Input
-        class PresetView
-          class Update < Logic::Input
-            passkey     :id
-            passthrough :name, :sorter
-            passboolean :preview
-            passarray   :fieldConfigs
-          end
-        end
-      end
-    end
-  end
-end
+module Ecoportal
+  module API
+    class GraphQL
+      module Input
+        class PresetView
+          class Update < Logic::Input
+            passkey     :id
+            passthrough :name, :sorter
+            passboolean :preview
+            passarray   :fieldConfigs
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ecoportal/api/graphql/input/workflow_command/add_stage.rb

@@ -1,18 +1,18 @@
-module Ecoportal
-  module API
-    class GraphQL
-      module Input
-        class WorkflowCommand
-          module AddStage
-            SCHEMA_VERSION = '20260605'.freeze
-            VALID_KEYS = %i[placeholderId name ordering].freeze
-
-            def self.build(**kwargs)
-              kwargs.slice(*VALID_KEYS).compact
-            end
-          end
-        end
-      end
-    end
-  end
-end
+module Ecoportal
+  module API
+    class GraphQL
+      module Input
+        class WorkflowCommand
+          module AddStage
+            SCHEMA_VERSION = '20260605'.freeze
+            VALID_KEYS = %i[placeholderId name ordering].freeze
+
+            def self.build(**kwargs)
+              kwargs.slice(*VALID_KEYS).compact
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ecoportal/api/graphql/input/workflow_command/edit_field_configuration.rb

@@ -1,21 +1,21 @@
-module Ecoportal
-  module API
-    class GraphQL
-      module Input
-        class WorkflowCommand
-          module EditFieldConfiguration
-            SCHEMA_VERSION = '20260605'.freeze
-
-            BASE_KEYS = %i[dataFieldId label tooltip description hideView hiddenOnMobile enableActions globalBinding].freeze
-
-            def self.build(data_field_id:, **kwargs)
-              { dataFieldId: data_field_id }.
-                merge(kwargs.slice(*(BASE_KEYS - [:dataFieldId])).compact).
-                tap { |h| h[:byType] = kwargs[:byType] if kwargs.key?(:byType) }
-            end
-          end
-        end
-      end
-    end
-  end
-end
+module Ecoportal
+  module API
+    class GraphQL
+      module Input
+        class WorkflowCommand
+          module EditFieldConfiguration
+            SCHEMA_VERSION = '20260605'.freeze
+
+            BASE_KEYS = %i[dataFieldId label tooltip description hideView hiddenOnMobile enableActions globalBinding].freeze
+
+            def self.build(data_field_id:, **kwargs)
+              { dataFieldId: data_field_id }.
+                merge(kwargs.slice(*(BASE_KEYS - [:dataFieldId])).compact).
+                tap { |h| h[:byType] = kwargs[:byType] if kwargs.key?(:byType) }
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ecoportal/api/graphql/input/workflow_command/edit_page.rb

@@ -1,28 +1,28 @@
-module Ecoportal
-  module API
-    class GraphQL
-      module Input
-        class WorkflowCommand
-          module EditPage
-            SCHEMA_VERSION = '20260605'.freeze
-            VALID_KEYS = %i[
-              name icon themeId timeZone disableDirectPermissions mobileEnabled useSectionsOnMobile
-              showStrategyForRestrictedStages showAssigneeNamesForRestrictedStages showTaskDueDateForRestrictedStages
-              hideActivityStream disableComments enableDashboardImport enableActionsOnFields showCreator active
-              counterPrefix counterPostfix counterEnabled counter
-              addLocationIds removeLocationIds
-              addBaseTags removeBaseTags
-              addOtherTags removeOtherTags
-              addFolders removeFolders
-              creatorEnabled creatorEditable creatorFlags
-            ].freeze
-
-            def self.build(**kwargs)
-              kwargs.slice(*VALID_KEYS).compact
-            end
-          end
-        end
-      end
-    end
-  end
-end
+module Ecoportal
+  module API
+    class GraphQL
+      module Input
+        class WorkflowCommand
+          module EditPage
+            SCHEMA_VERSION = '20260605'.freeze
+            VALID_KEYS = %i[
+              name icon themeId timeZone disableDirectPermissions mobileEnabled useSectionsOnMobile
+              showStrategyForRestrictedStages showAssigneeNamesForRestrictedStages showTaskDueDateForRestrictedStages
+              hideActivityStream disableComments enableDashboardImport enableActionsOnFields showCreator active
+              counterPrefix counterPostfix counterEnabled counter
+              addLocationIds removeLocationIds
+              addBaseTags removeBaseTags
+              addOtherTags removeOtherTags
+              addFolders removeFolders
+              creatorEnabled creatorEditable creatorFlags
+            ].freeze
+
+            def self.build(**kwargs)
+              kwargs.slice(*VALID_KEYS).compact
+            end
+          end
+        end
+      end
+    end
+  end
+end