ecoportal-api-graphql 1.3.16 → 2.2.0

data/lib/ecoportal/api/graphql/base/file_container.rb

@@ -2,11 +2,19 @@ module Ecoportal
   module API
     class GraphQL
       module Base
+        # Verified against the live schema 2026-07-30: activeFileAttachment, activeName,
+        # activeVersion, archive, canDownload, canShow, draft, fileAttachments, fileSize, id,
+        # locations, name, otherTags, tags, token.
+        #
+        # ★ `activeVersionId` was declared here and does NOT exist on the type (it is
+        # `activeVersion`) — it always read nil. `otherTags` was missing, which matters because
+        # `UploadInput.otherTags` is the only way to tag a container.
         class FileContainer < Logic::BaseModel
-          passkey :id
-          passthrough :name, :activeName
-          passthrough :fileSize, :token, :activeVersionId
-          passarray :tags
+          passkey     :id
+          passthrough :name, :activeName, :activeVersion
+          passthrough :fileSize, :token
+          passboolean :draft
+          passarray   :tags, :otherTags
         end
       end
     end

data/lib/ecoportal/api/graphql/base/location_classification_type.rb

@@ -8,6 +8,8 @@ module Ecoportal
           passkey :id
           passthrough :name
           passboolean :active
+          # Whether this classification was AI-generated (2026-07 schema).
+          passboolean :aiGenerated, read_only: true
         end
       end
     end

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

@@ -1,14 +1,14 @@
-module Ecoportal
-  module API
-    class GraphQL
-      module Base
-        # LocationNodeType
-        class LocationNode < Interface::LocationStructure::Node
-          class_resolver :location_node_class, self
-
-          passthrough :highlights
-        end
-      end
-    end
-  end
-end
+module Ecoportal
+  module API
+    class GraphQL
+      module Base
+        # LocationNodeType
+        class LocationNode < Interface::LocationStructure::Node
+          class_resolver :location_node_class, self
+
+          passthrough :highlights
+        end
+      end
+    end
+  end
+end

data/lib/ecoportal/api/graphql/base/location_structure/draft/structure.rb

@@ -1,37 +1,37 @@
-module Ecoportal
-  module API
-    class GraphQL
-      module Base
-        class LocationStructure
-          class Draft
-            class Structure < Interface::LocationStructure::Nodes
-              class_resolver :location_node_class, Base::LocationNode
-
-              def draft?
-                true
-              end
-
-              def id
-                draft&.id
-              end
-
-              def name
-                draft&.name
-              end
-
-              def parent_structure
-                draft&.parent_structure
-              end
-
-              def draft
-                return if _parent == self
-
-                _parent
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end
+module Ecoportal
+  module API
+    class GraphQL
+      module Base
+        class LocationStructure
+          class Draft
+            class Structure < Interface::LocationStructure::Nodes
+              class_resolver :location_node_class, Base::LocationNode
+
+              def draft?
+                true
+              end
+
+              def id
+                draft&.id
+              end
+
+              def name
+                draft&.name
+              end
+
+              def parent_structure
+                draft&.parent_structure
+              end
+
+              def draft
+                return if _parent == self
+
+                _parent
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ecoportal/api/graphql/base/location_structure/draft.rb

