diff --git a/api/chalicelib/core/users.py b/api/chalicelib/core/users.py index cc079cabe..5a9f8b3ee 100644 --- a/api/chalicelib/core/users.py +++ b/api/chalicelib/core/users.py @@ -33,7 +33,7 @@ def get_user_settings(user_id): return helper.dict_to_camel_case(cur.fetchone()) -def update_user_module(user_id, module): +def update_user_module(user_id, data: schemas.ModuleStatus): # example data = {"settings": {"modules": ['ASSIST', 'METADATA']} # update user settings from users.settings:jsonb column only update settings.modules # if module property is not exists, it will be created @@ -46,10 +46,11 @@ def update_user_module(user_id, module): if settings.get("modules") is None: settings["modules"] = [] - if module in settings["modules"]: - settings["modules"].remove(module) - else: - settings["modules"].append(module) + if data.status and data.module not in settings["modules"]: + settings["modules"].append(data.module) + + elif not data.status and data.module in settings["modules"]: + settings["modules"].remove(data.module) return update_user_settings(user_id, settings) @@ -64,7 +65,7 @@ def update_user_settings(user_id, settings): WHERE users.user_id = %(user_id)s AND deleted_at IS NULL RETURNING settings;""", - {"user_id": user_id, "settings": settings}) + {"user_id": user_id, "settings": json.dumps(settings)}) ) return helper.dict_to_camel_case(cur.fetchone()) diff --git a/api/schemas.py b/api/schemas.py index 81b50e43e..991ef4c65 100644 --- a/api/schemas.py +++ b/api/schemas.py @@ -1436,7 +1436,7 @@ class FeatureFlagStatus(BaseModel): class ModuleStatus(BaseModel): module: str = Field(..., description="Possible values: notes, bugs, live", - regex="^(assist|notes|bug_reports|sessions|alerts)$") + regex="^(assist|notes|bug-reports|offline-recordings|alerts)$") status: bool = Field(...) class Config: diff --git a/frontend/app/components/Client/Modules/ModuleCard.tsx b/frontend/app/components/Client/Modules/ModuleCard.tsx index 3bb89f7e9..ea6a7309b 100644 --- a/frontend/app/components/Client/Modules/ModuleCard.tsx +++ b/frontend/app/components/Client/Modules/ModuleCard.tsx @@ -22,7 +22,8 @@ function ModuleCard(props: Props) {

{module.description}

