-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/src/Resources/app/administration/src/main.js b/src/Resources/app/administration/src/main.js
index d648f31..a2ef49d 100644
--- a/src/Resources/app/administration/src/main.js
+++ b/src/Resources/app/administration/src/main.js
@@ -1,3 +1,4 @@
+import './mixins/nosto-scheduler-utils';
import './component/nosto-entity-listing';
import './component/nosto-job-status-badge';
import './module/nosto-job';
diff --git a/src/Resources/app/administration/src/mixins/nosto-scheduler-utils.js b/src/Resources/app/administration/src/mixins/nosto-scheduler-utils.js
new file mode 100644
index 0000000..9138dfd
--- /dev/null
+++ b/src/Resources/app/administration/src/mixins/nosto-scheduler-utils.js
@@ -0,0 +1,9 @@
+const { Mixin, Utils } = Shopware;
+
+Mixin.register('nosto-scheduler-utils', {
+ methods: {
+ formatDate(date) {
+ return Utils.format.date(date);
+ },
+ },
+});
diff --git a/src/Resources/app/administration/src/module/nosto-job/page/nosto-job-listing-index/index.js b/src/Resources/app/administration/src/module/nosto-job/page/nosto-job-listing-index/index.js
index a620cda..22e8288 100644
--- a/src/Resources/app/administration/src/module/nosto-job/page/nosto-job-listing-index/index.js
+++ b/src/Resources/app/administration/src/module/nosto-job/page/nosto-job-listing-index/index.js
@@ -2,7 +2,7 @@ import template from './nosto-job-listing-index.html.twig';
import JobHelper from '../../../../util/job.helper';
import './nosto-job-listing-index.scss';
-const { Component } = Shopware;
+const { Component, Mixin } = Shopware;
const { Criteria } = Shopware.Data;
/** @private */
@@ -17,7 +17,8 @@ Component.register('nosto-job-listing-index', {
],
mixins: [
- 'notification',
+ Mixin.getByName('notification'),
+ Mixin.getByName('nosto-scheduler-utils'),
],
props: {
diff --git a/src/Resources/app/administration/src/module/nosto-job/page/nosto-job-listing-index/nosto-job-listing-index.html.twig b/src/Resources/app/administration/src/module/nosto-job/page/nosto-job-listing-index/nosto-job-listing-index.html.twig
index 4ce00f1..1fef761 100644
--- a/src/Resources/app/administration/src/module/nosto-job/page/nosto-job-listing-index/nosto-job-listing-index.html.twig
+++ b/src/Resources/app/administration/src/module/nosto-job/page/nosto-job-listing-index/nosto-job-listing-index.html.twig
@@ -3,11 +3,11 @@
{% block nosto_scheduler_job_view_mode %}
-
+
{{ option.name }}
-
+
{{ $tc('job-listing.page.listing.index.status') }}
{{ $tc('job-listing.page.listing.index.job-type') }}
@@ -15,21 +15,24 @@
{% block nosto_scheduler_job_auto_load_switcher %}
-
@@ -63,6 +66,7 @@
:allowEdit="false"
:jobTypes="jobTypes"
:isGroupedView="isGroupedView"
+ sortDirection="DESC"
@page-change="pageChange"
:columns="columns">
@@ -80,17 +84,17 @@
{% block nosto_job_list_grid_job_started_date %}
- {{ item.startedAt|date() }}
+ {{ formatDate(item.startedAt) }}
{% endblock %}
{% block nosto_job_list_grid_job_finished_date %}
- {{ item.finishedAt|date() }}
+ {{ formatDate(item.finishedAt) }}
{% endblock %}
{% block nosto_job_list_grid_job_created_date %}
- {{ item.createdAt|date() }}
+ {{ formatDate(item.createdAt) }}
{% endblock %}
diff --git a/src/Resources/config/routes.xml b/src/Resources/config/routes.xml
index d22770f..89eb805 100644
--- a/src/Resources/config/routes.xml
+++ b/src/Resources/config/routes.xml
@@ -4,5 +4,5 @@
xsi:schemaLocation="http://symfony.com/schema/routing
https://symfony.com/schema/routing/routing-1.0.xsd">
- n.parts.length&&(s.parts.length=n.parts.length)}else{var a=[];for(o=0;o\n {{ $tc(\'global.sw-bulk-edit-modal.bulkEdit\') }}\n \n {% endblock %}\n\n {% block sw_data_grid_bulk_delete_content %}\n \n \n {{ $tc(\'global.default.delete\') }}\n \n {% endblock %}\n{% endblock %}\n\n{% block sw_data_grid_slot_bulk_modals %}\n {% block sw_data_grid_bulk_edit_modal %}\n \n {% block sw_data_grid_slot_bulk_edit_modal %}\n \n \n \n {{ $tc(\'global.entity-components.deleteMessage\', selectionCount, { count: selectionCount }) }}\n \n
\n\n \n \n \n {{ $tc(\'global.default.cancel\') }}\n \n \n\n \n \n {{ $tc(\'global.default.delete\') }}\n \n \n \n \n {% endblock %}\n{% endblock %}\n\n{% block sw_data_grid_slot_actions %}\n \n \n{% endblock %}\n',inject:["NostoRescheduleService","repositoryFactory","filterFactory","feature"],mixins:["notification"],props:{isGroupedView:{type:Boolean,required:!1,default:!1},jobTypes:{type:Array,required:!1,default:function(){return[]}},filterCriteria:{type:Array,required:!1,default:function(){return[]}}},data:function(){return{jobItems:null,isLoading:!1,reloadInterval:null,showJobInfoModal:!1,showJobSubsModal:!1,currentJobID:null,showMessagesModal:!1,currentJobMessages:null,groupCreationDate:{},sortType:"status",jobDisplayType:null,autoLoad:!1,autoLoadIsActive:!1,autoReloadInterval:6e4}},computed:{jobRepository:function(){return this.repositoryFactory.create("nosto_scheduler_job")},messageRepository:function(){return this.repositoryFactory.create("nosto_scheduler_job_message")},columns:function(){return[{property:"name",label:this.$tc("job-listing.page.listing.grid.column.name"),allowResize:!0,width:"250px"},{property:"status",label:this.$tc("job-listing.page.listing.grid.column.status"),allowResize:!0,width:"150px"},{property:"startedAt",label:this.$tc("job-listing.page.listing.grid.column.started-at"),allowResize:!0,width:"170px",sortable:!0},{property:"finishedAt",label:this.$tc("job-listing.page.listing.grid.column.finished-at"),allowResize:!0,width:"170px"},{property:"createdAt",label:this.$tc("job-listing.page.listing.grid.column.created-at"),allowResize:!0,width:"170px"},{property:"subJobs",label:this.$tc("job-listing.page.listing.grid.column.child-jobs"),allowResize:!0,width:"250px",visible:!0,sortable:!1},{property:"messages",label:this.$tc("job-listing.page.listing.grid.column.messages"),allowResize:!0,width:"250px",visible:!0,sortable:!1}]},jobDisplayMode:function(){return[{name:this.$tc("job-listing.page.listing.index.list"),value:"list"},{name:this.$tc("job-listing.page.listing.index.grouped"),value:"grouped"},{name:this.$tc("job-listing.page.listing.index.chart"),value:"chart"}]}},watch:{autoLoadIsActive:function(){this._handleAutoReload(this.autoLoadIsActive)},jobDisplayType:function(){this.stopAutoLoading(),this.$emit("job-display-type-changed",this.jobDisplayType)},filterCriteria:function(){this.filterCriteriaChanged(this.filterCriteria)}},created:function(){this.createdComponent()},beforeDestroy:function(){clearInterval(this.reloadInterval)},methods:{createdComponent:function(){this.jobDisplayType="list",this.getList()},filterCriteriaChanged:function(e){this.getList(e)},_handleAutoReload:function(e){var t=this;e&&this.autoReloadInterval>0?"list"===this.jobDisplayType?this.reloadInterval=setInterval((function(){t.updateList()}),this.autoReloadInterval):"grouped"===this.jobDisplayType?this.reloadInterval=setInterval((function(){t.$refs.jobGroups.initGroupedView()}),this.autoReloadInterval):"chart"===this.jobDisplayType&&(this.reloadInterval=setInterval((function(){t.$refs.jobCharts.initChartData()}),this.autoReloadInterval)):clearInterval(this.reloadInterval)},pageChange:function(){this.autoLoadIsActive=!1,clearInterval(this.reloadInterval)},getLinkParams:function(e){return{id:e.id,backPath:this.$route.name}},updateList:function(e){var t=this,n=new u;return n.addFilter(u.equals("parentId",null)),n.addSorting(u.sort("createdAt","DESC",!1)),n.addAssociation("messages"),n.addAssociation("subJobs"),e&&e.forEach((function(e){n.addFilter(e)})),this.jobTypes!==[]&&n.addFilter(u.equalsAny("type",this.jobTypes)),this.jobRepository.search(n,Shopware.Context.api).then((function(e){t.jobItems=c.sortMessages(e)}))},getMessagesCount:function(e,t){return e.messages.filter((function(e){return e.type==="".concat(t,"-message")})).length},getChildrenCount:function(e,t){return e.subJobs.filter((function(e){return e.status===t})).length},getList:function(e){var t=this;this.isLoading=!0,this.updateList(e).then((function(){t.isLoading=!1}))},onRefresh:function(e){return"grouped"===this.jobDisplayType?this.$refs.jobGroups.onRefresh():"chart"===this.jobDisplayType?this.$refs.jobCharts.onRefresh():this.getList(e)},canDelete:function(e){return-1!==["error","succeed"].indexOf(e.status)},onDeleteJob:function(e){var t=this;this.jobRepository.delete(e,Shopware.Context.api).then((function(){t.updateList()}))},rescheduleJob:function(e){var t=this;this.NostoRescheduleService.rescheduleJob(e).then((function(){t.createNotificationSuccess({message:"Job has been rescheduled successfully."}),t.updateList()})).catch((function(){t.createNotificationError({message:"Unable reschedule job."})}))},showSubJobs:function(e){this.currentJobID=e,this.showJobSubsModal=!0},showJobMessages:function(e){this.currentJobMessages=e.messages,this.showMessagesModal=!0},stopAutoLoading:function(){this.autoLoadIsActive=!1,clearInterval(this.reloadInterval)}}});var b=n("HzdX"),m=n("WYcQ");function g(e){return(g="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function p(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function f(e,t){for(var n=0;n