collavre 0.7.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24812d5fb8a185c36f54a83dd822271f6ce858196fee3217fc5006a96ba03550
-  data.tar.gz: af46f88162225a5bd5121acb7c2e0f597f944e4b3a556163f0074c2e57684da3
+  metadata.gz: 220ee539008a01bf0df3c62d9c815ff16ed8687fb27e2c98d1a62288b3f302e1
+  data.tar.gz: 97d41b82062cdc7c2223e4ab707bfc46465d65bf45555e7fb418f50626ed9795
 SHA512:
-  metadata.gz: 604b3ec73abf15fa485ddb03dbf3b55313b35d0d9ab736e25172fc229e1903ece4b4e89658868f4823f5c5ebcd4195af35f530d41589af13b1b09d05a659b87f
-  data.tar.gz: d530ae61ee81e7081214e8cab9bef44c8d1fa52c82c972da4e717e5617f420dc41b37cd1fe5b74a9ae2d09b8271e33b454106cb934bc67f4bf8079ba7cc55420
+  metadata.gz: 770cddad2594765fdfea31511f0f5f1479c16345688fcd29102417024a3e6685c627cf43f8b159b2b7fbffbe3a29e4fb3b62d8674d1be0828beedf0666ac3af8
+  data.tar.gz: f9efa032715bf3e1493fa29ef98b46d6d1a98460d364595bc8ef2692bb6cd78ce464afeed35f3c456fdc3177e380434db87b8f8d4cea48f25d240f32a35e2e3c

data/app/assets/stylesheets/collavre/comments_popup.css

@@ -1275,6 +1275,42 @@ body.chat-fullscreen {
     outline: none;
 }
 
+/* Archive topic styles */
+.topic-archived-toggle {
+    display: inline-flex;
+    align-items: center;
+    padding: 0.15em var(--space-2);
+    border-radius: var(--radius-3);
+    font-size: var(--text-0);
+    cursor: pointer;
+    opacity: 0.6;
+    border: 1px dashed var(--border-color);
+}
+.topic-archived-toggle:hover {
+    opacity: 1;
+}
+.topic-tag.topic-archived {
+    opacity: 0.5;
+    font-style: italic;
+}
+.archive-topic-btn,
+.unarchive-topic-btn {
+    background: none;
+    border: none;
+    cursor: pointer;
+    font-size: var(--text-00);
+    padding: 0 var(--space-1);
+    opacity: 0.6;
+    vertical-align: middle;
+}
+.archive-topic-btn:hover,
+.unarchive-topic-btn:hover {
+    opacity: 1;
+}
+.delete-topic-btn {
+    margin-left: var(--space-1);
+}
+
 /* Selection action bar */
 .selection-action-bar {
     position: sticky;

data/app/assets/stylesheets/collavre/creatives.css

@@ -678,4 +678,30 @@ creative-tree-row:not([expanded]) .creative-toggle-btn {
         left: 0.5em;
         width: auto;
     }
-}
+}
+/* Archive toggle button */
+.archive-toggle-btn {
+    background: none;
+    border: none;
+    cursor: pointer;
+    font-size: var(--text-2);
+    padding: var(--space-1) var(--space-2);
+    opacity: 0.5;
+    transition: opacity 0.2s var(--ease-2);
+}
+.archive-toggle-btn:hover {
+    opacity: 0.8;
+}
+.archive-toggle-btn.active {
+    opacity: 1.0;
+    background: var(--surface-input);
+    border-radius: var(--radius-2);
+}
+
+/* Archived creative row */
+creative-tree-row[archived] .creative-tree {
+    opacity: 0.5;
+}
+creative-tree-row[archived] .creative-row {
+    background-color: var(--surface-input);
+}

data/app/controllers/collavre/comments_controller.rb

@@ -60,7 +60,13 @@ module Collavre
       end
 
       # Apply the Topic Filter
-      scope = scope.where(topic_id: effective_topic_id) if effective_topic_id.present?
+      if effective_topic_id.present?
+        scope = scope.where(topic_id: effective_topic_id)
+      else
+        # Main view: exclude comments from archived topics
+        archived_topic_ids = @creative.topics.archived.pluck(:id)
+        scope = scope.where.not(topic_id: archived_topic_ids) if archived_topic_ids.any?
+      end
 
       # Default order: Newest first (created_at DESC)
       # This matches the column-reverse layout where the first item in the list is the visual bottom (Newest).
@@ -150,6 +156,10 @@ module Collavre
     end
 
     def create
+      if @creative.archived?
+        render json: { error: I18n.t("collavre.comments.archived_creative") }, status: :forbidden and return
+      end
+
       unless @creative.has_permission?(Current.user, :feedback)
         render json: { error: I18n.t("collavre.comments.no_permission") }, status: :forbidden and return
       end

data/app/controllers/collavre/creatives_controller.rb

@@ -9,7 +9,7 @@ module Collavre
     # Removed unauthenticated access to index and show actions
     allow_unauthenticated_access only: %i[ index children export_markdown show slide_view ]
     before_action :enforce_creatives_login_policy, only: %i[ index children export_markdown show slide_view ]