@@ -1,93 +1,93 @@
-module Ecoportal
-  module API
-    class GraphQL
-      module Base
-        class LocationStructure
-          class Draft < Logic::BaseModel
-            read_only!
-
-            class_resolver :structure_class, "Base::LocationStructure::Draft::Structure"
-
-            passkey :id
-
-            passthrough :name, :notes
-
-            passboolean :commited
-            alias_method :commited?, :commited
-
-            embeds_one :createdAt, klass: Base::DateTime
-
-            embeds_one :structure, klass: :structure_class
-
-            passarray :conflictingIds
-            embeds_many :commands, klass: Interface::LocationStructure::Command
-            embeds_many :results, read_only: true, klass: "Ecoportal::API::GraphQL::Payload::LocationStructure::CommandExecutionResult"
-
-            passboolean :ok
-
-            def ok?
-              ok != false
-            end
-
-            def success?
-              !error?
-            end
-
-            def error?
-              conflictingIds?    ||
-                result_errors?   ||
-                !ok?
-            end
-
-            def error_doc
-              if conflictingIds?
-                {
-                  conflictingIds: conflictingIds.doc
-                }
-              elsif result_errors?
-                {
-                  results: [result_errors.first&.error_doc]
-                }
-              elsif !ok?
-                {
-                  ok: ok
-                }
-              end
-            end
-
-            def structure_id
-              parent_structure&.id
-            end
-
-            def structure_name
-              parent_structure&.name
-            end
-
-            # @note draft is in a collection of drafts
-            def parent_structure
-              return unless _parent != self
-              return unless _parent._parent != _parent
-              return unless _parent.is_a?(Base::LocationStructure)
-
-              _parent._parent
-            end
-
-            def conflictingIds?
-              (conflictingIds || []).any?
-            end
-
-            def result_errors?
-              result_errors.any?
-            end
-
-            def result_errors
-              results.select(&:error?)
-            end
-          end
-        end
-      end # GraphQL
-    end # API
-  end # Ecoportal
-end
-
-require_relative 'draft/structure'
+module Ecoportal
+  module API
+    class GraphQL
+      module Base
+        class LocationStructure
+          class Draft < Logic::BaseModel
+            read_only!
+
+            class_resolver :structure_class, "Base::LocationStructure::Draft::Structure"
+
+            passkey :id
+
+            passthrough :name, :notes
+
+            passboolean :commited
+            alias_method :commited?, :commited
+
+            embeds_one :createdAt, klass: Base::DateTime
+
+            embeds_one :structure, klass: :structure_class
+
+            passarray :conflictingIds
+            embeds_many :commands, klass: Interface::LocationStructure::Command
+            embeds_many :results, read_only: true, klass: "Ecoportal::API::GraphQL::Payload::LocationStructure::CommandExecutionResult"
+
+            passboolean :ok
+
+            def ok?
+              ok != false
+            end
+
+            def success?
+              !error?
+            end
+
+            def error?
+              conflictingIds?    ||
+                result_errors?   ||
+                !ok?
+            end
+
+            def error_doc
+              if conflictingIds?
+                {
+                  conflictingIds: conflictingIds.doc
+                }
+              elsif result_errors?
+                {
+                  results: [result_errors.first&.error_doc]
+                }
+              elsif !ok?
+                {
+                  ok: ok
+                }
+              end
+            end
+
+            def structure_id
+              parent_structure&.id
+            end
+
+            def structure_name
+              parent_structure&.name
+            end
+
+            # @note draft is in a collection of drafts
+            def parent_structure
+              return unless _parent != self
+              return unless _parent._parent != _parent
+              return unless _parent.is_a?(Base::LocationStructure)
+
+              _parent._parent
+            end
+
+            def conflictingIds?
+              (conflictingIds || []).any?
+            end
+
+            def result_errors?
+              result_errors.any?
+            end
+
+            def result_errors
+              results.select(&:error?)
+            end
+          end
+        end
+      end # GraphQL
+    end # API
+  end # Ecoportal
+end
+
+require_relative 'draft/structure'

data/lib/ecoportal/api/graphql/base/location_structure.rb

@@ -11,6 +11,9 @@ module Ecoportal
           passkey :id
           passthrough :name, :weight
           passboolean :archived, :published, :visitorManagementEnabled
+          # AI-generated structure support (2026-07 schema).
+          passthrough :aiPrompt, read_only: true
+          passboolean :generating, read_only: true
           embeds_one :updatedAt, klass: Base::DateTime
 
           embeds_many :drafts, klass: :draft_class, order_key: :createdAt

data/lib/ecoportal/api/graphql/base/minimal_dashboard.rb

