From 5ff152233b51de3ec62d3cca3fa0c968128e612b Mon Sep 17 00:00:00 2001 From: Nuwan Date: Mon, 3 Feb 2025 12:25:21 +0530 Subject: [PATCH] account preferences page new page to change user's recording preferences --- .../account/account-preferences-page.cy.js | 34 ++++++ .../components/dashboard/JKDashboardMain.js | 2 + .../components/page/JKAccountPreferences.js | 106 ++++++++++++++++++ jam-ui/src/i18n/locales/en/account.json | 22 +++- jam-ui/src/routes.js | 1 + ...50202222413_add_recording_pref_to_users.rb | 9 ++ ruby/lib/jam_ruby/models/user.rb | 5 + web/app/controllers/api_users_controller.rb | 3 + 8 files changed, 176 insertions(+), 6 deletions(-) create mode 100644 jam-ui/cypress/e2e/account/account-preferences-page.cy.js create mode 100644 jam-ui/src/components/page/JKAccountPreferences.js create mode 100644 ruby/db/migrate/20250202222413_add_recording_pref_to_users.rb diff --git a/jam-ui/cypress/e2e/account/account-preferences-page.cy.js b/jam-ui/cypress/e2e/account/account-preferences-page.cy.js new file mode 100644 index 000000000..697fde682 --- /dev/null +++ b/jam-ui/cypress/e2e/account/account-preferences-page.cy.js @@ -0,0 +1,34 @@ +/// + +import makeFakeUser from '../../factories/user'; + +describe('Account Preferences Feature', () => { + beforeEach(() => { + // Log in to the application or navigate to the account page + // where the change email feature is available + const currentUser = makeFakeUser({ + email: 'sam@example.com', + recording_pref: 0 + }); + cy.stubAuthenticate({ ...currentUser }); + cy.intercept('POST', /\S+\/users\S+/, { + statusCode: 200 + }).as('updateUser'); + cy.visit('/account/preferences'); + }); + + it('should display the current recording preference', () => { + // Assert that the current recording preference is displayed + cy.get('[data-testid=recording_pref_none]').should('be.checked'); + }); + + it('should save the new recording preference', () => { + // Select a new recording preference + cy.get('[data-testid=recording_pref_my_audio]').check('1'); + cy.wait('@updateUser'); + // Assert that the new recording preference is saved + cy.contains('Recording preference saved successfully.'); + }); + +}); + diff --git a/jam-ui/src/components/dashboard/JKDashboardMain.js b/jam-ui/src/components/dashboard/JKDashboardMain.js index a783adfd6..4ecbced6a 100644 --- a/jam-ui/src/components/dashboard/JKDashboardMain.js +++ b/jam-ui/src/components/dashboard/JKDashboardMain.js @@ -37,6 +37,7 @@ import JKEditProfile from '../page/JKEditProfile'; import JKEditAccount from '../page/JKEditAccount'; import JKAccountSubscription from '../page/JKAccountSubscription'; import JKPaymentHistory from '../page/JKPaymentHistory'; +import JKAccountPreferences from '../page/JKAccountPreferences'; import JKAffiliateProgram from '../affiliate/JKAffiliateProgram'; import JKAffiliatePayee from '../affiliate/JKAffiliatePayee'; @@ -294,6 +295,7 @@ function JKDashboardMain() { + diff --git a/jam-ui/src/components/page/JKAccountPreferences.js b/jam-ui/src/components/page/JKAccountPreferences.js new file mode 100644 index 000000000..900b7087f --- /dev/null +++ b/jam-ui/src/components/page/JKAccountPreferences.js @@ -0,0 +1,106 @@ +import React, { useState, useEffect } from 'react' +import { Row, Col, Card, CardHeader, CardBody, Form, FormGroup, Label, Input } from 'reactstrap'; +import FalconCardHeader from '../common/FalconCardHeader'; +import { useTranslation } from 'react-i18next'; +import { useAuth } from '../../context/UserAuth'; +import { updateUser } from '../../helpers/rest'; +import { toast } from 'react-toastify'; +import { useForm } from 'react-hook-form'; + +const JKAccountPreferences = () => { + const { t } = useTranslation('account'); + const { currentUser } = useAuth(); + const [selectedPref, setSelectedPref] = useState(null); + const [selectedPrefV2, setSelectedPrefV2] = useState(null); + + const { + register, + setValue + } = useForm(); + + useEffect(() => { + if (currentUser) { + setValue('recording_pref', currentUser.recording_pref); + setSelectedPrefV2(currentUser.recording_pref); + } + }, [currentUser]); + + //save the selected preference to the database + useEffect(() => { + if (!currentUser || selectedPref === null) { + return; + } + + const params = { + recording_pref: selectedPref + } + + updateUser(currentUser.id, params).then(response => { + setSelectedPrefV2(selectedPref); + toast.success(t('preferences.recording_preferences.save_success')); + }).catch(error => { + console.log(error); + toast.error(t('preferences.recording_preferences.save_error')); + }); + + }, [selectedPref]); + + return ( + + + + + + + +
{t('preferences.recording_preferences.title')}
+ + + + {t('preferences.recording_preferences.help_text')} + + +
+ + setSelectedPref(0)} /> + + + + setSelectedPref(1)} /> + + + + setSelectedPref(2)} /> + + +
+ + + + + + + + + ) +} + +export default JKAccountPreferences \ No newline at end of file diff --git a/jam-ui/src/i18n/locales/en/account.json b/jam-ui/src/i18n/locales/en/account.json index b6497ec32..f21faf728 100644 --- a/jam-ui/src/i18n/locales/en/account.json +++ b/jam-ui/src/i18n/locales/en/account.json @@ -24,7 +24,6 @@ "alerts": { "updated": "Your account identity has been updated.", "confirmation_email_sent": "A confirmation email has been sent to your email address. Please click the link in the email to confirm your email address." - } }, "password_form": { @@ -52,8 +51,20 @@ "help_text_p2": "to reset your password, and you will receive an email with instructions on how to reset your password to the email address associated with your JamKazam account." } } - - + }, + "preferences": { + "page_title": "Preferences", + "recording_preferences": { + "title": "Recording", + "help_text": "Record the follwing selection on my computer when someone else in a session I'm playing in starts a recording.", + "options": { + "none": "Don't record anything on my computer", + "my_audio": "Record my own audio tracks", + "my_audio_and_session_mix": "Record my own audio tracks and the session mix" + }, + "save_success": "Recording preference saved successfully.", + "save_error": "Failed to save recording preference. Please try again later." + } }, "subscription": { "page_title": "Subscription", @@ -71,7 +82,6 @@ "part1": "To compare the features available for different subscription plans ", "click_here": "click here", "part2": " to view a help article on our available plans." - } }, "play_time": { @@ -83,7 +93,7 @@ "changed_to_free_plan": "You have chosen to go back down to the FREE PLAN. Your subscription will be canceled, and you will keep your plan until the end of the current billing cycle.", "failed_to_change_plan": "Failed to update subscription plan. Please try again later. Please contact support@jamkazam.com if you continue to have problems.", "changed_plan_successfully": "You have successfully updated your subscription plan." - } + } }, "payments": { "page_title": "Payment History", @@ -98,4 +108,4 @@ "load_more": "Load More", "loading": "Loading..." } -} \ No newline at end of file +} diff --git a/jam-ui/src/routes.js b/jam-ui/src/routes.js index 85e77972f..deeb8b84c 100644 --- a/jam-ui/src/routes.js +++ b/jam-ui/src/routes.js @@ -59,6 +59,7 @@ export const accountRoutes = { { to: '/account/subscription', name: 'Subscription'}, { to: '/account/payments', name: 'Payment History'}, { to: '/account/payment-method', name: 'Payment Method'}, + { to: '/account/preferences', name: 'Preferences'}, ] } diff --git a/ruby/db/migrate/20250202222413_add_recording_pref_to_users.rb b/ruby/db/migrate/20250202222413_add_recording_pref_to_users.rb new file mode 100644 index 000000000..ed18997f9 --- /dev/null +++ b/ruby/db/migrate/20250202222413_add_recording_pref_to_users.rb @@ -0,0 +1,9 @@ + class AddRecordingPrefToUsers < ActiveRecord::Migration + def self.up + execute "ALTER TABLE users ADD COLUMN recording_pref INT" + execute "UPDATE users SET recording_pref = 0" + end + def self.down + execute "ALTER TABLE users DROP COLUMN recording_pref" + end + end diff --git a/ruby/lib/jam_ruby/models/user.rb b/ruby/lib/jam_ruby/models/user.rb index 5231cb678..b47d62861 100644 --- a/ruby/lib/jam_ruby/models/user.rb +++ b/ruby/lib/jam_ruby/models/user.rb @@ -66,6 +66,11 @@ module JamRuby ESCALATION_REASON_OTHER = "Other" ESCALATION_REASONS = [ESCALATION_REASON_NO_AUDIO_STREAM, ESCALATION_REASON_NO_VIDEO_STREAM, ESCALATION_REASON_SETUP_WIZARD_FAILURE, ESCALATION_REASON_OTHER] + enum :recording_pref, [ + {no_recording: 0}, + {own_tracks: 1}, + {own_tracks_and_session_mix: 2} + ] devise :database_authenticatable, :recoverable, :rememberable diff --git a/web/app/controllers/api_users_controller.rb b/web/app/controllers/api_users_controller.rb index b7d6e27e0..02e8bc842 100644 --- a/web/app/controllers/api_users_controller.rb +++ b/web/app/controllers/api_users_controller.rb @@ -57,6 +57,7 @@ class ApiUsersController < ApiController photo_url: current_user.photo_url, show_free_jamtrack: current_user.show_free_jamtrack?, is_affiliate_partner: current_user.affiliate_partner.present?, + recording_pref: current_user.recording_pref, }, status: 200 end @@ -246,6 +247,8 @@ class ApiUsersController < ApiController @user.retailer_interest = !!params[:retailer_interest] @user.desired_package = LessonPackageType.find_by_package_type!(params[:desired_package]) if params.has_key?(:desired_package) @user.accept_desktop_notifications = params[:accept_desktop_notifications] if params.has_key?(:accept_desktop_notifications) + @user.recording_pref = params[:recording_pref] if params.has_key?(:recording_pref) + if @user.save test_drive_package_details = params[:test_drive_package]