-    before_action :set_creative, only: %i[ show edit update destroy parent_suggestions slide_view request_permission unconvert contexts update_contexts update_metadata ]
+    before_action :set_creative, only: %i[ show edit update destroy parent_suggestions slide_view request_permission unconvert contexts update_contexts update_metadata archive unarchive ]
 
     def index
       respond_to do |format|
@@ -310,6 +310,24 @@ module Collavre
       end
     end
 
+    def archive
+      unless @creative.has_permission?(Current.user, :write) || @creative.user == Current.user
+        render json: { error: t("collavre.creatives.errors.no_permission") }, status: :forbidden and return
+      end
+
+      @creative.archive!
+      head :ok
+    end
+
+    def unarchive
+      unless @creative.has_permission?(Current.user, :write) || @creative.user == Current.user
+        render json: { error: t("collavre.creatives.errors.no_permission") }, status: :forbidden and return
+      end
+
+      @creative.unarchive!
+      head :ok
+    end
+
     def destroy
       parent = @creative.parent
       unless @creative.has_permission?(Current.user, :admin)
@@ -355,7 +373,8 @@ module Collavre
           params[:due_after].present? ||
           params[:has_due_date].present? ||
           params[:assignee_id].present? ||
-          params[:unassigned].present?
+          params[:unassigned].present? ||
+          params[:show_archived].present?
       end
 
       def serialize_creatives(collection)

data/app/controllers/collavre/topics_controller.rb

@@ -6,8 +6,13 @@ module Collavre
       is_owner = @creative.user == Current.user
       can_manage = @creative.has_permission?(Current.user, :admin) || is_owner
       can_create_topic = can_manage || @creative.has_permission?(Current.user, :write)
+
+      active_topics = @creative.topics.active.order(:created_at)
+      archived_topics = @creative.topics.archived.order(:created_at)
+
       render json: {
-        topics: @creative.topics.order(:created_at),
+        topics: active_topics,
+        archived_topics: archived_topics,
         can_manage: can_manage,
         can_create_topic: can_create_topic
       }
@@ -100,6 +105,36 @@ module Collavre
       render json: { success: true, topic: topic.slice(:id, :name), target_creative_id: target_creative.id }
     end
 
+    def archive
+      unless @creative.has_permission?(Current.user, :write) || @creative.user == Current.user
+        render json: { error: I18n.t("collavre.topics.no_permission") }, status: :forbidden and return
+      end
+
+      topic = @creative.topics.find(params[:id])
+      topic.archive!
+
+      TopicsChannel.broadcast_to(
+        @creative,
+        { action: "archived", topic: topic.slice(:id, :name) }
+      )
+      render json: { success: true }
+    end
+
+    def unarchive
+      unless @creative.has_permission?(Current.user, :write) || @creative.user == Current.user
+        render json: { error: I18n.t("collavre.topics.no_permission") }, status: :forbidden and return
+      end
+
+      topic = @creative.topics.find(params[:id])
+      topic.unarchive!
+
+      TopicsChannel.broadcast_to(
+        @creative,
+        { action: "unarchived", topic: topic.slice(:id, :name, :archived_at) }
+      )
+      render json: { success: true }
+    end
+
     def reorder
       unless @creative.has_permission?(Current.user, :admin) || @creative.user == Current.user
         render json: { error: I18n.t("collavre.topics.no_permission") }, status: :forbidden and return

data/app/helpers/collavre/application_helper.rb

@@ -1,5 +1,42 @@
 module Collavre
   module ApplicationHelper
+    # All Collavre engine stylesheets in load order.
+    # Host apps should call <%= collavre_stylesheets %> in their layout <head>
+    # instead of listing individual stylesheet_link_tags.
+    COLLAVRE_STYLESHEETS = %w[
+      collavre/design_tokens
+      collavre/dark_mode
+      collavre/creatives
+      collavre/actiontext
+      collavre/activity_logs
+      collavre/user_menu
+      collavre/org_chart
+      collavre/popup
+      collavre/comments_popup
+      collavre/comment_versions
+      collavre/mention_menu
+      collavre/slide_view
+    ].freeze
+
+    COLLAVRE_PRINT_STYLESHEETS = %w[
+      collavre/print
+    ].freeze
+
+    # Renders all Collavre engine stylesheet tags.
+    # Call this once in the host app's layout <head> section.
+    #
+    #   <%= collavre_stylesheets %>
+    #
+    def collavre_stylesheets
+      tags = COLLAVRE_STYLESHEETS.map do |sheet|
+        stylesheet_link_tag(sheet)
+      end
+      tags += COLLAVRE_PRINT_STYLESHEETS.map do |sheet|
+        stylesheet_link_tag(sheet, media: "print")
+      end
+      safe_join(tags, "\n    ")
+    end
+
     # Returns the body CSS class for the current user's theme.
     # Custom themes get "light-mode" to disable OS dark mode overrides,
     # ensuring the custom theme controls all colors regardless of OS setting.

data/app/helpers/collavre/creatives_helper.rb

@@ -34,7 +34,9 @@ module Collavre
       end
 
       content_tag(:div, class: "creative-row-end") do