- + props.onToggle(module)} />
diff --git a/frontend/app/components/Client/Modules/Modules.tsx b/frontend/app/components/Client/Modules/Modules.tsx index 325d9fecb..af47c9ead 100644 --- a/frontend/app/components/Client/Modules/Modules.tsx +++ b/frontend/app/components/Client/Modules/Modules.tsx @@ -1,8 +1,10 @@ -import React from 'react'; +import React, { useEffect } from 'react'; import ModuleCard from 'Components/Client/Modules/ModuleCard'; import { modules as list } from './'; import withPageTitle from 'HOCs/withPageTitle'; import { connect } from 'react-redux'; +import { userService } from 'App/services'; +import { toast } from 'react-toastify'; interface Props { modules: string[]; @@ -10,10 +12,33 @@ interface Props { function Modules(props: Props) { const { modules } = props; + const [modulesState, setModulesState] = React.useState([]); - const onToggle = (module: any) => { - module.isEnabled = !module.isEnabled; + const onToggle = async (module: any) => { + try { + const isEnabled = !module.isEnabled; + module.isEnabled = isEnabled; + setModulesState([...modulesState]); + await userService.saveModules({ + module: module.key, + status: isEnabled + }); + toast.success(`Module ${module.label} ${isEnabled ? 'enabled' : 'disabled'}`); + } catch (err) { + toast.error(`Failed to ${module.isEnabled ? 'disable' : 'enable'} module ${module.label}`); + module.isEnabled = !module.isEnabled; + setModulesState([...modulesState]); + } }; + + useEffect(() => { + list.forEach((module) => { + module.isEnabled = modules.includes(module.key); + }); + setModulesState(list); + }, [modules]); + + return (
@@ -26,7 +51,7 @@ function Modules(props: Props) {
- {list.map((module) => ( + {modulesState.map((module) => (
@@ -38,5 +63,5 @@ function Modules(props: Props) { export default withPageTitle('Modules - OpenReplay Preferences')(connect((state: any) => ({ - modules: state.getIn(['user', 'account', 'modules']) || [] + modules: state.getIn(['user', 'account', 'settings', 'modules']) || [] }))(Modules)); \ No newline at end of file diff --git a/frontend/app/components/shared/ProjectDropdown/ProjectDropdown.tsx b/frontend/app/components/shared/ProjectDropdown/ProjectDropdown.tsx index 78b75eec3..538e59dbd 100644 --- a/frontend/app/components/shared/ProjectDropdown/ProjectDropdown.tsx +++ b/frontend/app/components/shared/ProjectDropdown/ProjectDropdown.tsx @@ -60,7 +60,7 @@ function ProjectDropdown(props: Props) { {isAdmin && ( <> } key='all-projects' onClick={addProjectClickHandler}> - Add Project + Add Project @@ -71,9 +71,9 @@ function ProjectDropdown(props: Props) { icon={} key={site.id} onClick={() => handleSiteChange(site.id)} - className='px-3 py-2' + className="!py-2" > - {site.host} + {site.host} ))} @@ -83,7 +83,7 @@ function ProjectDropdown(props: Props) { diff --git a/frontend/app/components/shared/SessionItem/SessionItem.tsx b/frontend/app/components/shared/SessionItem/SessionItem.tsx index e1926813d..653590234 100644 --- a/frontend/app/components/shared/SessionItem/SessionItem.tsx +++ b/frontend/app/components/shared/SessionItem/SessionItem.tsx @@ -166,7 +166,7 @@ function SessionItem(props: RouteComponentProps & Props) { {!compact && (
- +
+ {/**/} {isAssist && (
) { // @ts-ignore const { siteId, modules } = props; const isPreferencesActive = props.location.pathname.includes('/client/'); + console.log('modules', modules); let menu = isPreferencesActive ? preferences : main_menu; @@ -136,5 +137,5 @@ function SideMenu(props: RouteComponentProps) { } export default withRouter(connect((state: any) => ({ - modules: state.getIn(['user', 'account', 'modules']) || [] + modules: state.getIn(['user', 'account', 'settings', "modules"]) || [] }))(SideMenu)); diff --git a/frontend/app/layout/TopHeader.tsx b/frontend/app/layout/TopHeader.tsx index ba0fb0b5b..b9d68d457 100644 --- a/frontend/app/layout/TopHeader.tsx +++ b/frontend/app/layout/TopHeader.tsx @@ -22,7 +22,7 @@ function TopHeader() { >
-
+
diff --git a/frontend/app/services/UserService.ts b/frontend/app/services/UserService.ts index 705040eb2..89bffd3fc 100644 --- a/frontend/app/services/UserService.ts +++ b/frontend/app/services/UserService.ts @@ -1,5 +1,5 @@ import APIClient from 'App/api_client'; -import { IUser } from 'App/mstore/types/user' +import User from 'App/mstore/types/user' export default class UserService { private client: APIClient; @@ -24,7 +24,7 @@ export default class UserService { .then((response: { data: any; }) => response.data || {}); } - save(user: IUser): Promise { + save(user: User): Promise { const data = user.toSave(); if (user.userId) { return this.client.put('/client/members/' + user.userId, data) @@ -88,4 +88,11 @@ export default class UserService { .then((response: { data: any; }) => response.data || {}); } + saveModules(module: any) { + return this.client.post('/users/modules', module) + .then(r => r.json()) + .then((response: { data: any; }) => response.data || {}) + .catch(e => Promise.reject(e)) + } + } \ No newline at end of file diff --git a/frontend/app/svg/avatar/icn_avatar1.svg b/frontend/app/svg/avatar/icn_avatar1.svg new file mode 100644 index 000000000..a834c7a22 --- /dev/null +++ b/frontend/app/svg/avatar/icn_avatar1.svg @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/frontend/app/svg/avatar/icn_avatar10.svg b/frontend/app/svg/avatar/icn_avatar10.svg new file mode 100644 index 000000000..dd0db9350 --- /dev/null +++ b/frontend/app/svg/avatar/icn_avatar10.svg @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/frontend/app/svg/avatar/icn_avatar11.svg b/frontend/app/svg/avatar/icn_avatar11.svg new file mode 100644 index 000000000..a514e7626 --- /dev/null +++ b/frontend/app/svg/avatar/icn_avatar11.svg @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/frontend/app/svg/avatar/icn_avatar12.svg b/frontend/app/svg/avatar/icn_avatar12.svg new file mode 100644 index 000000000..4b32375d6 --- /dev/null +++ b/frontend/app/svg/avatar/icn_avatar12.svg @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/frontend/app/svg/avatar/icn_avatar13.svg b/frontend/app/svg/avatar/icn_avatar13.svg new file mode 100644 index 000000000..6a6628833 --- /dev/null +++ b/frontend/app/svg/avatar/icn_avatar13.svg @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/frontend/app/svg/avatar/icn_avatar14.svg b/frontend/app/svg/avatar/icn_avatar14.svg new file mode 100644 index 000000000..8c0bddc3b --- /dev/null +++ b/frontend/app/svg/avatar/icn_avatar14.svg @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/frontend/app/svg/avatar/icn_avatar15.svg b/frontend/app/svg/avatar/icn_avatar15.svg new file mode 100644 index 000000000..ca6302afa --- /dev/null +++ b/frontend/app/svg/avatar/icn_avatar15.svg @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/frontend/app/svg/avatar/icn_avatar16.svg b/frontend/app/svg/avatar/icn_avatar16.svg new file mode 100644 index 000000000..a19b3e5b0 --- /dev/null +++ b/frontend/app/svg/avatar/icn_avatar16.svg @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/frontend/app/svg/avatar/icn_avatar17.svg b/frontend/app/svg/avatar/icn_avatar17.svg new file mode 100644 index 000000000..e4626578a --- /dev/null +++ b/frontend/app/svg/avatar/icn_avatar17.svg @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/frontend/app/svg/avatar/icn_avatar18.svg b/frontend/app/svg/avatar/icn_avatar18.svg new file mode 100644 index 000000000..49af7f36b --- /dev/null +++ b/frontend/app/svg/avatar/icn_avatar18.svg @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/frontend/app/svg/avatar/icn_avatar19.svg b/frontend/app/svg/avatar/icn_avatar19.svg new file mode 100644 index 000000000..5963b8412 --- /dev/null +++ b/frontend/app/svg/avatar/icn_avatar19.svg @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/frontend/app/svg/avatar/icn_avatar2.svg b/frontend/app/svg/avatar/icn_avatar2.svg new file mode 100644 index 000000000..b5191f915 --- /dev/null +++ b/frontend/app/svg/avatar/icn_avatar2.svg @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/frontend/app/svg/avatar/icn_avatar20.svg b/frontend/app/svg/avatar/icn_avatar20.svg new file mode 100644 index 000000000..4972e263f --- /dev/null +++ b/frontend/app/svg/avatar/icn_avatar20.svg @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/frontend/app/svg/avatar/icn_avatar21.svg b/frontend/app/svg/avatar/icn_avatar21.svg new file mode 100644 index 000000000..1bf436921 --- /dev/null +++ b/frontend/app/svg/avatar/icn_avatar21.svg @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/frontend/app/svg/avatar/icn_avatar22.svg b/frontend/app/svg/avatar/icn_avatar22.svg new file mode 100644 index 000000000..ccb89aebe --- /dev/null +++ b/frontend/app/svg/avatar/icn_avatar22.svg @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/frontend/app/svg/avatar/icn_avatar23.svg b/frontend/app/svg/avatar/icn_avatar23.svg new file mode 100644 index 000000000..727b39982 --- /dev/null +++ b/frontend/app/svg/avatar/icn_avatar23.svg @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/frontend/app/svg/avatar/icn_avatar24.svg b/frontend/app/svg/avatar/icn_avatar24.svg new file mode 100644 index 000000000..cc51c0f94 --- /dev/null +++ b/frontend/app/svg/avatar/icn_avatar24.svg @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/frontend/app/svg/avatar/icn_avatar25.svg b/frontend/app/svg/avatar/icn_avatar25.svg new file mode 100644 index 000000000..3cbe65771 --- /dev/null +++ b/frontend/app/svg/avatar/icn_avatar25.svg @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/frontend/app/svg/avatar/icn_avatar26.svg b/frontend/app/svg/avatar/icn_avatar26.svg new file mode 100644 index 000000000..175dc112c --- /dev/null +++ b/frontend/app/svg/avatar/icn_avatar26.svg @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/frontend/app/svg/avatar/icn_avatar27.svg b/frontend/app/svg/avatar/icn_avatar27.svg new file mode 100644 index 000000000..d55200289 --- /dev/null +++ b/frontend/app/svg/avatar/icn_avatar27.svg @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/frontend/app/svg/avatar/icn_avatar28.svg b/frontend/app/svg/avatar/icn_avatar28.svg new file mode 100644 index 000000000..2babfe608 --- /dev/null +++ b/frontend/app/svg/avatar/icn_avatar28.svg @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/frontend/app/svg/avatar/icn_avatar29.svg b/frontend/app/svg/avatar/icn_avatar29.svg new file mode 100644 index 000000000..c3e648e8d --- /dev/null +++ b/frontend/app/svg/avatar/icn_avatar29.svg @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/frontend/app/svg/avatar/icn_avatar3.svg b/frontend/app/svg/avatar/icn_avatar3.svg new file mode 100644 index 000000000..afb7e2001 --- /dev/null +++ b/frontend/app/svg/avatar/icn_avatar3.svg @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/frontend/app/svg/avatar/icn_avatar30.svg b/frontend/app/svg/avatar/icn_avatar30.svg new file mode 100644 index 000000000..6e281ed95 --- /dev/null +++ b/frontend/app/svg/avatar/icn_avatar30.svg @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/frontend/app/svg/avatar/icn_avatar31.svg b/frontend/app/svg/avatar/icn_avatar31.svg new file mode 100644 index 000000000..28e374dab --- /dev/null +++ b/frontend/app/svg/avatar/icn_avatar31.svg @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/frontend/app/svg/avatar/icn_avatar32.svg b/frontend/app/svg/avatar/icn_avatar32.svg new file mode 100644 index 000000000..e7a75d6f5 --- /dev/null +++ b/frontend/app/svg/avatar/icn_avatar32.svg @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/frontend/app/svg/avatar/icn_avatar4.svg b/frontend/app/svg/avatar/icn_avatar4.svg new file mode 100644 index 000000000..a1043f9d0 --- /dev/null +++ b/frontend/app/svg/avatar/icn_avatar4.svg @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/frontend/app/svg/avatar/icn_avatar5.svg b/frontend/app/svg/avatar/icn_avatar5.svg new file mode 100644 index 000000000..3a3a67279 --- /dev/null +++ b/frontend/app/svg/avatar/icn_avatar5.svg @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/frontend/app/svg/avatar/icn_avatar6.svg b/frontend/app/svg/avatar/icn_avatar6.svg new file mode 100644 index 000000000..fd39b98f9 --- /dev/null +++ b/frontend/app/svg/avatar/icn_avatar6.svg @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/frontend/app/svg/avatar/icn_avatar7.svg b/frontend/app/svg/avatar/icn_avatar7.svg new file mode 100644 index 000000000..ae8b6a6f5 --- /dev/null +++ b/frontend/app/svg/avatar/icn_avatar7.svg @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/frontend/app/svg/avatar/icn_avatar8.svg b/frontend/app/svg/avatar/icn_avatar8.svg new file mode 100644 index 000000000..cedf10093 --- /dev/null +++ b/frontend/app/svg/avatar/icn_avatar8.svg @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/frontend/app/svg/avatar/icn_avatar9.svg b/frontend/app/svg/avatar/icn_avatar9.svg new file mode 100644 index 000000000..8a15df20f --- /dev/null +++ b/frontend/app/svg/avatar/icn_avatar9.svg @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/frontend/app/types/account/account.ts b/frontend/app/types/account/account.ts index 3abc23d84..e06713f98 100644 --- a/frontend/app/types/account/account.ts +++ b/frontend/app/types/account/account.ts @@ -14,7 +14,7 @@ export interface IAccount extends IMember { license: string expirationDate?: DateTime permissions: string[] - modules: string[] + settings: any iceServers: string hasPassword: boolean apiKey: string @@ -34,7 +34,7 @@ export default Member.extend({ license: '', expirationDate: undefined, permissions: [], - modules: ['notes'], + settings: {}, iceServers: undefined, hasPassword: false, // to check if it's SSO apiKey: undefined,