Skip to content
This repository was archived by the owner on Jan 14, 2025. It is now read-only.

Bug/incorrect page state while waiting for periods view data, cleanup #240

Merged
xsalonx merged 5 commits into from
Oct 5, 2023
Merged

Bug/incorrect page state while waiting for periods view data, cleanup #240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bc323e4
no unkown error
xsalonx Oct 3, 2023
847e994
stop using old fetchedDataManager for periods view
xsalonx Oct 3, 2023
2f5a992
cleanup
xsalonx Oct 4, 2023
b8e68e4
cleanup
xsalonx Oct 4, 2023
08c8029
revoke revoked changed, refactor
xsalonx Oct 4, 2023
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
3 changes: 0 additions & 3 deletions app/public/model/navigation/ObsoleteNavigation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,6 @@ export default class Navigation extends Observable {
);
} else {
await this.pageNavigation(url, page);
this.parent.fetchedData.reqForData()
.then(() => {})
.catch(() => {});
}
break;
}
Expand Down
4 changes: 2 additions & 2 deletions app/public/views/periods/overview/periodsPanel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
*/

import periodsContent from './periodsContent.js';
import { waiting, unknown, failureWithMessage } from '../../../components/messagePanel/messages.js';
import { waiting, failureWithMessage } from '../../../components/messagePanel/messages.js';

export default function periodsPanel(periodsModel, model) {
return periodsModel.currentPagePeriods.match({
NotAsked: () => unknown(periodsModel),
NotAsked: () => waiting(),
Loading: () => waiting(),
Success: () => periodsContent(periodsModel, model),
Failure: (errors) => failureWithMessage(periodsModel, errors),
Expand Down
11 changes: 8 additions & 3 deletions app/public/views/userView/data/dataPanel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,20 @@ const { pageNames } = RCT;
export default function dataPanel(model, runs, detectors, flags) {
const { dataAccess, periods } = model;
const { page, index } = dataAccess.getCurrentDataPointer();
const data = dataAccess.fetchedData[page][index];

// Handling with new API
switch (page) {
case pageNames.periods:
return periodsPanel(periods, model);
}

// Handling with legacy API
const data = dataAccess.fetchedData[page][index];
return data ? data.match({
NotAsked: () => obsoleteUnknown(dataAccess),
Loading: () => waiting(),
Success: () => {
switch (page) {
case pageNames.periods:
return periodsPanel(periods, model);
case pageNames.flags:
return flagsPanel(dataAccess, runs, detectors, flags);
case pageNames.runsPerDataPass:
Expand Down