-        comment_part = if creative.has_permission?(Current.user, :feedback)
+        comment_part = if creative.archived?
+          safe_join([])
+        elsif creative.has_permission?(Current.user, :feedback)
           origin = creative.effective_origin
           comments_count = origin.comments.size
           pointer = CommentReadPointer.find_by(user: Current.user, creative: origin)

data/app/javascript/components/creative_tree_row.js

@@ -23,6 +23,7 @@ class CreativeTreeRow extends LitElement {
     editOffIconHtml: { state: true },
     originLinkHtml: { state: true },
     isTitle: { type: Boolean, attribute: "is-title", reflect: true },
+    archived: { type: Boolean, attribute: "archived", reflect: true },
     loadingChildren: { type: Boolean, attribute: "loading-children", reflect: true },
     _loadingDotsState: { state: true }
   };

data/app/javascript/controllers/comments/list_controller.js

@@ -59,6 +59,13 @@ export default class extends Controller {
   }
 
   handleTopicChange(event) {
+    // During notifyChildControllers, topic loading fires change events before
+    // onPopupOpened sets up highlightAfterLoad. Suppress these to avoid a
+    // race where a non-highlight load overwrites the deep-link highlight load.
+    if (this.suppressTopicChangeLoad) {
+      this.currentTopicId = event.detail.topicId
+      return
+    }
     this.currentTopicId = event.detail.topicId
     this.resetToLatest()
   }
@@ -148,10 +155,13 @@ export default class extends Controller {
     }
 
     const requestTopicId = this.currentTopicId || ""