@@ -0,0 +1,25 @@
+module Ecoportal
+  module API
+    class GraphQL
+      module Base
+        # Lightweight dashboard descriptor returned by the `dashboardSearch` connection.
+        # Read-only. For the full dashboard (components, filters, permissions) the
+        # `Dashboard` type is not yet modelled — see docs/worklog.md.
+        #
+        # Enum-valued fields are exposed as plain strings:
+        # - permissionType: 'GLOBAL' | 'RESTRICTED' | 'PRIVATE'
+        # - parentResourceType: DashboardParentResource (REGISTER, REPORTING, TASKS, ...)
+        class MinimalDashboard < Logic::BaseModel
+          read_only!
+
+          passkey :id
+          passthrough :name
+          passthrough :parentResource, :parentResourceId, :parentResourceType
+          passthrough :permissionType
+          passthrough :weight
+          passboolean :global
+        end
+      end
+    end
+  end
+end

data/lib/ecoportal/api/graphql/base/organization.rb

@@ -8,6 +8,8 @@ module Ecoportal
           passkey :id
           passthrough :name, :companyName
           passthrough :logoUrl, read_only: true
+          # Whether contractor admins may add other contractor admins (2026-07 schema).
+          passboolean :allowContractorAdminsToAddAdmins, read_only: true
         end
       end
     end

data/lib/ecoportal/api/graphql/base/page/data_field/actions_list.rb

@@ -1,9 +1,9 @@
-module Ecoportal::API::GraphQL::Base::Page
-  class DataField
-    # Actions list field — embedded action items linked to this page.
-    # Actions are managed through Mutation::Action::*; not via DataFieldInput.
-    class ActionsList < DataField
-      passarray :actions # each: { id:, name:, status: }
-    end
-  end
-end
+module Ecoportal::API::GraphQL::Base::Page
+  class DataField
+    # Actions list field — embedded action items linked to this page.
+    # Actions are managed through Mutation::Action::*; not via DataFieldInput.
+    class ActionsList < DataField
+      passarray :actions # each: { id:, name:, status: }
+    end
+  end
+end

data/lib/ecoportal/api/graphql/base/page/data_field/ai_summary.rb

@@ -1,18 +1,18 @@
-module Ecoportal::API::GraphQL::Base::Page
-  class DataField
-    # AI-generated summary field.
-    # Content is generated server-side via generateAiSummary mutation (Bedrock Claude).
-    # Not settable via DataFieldInput — use the dedicated mutation instead.
-    #
-    # instructions: the AI prompt configured on this field in the template.
-    # trigger: "submitted" | "approved" — when generation fires.
-    # trigger_stage_ids: stages that trigger generation (empty = all stages).
-    # text_format: "simple_text" | "bullet_points" | "numbered_list" | "headings"
-    class AiSummary < DataField
-      passthrough :aiSummary, :generatedAt, :instructions
-      passthrough :trigger, :textFormat
-      passarray   :triggerStageIds, :fieldConfigurations
-      passboolean :alreadyRated
-    end
-  end
-end
+module Ecoportal::API::GraphQL::Base::Page
+  class DataField
+    # AI-generated summary field.
+    # Content is generated server-side via generateAiSummary mutation (Bedrock Claude).
+    # Not settable via DataFieldInput — use the dedicated mutation instead.
+    #
+    # instructions: the AI prompt configured on this field in the template.
+    # trigger: "submitted" | "approved" — when generation fires.
+    # trigger_stage_ids: stages that trigger generation (empty = all stages).
+    # text_format: "simple_text" | "bullet_points" | "numbered_list" | "headings"
+    class AiSummary < DataField
+      passthrough :aiSummary, :generatedAt, :instructions
+      passthrough :trigger, :textFormat
+      passarray   :triggerStageIds, :fieldConfigurations
+      passboolean :alreadyRated
+    end
+  end
+end

data/lib/ecoportal/api/graphql/base/page/data_field/checklist.rb

