Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(frontend): use selected filters instead of expanded params #1244

Merged
merged 1 commit into from
Sep 15, 2024
Merged

chore(frontend): use selected filters instead of expanded params #1244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions frontend/dashboard/app/[teamId]/apps/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { AppNameChangeApiStatus, AuthzAndMembersApiStatus, changeAppNameFromServ
import CreateApp from "@/app/components/create_app";
import DangerConfirmationModal from "@/app/components/danger_confirmation_modal";
import DropdownSelect, { DropdownSelectType } from "@/app/components/dropdown_select";
import Filters, { AppVersionsInitialSelectionType, defaultSelectedFilters } from "@/app/components/filters";
import Filters, { AppVersionsInitialSelectionType, defaultFilters } from "@/app/components/filters";
import { auth, getUserIdOrRedirectToAuth } from "@/app/utils/auth/auth";
import { formatDateToHumanReadableDateTime } from "@/app/utils/time_utils";
import { useRouter } from 'next/navigation';
Expand All @@ -13,7 +13,7 @@ import React, { useState, useEffect } from 'react';
export default function Apps({ params }: { params: { teamId: string } }) {
const router = useRouter()

const [selectedFilters, setSelectedFilters] = useState(defaultSelectedFilters);
const [filtesr, setFilters] = useState(defaultFilters);

const [currentUserCanChangeAppSettings, setCurrentUserCanChangeAppSettings] = useState(false)

Expand Down Expand Up @@ -54,7 +54,7 @@ export default function Apps({ params }: { params: { teamId: string } }) {
const getAppSettings = async () => {
setFetchAppSettingsApiStatus(FetchAppSettingsApiStatus.Loading)

const result = await fetchAppSettingsFromServer(selectedFilters.selectedApp.id, router);
const result = await fetchAppSettingsFromServer(filtesr.app.id, router);

switch (result.status) {
case FetchAppSettingsApiStatus.Error:
Expand All @@ -69,18 +69,18 @@ export default function Apps({ params }: { params: { teamId: string } }) {

useEffect(() => {
// Don't try to fetch settings if selected app is not yet set
if (!selectedFilters.ready) {
if (!filtesr.ready) {
return
}

getAppSettings()
}, [selectedFilters]);
}, [filtesr]);

const saveAppSettings = async () => {
setUpdateAppSettingsApiStatus(UpdateAppSettingsApiStatus.Loading)
setUpdateAppSettingsMsg("Saving...")

const result = await updateAppSettingsFromServer(selectedFilters.selectedApp.id, updatedAppSettings, router)
const result = await updateAppSettingsFromServer(filtesr.app.id, updatedAppSettings, router)

switch (result.status) {

Expand Down Expand Up @@ -122,7 +122,7 @@ export default function Apps({ params }: { params: { teamId: string } }) {
const changeAppName = async () => {
setAppNameChangeApiStatus(AppNameChangeApiStatus.Loading)

const result = await changeAppNameFromServer(selectedFilters.selectedApp.id, newAppName, router)
const result = await changeAppNameFromServer(filtesr.app.id, newAppName, router)

switch (result.status) {
case AppNameChangeApiStatus.Error:
Expand Down Expand Up @@ -157,14 +157,14 @@ export default function Apps({ params }: { params: { teamId: string } }) {
showDeviceManufacturers={false}
showDeviceNames={false}
showFreeText={false}
onFiltersChanged={(updatedFilters) => setSelectedFilters(updatedFilters)} />
onFiltersChanged={(updatedFilters) => setFilters(updatedFilters)} />


{/* Main UI*/}
{selectedFilters.ready &&
{filtesr.ready &&
<div>
{/* Modal for confirming app name change */}
<DangerConfirmationModal body={<p className="font-sans">Are you sure you want to rename app <span className="font-display font-bold">{selectedFilters.selectedApp.name}</span> to <span className="font-display font-bold">{newAppName}</span>?</p>} open={appNameConfirmationModalOpen} affirmativeText="Yes, I'm sure" cancelText="Cancel"
<DangerConfirmationModal body={<p className="font-sans">Are you sure you want to rename app <span className="font-display font-bold">{filtesr.app.name}</span> to <span className="font-display font-bold">{newAppName}</span>?</p>} open={appNameConfirmationModalOpen} affirmativeText="Yes, I'm sure" cancelText="Cancel"
onAffirmativeAction={() => {
setAppNameConfirmationModalOpen(false)
changeAppName()
Expand All @@ -177,9 +177,9 @@ export default function Apps({ params }: { params: { teamId: string } }) {
<div className="flex flex-row items-center">
<p>App name:</p>
<div className="px-1" />
<input id="change-team-name-input" type="text" defaultValue={selectedFilters.selectedApp.name}
<input id="change-team-name-input" type="text" defaultValue={filtesr.app.name}
onChange={(event) => {
event.target.value === selectedFilters.selectedApp.name ? setSaveAppNameButtonDisabled(true) : setSaveAppNameButtonDisabled(false)
event.target.value === filtesr.app.name ? setSaveAppNameButtonDisabled(true) : setSaveAppNameButtonDisabled(false)
setNewAppName(event.target.value)
setAppNameChangeApiStatus(AppNameChangeApiStatus.Init)
}}
Expand All @@ -188,11 +188,11 @@ export default function Apps({ params }: { params: { teamId: string } }) {
{appNameChangeApiStatus === AppNameChangeApiStatus.Loading && <p className="text-sm align-bottom font-display">Changing app name...</p>}
{appNameChangeApiStatus === AppNameChangeApiStatus.Error && <p className="text-sm align-bottom font-display">Error changing app name, please try again</p>}
</div>
<p>Package name: {selectedFilters.selectedApp.unique_identifier}</p>
<p>Package name: {filtesr.app.unique_identifier}</p>
<div className="py-1" />
<p>Platform: {selectedFilters.selectedApp.platform}</p>
<p>Platform: {filtesr.app.platform}</p>
<div className="py-1" />
<p>Created at: {formatDateToHumanReadableDateTime(selectedFilters.selectedApp.created_at)}</p>
<p>Created at: {formatDateToHumanReadableDateTime(filtesr.app.created_at)}</p>
</div>
<div className="flex flex-row items-center">
<p>Data retention period</p>
Expand All @@ -213,8 +213,8 @@ export default function Apps({ params }: { params: { teamId: string } }) {
<div className="flex flex-row items-center">
<p>API key</p>
<div className="px-3" />
<input type="text" readOnly={true} value={selectedFilters.selectedApp.api_key.key} className="w-96 border border-black rounded-md outline-none focus-visible:outline-yellow-300 py-2 px-4 font-sans placeholder:text-neutral-400" />
<button className="mx-4 my-1 outline-none flex justify-center hover:bg-yellow-200 active:bg-yellow-300 focus-visible:bg-yellow-200 border border-black rounded-md font-display transition-colors duration-100 py-2 px-4" onClick={() => navigator.clipboard.writeText(selectedFilters.selectedApp.api_key.key)}>Copy</button>
<input type="text" readOnly={true} value={filtesr.app.api_key.key} className="w-96 border border-black rounded-md outline-none focus-visible:outline-yellow-300 py-2 px-4 font-sans placeholder:text-neutral-400" />
<button className="mx-4 my-1 outline-none flex justify-center hover:bg-yellow-200 active:bg-yellow-300 focus-visible:bg-yellow-200 border border-black rounded-md font-display transition-colors duration-100 py-2 px-4" onClick={() => navigator.clipboard.writeText(filtesr.app.api_key.key)}>Copy</button>
</div>
</div>
</div>
Expand Down
29 changes: 7 additions & 22 deletions frontend/dashboard/app/[teamId]/overview/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import React, { useState } from 'react';
import Journey, { JourneyType } from "@/app/components/journey";
import MetricsOverview from '@/app/components/metrics_overview';
import { FiltersApiType } from '@/app/api/api_calls';
import Filters, { AppVersionsInitialSelectionType, defaultSelectedFilters } from '@/app/components/filters';
import Filters, { AppVersionsInitialSelectionType, defaultFilters } from '@/app/components/filters';

export default function Overview({ params }: { params: { teamId: string } }) {
const [selectedFilters, setSelectedFilters] = useState(defaultSelectedFilters);
const [filters, setFilters] = useState(defaultFilters);

return (
<div className="flex flex-col selection:bg-yellow-200/75 items-start p-24 pt-8">
Expand All @@ -32,40 +32,25 @@ export default function Overview({ params }: { params: { teamId: string } }) {
showDeviceManufacturers={false}
showDeviceNames={false}
showFreeText={false}
onFiltersChanged={(updatedFilters) => setSelectedFilters(updatedFilters)} />
onFiltersChanged={(updatedFilters) => setFilters(updatedFilters)} />

<div className="py-4" />

{selectedFilters.ready &&
{filters.ready &&
<div className='w-5/6 h-[600px]'>
<Journey
teamId={params.teamId}
appId={selectedFilters.selectedApp.id}
bidirectional={false}
journeyType={JourneyType.Overview}
exceptionsGroupId={null}
startDate={selectedFilters.selectedStartDate}
endDate={selectedFilters.selectedEndDate}
appVersions={selectedFilters.selectedVersions}
osVersions={[]}
countries={[]}
networkProviders={[]}
networkTypes={[]}
networkGenerations={[]}
locales={[]}
deviceManufacturers={[]}
deviceNames={[]} />
filters={filters} />
</div>
}
<div className="py-8" />

{selectedFilters.ready &&
{filters.ready &&
<MetricsOverview
appId={selectedFilters.selectedApp.id}
startDate={selectedFilters.selectedStartDate}
endDate={selectedFilters.selectedEndDate}
appVersions={selectedFilters.selectedVersions} />}

filters={filters} />}
</div>
)
}
35 changes: 11 additions & 24 deletions frontend/dashboard/app/[teamId]/sessions/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"use client"

import { emptySessionsOverviewResponse, SessionsOverviewApiStatus, fetchSessionsOverviewFromServer, FiltersApiType } from '@/app/api/api_calls';
import Filters, { AppVersionsInitialSelectionType, defaultSelectedFilters } from '@/app/components/filters';
import Filters, { AppVersionsInitialSelectionType, defaultFilters } from '@/app/components/filters';
import Paginator, { PaginationDirection } from '@/app/components/paginator';
import SessionsOverviewPlot from '@/app/components/sessions_overview_plot';
import { formatDateToHumanReadableDate, formatDateToHumanReadableTime, formatMillisToHumanReadable } from '@/app/utils/time_utils';
Expand All @@ -13,7 +13,7 @@ export default function SessionsOverview({ params }: { params: { teamId: string
const router = useRouter()
const [sessionsOverviewApiStatus, setSessionsOverviewApiStatus] = useState(SessionsOverviewApiStatus.Loading);

const [selectedFilters, setSelectedFilters] = useState(defaultSelectedFilters);
const [filters, setFilters] = useState(defaultFilters);

const [sessionsOverview, setSessionsOverview] = useState(emptySessionsOverviewResponse);
const paginationOffset = 5
Expand All @@ -39,7 +39,7 @@ export default function SessionsOverview({ params }: { params: { teamId: string
limit = - limit
}

const result = await fetchSessionsOverviewFromServer(selectedFilters.selectedApp.id, selectedFilters.selectedStartDate, selectedFilters.selectedEndDate, selectedFilters.selectedVersions, selectedFilters.selectedSessionType, selectedFilters.selectedOsVersions, selectedFilters.selectedCountries, selectedFilters.selectedNetworkProviders, selectedFilters.selectedNetworkTypes, selectedFilters.selectedNetworkGenerations, selectedFilters.selectedLocales, selectedFilters.selectedDeviceManufacturers, selectedFilters.selectedDeviceNames, selectedFilters.selectedFreeText, keyId, limit, router)
const result = await fetchSessionsOverviewFromServer(filters, keyId, limit, router)

switch (result.status) {
case SessionsOverviewApiStatus.Error:
Expand All @@ -55,12 +55,12 @@ export default function SessionsOverview({ params }: { params: { teamId: string
}

useEffect(() => {
if (!selectedFilters.ready) {
if (!filters.ready) {
return
}

getSessionsOverview()
}, [paginationRange, selectedFilters]);
}, [paginationRange, filters]);

// Reset pagination range if not in default if any filters change
useEffect(() => {
Expand All @@ -71,7 +71,7 @@ export default function SessionsOverview({ params }: { params: { teamId: string
}

setPaginationRange({ start: 1, end: paginationOffset })
}, [selectedFilters]);
}, [filters]);

return (
<div className="flex flex-col selection:bg-yellow-200/75 items-start p-24 pt-8">
Expand All @@ -96,42 +96,29 @@ export default function SessionsOverview({ params }: { params: { teamId: string
showDeviceManufacturers={true}
showDeviceNames={true}
showFreeText={true}
onFiltersChanged={(updatedFilters) => setSelectedFilters(updatedFilters)} />
onFiltersChanged={(updatedFilters) => setFilters(updatedFilters)} />
<div className="py-4" />

{/* Error state for sessions fetch */}
{selectedFilters.ready
{filters.ready
&& sessionsOverviewApiStatus === SessionsOverviewApiStatus.Error
&& <p className="text-lg font-display">Error fetching list of sessions, please change filters, refresh page or select a different app to try again</p>}

{/* Empty state for sessions fetch */}
{selectedFilters.ready
{filters.ready
&& sessionsOverviewApiStatus === SessionsOverviewApiStatus.Success
&& (sessionsOverview.results === null || sessionsOverview.results.length === 0)
&& <p className="text-lg font-display">It seems there are no sessions for the current combination of filters. Please change filters to try again</p>}

{/* Main sessions list UI */}
{selectedFilters.ready
{filters.ready
&& (sessionsOverviewApiStatus === SessionsOverviewApiStatus.Success || sessionsOverviewApiStatus === SessionsOverviewApiStatus.Loading)
&& sessionsOverview.results !== null
&& sessionsOverview.results.length > 0 &&
<div className="flex flex-col items-center w-full">
<div className="py-4" />
<SessionsOverviewPlot
appId={selectedFilters.selectedApp.id}
startDate={selectedFilters.selectedStartDate}
endDate={selectedFilters.selectedEndDate}
appVersions={selectedFilters.selectedVersions}
sessionType={selectedFilters.selectedSessionType}
osVersions={selectedFilters.selectedOsVersions}
countries={selectedFilters.selectedCountries}
networkProviders={selectedFilters.selectedNetworkProviders}
networkTypes={selectedFilters.selectedNetworkTypes}
networkGenerations={selectedFilters.selectedNetworkGenerations}
locales={selectedFilters.selectedLocales}
deviceManufacturers={selectedFilters.selectedDeviceManufacturers}
deviceNames={selectedFilters.selectedDeviceNames}
freeText={selectedFilters.selectedFreeText} />
filters={filters} />
<div className="py-4" />
<div className='self-end'>
<Paginator prevEnabled={sessionsOverview.meta.previous} nextEnabled={sessionsOverview.meta.next} displayText={paginationRange.start + ' - ' + paginationRange.end}
Expand Down
Loading