chore(frontend/deps): use ember-data v4.12

adfinis · Aug 16, 2024 · 06b998b · 06b998b
1 parent d2a7bf6
commit 06b998b
Show file tree

Hide file tree

Showing 7 changed files with 174 additions and 121 deletions.
diff --git a/frontend/app/analysis/index/controller.js b/frontend/app/analysis/index/controller.js
@@ -169,8 +169,7 @@ export default class AnalysisController extends QPController {
     this.data.perform();
   }
 
-  @task
-  *prefetchData() {
+  prefetchData = task(async () => {
     const {
       customer: customerId,
       project: projectId,
@@ -179,7 +178,7 @@ export default class AnalysisController extends QPController {
       reviewer: reviewerId,
     } = this.allQueryParams;
 
-    return yield hash({
+    return await hash({
       customer: customerId && this.store.findRecord("customer", customerId),
       project: projectId && this.store.findRecord("project", projectId),
       task: taskId && this.store.findRecord("task", taskId),
@@ -188,7 +187,7 @@ export default class AnalysisController extends QPController {
       billingTypes: this.store.findAll("billing-type"),
       costCenters: this.store.findAll("cost-center"),
     });
-  }
+  });
 
   @enqueueTask
   *data() {

diff --git a/frontend/app/analysis/index/template.hbs b/frontend/app/analysis/index/template.hbs
@@ -4,6 +4,7 @@
   <PagePermission>
     <h1>Analysis</h1>
 
+    {{#unless this.prefetchData.isRunning}}
     <TaskSelection
       @history={{false}}
       @archived={{true}}
@@ -22,9 +23,6 @@
         @onReset={{queue t.clear this.reset}}
         as |fs|
       >
-        {{#if this.prefetchData.isRunning}}
-          <LoadingIcon />
-        {{else}}
           <fs.group @label="Task" @expanded={{true}}>
             <fs.label>
               Customer
@@ -222,9 +220,9 @@
             </fs.label>
 
           </fs.group>
-        {{/if}}
       </FilterSidebar>
     </TaskSelection>
+    {{/unless}}
 
     {{#if this.appliedFilters.length}}
       {{#if (and (not this._dataCache.length) this.data.isRunning)}}

diff --git a/frontend/app/index/activities/controller.js b/frontend/app/index/activities/controller.js
@@ -145,9 +145,7 @@ export default class ActivitiesIndexController extends Controller {
    */
   @action
   generateReportsCheck() {
-    const hasUnknown = !!this.activities.find(
-      (a) => a.task.get("id") === undefined
-    );
+    const hasUnknown = !!this.activities.find((a) => !a.task.get("id"));
     const hasOverlapping = !!this.sortedActivities.find((a) => {
       return a.get("active") && !a.get("from").isSame(moment(), "day");
     });

diff --git a/frontend/app/index/reports/controller.js b/frontend/app/index/reports/controller.js
@@ -29,6 +29,7 @@ export default class IndexReportController extends Controller {
   @tracked notBillable = false;
 
   @tracked showReschedule = false;
+  @tracked checkForEmptyRecord = false;
   @tracked _center;
 
   @service store;
@@ -96,6 +97,7 @@ export default class IndexReportController extends Controller {
 
   @action
   async createEmptyReport() {
+    if (!this.checkForEmptyRecord) return;
     await this.store.createRecord("report", {
       date: this.model,
       user: this.currentUser.user,

diff --git a/frontend/app/index/reports/route.js b/frontend/app/index/reports/route.js
@@ -58,5 +58,6 @@ export default class IndexReportsRoute extends Route {
         this.notify.error("Could not create report");
       }
     }
+    controller.checkForEmptyRecord = true;
   }
 }
diff --git a/frontend/package.json b/frontend/package.json
@@ -71,7 +71,7 @@
     "ember-component-css": "0.8.1",
     "ember-composable-helpers": "5.0.0",
     "ember-concurrency": "^4.0.2",
-    "ember-data": "~4.11.3",
+    "ember-data": "~4.12.8",
     "ember-decorators": "6.1.1",
     "ember-event-helpers": "^0.1.1",
     "ember-fetch": "8.1.2",

diff --git a/frontend/pnpm-lock.yaml b/frontend/pnpm-lock.yaml
-Original file line number
+Diff line change
@@ Expand Up / @@ -58,5 +58,6 @@ export default class IndexReportsRoute extends Route { @@
             this.notify.error("Could not create report");
           }
         }
+        controller.checkForEmptyRecord = true;
       }
     }