@uptime.app/contracts 3.0.52-rc.0.sso → 3.0.52-rc.2

package/src/hack-mapping/test-data/enriched-hack.json

@@ -2554,22 +2554,27 @@
     },
     "timeSaved": 499,
     "title": "Rich Dad Poor Dad",
-    "topics": [
-        {
-            "name": "Money & Investing"
-        },
-        {
-            "name": "Business"
+    "topics": [
+        {
+            "name": "Money & Investing"
+        },
+        {
+            "name": "Business"
         },
         {
             "name": "Career & Success"
         },
-        {
-            "name": "Leadership & Entrepreneurship"
-        }
-    ],
-    "type": "book",
-    "draftHackId": "3b24ef40-a60c-5767-93b5-f2c9dd94ceed",
+        {
+            "name": "Leadership & Entrepreneurship"
+        }
+    ],
+    "primaryTopics": [
+        {
+            "name": "Money & Investing"
+        }
+    ],
+    "type": "book",
+    "draftHackId": "3b24ef40-a60c-5767-93b5-f2c9dd94ceed",
     "draftHackVersion": 4,
     "updatedAt": "2023-07-21T07:02:16.240Z",
     "v": 402

package/src/hack-mapping/test-data/expected-app-full-hack.json

@@ -2489,21 +2489,26 @@
     },
     "timeSaved": 499,
     "title": "Rich Dad Poor Dad",
-    "topics": [
-        {
-            "name": "Money & Investing"
-        },
-        {
-            "name": "Business"
+    "topics": [
+        {
+            "name": "Money & Investing"
+        },
+        {
+            "name": "Business"
         },
         {
             "name": "Career & Success"
         },
-        {
-            "name": "Leadership & Entrepreneurship"
-        }
-    ],
-    "type": "book",
-    "updatedAt": "2023-07-21T07:02:16.240Z",
+        {
+            "name": "Leadership & Entrepreneurship"
+        }
+    ],
+    "primaryTopics": [
+        {
+            "name": "Money & Investing"
+        }
+    ],
+    "type": "book",
+    "updatedAt": "2023-07-21T07:02:16.240Z",
     "v": 402
 }

package/src/hack-mapping/test-data/expected-app-hack-metadata.json

@@ -73,21 +73,26 @@
     "themeId": "34",
     "timeSaved": 499,
     "title": "Rich Dad Poor Dad",
-    "topics": [
-        {
-            "name": "Money & Investing"
-        },
-        {
-            "name": "Business"
+    "topics": [
+        {
+            "name": "Money & Investing"
+        },
+        {
+            "name": "Business"
         },
         {
             "name": "Career & Success"
         },
-        {
-            "name": "Leadership & Entrepreneurship"
-        }
-    ],
-    "type": "book",
-    "updatedAt": "2023-07-21T07:02:16.240Z",
+        {
+            "name": "Leadership & Entrepreneurship"
+        }
+    ],
+    "primaryTopics": [
+        {
+            "name": "Money & Investing"
+        }
+    ],
+    "type": "book",
+    "updatedAt": "2023-07-21T07:02:16.240Z",
     "v": 402
 }

package/src/hack-mapping/test-data/expected-app-restricted-hack.json

@@ -779,21 +779,26 @@
     },
     "timeSaved": 499,
     "title": "Rich Dad Poor Dad",
-    "topics": [
-        {
-            "name": "Money & Investing"
-        },
-        {
-            "name": "Business"
+    "topics": [
+        {
+            "name": "Money & Investing"
+        },
+        {
+            "name": "Business"
         },
         {
             "name": "Career & Success"
         },
-        {
-            "name": "Leadership & Entrepreneurship"
-        }
-    ],
-    "type": "book",
-    "updatedAt": "2023-07-21T07:02:16.240Z",
+        {
+            "name": "Leadership & Entrepreneurship"
+        }
+    ],
+    "primaryTopics": [
+        {
+            "name": "Money & Investing"
+        }
+    ],
+    "type": "book",
+    "updatedAt": "2023-07-21T07:02:16.240Z",
     "v": 402
 }

package/src/identity-provider/identity-provider.ts

