feat(migrateV1): add basic data for issues

johannesjo · Dec 16, 2018 · 36b02c6 · 36b02c6
1 parent e4252ad
commit 36b02c6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/app/core/migrate/migrate.service.ts b/src/app/core/migrate/migrate.service.ts
@@ -33,7 +33,6 @@ export class MigrateService {
   checkForUpdate() {
     const isMigrated = loadFromLs(LS_IS_V1_MIGRATE);
     const currentProjectData = loadFromLs(STORAGE_CURRENT_PROJECT);
-    console.log(currentProjectData);
 
     if (currentProjectData) {
       this._matDialog.open(DialogConfirmComponent, {
@@ -110,7 +109,6 @@ export class MigrateService {
   private _transformTasks(oldTasks: OldTask[]): EntityState<Task> {
     // remove null entries
     const cleanOldTasks = oldTasks.filter(ot => !!ot);
-    console.log(cleanOldTasks);
 
     const transformedSubTasks = [];
     const transformedMainTasks = cleanOldTasks.map((ot, i) => {
@@ -141,6 +139,8 @@ export class MigrateService {
 
       title: ot.title,
       id: ot.id,
+      issueId: ot.originalId,
+      issueType: ot.originalType,
       isDone: ot.isDone,
       notes: ot.notes,
       subTaskIds: (ot.subTasks && ot.subTasks.length > 0) ? ot.subTasks.map(t => t.id) : [],

diff --git a/src/app/tasks/store/task.selectors.ts b/src/app/tasks/store/task.selectors.ts
@@ -5,7 +5,7 @@ import { TaskWithSubTasks } from '../task.model';
 
 const mapIssueDataToTask = (tasks_, issueEntityMap) => {
   return tasks_ && tasks_.map((task) => {
-    const issueData = (task.issueId && task.issueType) && issueEntityMap[task.issueType][task.issueId];
+    const issueData = (task.issueId && task.issueType) && issueEntityMap[task.issueType] && issueEntityMap[task.issueType][task.issueId];
     return issueData ? {...task, issueData: issueData} : task;
   });
 };