@@ -1,29 +1,29 @@
-module Ecoportal::API::GraphQL::Base::Page
-  class DataField
-    class Checklist < DataField
-      passarray :items # each: { id:, label:, checked: }
-      passthrough :complete
-
-      # Check/uncheck an item by label or id.
-      def check(label_or_id, checked: true)
-        item = (doc['items'] || []).find { |i| i['label'] == label_or_id.to_s || i['id'] == label_or_id.to_s }
-        return unless item
-
-        item['checked'] = checked
-      end
-
-      def as_input
-        return nil unless dirty?
-
-        {
-          checklist: {
-            id:    id,
-            # rubocop:disable Style/DoubleNegation
-            items: (doc['items'] || []).map { |i| { id: i['id'], checked: !!i['checked'] } }
-            # rubocop:enable Style/DoubleNegation
-          }
-        }
-      end
-    end
-  end
-end
+module Ecoportal::API::GraphQL::Base::Page
+  class DataField
+    class Checklist < DataField
+      passarray :items # each: { id:, label:, checked: }
+      passthrough :complete
+
+      # Check/uncheck an item by label or id.
+      def check(label_or_id, checked: true)
+        item = (doc['items'] || []).find { |i| i['label'] == label_or_id.to_s || i['id'] == label_or_id.to_s }
+        return unless item
+
+        item['checked'] = checked
+      end
+
+      def as_input
+        return nil unless dirty?
+
+        {
+          checklist: {
+            id:    id,
+            # rubocop:disable Style/DoubleNegation
+            items: (doc['items'] || []).map { |i| { id: i['id'], checked: !!i['checked'] } }
+            # rubocop:enable Style/DoubleNegation
+          }
+        }
+      end
+    end
+  end
+end

data/lib/ecoportal/api/graphql/base/page/data_field/contractor_entities.rb

@@ -1,12 +1,15 @@
-module Ecoportal::API::GraphQL::Base::Page
+module Ecoportal::API::GraphQL::Base::Page
   class DataField
     # Contractor entity selector field.
     # Stores references to ContractorEntity records.
     class ContractorEntities < DataField
-      passarray :contractors # each: { id:, name: }
+      passarray :contractors # staged writes; the READ response uses `contractorEntities`
 
+      # Current contractor-entity ids. The GraphQL response carries them under
+      # `contractorEntities` (CommonPageUnion's contractorEntitiesField), NOT `contractors`
+      # — so read from there. After a contractor_entity_ids= write, prefer the staged value.
       def contractor_entity_ids
-        Array(contractors).map { |c| c.is_a?(Hash) ? c['id'] : c }.compact
+        contractor_ids_from(doc)
       end
 
       def contractor_entity_ids=(ids)
@@ -18,11 +21,31 @@
         self.contractor_entity_ids = ids
       end
 
+      # Dirty only when the effective id SET actually changed — same phantom-dirty class as
+      # CrossReference (READ one key, WRITE another): the default leaf diff flags the field
+      # the moment the `contractors` key appears, even for a no-op restatement or a clear on
+      # an already-empty field.
+      def dirty?
+        contractor_ids_from(doc).sort != contractor_ids_from(original_doc).sort
+      end
+
       def as_input
         return nil unless dirty?
 
         { contractorEntities: { id: id, contractorEntityIds: contractor_entity_ids } }
       end
+
+      private
+
+      # Prefer the staged `contractors` (write shape), fall back to `contractorEntities`
+      # (read shape). Shape-agnostic for both `doc` and `original_doc`, so the comparison
+      # stays correct after `consolidate!` copies the staged shape into the baseline.
+      def contractor_ids_from(source_doc)
+        return [] unless source_doc
+
+        src = source_doc.key?('contractors') ? source_doc['contractors'] : source_doc['contractorEntities']
+        Array(src).map { |c| c.is_a?(Hash) ? c['id'] : c }.compact
+      end
     end
   end
 end

data/lib/ecoportal/api/graphql/base/page/data_field/cross_reference.rb

@@ -1,4 +1,4 @@
-module Ecoportal::API::GraphQL::Base::Page
+module Ecoportal::API::GraphQL::Base::Page
   class DataField
     # Cross-reference field — links to pages in another register.
     class CrossReference < DataField

data/lib/ecoportal/api/graphql/base/page/data_field/date_field.rb

