Reinstate groups (WIP)

We will need them until all clients are on latest model

fronts-client/src/fixtures/shared.ts

@@ -597,6 +597,7 @@ const collectionConfig: CollectionConfig = {
 	id: 'exampleCollection',
 	displayName: 'Example Collection',
 	type: 'any',
+	groups: ['large', 'medium', 'small'],
 	groupsConfig: [{
 		name: 'large',
 		maxItems: 10,

fronts-client/src/types/Collection.ts

@@ -23,7 +23,7 @@ interface Group {
 
 interface GroupConfig {
 	name: string;
-	maxItems: number | null;
+	maxItems?: number;
 }
 
 /** CardSets represent all of the lists of cards available in a collection. */

fronts-client/src/types/FaciaApi.ts

@@ -43,6 +43,7 @@ interface CollectionConfigResponse {
 	type?: string;
 	backfill?: unknown;
 	href?: string;
+	groups?: string[];
 	groupsConfig?: GroupConfig[];
 	metadata?: unknown[];
 	uneditable?: boolean;
@@ -116,6 +117,7 @@ export interface EditionCollectionFromResponse {
 	platform?: string;
 	displayName: string;
 	groups?: string[];
+	groupsConfig?: GroupConfig[];
 	metadata?: Array<{ type: string }>;
 	uneditable?: boolean;
 	isHidden?: boolean;

fronts-client/src/util/__tests__/shared.spec.ts

@@ -109,7 +109,7 @@ describe('Shared utilities', () => {
 			expect(result.cards[prevGroup3.cards[0]].id).toBe('article/live/3');
 		});
 		it('should insert a default group for empty collections', () => {
-			const { groupsConfig, ...collectionConfigWithoutGroups } = collectionConfig;
+			const { groups, ...collectionConfigWithoutGroups } = collectionConfig;
 			const result = normaliseCollectionWithNestedArticles(
 				{
 					...collection,
@@ -145,7 +145,7 @@ describe('Shared utilities', () => {
 				collectionWithoutGroups,
 				{
 					...collectionConfig,
-					groupsConfig: undefined,
+					groups: undefined,
 				},
 			);
 			const groupId = result.normalisedCollection.live![0];
@@ -154,7 +154,7 @@ describe('Shared utilities', () => {
 		it('should create different groups for cards belonging to different groups even if they are not specified in the config', () => {
 			const result = normaliseCollectionWithNestedArticles(collection, {
 				...collectionConfig,
-				groupsConfig: undefined,
+				groups: undefined,
 			});
 			const groupId1 = result.normalisedCollection.live![0];
 			expect(result.groups[groupId1].cards).toHaveLength(1);
@@ -168,7 +168,7 @@ describe('Shared utilities', () => {
 			};
 			const result = normaliseCollectionWithNestedArticles(collection, {
 				...configWithExtraGroup,
-				groupsConfig: undefined,
+				groups: undefined,
 			});
 			expect(Object.keys(result.groups)).toHaveLength(4);
 		});

fronts-client/src/util/frontsUtils.ts

@@ -38,6 +38,7 @@ const combineCollectionWithConfig = (
 		displayName: useCollectionDisplayName
 			? collection.displayName
 			: collectionConfig.displayName,
+		groups: collectionConfig.groups,
 		groupsConfig: collectionConfig.groupsConfig,
 		type: collectionConfig.type,
 		frontsToolSettings: collectionConfig.frontsToolSettings,

fronts-client/src/util/shared.ts

@@ -53,20 +53,20 @@ const addGroupsForStage = (
 		let name: string | null = null;
 		const groupNumberAsInt = getGroupIndex(group.id);
 		if (
-			collectionConfig.groupsConfig &&
-			groupNumberAsInt < collectionConfig.groupsConfig.length
+			collectionConfig.groups &&
+			groupNumberAsInt < collectionConfig.groups.length
 		) {
-			name = collectionConfig.groupsConfig[groupNumberAsInt].name;
+			name = collectionConfig.groups[groupNumberAsInt];
 		}
 		return { ...group, name };
 	});
 
 	// We may have empty groups in the config which would not show up in the normalised
 	// groups result. We need to add these into the groups array.
-	if (collectionConfig.groupsConfig) {
-		collectionConfig.groupsConfig.forEach((groupConfig, groupConfigIndex) => {
+	if (collectionConfig.groups) {
+		collectionConfig.groups.forEach((group, groupConfigIndex) => {
 			if (!configGroupIndexExistsInGroups(groupsWithNames, groupConfigIndex)) {
-				groupsWithNames.push(createGroup(`${groupConfigIndex}`, groupConfig.name));
+				groupsWithNames.push(createGroup(`${groupConfigIndex}`, group));
 			}
 		});
 	}

public/src/js/constants/defaults.js

@@ -26,6 +26,12 @@ export default {
         { 'name': 'fixed/small/slow-V-half' },
         {
           'name': 'dynamic/fast',
+          'groups': [
+            'standard',
+            'big',
+            'very big',
+            'huge'
+          ],
           'groupsConfig': [
             {
               name: 'standard'
@@ -43,6 +49,12 @@ export default {
         },
         {
           'name': 'dynamic/slow',
+          'groups': [
+            'standard',
+            'big',
+            'very big',
+            'huge'
+          ],
           'groupsConfig': [
             {
               name: 'standard'
@@ -60,6 +72,10 @@ export default {
         },
         {
           'name': 'dynamic/package',
+          'groups': [
+            'standard',
+            'snap',
+          ],
           'groupsConfig': [
             {
               name: 'standard'
@@ -71,6 +87,10 @@ export default {
         },
         {
           'name': 'dynamic/slow-mpu',
+          'groups': [
+            'standard',
+            'big',
+          ],
           'groupsConfig': [
             {
               name: 'standard'
@@ -85,6 +105,10 @@ export default {
         { 'name': 'news/most-popular' },
         {
           'name': 'breaking-news/not-for-other-fronts',
+          groups: [
+            'minor',
+            'major'
+          ],
           groupsConfig: [
             {
               name: 'minor'
@@ -98,6 +122,11 @@ export default {
         { 'name': 'scrollable/highlights' },
         {
             'name': 'flexible/general',
+            'groups': [
+              'small',
+              'large',
+              'splash'
+            ],
             'groupsConfig': [
               {
                 name: 'small',
@@ -115,6 +144,10 @@ export default {
         },
         {
             'name': 'flexible/special',
+            'groups': [
+              'standard',
+              'snap',
+            ],
             'groupsConfig': [
               {
                 name: 'standard'

public/src/js/widgets/columns/fronts-config.html

@@ -254,11 +254,9 @@
             </div>
 
             <config-collection-tags params="tags: meta.metadata" class="tags"></config-collection-tags>
-            <!-- ko if: meta.groupsConfig -->
+            <!-- ko if: meta.groups -->
                 <label>Groups</label>
-                <div data-bind="foreach: meta.groupsConfig">
-                  <span class="cnf-form__value" data-bind="text: name"></span>
-                </div>
+                <span class="cnf-form__value" data-bind="text: meta.groups"></span>
             <!-- /ko -->
 
             <!-- ko if: meta.type() === "flexible/general"-->

test/config/TransformationsSpec.scala

@@ -9,6 +9,7 @@ class TransformationsSpec extends FlatSpec with Matchers {
     displayName = Some("New collection"),
     `type` = Some("???"),
     href = Some("newfront"),
+    groups = Some(List("1", "2")),
     groupsConfig = Some(List(GroupsConfigJson(name = "1", maxItems = Some(10)), GroupsConfigJson(name = "2", maxItems = Some(10)))),
     uneditable = Some(false),
     showTags = Some(true),

test/services/CollectionServiceTest.scala

@@ -83,7 +83,7 @@ class CollectionServiceTest extends FreeSpec with Matchers {
       `type` = Some("dynamic/slow"),
       href = None,
       description = None,
-      groups = None,
+      groups = Some(List("Group 1", "Group 2")),
       groupsConfig = Some(List(
         GroupsConfigJson(name = "Group 1", maxItems = Some(10)),
         GroupsConfigJson(name = "Group 2", maxItems = Some(10))