Showcase new features (#946)

* feat(database): add new section

* chore(backend): add section to prefs for new users

* feat(frontend): add pro required label

* chore(frontend): order of props

* feat(frontend): choose a default provider for new progress updates

Author: IgnisDa

apps/backend/src/users.rs

@@ -266,6 +266,7 @@ pub enum DashboardElementLot {
     Upcoming,
     InProgress,
     Summary,
+    Recommendations,
 }
 
 #[skip_serializing_none]
@@ -316,6 +317,11 @@ impl Default for UserGeneralPreferences {
                     hidden: false,
                     num_elements: None,
                 },
+                UserGeneralDashboardElement {
+                    section: DashboardElementLot::Recommendations,
+                    hidden: false,
+                    num_elements: Some(8),
+                },
             ],
             persist_queries: true,
             disable_integrations: false,

apps/frontend/app/routes/_dashboard._index.tsx

@@ -36,7 +36,7 @@ import { Fragment, type ReactNode } from "react";
 import { $path } from "remix-routes";
 import invariant from "tiny-invariant";
 import { match } from "ts-pattern";
-import { ApplicationGrid } from "~/components/common";
+import { ApplicationGrid, ProRequiredAlert } from "~/components/common";
 import { displayWeightWithUnit } from "~/components/fitness";
 import {
 	DisplayCollectionEntity,
@@ -161,6 +161,15 @@ export default function Page() {
 								</Section>
 							) : null,
 						)
+						.with([DashboardElementLot.Recommendations, false], () => (
+							<Section
+								key={DashboardElementLot.Recommendations}
+								lot={DashboardElementLot.Recommendations}
+							>
+								<Title>Recommendations</Title>
+								<ProRequiredAlert tooltipLabel="Get new recommendations every hour" />
+							</Section>
+						))
 						.with([DashboardElementLot.Summary, false], () => (
 							<Section
 								key={DashboardElementLot.Summary}

apps/frontend/app/routes/_dashboard.tsx

@@ -799,11 +799,13 @@ const MetadataProgressUpdateForm = ({
 			onSubmit={onSubmit}
 			metadataDetails={metadataDetails}
 			metadataToUpdate={metadataToUpdate}
+			history={userMetadataDetails.history}
 		/>
 	);
 };
 
 type InProgress = UserMetadataDetailsQuery["userMetadataDetails"]["inProgress"];
+type History = UserMetadataDetailsQuery["userMetadataDetails"]["history"];
 
 const MetadataInProgressUpdateForm = ({
 	onSubmit,
@@ -910,10 +912,10 @@ const MetadataInProgressUpdateForm = ({
 					</>
 				) : null}
 				<Select
-					data={userPreferences.general.watchProviders}
-					label={`Where did you ${getVerb(Verb.Read, metadataDetails.lot)} it?`}
 					name="providerWatchedOn"
 					defaultValue={inProgress.providerWatchedOn}
+					data={userPreferences.general.watchProviders}
+					label={`Where did you ${getVerb(Verb.Read, metadataDetails.lot)} it?`}
 				/>
 				<Button variant="outline" type="submit">
 					Update
@@ -927,10 +929,12 @@ const NewProgressUpdateForm = ({
 	onSubmit,
 	metadataDetails,
 	metadataToUpdate,
+	history,
 }: {
 	onSubmit: (e: FormEvent<HTMLFormElement>) => void;
 	metadataToUpdate: UpdateProgressData;
 	metadataDetails: MetadataDetailsQuery["metadataDetails"];
+	history: History;
 }) => {
 	const userPreferences = useUserPreferences();
 	const [_, setMetadataToUpdate] = useMetadataProgressUpdate();
@@ -940,6 +944,7 @@ const NewProgressUpdateForm = ({
 	);
 	const [watchTime, setWatchTime] =
 		useState<(typeof WATCH_TIMES)[number]>("Just Right Now");
+	const lastProviderWatchedOn = history[0]?.providerWatchedOn;
 
 	return (
 		<Form
@@ -1128,9 +1133,10 @@ const NewProgressUpdateForm = ({
 					/>
 				) : null}
 				<Select
-					label={`Where did you ${getVerb(Verb.Read, metadataDetails.lot)} it?`}
-					data={userPreferences.general.watchProviders}
 					name="providerWatchedOn"
+					defaultValue={lastProviderWatchedOn}
+					data={userPreferences.general.watchProviders}
+					label={`Where did you ${getVerb(Verb.Read, metadataDetails.lot)} it?`}
 				/>
 				{selectedDate ? (
 					<input

libs/database/src/migrations/m20240805_add_new_section_to_dashboard.rs

@@ -0,0 +1,41 @@
+use sea_orm_migration::prelude::*;
+
+#[derive(DeriveMigrationName)]
+pub struct Migration;
+
+#[async_trait::async_trait]
+impl MigrationTrait for Migration {
+    async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+        let db = manager.get_connection();
+        db.execute_unprepared(
+            r#"
+UPDATE "user"
+SET preferences = jsonb_set(
+  preferences,
+  '{general, dashboard}',
+  (
+    CASE
+      WHEN NOT EXISTS (
+        SELECT 1
+        FROM jsonb_array_elements(COALESCE(preferences->'general'->'dashboard', '[]'::jsonb)) AS elem
+        WHERE elem->>'section' = 'RECOMMENDATIONS'
+      )
+      THEN COALESCE(preferences->'general'->'dashboard', '[]'::jsonb) ||
+           jsonb_build_array(jsonb_build_object('hidden', false, 'section', 'RECOMMENDATIONS', 'numElements', 8))
+      ELSE COALESCE(preferences->'general'->'dashboard', '[]'::jsonb)
+    END
+  )::jsonb,
+  true
+)
+WHERE preferences->'general'->'dashboard' IS NOT NULL;
+"#,
+        )
+        .await?;
+
+        Ok(())
+    }
+
+    async fn down(&self, _manager: &SchemaManager) -> Result<(), DbErr> {
+        Ok(())
+    }
+}

libs/database/src/migrations/mod.rs

@@ -43,6 +43,7 @@ mod m20240723_remove_integration_columns_from_user_table;
 mod m20240724_add_new_columns_to_collection_to_entity;
 mod m20240724_zzz_new_generated_collection_to_entity_columns;
 mod m20240730_changes_for_push_integrations;
+mod m20240805_add_new_section_to_dashboard;
 
 pub use m20230410_create_metadata::Metadata as AliasedMetadata;
 pub use m20230413_create_person::Person as AliasedPerson;
@@ -107,6 +108,7 @@ impl MigratorTrait for Migrator {
             Box::new(m20240724_add_new_columns_to_collection_to_entity::Migration),
             Box::new(m20240724_zzz_new_generated_collection_to_entity_columns::Migration),
             Box::new(m20240730_changes_for_push_integrations::Migration),
+            Box::new(m20240805_add_new_section_to_dashboard::Migration),
         ]
     }
 }

libs/generated/src/graphql/backend/graphql.ts

@@ -263,6 +263,7 @@ export type CreateUserNotificationPlatformInput = {
 
 export enum DashboardElementLot {
   InProgress = 'IN_PROGRESS',
+  Recommendations = 'RECOMMENDATIONS',
   Summary = 'SUMMARY',
   Upcoming = 'UPCOMING'
 }