@@ -1,23 +1,23 @@
-module Ecoportal::API::GraphQL::Base::Page
-  class DataField
-    # Wraps Date data field. Mapped from __typename 'Date'.
-    # value is an ISO8601DateTime string (e.g. "2024-11-25T08:30:00+13:00").
-    class DateField < DataField
-      # value is nested: { dateTime: "...", timeZone: "..." } or raw string
-      def value
-        v = doc['value']
-        v.is_a?(Hash) ? v['dateTime'] : v
-      end
-
-      def value=(iso8601_string)
-        doc['value'] = iso8601_string
-      end
-
-      def as_input
-        return nil unless dirty?
-
-        { date: { id: id, value: value } }
-      end
-    end
-  end
-end
+module Ecoportal::API::GraphQL::Base::Page
+  class DataField
+    # Wraps Date data field. Mapped from __typename 'Date'.
+    # value is an ISO8601DateTime string (e.g. "2024-11-25T08:30:00+13:00").
+    class DateField < DataField
+      # value is nested: { dateTime: "...", timeZone: "..." } or raw string
+      def value
+        v = doc['value']
+        v.is_a?(Hash) ? v['dateTime'] : v
+      end
+
+      def value=(iso8601_string)
+        doc['value'] = iso8601_string
+      end
+
+      def as_input
+        return nil unless dirty?
+
+        { date: { id: id, value: value } }
+      end
+    end
+  end
+end

data/lib/ecoportal/api/graphql/base/page/data_field/file_field.rb

@@ -1,24 +1,63 @@
-module Ecoportal::API::GraphQL::Base::Page
+module Ecoportal::API::GraphQL::Base::Page
   class DataField
     # File attachment field.
-    # Writing requires a prior file upload to the REST upload endpoint
-    # to obtain fileContainerIds — see the file-upload TODO in projects/TODO.md.
-    # The file_container_ids= setter can be used once IDs are available.
+    # READ: the fragment selects `items { id fileContainer { id ... } }` — the container id
+    # lives at items[].fileContainer.id, NOT in a `fileContainers` array (live-verified;
+    # the previous reader keyed on a doc key the API never returns).
+    # WRITE: live `FileInput` accepts `items: [ItemInput]` ({id, fileContainerId, position}),
+    # NOT `fileContainerIds`. The backend applies `items` as FULL-REPLACE — any existing item
+    # whose id is not echoed back is destroyed — so `as_input` sends kept items as `{id:}`
+    # and new containers as `{fileContainerId:}`.
+    # `items` is deliberately a plain doc reader, not `passarray`: materialising an ArrayModel
+    # writes `items: []` into the doc of a field read without $content, and a phantom-dirty
+    # empty `items` here doesn't no-op — it DELETES every attachment on the next update.
+    # Container ids come from a prior upload — see FileUpload::Client#upload_all.
     class FileField < DataField
-      passarray :fileContainers # each: { id:, fileName:, ... }
+      # each: { 'id' =>, 'fileContainer' => { 'id' =>, 'activeFileAttachment' => {...} } }
+      def items
+        Array(doc['items'])
+      end
 
       def file_container_ids
-        Array(fileContainers).map { |c| c.is_a?(Hash) ? c['id'] : c }.compact
+        items.map do |item|
+          item.is_a?(Hash) ? item.dig('fileContainer', 'id') : item
+        end.compact
       end
 
+      # Full-replace: containers already on the field keep their item identity;
+      # ids not present in `ids` are removed server-side by omission.
       def file_container_ids=(ids)
-        doc['fileContainers'] = Array(ids).map { |id_val| { 'id' => id_val } }
+        kept = {}
+        items.each do |item|
+          next unless item.is_a?(Hash) && (fc_id = item.dig('fileContainer', 'id'))
+
+          kept[fc_id] ||= item['id']
+        end
+        doc['items'] = Array(ids).map do |fc_id|
+          new_item = { 'fileContainer' => { 'id' => fc_id } }
+          new_item['id'] = kept[fc_id] if kept[fc_id]
+          new_item
+        end
       end
 
       def as_input
         return nil unless dirty?
 
-        { file: { id: id, fileContainerIds: file_container_ids } }
+        { file: { id: id, items: items_input } }
+      end
+
+      private
+
+      def items_input
+        items.map do |item|
+          next unless item.is_a?(Hash)
+
+          if (item_id = item['id'])
+            { id: item_id }
+          else
+            { fileContainerId: item.dig('fileContainer', 'id') }
+          end
+        end.compact
       end
     end
   end