musora-content-services 1.2.3 → 1.2.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "musora-content-services",
-  "version": "1.2.3",
+  "version": "1.2.5",
   "description": "A package for Musoras content services ",
   "main": "src/index.js",
   "type": "module",

package/src/contentMetaData.js

@@ -1012,6 +1012,7 @@ const contentMetadata = {
             allowableFilters: ['difficulty', 'genre', 'essential', 'theory', 'lifestyle'],
         },
         'question-and-answer': {
+            thumbnailUrl: 'https://d1923uyy6spedc.cloudfront.net/question-answer-singeo.png',
             icon: "fas fa-question-circle",
             description: "Each week we go live to answer your questions. Submit your questions in advance using the button below, in the Q&A thread in the forums, or live in the community chat.",
             allowableFilters: ['difficulty', 'genre', 'essential', 'theory'],

package/src/contentTypeConfig.js

@@ -34,14 +34,26 @@ export const resourcesField = `[
           ... *[railcontent_id == ^.parent_content_data[0].id] [0].resource[]{resource_name, _key, "resource_url": coalesce('${CloudFrontURl}'+string::split(resource_aws.asset->fileURL, '${AWSUrl}')[1], resource_url )},
           ]`;
 
-
+/*
+ *  NOTE: TP-366 - Arrays can be either arrays of different objects or arrays of different primitives, not both
+ *  updated query so assignment_sheet_music_image can be either an image or a URL
+ *  see: https://www.sanity.io/docs/array-type#fNBIr84P
+ */
 export const assignmentsField = `"assignments":assignment[]{
     "id": railcontent_id,
         "soundslice_slug": assignment_soundslice,
         "title": assignment_title,
-        "sheet_music_image_url": assignment_sheet_music_image,
+        "sheet_music_image_url": 
+          coalesce(assignment_sheet_music_image_new[]{
+              _type == 'Image' => {
+                'url': asset->url
+              },
+              _type == 'URL' => {
+                url
+              }
+            }.url,  assignment_sheet_music_image),
         "timecode": assignment_timecode,
-        "description": assignment_description
+        "description": coalesce(assignment_description,'')
 },`
 
 const contentWithInstructorsField = {
@@ -191,7 +203,7 @@ export let contentTypeConfig = {
                     "id":railcontent_id,
                     name,
                     short_bio,
-                    "biography": short_bio[0].children[0].text, 
+                    "biography": short_bio[0].children[0].text,
                     web_url_path,
                     "coach_card_image": coach_card_image.asset->url,
                     "coach_profile_image":thumbnail_url.asset->url
@@ -391,8 +403,8 @@ export let contentTypeConfig = {
     'backstage-secret': contentWithInstructorsField,
     'question-and-answer': contentWithInstructorsField,
     'student-collaboration': contentWithInstructorsField,
-    'live': {...contentWithInstructorsField, 'slug': 'live-streams'},
-    'solo': {...contentWithInstructorsField, 'slug': 'solos'},
+    'live': { ...contentWithInstructorsField, 'slug': 'live-streams' },
+    'solo': { ...contentWithInstructorsField, 'slug': 'solos' },
     'boot-camp': contentWithInstructorsField,
     'gear-guids': contentWithInstructorsField,
     'performance': contentWithInstructorsField,

package/src/index.d.ts

@@ -89,20 +89,14 @@ import {
 	fetchAll,
 	fetchAllFilterOptions,
 	fetchAllPacks,
-	fetchAllSongs,
 	fetchArtistLessons,
 	fetchArtists,
-	fetchAssignments,
 	fetchByRailContentId,
 	fetchByRailContentIds,
 	fetchByReference,
-	fetchCatalogMetadata,
-	fetchChallengeOverview,
 	fetchChatAndLiveEnvent,
-	fetchChildren,
 	fetchCoachLessons,
 	fetchCommentModContentData,
-	fetchCourseOverview,
 	fetchFoundation,
 	fetchGenreLessons,
 	fetchHierarchy,
@@ -112,30 +106,22 @@ import {
 	fetchMethod,
 	fetchMethodChildren,
 	fetchMethodChildrenIds,
-	fetchMethodNextLesson,
 	fetchMethodPreviousNextLesson,
-	fetchMethods,
 	fetchNewReleases,
 	fetchNextPreviousLesson,
 	fetchPackAll,
-	fetchPackChildren,
 	fetchPackData,
-	fetchParentByRailContentId,
 	fetchParentForDownload,
 	fetchPlayAlongsCount,
 	fetchRelatedLessons,
-	fetchRelatedMethodLessons,
 	fetchRelatedSongs,
 	fetchSanity,
 	fetchScheduledReleases,
 	fetchShowsData,
 	fetchSongArtistCount,
 	fetchSongById,
-	fetchSongCount,
-	fetchSongFilterOptions,
 	fetchTopLevelParentId,
 	fetchUpcomingEvents,
-	fetchWorkouts,
 	getSortOrder,
 	jumpToContinueContent
 } from './services/sanity.js';
@@ -162,22 +148,17 @@ declare module 'musora-content-services' {
 		fetchAllCompletedStates,
 		fetchAllFilterOptions,
 		fetchAllPacks,
-		fetchAllSongs,
 		fetchArtistLessons,
 		fetchArtists,
-		fetchAssignments,
 		fetchByRailContentId,
 		fetchByRailContentIds,
 		fetchByReference,
 		fetchCarouselCardData,
-		fetchCatalogMetadata,
 		fetchChallengeIndexMetadata,
 		fetchChallengeLessonData,
 		fetchChallengeMetadata,
-		fetchChallengeOverview,
 		fetchChallengeUserActiveChallenges,
 		fetchChatAndLiveEnvent,
-		fetchChildren,
 		fetchCoachLessons,
 		fetchCommentModContentData,
 		fetchCompletedChallenges,
@@ -186,7 +167,6 @@ declare module 'musora-content-services' {
 		fetchContentInProgress,
 		fetchContentPageUserData,
 		fetchContentProgress,
-		fetchCourseOverview,
 		fetchFoundation,
 		fetchGenreLessons,
 		fetchHandler,
@@ -197,17 +177,13 @@ declare module 'musora-content-services' {
 		fetchMethod,
 		fetchMethodChildren,
 		fetchMethodChildrenIds,
-		fetchMethodNextLesson,
 		fetchMethodPreviousNextLesson,
-		fetchMethods,
 		fetchNewReleases,
 		fetchNextContentDataForParent,
 		fetchNextPreviousLesson,
 		fetchOwnedChallenges,
 		fetchPackAll,
-		fetchPackChildren,
 		fetchPackData,
-		fetchParentByRailContentId,
 		fetchParentForDownload,
 		fetchPinnedPlaylists,
 		fetchPlayAlongsCount,
@@ -215,15 +191,12 @@ declare module 'musora-content-services' {
 		fetchPlaylistItem,
 		fetchPlaylistItems,
 		fetchRelatedLessons,
-		fetchRelatedMethodLessons,
 		fetchRelatedSongs,
 		fetchSanity,
 		fetchScheduledReleases,
 		fetchShowsData,
 		fetchSongArtistCount,
 		fetchSongById,
-		fetchSongCount,
-		fetchSongFilterOptions,
 		fetchSongsInProgress,
 		fetchTopLevelParentId,
 		fetchUpcomingEvents,
@@ -234,7 +207,6 @@ declare module 'musora-content-services' {
 		fetchUserPermissions,
 		fetchUserPermissionsData,
 		fetchUserPlaylists,
-		fetchWorkouts,
 		getAllCompleted,
 		getAllStarted,
 		getAllStartedOrCompleted,

package/src/index.js

@@ -89,20 +89,14 @@ import {
 	fetchAll,
 	fetchAllFilterOptions,
 	fetchAllPacks,
-	fetchAllSongs,
 	fetchArtistLessons,
 	fetchArtists,
-	fetchAssignments,
 	fetchByRailContentId,
 	fetchByRailContentIds,
 	fetchByReference,
-	fetchCatalogMetadata,
-	fetchChallengeOverview,
 	fetchChatAndLiveEnvent,
-	fetchChildren,
 	fetchCoachLessons,
 	fetchCommentModContentData,
-	fetchCourseOverview,
 	fetchFoundation,
 	fetchGenreLessons,
 	fetchHierarchy,
@@ -112,30 +106,22 @@ import {
 	fetchMethod,
 	fetchMethodChildren,
 	fetchMethodChildrenIds,
-	fetchMethodNextLesson,
 	fetchMethodPreviousNextLesson,
-	fetchMethods,
 	fetchNewReleases,
 	fetchNextPreviousLesson,
 	fetchPackAll,
-	fetchPackChildren,
 	fetchPackData,
-	fetchParentByRailContentId,
 	fetchParentForDownload,
 	fetchPlayAlongsCount,
 	fetchRelatedLessons,
-	fetchRelatedMethodLessons,
 	fetchRelatedSongs,
 	fetchSanity,
 	fetchScheduledReleases,
 	fetchShowsData,
 	fetchSongArtistCount,
 	fetchSongById,
-	fetchSongCount,
-	fetchSongFilterOptions,
 	fetchTopLevelParentId,
 	fetchUpcomingEvents,
-	fetchWorkouts,
 	getSortOrder,
 	jumpToContinueContent
 } from './services/sanity.js';
@@ -161,22 +147,17 @@ export {
 	fetchAllCompletedStates,
 	fetchAllFilterOptions,
 	fetchAllPacks,
-	fetchAllSongs,
 	fetchArtistLessons,
 	fetchArtists,
-	fetchAssignments,
 	fetchByRailContentId,
 	fetchByRailContentIds,
 	fetchByReference,
 	fetchCarouselCardData,
-	fetchCatalogMetadata,
 	fetchChallengeIndexMetadata,
 	fetchChallengeLessonData,
 	fetchChallengeMetadata,
-	fetchChallengeOverview,
 	fetchChallengeUserActiveChallenges,
 	fetchChatAndLiveEnvent,
-	fetchChildren,
 	fetchCoachLessons,
 	fetchCommentModContentData,
 	fetchCompletedChallenges,
@@ -185,7 +166,6 @@ export {
 	fetchContentInProgress,
 	fetchContentPageUserData,
 	fetchContentProgress,
-	fetchCourseOverview,
 	fetchFoundation,
 	fetchGenreLessons,
 	fetchHandler,
@@ -196,17 +176,13 @@ export {
 	fetchMethod,
 	fetchMethodChildren,
 	fetchMethodChildrenIds,
-	fetchMethodNextLesson,
 	fetchMethodPreviousNextLesson,
-	fetchMethods,
 	fetchNewReleases,
 	fetchNextContentDataForParent,
 	fetchNextPreviousLesson,
 	fetchOwnedChallenges,
 	fetchPackAll,
-	fetchPackChildren,
 	fetchPackData,
-	fetchParentByRailContentId,
 	fetchParentForDownload,
 	fetchPinnedPlaylists,
 	fetchPlayAlongsCount,
@@ -214,15 +190,12 @@ export {
 	fetchPlaylistItem,
 	fetchPlaylistItems,
 	fetchRelatedLessons,
-	fetchRelatedMethodLessons,
 	fetchRelatedSongs,
 	fetchSanity,
 	fetchScheduledReleases,
 	fetchShowsData,
 	fetchSongArtistCount,
 	fetchSongById,
-	fetchSongCount,
-	fetchSongFilterOptions,
 	fetchSongsInProgress,
 	fetchTopLevelParentId,
 	fetchUpcomingEvents,
@@ -233,7 +206,6 @@ export {
 	fetchUserPermissions,
 	fetchUserPermissionsData,
 	fetchUserPlaylists,
-	fetchWorkouts,
 	getAllCompleted,
 	getAllStarted,
 	getAllStartedOrCompleted,

package/src/services/contentProgress.js

@@ -5,7 +5,7 @@ import {
     postRecordWatchSession
 } from "./railcontent.js";
 import {DataContext, ContentProgressVersionKey} from "./dataContext.js";
-import {fetchAssignments, fetchHierarchy} from "./sanity.js";
+import {fetchHierarchy} from "./sanity.js";
 
 const STATE_STARTED = 'started';
 const STATE_COMPLETED = 'completed';