zaphar/dynamicbible
1
0
Fork 0
mirror of https://gitlab.com/walljm/dynamicbible.git synced 2025-07-25 08:19:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Dont assume saved pages is not null in the state

Browse Source
This commit is contained in:
Jeremy Wall 2020-08-18 19:48:03 -04:00
parent 0231742800
commit 0aeb891b32
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/src/app/components/add-to-page-modal/add-to-page-modal.component.ts
View File

@ -13,7 +13,7 @@ import { CardItem } from '../../models/card-state';
export class AddToPageModalComponent { export class AddToPageModalComponent {
form: FormGroup; form: FormGroup;
title: string; title: string;
pages$ = this.appService.select((state) => state.savedPages); pages$ = this.appService.select((state) => (state.savedPages === null ? null : state.savedPages.value));
@ViewChild('pageList') @ViewChild('pageList')
pageList: MatSelectionList; pageList: MatSelectionList;

10
src/src/app/services/app-state-reducer.ts
View File

@ -178,7 +178,7 @@ export function reducer(state: AppState, action: AppAction): AppState {
} }
case 'SAVE_PAGE': { case 'SAVE_PAGE': {
const savedPages = new Storable([ const savedPages = new Storable([
...state.savedPages.value, ...(state.savedPages ? state.savedPages.value : []),
{ {
// create a new saved page object // create a new saved page object
title: action.title, title: action.title,
@ -216,7 +216,7 @@ export function reducer(state: AppState, action: AppAction): AppState {
} }
case 'ADD_CARD_TO_SAVED_PAGE': { case 'ADD_CARD_TO_SAVED_PAGE': {
const savedPages = new Storable([ const savedPages = new Storable([
...state.savedPages.value.map((o) => { ...(state.savedPages ? state.savedPages.value : []).map((o) => {
if (o.id.toString() === action.pageId) { if (o.id.toString() === action.pageId) {
let cards = [] as CardItem[]; let cards = [] as CardItem[];
if (state.settings.value.displaySettings.appendCardToBottom) { if (state.settings.value.displaySettings.appendCardToBottom) {
@ -294,7 +294,7 @@ export function reducer(state: AppState, action: AppAction): AppState {
const savedPages = const savedPages =
state.currentSavedPage !== null state.currentSavedPage !== null
? new Storable( ? new Storable(
state.savedPages.value.map((o) => { (state.savedPages ? state.savedPages.value : []).map((o) => {
if (o === state.currentSavedPage) { if (o === state.currentSavedPage) {
return currentSavedPage; return currentSavedPage;
} }
@ -415,7 +415,7 @@ export function reducer(state: AppState, action: AppAction): AppState {
]); ]);
const savedPages = new Storable<SavedPage[]>([ const savedPages = new Storable<SavedPage[]>([
...state.savedPages.value.map((sp) => { ...(state.savedPages ? state.savedPages.value : []).map((sp) => {
return { return {
...sp, ...sp,
queries: sp.queries.map((o) => { queries: sp.queries.map((o) => {
@ -457,7 +457,7 @@ export function reducer(state: AppState, action: AppAction): AppState {
const notes = new Storable<NoteItem[]>([...state.notes.value.filter((o) => o.id !== action.note.id)]); const notes = new Storable<NoteItem[]>([...state.notes.value.filter((o) => o.id !== action.note.id)]);
const savedPages = new Storable<SavedPage[]>([ const savedPages = new Storable<SavedPage[]>([
...state.savedPages.value.map((sp) => { ...(state.savedPages ? state.savedPages.value : []).map((sp) => {
return { return {
...sp, ...sp,
queries: sp.queries.filter((o) => { queries: sp.queries.filter((o) => {