ZCU-PUB/feat(community): also apply "Články" 3rd order in the community browse tree (#953)

The initial fix only reordered the community *detail* page (the themed
sub-collection list). The "Communities & Collections" browse tree
(/community-list) renders collections through CommunityListService and was
still showing the default alphabetical order (Články last).

Extract the ordering rule into a shared pure helper
(shared/zcu-collection-order.ts) and apply it in both places:
- the custom-theme sub-collection-list override (delegates to the helper),
- CommunityListService (reorders each fetched collection page in the tree).

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

Author: Matus Kasak

src/app/community-list-page/community-list-service.ts

@@ -25,6 +25,7 @@ import { ShowMoreFlatNode } from './show-more-flat-node.model';
 import { FindListOptions } from '../core/data/find-list-options.model';
 import { AppConfig, APP_CONFIG } from 'src/config/app-config.interface';
 import { v4 as uuidv4 } from 'uuid';
+import { reorderZcuPublicationCollections } from '../shared/zcu-collection-order';
 
 // Helper method to combine and flatten an array of observables of flatNode arrays
 export const combineAndFlatten = (obsList: Observable<FlatNode[]>[]): Observable<FlatNode[]> =>
@@ -255,7 +256,8 @@ export class CommunityListService {
             getFirstCompletedRemoteData(),
             map((rd: RemoteData<PaginatedList<Collection>>) => {
               if (hasValue(rd) && hasValue(rd.payload)) {
-                let nodes = rd.payload.page
+                // issue #953: apply the ZCU collection display order in the community browse tree
+                let nodes = reorderZcuPublicationCollections(rd.payload.page)
                   .map((collection: Collection) => toFlatNode(collection, observableOf(false), level + 1, false, communityFlatNode));
                 if (currentCollectionPage < rd.payload.totalPages && currentCollectionPage === rd.payload.currentPage) {
                   nodes = [...nodes, showMoreFlatNode(`collection-${uuidv4()}`, level + 1, communityFlatNode)];

src/app/shared/zcu-collection-order.spec.ts

@@ -0,0 +1,70 @@
+import { Collection } from '../core/shared/collection.model';
+import {
+  reorderZcuPublicationCollections,
+  ZCU_SECOND_COLLECTION_NAME,
+  ZCU_THIRD_COLLECTION_NAME,
+} from './zcu-collection-order';
+
+/**
+ * Builds a minimal Collection-like stub that only exposes the `name` getter used by the ordering.
+ *
+ * @param name the collection name (dc.title) to expose
+ * @returns an object typed as Collection for the purposes of these tests
+ */
+function fakeCollection(name: string): Collection {
+  return { get name(): string { return name; } } as Collection;
+}
+
+/**
+ * Maps a list of collections to their names for concise assertions.
+ *
+ * @param collections the collections to map
+ * @returns the ordered list of collection names
+ */
+function names(collections: Collection[]): string[] {
+  return collections.map((collection: Collection) => collection.name);
+}
+
+describe('reorderZcuPublicationCollections', () => {
+  it('uses the exact diacritic pinned names', () => {
+    expect(ZCU_SECOND_COLLECTION_NAME).toBe('Kapitoly v knihách');
+    expect(ZCU_THIRD_COLLECTION_NAME).toBe('Články');
+  });
+
+  it('pins "Články" to the 3rd position, directly after "Kapitoly v knihách"', () => {
+    const input = [
+      fakeCollection('Knihy'),
+      fakeCollection(ZCU_SECOND_COLLECTION_NAME),
+      fakeCollection('Zprávy'),
+      fakeCollection(ZCU_THIRD_COLLECTION_NAME),
+    ];
+
+    const result = reorderZcuPublicationCollections(input);
+
+    expect(result[2].name).toBe(ZCU_THIRD_COLLECTION_NAME);
+    expect(names(result).indexOf(ZCU_THIRD_COLLECTION_NAME))
+      .toBe(names(result).indexOf(ZCU_SECOND_COLLECTION_NAME) + 1);
+    expect(names(result)).toEqual(['Knihy', ZCU_SECOND_COLLECTION_NAME, ZCU_THIRD_COLLECTION_NAME, 'Zprávy']);
+  });
+
+  it('leaves the list unchanged when a pinned collection is missing', () => {
+    expect(names(reorderZcuPublicationCollections([
+      fakeCollection('Knihy'), fakeCollection(ZCU_THIRD_COLLECTION_NAME),
+    ]))).toEqual(['Knihy', ZCU_THIRD_COLLECTION_NAME]);
+
+    expect(names(reorderZcuPublicationCollections([
+      fakeCollection('Knihy'), fakeCollection(ZCU_SECOND_COLLECTION_NAME),
+    ]))).toEqual(['Knihy', ZCU_SECOND_COLLECTION_NAME]);
+  });
+
+  it('leaves the list unchanged when there are no other collections', () => {
+    expect(names(reorderZcuPublicationCollections([
+      fakeCollection(ZCU_SECOND_COLLECTION_NAME), fakeCollection(ZCU_THIRD_COLLECTION_NAME),
+    ]))).toEqual([ZCU_SECOND_COLLECTION_NAME, ZCU_THIRD_COLLECTION_NAME]);
+  });
+
+  it('handles empty and single-element input without error', () => {
+    expect(reorderZcuPublicationCollections([])).toEqual([]);
+    expect(names(reorderZcuPublicationCollections([fakeCollection('Knihy')]))).toEqual(['Knihy']);
+  });
+});

src/app/shared/zcu-collection-order.ts

@@ -0,0 +1,38 @@
+import { Collection } from '../core/shared/collection.model';
+
+/**
+ * Name of the collection pinned to the 2nd position for the ZCU publications community (issue #953).
+ */
+export const ZCU_SECOND_COLLECTION_NAME = 'Kapitoly v knihách';
+
+/**
+ * Name of the collection pinned to the 3rd position for the ZCU publications community (issue #953).
+ */
+export const ZCU_THIRD_COLLECTION_NAME = 'Články';
+
+/**
+ * Reorders a list of collections so that "Kapitoly v knihách" is shown 2nd and "Články" 3rd, while
+ * every other collection keeps its original (alphabetical) order. This is the ZCU-specific hardcode
+ * for issue #953, shared by every place that lists a community's collections (the community page and
+ * the community browse tree).
+ *
+ * The rule only applies when both pinned collections are present and there is at least one other
+ * collection; otherwise the list is returned unchanged. The result is
+ * `[others[0], second, third, ...others.slice(1)]`.
+ *
+ * @param collections the collections to reorder (as fetched, alphabetical by dc.title)
+ * @returns a new, reordered array, or the original array when the rule does not apply
+ */
+export function reorderZcuPublicationCollections(collections: Collection[]): Collection[] {
+  if (!Array.isArray(collections) || collections.length === 0) {
+    return collections;
+  }
+  const second = collections.find((collection: Collection) => collection.name === ZCU_SECOND_COLLECTION_NAME);
+  const third = collections.find((collection: Collection) => collection.name === ZCU_THIRD_COLLECTION_NAME);
+  const others = collections.filter((collection: Collection) => collection !== second && collection !== third);
+
+  if (second && third && others.length >= 1) {
+    return [others[0], second, third, ...others.slice(1)];
+  }
+  return collections;
+}

src/themes/custom/app/community-page/sub-collection-list/community-page-sub-collection-list.component.ts

@@ -4,16 +4,7 @@ import { CommunityPageSubCollectionListComponent as BaseComponent }
 import { RemoteData } from '../../../../../app/core/data/remote-data';
 import { PaginatedList } from '../../../../../app/core/data/paginated-list.model';
 import { Collection } from '../../../../../app/core/shared/collection.model';
-
-/**
- * Name of the collection pinned to the 2nd position for the ZCU publications community.
- */
-const SECOND_COLLECTION_NAME = 'Kapitoly v knihách';
-
-/**
- * Name of the collection pinned to the 3rd position for the ZCU publications community.
- */
-const THIRD_COLLECTION_NAME = 'Články';
+import { reorderZcuPublicationCollections } from '../../../../../app/shared/zcu-collection-order';
 
 @Component({
   selector: 'ds-community-page-sub-collection-list',
@@ -40,25 +31,14 @@ export class CommunityPageSubCollectionListComponent extends BaseComponent {
   }
 
   /**
-   * Pure helper that reorders a list of collections to pin "Kapitoly v knihách" to the 2nd
-   * position and "Články" to the 3rd, keeping every other collection in its original order.
-   *
-   * The rule only applies when both pinned collections are present and there is at least one
-   * other collection; otherwise the list is returned unchanged. The result is
-   * `[others[0], second, third, ...others.slice(1)]`.
+   * Reorders the current page of collections using the shared ZCU ordering rule (issue #953),
+   * pinning "Kapitoly v knihách" to the 2nd position and "Články" to the 3rd.
    *
    * @param collections the collections of the current page (alphabetical by dc.title)
    * @returns a new, reordered array, or the original array when the rule does not apply
    */
   protected reorderCollections(collections: Collection[]): Collection[] {
-    const second = collections.find((collection: Collection) => collection.name === SECOND_COLLECTION_NAME);
-    const third = collections.find((collection: Collection) => collection.name === THIRD_COLLECTION_NAME);
-    const others = collections.filter((collection: Collection) => collection !== second && collection !== third);
-
-    if (second && third && others.length >= 1) {
-      return [others[0], second, third, ...others.slice(1)];
-    }
-    return collections;
+    return reorderZcuPublicationCollections(collections);
   }
 
 }