@@ -30,8 +30,6 @@ export interface IdentityProviderConfig {
         'custom:ext_organisation_id'?: string;
         'custom:ext_user_id'?: string;
         'custom:country_code'?: string;
-        'custom:team_name'?: string;
-        'custom:is_manager'?: string;
     };
 }
 
@@ -46,6 +44,4 @@ export interface IdentityProviderClaims {
     given_name?: string;
     externalUserId?: string;
     countryCode?: string;
-    teamName?: string;
-    isManager?: string
-}
+}

package/src/index.ts

@@ -166,6 +166,9 @@ export * from './text-to-speech/text-segment';
 export * from './theme/theme';
 export * from './theme/theme-events';
 
+export * from './topics/primary-topic';
+export * from './topics/primary-topic-mapping';
+
 export * from './translation/translation-events';
 export * from './translation/translation';
 

package/src/pending-hack/pending-hack.ts

@@ -2,6 +2,7 @@
 import { ExtractedSubject } from '../hack/extracted-subject';
 import { HackAffiliate, HackContributor, HackType, HackSourceData, HackTopic, HackExternalLink } from '../hack/hack';
 import { Segment } from '../segment/segment';
+import { PrimaryTopic } from '../topics/primary-topic';
 
 export interface PendingHack {
     id: string;
@@ -24,6 +25,7 @@ export interface PendingHack {
     copyrightFreeCoverUrl?: string;
     affiliate?: HackAffiliate;
     topics: HackTopic[];
+    primaryTopics: PrimaryTopic[];
     contributors: HackContributor[];
     type: HackType;
     sourceData?: HackSourceData;

package/src/spark/spark.ts

@@ -52,6 +52,7 @@ export type SparkHack = Pick<Hack,
 | 'editorialTags'
 | 'coverUrl'
 | 'topics'
+| 'primaryTopics'
 | 'type'
 | 'affiliate'
 | 'contributors'

package/src/topics/primary-topic-mapping.test.ts

@@ -0,0 +1,36 @@
+import { mapPrimaryTopicsToOldTopics, OLD_TOPIC_TAGS, VALID_PRIMARY_TOPIC_TAGS } from './primary-topic-mapping';
+
+describe('mapPrimaryTopicsToOldTopics', () => {
+    test('maps split primary topics back to their old topic', () => {
+        expect(mapPrimaryTopicsToOldTopics(['Politics, Law & Economics'])).toEqual(['Culture & Society']);
+        expect(mapPrimaryTopicsToOldTopics(['Communication'])).toEqual(['Personal Growth']);
+        expect(mapPrimaryTopicsToOldTopics(['AI & Technology'])).toEqual(['Technology & the Future']);
+    });
+
+    test('supports PrimaryTopic objects', () => {
+        expect(mapPrimaryTopicsToOldTopics([{ name: 'Career Success' }])).toEqual(['Career & Success']);
+    });
+
+    test('returns undefined for unknown topics', () => {
+        expect(mapPrimaryTopicsToOldTopics(['Unknown Topic'])).toEqual([]);
+    });
+
+    test('maps every valid primary topic tag to a known old topic tag', () => {
+        for (const primaryTopic of VALID_PRIMARY_TOPIC_TAGS) {
+            const oldTopic = mapPrimaryTopicsToOldTopics([primaryTopic])[0];
+            expect(oldTopic).toBeDefined();
+            expect(OLD_TOPIC_TAGS).toContain(oldTopic);
+        }
+    });
+    test('deduplicates old topics while preserving input order', () => {
+        expect(
+            mapPrimaryTopicsToOldTopics([
+                { name: 'Marketing' },
+                { name: 'Sales' },
+                { name: 'Biographies' },
+                { name: 'Marketing' },
+                { name: 'Unknown Topic' }
+            ])
+        ).toEqual(['Marketing & Sales', 'Biographies']);
+    });
+});

package/src/topics/primary-topic-mapping.ts

@@ -0,0 +1,110 @@
+import { PrimaryTopic } from './primary-topic';
+
+export const VALID_PRIMARY_TOPIC_TAGS = [
+    'Arts & Design',
+    'Biographies',
+    'Business',
+    'Career Success',
+    'Communication',
+    'Education & Studying',
+    'Entrepreneurship',
+    'Environment',
+    'Fitness & Sports',
+    'History',
+    'Home & Hobbies',
+    'Humanity & Societies',
+    'Identity & Equality',
+    'Investing',
+    'Leadership & Management',
+    'Marketing',
+    'Media & Entertainment',
+    'Mental Health',
+    'Mindfulness',
+    'Money & Finances',
+    'Neurodiversity',
+    'Nutrition & Health',
+    'Parenting & Family',
+    'Personal Growth',
+    'Politics, Law & Economics',
+    'Psychology & Philosophy',
+    'Relationships',
+    'Religion',
+    'Sales',
+    'Science',
+    'Sex',
+    'AI & Technology'
+];
+
+export const OLD_TOPIC_TAGS = [
+    'Arts & Design',
+    'Biographies',
+    'Business',
+    'Culture & Society',
+    'Career & Success',
+    'Education',
+    'Health & Fitness',
+    'History',
+    'Leadership & Entrepreneurship',
+    'Lifestyle',
+    'Marketing & Sales',
+    'Mind & Philosophy',
+    'Money & Investing',
+    'Parenting & Relationships',
+    'Personal Growth',
+    'Religion & Spirituality',
+    'Science & the Environment',
+    'Technology & the Future'
+];
+
+export type PrimaryTopicTag = (typeof VALID_PRIMARY_TOPIC_TAGS)[number];
+export type OldTopicTag = (typeof OLD_TOPIC_TAGS)[number];
+
+const TOPIC_TO_PRIMARY_TOPIC_MAPPING: Record<OldTopicTag, PrimaryTopicTag[]> = {
+    'Arts & Design': ['Arts & Design', 'Media & Entertainment'],
+    'Biographies': ['Biographies'],
+    'Business': ['Business'],
+    'Culture & Society': ['Identity & Equality', 'Politics, Law & Economics', 'Humanity & Societies'],
+    'Career & Success': ['Career Success'],
+    'Education': ['Education & Studying'],
+    'Health & Fitness': ['Nutrition & Health', 'Fitness & Sports', 'Mental Health', 'Neurodiversity'],
+    'History': ['History'],
+    'Leadership & Entrepreneurship': ['Leadership & Management', 'Entrepreneurship'],
+    'Lifestyle': ['Home & Hobbies'],
+    'Marketing & Sales': ['Marketing', 'Sales'],
+    'Mind & Philosophy': ['Mindfulness', 'Psychology & Philosophy'],
+    'Money & Investing': ['Money & Finances', 'Investing'],
+    'Parenting & Relationships': ['Sex', 'Relationships', 'Parenting & Family'],
+    'Personal Growth': ['Personal Growth', 'Communication'],
+    'Religion & Spirituality': ['Religion'],
+    'Science & the Environment': ['Science', 'Environment'],
+    'Technology & the Future': ['AI & Technology']
+};
+
+const PRIMARY_TOPIC_TO_OLD_TOPIC_MAPPING = Object.entries(TOPIC_TO_PRIMARY_TOPIC_MAPPING).reduce(
+    (mapping, [oldTopic, primaryTopics]) => {
+        for (const primaryTopic of primaryTopics) {
+            mapping[primaryTopic] = oldTopic as OldTopicTag;
+        }
+
+        return mapping;
+    },
+    {} as Record<PrimaryTopicTag, OldTopicTag>
+);
+
+function primaryTopicNameOf(primaryTopic: PrimaryTopic | string): string {
+    return typeof primaryTopic === 'string' ? primaryTopic : primaryTopic.name;
+}
+
+function mapPrimaryTopicToOldTopic(primaryTopic: PrimaryTopic | string): OldTopicTag | undefined {
+    return PRIMARY_TOPIC_TO_OLD_TOPIC_MAPPING[primaryTopicNameOf(primaryTopic) as PrimaryTopicTag];
+}
+
+export function mapPrimaryTopicsToOldTopics(primaryTopics: Array<PrimaryTopic | string>): OldTopicTag[] {
+    return [
+        ...new Set(
+            primaryTopics
+                .map(mapPrimaryTopicToOldTopic)
+                .filter((oldTopic): oldTopic is OldTopicTag => oldTopic !== undefined)
+        )
+    ];
+}

package/src/topics/primary-topic.ts

@@ -0,0 +1,3 @@
+export interface PrimaryTopic {
+    name: string;
+}