+    const requestCreativeId = this.creativeId
 
     this.fetchComments(params).then((html) => {
-      // If topic changed while fetching (e.g. deep link detection), discard this stale response.
-      // The topic change event will have triggered a new load.
+      // Discard stale responses if creative or topic changed while fetching.
+      // This prevents a race condition where switching creatives causes
+      // the old creative's comments to overwrite the new creative's list.
+      if (this.creativeId !== requestCreativeId) return
       if (String(this.currentTopicId || "") !== String(requestTopicId)) return
 
       this.listTarget.innerHTML = html
@@ -307,6 +317,7 @@ export default class extends Controller {
     if (!comment) return
     comment.scrollIntoView({ behavior: 'auto', block: 'center' })
     comment.classList.add('highlight-flash')
+    comment.dataset.highlighted = 'true'
     window.setTimeout(() => comment.classList.remove('highlight-flash'), 2000)
   }
 

data/app/javascript/controllers/comments/popup_controller.js

@@ -199,11 +199,29 @@ export default class extends Controller {
   }
 
   async notifyChildControllers({ creativeId, canComment, highlightId }) {
+    // Pre-set creativeId on list controller BEFORE loading topics.
+    // Topics loading triggers a change event that list controller handles.
+    // Without this, list controller still holds the previous creative's ID
+    // and would fetch comments for the wrong creative (race condition).
+    //
+    // Also suppress topic-change-triggered loads during topic initialization.
+    // Without this, the topic change event fires loadInitialComments() before
+    // onPopupOpened sets highlightAfterLoad, causing a race where the non-highlight
+    // load can overwrite the deep-link highlight load.
+    if (this.listController) {
+      this.listController.creativeId = creativeId
+      this.listController.suppressTopicChangeLoad = true
+    }
+
     // Load topics first to establish context
     if (this.topicsController) {
       await this.topicsController.onPopupOpened({ creativeId })
     }
 
+    if (this.listController) {
+      this.listController.suppressTopicChangeLoad = false
+    }
+
     if (this.formController) {
       this.formController.onPopupOpened({ creativeId, canComment })
     }

data/app/javascript/controllers/comments/topics_controller.js

@@ -67,6 +67,8 @@ export default class extends Controller {
                 this.topics = topics
                 this.canManageTopics = canManage
                 this.canCreateTopic = canCreateTopic
+                this.archivedTopics = data.archived_topics || []
+
                 this.renderTopics(this.topics, this.canManageTopics, this.canCreateTopic)
                 this.restoreSelection()
             }
@@ -115,12 +117,28 @@ export default class extends Controller {
                         #${topic.name}`
 
             if (canManage) {
+                html += `<button class="archive-topic-btn" data-action="click->comments--topics#archiveTopic" data-id="${topic.id}" title="📦">📦</button>`
                 html += `<button class="delete-topic-btn" data-action="click->comments--topics#deleteTopic" data-id="${topic.id}">&times;</button>`
             }
 
             html += `</span>`
         })
 
+        // Archived topics section
+        if (this.archivedTopics && this.archivedTopics.length > 0) {
+            html += `<span class="topic-archived-toggle" data-action="click->comments--topics#toggleArchivedTopics">
+                      📦 ${this.archivedTopics.length}
+                     </span>`
+            if (this.showingArchived) {
+                this.archivedTopics.forEach(topic => {
+                    html += `<span class="topic-tag topic-archived" data-id="${topic.id}">
+                              #${topic.name}
+                              ${canManage ? `<button class="unarchive-topic-btn" data-action="click->comments--topics#unarchiveTopic" data-id="${topic.id}" title="Restore">↩</button>` : ''}
+                             </span>`
+                })
+            }
+        }
+
         // Add create button container (write permission is sufficient for topic creation)
         if (canCreateTopic) {
             html += `<span class="topic-creation-container" data-comments--topics-target="creationContainer">
@@ -323,6 +341,63 @@ export default class extends Controller {
         }
     }
 
+    async archiveTopic(event) {
+        event.stopPropagation()
+        const topicId = event.target.dataset.id
+        if (!topicId) return
+
+        try {
+            const response = await fetch(`/creatives/${this.creativeId}/topics/${topicId}/archive`, {
+                method: 'PATCH',
+                headers: {
+                    'X-CSRF-Token': document.querySelector('meta[name="csrf-token"]').content
+                }
+            })
+
+            if (response.ok) {
+                if (String(this.currentTopicId) === String(topicId)) {
+                    this.currentTopicId = ""
+                    this.dispatch("change", { detail: { topicId: "" } })
+                }
+                this.loadTopics()
+            } else {
+                alert("Failed to archive topic")
+            }
+        } catch (e) {
+            console.error("Error archiving topic", e)
+        }
+    }
+
+    async unarchiveTopic(event) {
+        event.stopPropagation()
+        const topicId = event.target.dataset.id
+        if (!topicId) return
+
+        try {
+            const response = await fetch(`/creatives/${this.creativeId}/topics/${topicId}/unarchive`, {
+                method: 'PATCH',
+                headers: {
+                    'X-CSRF-Token': document.querySelector('meta[name="csrf-token"]').content
+                }
+            })
+
+            if (response.ok) {
+                this.loadTopics()
+            } else {
+                alert("Failed to restore topic")
+            }
+        } catch (e) {
+            console.error("Error restoring topic", e)
+        }
+    }
+
+    toggleArchivedTopics(event) {
+        event.stopPropagation()
+        this.showingArchived = !this.showingArchived
+        this.renderTopics(this.topics, this.canManageTopics, this.canCreateTopic)
+        this.restoreSelection()
+    }
+
     showInput(event) {
         event.preventDefault()
         const container = this.element.querySelector('[data-comments--topics-target="creationContainer"]')
@@ -614,6 +689,11 @@ export default class extends Controller {
             return
         }
 
+        if (action === "archived" || action === "unarchived") {
+            this.loadTopics()
+            return
+        }
+
         if (action === "reordered" && data.topic_ids) {
             this.reorderTopicsFromServer(data.topic_ids)
             return

data/app/javascript/controllers/creatives/tree_controller.js

@@ -20,6 +20,7 @@ export default class extends Controller {
     this.queueAlignmentUpdate()
     window.addEventListener('resize', this.handleResize)
     this.element.addEventListener('creative-tree:updated', this.handleTreeUpdated)
+    this._setupArchiveToggle()
   }
 
   disconnect() {
@@ -29,6 +30,49 @@ export default class extends Controller {
     }
     window.removeEventListener('resize', this.handleResize)
     this.element.removeEventListener('creative-tree:updated', this.handleTreeUpdated)
+    if (this._archiveToggleHandler) {
+      document.getElementById('toggle-archived-btn')?.removeEventListener('click', this._archiveToggleHandler)
+      document.getElementById('toggle-archived-btn-mobile')?.removeEventListener('click', this._archiveToggleHandler)
+    }
+  }
+
+  _setupArchiveToggle() {
+    const btn = document.getElementById('toggle-archived-btn')
+    const mobileBtn = document.getElementById('toggle-archived-btn-mobile')
+    if (!btn && !mobileBtn) return
+
+    this._showingArchived = false
+
+    const toggle = () => {
+      this._showingArchived = !this._showingArchived
+
+      // Update desktop button
+      if (btn) {
+        btn.classList.toggle('active', this._showingArchived)
+        btn.title = this._showingArchived ? (btn.dataset.hideText || '') : (btn.dataset.showText || '')
+      }
+
+      // Update mobile button text
+      if (mobileBtn) {
+        const label = this._showingArchived ? (mobileBtn.dataset.hideText || '') : (mobileBtn.dataset.showText || '')
+        mobileBtn.textContent = '📦 ' + label
+      }
+
+      const url = new URL(this.urlValue, window.location.origin)
+      if (this._showingArchived) {
+        url.searchParams.set('show_archived', 'true')
+      } else {
+        url.searchParams.delete('show_archived')
+      }
+      this.urlValue = url.pathname + url.search
+      this.element.innerHTML = ''
+      delete this.element.dataset.loaded
+      this.load()
+    }
+
+    this._archiveToggleHandler = toggle
+    if (btn) btn.addEventListener('click', toggle)
+    if (mobileBtn) mobileBtn.addEventListener('click', toggle)
   }
 
   load() {

data/app/javascript/creatives/tree_renderer.js

@@ -64,6 +64,7 @@ function applyRowProperties(row, node) {
   updateBooleanAttr('hasChildren', 'has-children', node.has_children)
   updateBooleanAttr('expanded', 'expanded', node.expanded)
   updateBooleanAttr('isRoot', 'is-root', node.is_root)
+  updateBooleanAttr('archived', 'archived', node.archived)
 
   if (node.link_url) {
     if (row.linkUrl !== node.link_url) {

data/app/javascript/lib/api/creatives.js

@@ -58,6 +58,18 @@ export function destroy(id, withChildren = false) {
   })
 }
 
+export function archive(id) {
+  return csrfFetch(`/creatives/${id}/archive`, {
+    method: 'PATCH',
+  })
+}
+
+export function unarchive(id) {
+  return csrfFetch(`/creatives/${id}/unarchive`, {
+    method: 'PATCH',
+  })
+}
+
 export function unconvert(id) {
   return csrfFetch(`/creatives/${id}/unconvert`, {
     method: 'POST',
@@ -84,6 +96,8 @@ const creativesApi = {
   save,
   linkExisting,
   destroy,
+  archive,
+  unarchive,
   unconvert,
   updateMetadata,
 }

data/app/javascript/modules/creative_row_editor.js

@@ -86,6 +86,7 @@ export function initializeCreativeRowEditor() {
     const levelDownBtn = document.getElementById('inline-level-down');
     const levelUpBtn = document.getElementById('inline-level-up');
     const deletePopupToggle = document.getElementById('inline-delete-popup-toggle');
+    const archiveBtn = document.getElementById('inline-archive');
     const deleteBtn = document.getElementById('inline-delete');
     const deleteWithChildrenBtn = document.getElementById('inline-delete-with-children');
     const linkBtn = document.getElementById('inline-link');
@@ -677,6 +678,13 @@ export function initializeCreativeRowEditor() {
       if (levelUpBtn) levelUpBtn.disabled = !canLevelUp;
 
       if (deletePopupToggle) deletePopupToggle.disabled = !hasCreativeId;
+      if (archiveBtn) {
+        archiveBtn.disabled = !hasCreativeId;
+        // Toggle label between Archive / Restore based on creative state
+        const targetRow = hasCreativeId ? document.querySelector(`creative-tree-row[creative-id="${form.dataset.creativeId}"]`) : null;
+        const isArchived = targetRow?.hasAttribute('archived');
+        archiveBtn.textContent = isArchived ? (archiveBtn.dataset.restoreLabel || 'Restore') : (archiveBtn.dataset.archiveLabel || 'Archive');
+      }
       if (deleteBtn) deleteBtn.disabled = !hasCreativeId;
       if (deleteWithChildrenBtn) deleteWithChildrenBtn.disabled = !hasCreativeId;
       if (linkBtn) linkBtn.disabled = !hasCreativeId || linkBtn.style.display === 'none';
@@ -1848,6 +1856,40 @@ export function initializeCreativeRowEditor() {
       levelUpBtn.addEventListener('click', levelUp);
     }
 
+    if (archiveBtn) {
+      archiveBtn.addEventListener('click', function () {
+        const creativeId = form.dataset.creativeId;
+        if (!creativeId) return;
+        const row = document.querySelector(`creative-tree-row[creative-id="${creativeId}"]`);
+        const isArchived = row?.hasAttribute('archived');
+        const confirmMsg = isArchived ? archiveBtn.dataset.restoreConfirm : archiveBtn.dataset.confirm;
+
+        if (confirm(confirmMsg)) {
+          const apiCall = isArchived ? creativesApi.unarchive(creativeId) : creativesApi.archive(creativeId);
+          apiCall.then(res => {
+            if (res.ok) {
+              if (!isArchived) {
+                // Archiving: remove from view
+                const childrenContainer = document.getElementById(`creative-children-${creativeId}`);
+                if (childrenContainer) childrenContainer.remove();
+                if (row) row.remove();
+              } else {
+                // Restoring: reload tree to show updated state
+                const treeEl = document.querySelector('[data-controller="creatives--tree"]');
+                if (treeEl) {
+                  treeEl.innerHTML = '';
+                  delete treeEl.dataset.loaded;
+                  const ctrl = window.Stimulus?.getControllerForElementAndIdentifier(treeEl, 'creatives--tree');
+                  if (ctrl) ctrl.load();
+                }
+              }
+              closeEditor();
+            }
+          });
+        }
+      });
+    }
+
     if (deleteBtn) {
       deleteBtn.addEventListener('click', function () {
         if (confirm(deleteBtn.dataset.confirm)) deleteCurrent(false);

data/app/models/collavre/creative.rb

@@ -22,6 +22,10 @@ module Collavre
 
     has_closure_tree order: :sequence, name_column: :description, hierarchy_table_name: "creative_hierarchies"
 
+    # --- Archive scopes ---
+    scope :active, -> { where(archived_at: nil) }
+    scope :archived, -> { where.not(archived_at: nil) }
+
     attr_accessor :filtered_progress
 
     belongs_to :user, class_name: Collavre.configuration.user_class_name, optional: true
@@ -143,6 +147,64 @@ module Collavre
       end
     end
 
+    # --- Archive ---
+    def archived?
+      archived_at.present?
+    end
+
+    def archive!
+      now = Time.current
+      self.class.transaction do
+        # Archive self and descendants
+        self_and_descendants.where(archived_at: nil).update_all(archived_at: now)
+
+        # If this is a linked creative, also archive the origin and its descendants
+        origin = effective_origin(Set.new)
+        if origin != self
+          origin.self_and_descendants.where(archived_at: nil).update_all(archived_at: now)
+          # Archive all other linked creatives of the origin
+          origin.linked_creatives.where.not(id: id).find_each do |linked|
+            linked.self_and_descendants.where(archived_at: nil).update_all(archived_at: now)
+          end
+        end
+
+        # Also archive any linked creatives that point to this one
+        linked_creatives.find_each do |linked|
+          linked.self_and_descendants.where(archived_at: nil).update_all(archived_at: now)
+        end
+
+        reload
+        parent&.reload
+        Collavre::Creatives::ProgressService.new(parent).update_progress_from_children! if parent
+      end
+    end
+
+    def unarchive!
+      self.class.transaction do
+        # Unarchive self and descendants
+        self_and_descendants.where.not(archived_at: nil).update_all(archived_at: nil)
+
+        # If this is a linked creative, also unarchive the origin and its descendants
+        origin = effective_origin(Set.new)
+        if origin != self
+          origin.self_and_descendants.where.not(archived_at: nil).update_all(archived_at: nil)
+          # Unarchive all other linked creatives of the origin
+          origin.linked_creatives.where.not(id: id).find_each do |linked|
+            linked.self_and_descendants.where.not(archived_at: nil).update_all(archived_at: nil)
+          end
+        end
+
+        # Also unarchive any linked creatives that point to this one
+        linked_creatives.find_each do |linked|
+          linked.self_and_descendants.where.not(archived_at: nil).update_all(archived_at: nil)
+        end
+
+        reload
+        parent&.reload
+        Collavre::Creatives::ProgressService.new(parent).update_progress_from_children! if parent
+      end
+    end
+
 
     private
 

data/app/models/collavre/topic.rb

@@ -7,12 +7,28 @@ module Collavre
 
     has_many :comments, class_name: "Collavre::Comment", dependent: :destroy
 
+    # --- Archive scopes ---
+    scope :active, -> { where(archived_at: nil) }
+    scope :archived, -> { where.not(archived_at: nil) }
+
     validates :name, presence: true, uniqueness: { scope: :creative_id }
 
     before_create :set_default_position
 
     default_scope { order(:position) }
 
+    def archived?
+      archived_at.present?
+    end
+
+    def archive!
+      update!(archived_at: Time.current)
+    end
+
+    def unarchive!
+      update!(archived_at: nil)
+    end
+
     private
 
     def set_default_position

data/app/services/collavre/creatives/index_query.rb

@@ -112,8 +112,11 @@ module Creatives
       creative = Creative.find_by(id: params[:id])
       return empty_result unless creative && readable?(creative)
 
+      children = creative.children_with_permission(user, :read)
+      children = children.select { |c| !c.archived? } unless params[:show_archived]
+
       {
-        creatives: creative.children_with_permission(user, :read),
+        creatives: children,
         parent: creative,
         allowed_ids: nil,
         overall_progress: nil,
@@ -122,8 +125,11 @@ module Creatives
     end
 
     def handle_root_query
+      roots = Creative.where(user: user).roots
+      roots = roots.where(archived_at: nil) unless params[:show_archived]
+
       {
-        creatives: Creative.where(user: user).roots,
+        creatives: roots,
         parent: nil,
         allowed_ids: nil,
         overall_progress: nil,
@@ -132,7 +138,7 @@ module Creatives
     end
 
     def determine_scope
-      if params[:id]
+      base_scope = if params[:id]
         base = Creative.find_by(id: params[:id])&.effective_origin
         return Creative.none unless base
 
@@ -163,6 +169,10 @@ module Creatives
       else
         Creative.where(origin_id: nil)  # Only real creatives (not shells)
       end
+
+      # Exclude archived creatives from all filters/search unless explicitly requested
+      base_scope = base_scope.where(archived_at: nil) unless params[:show_archived]
+      base_scope
     end
 
     def determine_start_nodes(allowed_ids)

data/app/services/collavre/creatives/progress_service.rb

@@ -8,10 +8,11 @@ module Collavre
       end
 
       def update_progress_from_children!
-        if creative.children.any?
+        active_children = creative.children.active
+        if active_children.any?
           # Use Ruby calculation to get effective progress (handling delegation for linked creatives)
           # instead of SQL average which reads potentially stale DB columns.
-          new_progress = creative.children.map(&:progress).sum.to_f / creative.children.size
+          new_progress = active_children.map(&:progress).sum.to_f / active_children.size
           creative.update(progress: new_progress)
         else
           creative.update(progress: 0)
@@ -37,8 +38,9 @@ module Collavre
         rescue ActiveRecord::RecordNotFound
           return
         end
-        new_progress = if parent.children.any?
-                         parent.children.map(&:progress).sum.to_f / parent.children.size
+        active_children = parent.children.active
+        new_progress = if active_children.any?
+                         active_children.map(&:progress).sum.to_f / active_children.size
         else
                          0
         end
@@ -51,9 +53,10 @@ module Collavre
 
       def progress_for_tags(tag_ids, user)
         return creative.progress if tag_ids.blank?
+        return nil if creative.archived?
 
         tag_ids = Array(tag_ids).map(&:to_s)
-        visible_children = creative.children_with_permission(user)
+        visible_children = creative.children_with_permission(user).select { |c| !c.archived? }
         child_values = visible_children.map do |child|
           self.class.new(child).progress_for_tags(tag_ids, user)
         end.compact
@@ -70,7 +73,9 @@ module Collavre
 
       # `tagged_ids` should be a Set of creative IDs tagged with the plan.
       def progress_for_plan(tagged_ids)
-        child_values = creative.children.map do |child|
+        return nil if creative.archived?
+
+        child_values = creative.children.active.map do |child|
           self.class.new(child).progress_for_plan(tagged_ids)
         end.compact
 

data/app/services/collavre/creatives/tree_builder.rb

@@ -121,6 +121,7 @@ module Creatives
           has_children: filtered_children.any?,
           expanded: expanded,
           is_root: creative.parent.nil?,
+          archived: creative.archived?,
           link_url: view_context.collavre.creative_path(creative),
           templates: template_payload_for(creative),
           inline_editor_payload: inline_editor_payload_for(creative),
@@ -148,6 +149,7 @@ module Creatives
       return [] if raw_params["comment"] == "true" || raw_params["search"].present?
 
       children = creative.children_with_permission(user)
+      children = children.select { |c| !c.archived? } unless raw_params["show_archived"]
       if allowed_creative_ids
         children.select { |c| allowed_creative_ids.include?(c.id.to_s) }
       else

data/app/views/collavre/creatives/_inline_edit_form.html.erb

@@ -58,6 +58,16 @@
               button_attributes: { id: 'inline-delete-popup-toggle' },
               menu_id: 'inline-delete-popup-menu'
             ) do %>
+          <button type="button"
+                  id="inline-archive"
+                  class="popup-menu-item"
+                  title="<%= t('collavre.creatives.index.archive') %>"
+                  data-confirm="<%= t('collavre.creatives.index.archive_confirm') %>"
+                  data-archive-label="<%= t('collavre.creatives.index.archive') %>"
+                  data-restore-label="<%= t('collavre.creatives.index.unarchive') %>"
+                  data-restore-confirm="<%= t('collavre.creatives.index.unarchive_confirm', default: 'Restore this creative?') %>">
+            <%= t('collavre.creatives.index.archive') %>
+          </button>
           <button type="button"
                   id="inline-delete"
                   class="popup-menu-item danger-link"

data/app/views/collavre/creatives/_mobile_actions_menu.html.erb

@@ -25,6 +25,9 @@
     <% if @parent_creative.present? %>
       <%= button_to t('collavre.creatives.index.slide_view'), slide_view_creative_path(@parent_creative), method: :get, class: 'popup-menu-item' %>
     <% end %>
+    <% if authenticated? %>
+      <button type="button" id="toggle-archived-btn-mobile" class="popup-menu-item" data-show-text="<%= t('collavre.creatives.index.show_archived') %>" data-hide-text="<%= t('collavre.creatives.index.hide_archived') %>">📦 <%= t('collavre.creatives.index.show_archived') %></button>
+    <% end %>
     <% if authenticated? && (!params[:id] || (current_creative && current_creative.has_permission?(Current.user, :write))) %>
       <button type="button" class="popup-menu-item" data-controller="click-target" data-click-target-id-value="import-markdown-btn" data-action="click->click-target#trigger"><%= t('collavre.creatives.index.import_markdown') %></button>
     <% end %>

data/app/views/collavre/creatives/index.html.erb

@@ -54,6 +54,9 @@
   <button id="expand-all-btn" class="expand-btn" style="width: 36px;" data-expand-text="<%= t('app.expand_all') %>" data-collapse-text="<%= t('app.collapse_all') %>" data-action="click->creatives--expansion#toggleAll" data-creatives--expansion-target="expand"><span aria-hidden="true">▼</span></button>
   <button id="toggle-edit-btn" class="edit-toggle-btn mobile-only" aria-label="<%= t('.edit') %>" title="<%= t('.edit') %>">
     <span aria-hidden="true"><%= svg_tag 'edit.svg', class: 'icon-edit', width: 16, height: 16 %></span></button>
+  <% if authenticated? %>
+    <button id="toggle-archived-btn" class="archive-toggle-btn desktop-only" title="<%= t('collavre.creatives.index.show_archived') %>" data-show-text="<%= t('collavre.creatives.index.show_archived') %>" data-hide-text="<%= t('collavre.creatives.index.hide_archived') %>"><span aria-hidden="true">📦</span></button>
+  <% end %>
   <% if authenticated? && (!params[:id] || (@parent_creative && @parent_creative.has_permission?(Current.user, :write))) %>
     <button id="import-markdown-btn" class="import-btn desktop-only" data-action="click->creatives--import#toggle" data-creatives--import-target="toggle"><%= t('.import_markdown') %></button>
   <% end %>
@@ -179,7 +182,7 @@
   tree_params = params.to_unsafe_h.slice(
     "id", "tags", "min_progress", "max_progress", "search", "comment",
     "has_comments", "due_before", "due_after", "has_due_date",
-    "assignee_id", "unassigned"
+    "assignee_id", "unassigned", "show_archived"
   ).merge(format: :json)
   tree_url = creatives_path(tree_params)
 %>

data/config/locales/comments.en.yml

@@ -5,6 +5,9 @@ en:
       delete_confirm: This will delete all messages in this topic. Are you sure?
       new_placeholder: New Topic
       no_permission: You don't have permission to perform this action.
+      archive: Archive
+      unarchive: Restore
+      archived_topics: "Archived topics (%{count})"
       move:
         no_target_permission: You don't have write permission on the target creative.
         duplicate_name: A topic named '%{name}' already exists in the target creative.
@@ -25,6 +28,7 @@ en:
       delete_button: Delete
       not_owner: Only the comment owner can modify this.
       no_permission: You do not have permission to comment.
+      archived_creative: This creative is archived. Comments are disabled.
       convert_not_allowed: Only the comment owner or a creative admin can convert
         this message.
       convert_button: Convert

data/config/locales/comments.ko.yml

@@ -5,6 +5,9 @@ ko:
       delete_confirm: 이 토픽의 모든 메시지가 삭제됩니다. 확실합니까?
       new_placeholder: 새 토픽
       no_permission: 이 작업을 수행할 권한이 없습니다.
+      archive: 아카이브
+      unarchive: 복원
+      archived_topics: "아카이브된 토픽 (%{count}개)"
       move:
         no_target_permission: 대상 크리에이티브에 대한 쓰기 권한이 없습니다.
         duplicate_name: "'%{name}' 토픽이 대상 크리에이티브에 이미 존재합니다."
@@ -25,6 +28,7 @@ ko:
       delete_button: 삭제
       not_owner: 댓글 소유자만 수정할 수 있습니다.
       no_permission: 댓글을 추가할 권한이 없습니다.
+      archived_creative: 아카이브된 크리에이티브입니다. 채팅이 비활성화되었습니다.
       convert_not_allowed: 댓글 소유자 또는 크리에이티브 관리자만 이 메시지를 전환할 수 있습니다.
       convert_button: 전환
       convert_to_creative: 하위 크리에이티브로 전환

data/config/locales/creatives.en.yml

@@ -11,6 +11,12 @@ en:
         append_as_parent_creative: New upper-creative
         append_below_creative: Add below
         delete: Delete
+        archive: Archive
+        archive_confirm: Archive this item and all children?
+        unarchive_confirm: Restore this creative from archive?
+        unarchive: Restore
+        show_archived: Show archived
+        hide_archived: Hide archived
         delete_only_this: Delete only this Creative
         delete_with_children: Delete this Creative and all its children
         are_you_sure: Are you sure?

data/config/locales/creatives.ko.yml

@@ -11,6 +11,12 @@ ko:
         append_as_parent_creative: 상위에 추가
         append_below_creative: 아래에 추가
         delete: 삭제
+        archive: 아카이브
+        archive_confirm: 이 항목과 모든 하위 항목을 아카이브할까요?
+        unarchive_confirm: 이 크리에이티브를 아카이브에서 복원할까요?
+        unarchive: 복원
+        show_archived: 아카이브 표시
+        hide_archived: 아카이브 숨기기
         delete_only_this: 이 항목만 삭제
         delete_with_children: 이 항목과 모든 하위 항목 삭제
         are_you_sure: 정말 삭제하시겠습니까?

data/config/routes.rb

@@ -57,6 +57,8 @@ Collavre::Engine.routes.draw do
       end
       member do
         patch :move
+        patch :archive
+        patch :unarchive
       end
     end
     resources :comments, only: [ :index, :create, :destroy, :show, :update ] do
@@ -95,6 +97,8 @@ Collavre::Engine.routes.draw do
       post :share, to: "creatives#share", as: :share_creative
       post :request_permission, to: "creatives#request_permission"
       post :unconvert
+      patch :archive
+      patch :unarchive
       get :parent_suggestions
       get :slide_view
       get :contexts

data/db/migrate/20260313011922_add_archived_at_to_creatives_and_topics.rb

@@ -0,0 +1,9 @@
+class AddArchivedAtToCreativesAndTopics < ActiveRecord::Migration[8.0]
+  def change
+    add_column :creatives, :archived_at, :datetime
+    add_column :topics, :archived_at, :datetime
+
+    add_index :creatives, :archived_at, where: "archived_at IS NOT NULL", name: "index_creatives_on_archived_at"
+    add_index :topics, :archived_at, where: "archived_at IS NOT NULL", name: "index_topics_on_archived_at"
+  end
+end

data/lib/collavre/version.rb

@@ -1,3 +1,3 @@
 module Collavre
-  VERSION = "0.7.2"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: collavre
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
 platform: ruby
 authors:
 - Collavre
@@ -646,6 +646,7 @@ files:
 - db/migrate/20260223173533_add_review_type_to_comments.rb
 - db/migrate/20260225065200_create_comment_versions.rb
 - db/migrate/20260225074416_add_selected_version_id_to_comments.rb
+- db/migrate/20260313011922_add_archived_at_to_creatives_and_topics.rb
 - lib/collavre.rb
 - lib/collavre/configuration.rb
 - lib/collavre/engine.rb