From 1605be82a3be6fdbc1a8d41c2e099d743cd2c2b1 Mon Sep 17 00:00:00 2001
From: smuddyx <smuddyx@gmail.com>
Date: Sun, 4 Jul 2021 20:17:41 +0200
Subject: [PATCH] fix song sorting in docx

---
 src/app/modules/shows/services/docx.service.ts | 3 ++-
 src/app/modules/shows/services/show.ts         | 2 +-
 src/app/modules/songs/services/song.service.ts | 2 +-
 src/app/modules/songs/services/song.ts         | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/app/modules/shows/services/docx.service.ts b/src/app/modules/shows/services/docx.service.ts
index 960bb2c..2111b10 100644
--- a/src/app/modules/shows/services/docx.service.ts
+++ b/src/app/modules/shows/services/docx.service.ts
@@ -199,7 +199,8 @@ export class DocxService {
         sections,
       };
     });
-    const songs = (await Promise.all(songsAsync)).filter(_ => !!_).map(_ => _ as {showSong: ShowSong; song: Song; sections: Section[]});
+    const songsLoaded = (await Promise.all(songsAsync)).filter(_ => !!_).map(_ => _ as {showSong: ShowSong; sections: Section[]});
+    const songs = show.order.map(_ => songsLoaded.filter(f => f.showSong.id === _)[0]);
     return {songs, show, user, config};
   }
 
diff --git a/src/app/modules/shows/services/show.ts b/src/app/modules/shows/services/show.ts
index 0e23b1a..a1eaac1 100644
--- a/src/app/modules/shows/services/show.ts
+++ b/src/app/modules/shows/services/show.ts
@@ -1,4 +1,4 @@
-import * as firebase from 'firebase';
+import firebase from 'firebase/app';
 import Timestamp = firebase.firestore.Timestamp;
 
 export interface Show {
diff --git a/src/app/modules/songs/services/song.service.ts b/src/app/modules/songs/services/song.service.ts
index 91af449..1ed68ca 100644
--- a/src/app/modules/songs/services/song.service.ts
+++ b/src/app/modules/songs/services/song.service.ts
@@ -4,7 +4,7 @@ import {Song} from './song';
 import {SongDataService} from './song-data.service';
 import {first} from 'rxjs/operators';
 import {UserService} from '../../../services/user/user.service';
-import * as firebase from 'firebase';
+import firebase from 'firebase/app';
 import Timestamp = firebase.firestore.Timestamp;
 
 // declare let importCCLI: any;
diff --git a/src/app/modules/songs/services/song.ts b/src/app/modules/songs/services/song.ts
index b29faf0..c5c2614 100644
--- a/src/app/modules/songs/services/song.ts
+++ b/src/app/modules/songs/services/song.ts
@@ -1,5 +1,5 @@
+import firebase from 'firebase/app';
 import Timestamp = firebase.firestore.Timestamp;
-import * as firebase from 'firebase';
 
 export interface Song {
   id: string;