diff --git a/client/web/compose/src/mixins/listHelpers.js b/client/web/compose/src/mixins/listHelpers.js
index f91db383f..7cc9edaf6 100644
--- a/client/web/compose/src/mixins/listHelpers.js
+++ b/client/web/compose/src/mixins/listHelpers.js
@@ -10,7 +10,7 @@ export default {
filter: {},
pagination: {
- limit: 10,
+ limit: 12,
pageCursor: undefined,
prevPage: '',
nextPage: '',
@@ -123,9 +123,13 @@ export default {
}, 300),
encodeListParams () {
- const { sortBy, sortDesc } = this.sorting
+ let { sortBy, sortDesc } = this.sorting
const { limit, pageCursor } = this.pagination
+ if (sortBy === 'changedAt') {
+ sortBy = 'coalesce(deletedAt, updatedAt, createdAt)'
+ }
+
const sort = sortBy ? `${sortBy} ${sortDesc ? 'DESC' : 'ASC'}` : undefined
return {
diff --git a/client/web/compose/src/views/Admin/Charts/List.vue b/client/web/compose/src/views/Admin/Charts/List.vue
index 614438bcc..f1a97f1ea 100644
--- a/client/web/compose/src/views/Admin/Charts/List.vue
+++ b/client/web/compose/src/views/Admin/Charts/List.vue
@@ -92,8 +92,8 @@
/>
-
- {{ (item.updatedAt || item.createdAt) | locFullDateTime }}
+
+ {{ (item.deletedAt || item.updatedAt || item.createdAt) | locFullDateTime }}
@@ -159,15 +159,18 @@ export default {
return [
{
key: 'name',
+ label: this.$t('chart.columns.name'),
sortable: true,
tdClass: 'text-nowrap',
},
{
key: 'handle',
+ label: this.$t('chart.columns.handle'),
sortable: true,
},
{
- key: 'updatedAt',
+ key: 'changedAt',
+ label: this.$t('chart.columns.changedAt'),
sortable: true,
class: 'text-right text-nowrap',
},
diff --git a/client/web/compose/src/views/Admin/Modules/List.vue b/client/web/compose/src/views/Admin/Modules/List.vue
index 44d67334b..eeb9fa995 100644
--- a/client/web/compose/src/views/Admin/Modules/List.vue
+++ b/client/web/compose/src/views/Admin/Modules/List.vue
@@ -145,8 +145,8 @@
-
- {{ (item.updatedAt || item.createdAt) | locFullDateTime }}
+
+ {{ (item.deletedAt || item.updatedAt || item.createdAt) | locFullDateTime }}
@@ -214,15 +214,18 @@ export default {
return [
{
key: 'name',
+ label: this.$t('list.columns.name'),
sortable: true,
tdClass: 'text-nowrap',
},
{
key: 'handle',
+ label: this.$t('list.columns.handle'),
sortable: true,
},
{
- key: 'updatedAt',
+ key: 'changedAt',
+ label: this.$t('list.columns.changedAt'),
sortable: true,
class: 'text-right text-nowrap',
},
diff --git a/client/web/compose/src/views/Namespace/Manage.vue b/client/web/compose/src/views/Namespace/Manage.vue
index e2e7e5aba..b704fdb9e 100644
--- a/client/web/compose/src/views/Namespace/Manage.vue
+++ b/client/web/compose/src/views/Namespace/Manage.vue
@@ -83,18 +83,15 @@
/>
-
- {{ item.name }}
-
- {{ $t('disabled') }}
-
+
+
+
-
- {{ (item.updatedAt || item.createdAt) | locFullDateTime }}
+
+ {{ (item.deletedAt || item.updatedAt || item.createdAt) | locFullDateTime }}
@@ -124,13 +121,17 @@ export default {
return {
primaryKey: 'namespaceID',
+ pagination: {
+ limit: 13,
+ },
+
filter: {
query: '',
},
sorting: {
- sortBy: 'createdAt',
- sortDesc: true,
+ sortBy: 'name',
+ sortDesc: false,
},
}
},
@@ -172,14 +173,24 @@ export default {
{
key: 'slug',
sortable: true,
+ label: this.$t('table.columns.slug'),
class: 'text-nowrap',
- label: this.$t('table.columns.handle'),
},
{
- key: 'updatedAt',
+ key: 'enabled',
+ label: this.$t('table.columns.enabled'),
+ class: 'text-center',
+ },
+ {
+ key: 'changedAt',
sortable: true,
- class: 'text-nowrap',
- label: this.$t('table.columns.last-change'),
+ label: this.$t('table.columns.changedAt'),
+ class: 'text-right text-nowrap',
+ },
+ {
+ key: 'actions',
+ label: '',
+ tdClass: 'text-right text-nowrap',
},
]
},
diff --git a/client/web/reporter/src/mixins/listHelpers.js b/client/web/reporter/src/mixins/listHelpers.js
index f91db383f..7cc9edaf6 100644
--- a/client/web/reporter/src/mixins/listHelpers.js
+++ b/client/web/reporter/src/mixins/listHelpers.js
@@ -10,7 +10,7 @@ export default {
filter: {},
pagination: {
- limit: 10,
+ limit: 12,
pageCursor: undefined,
prevPage: '',
nextPage: '',
@@ -123,9 +123,13 @@ export default {
}, 300),
encodeListParams () {
- const { sortBy, sortDesc } = this.sorting
+ let { sortBy, sortDesc } = this.sorting
const { limit, pageCursor } = this.pagination
+ if (sortBy === 'changedAt') {
+ sortBy = 'coalesce(deletedAt, updatedAt, createdAt)'
+ }
+
const sort = sortBy ? `${sortBy} ${sortDesc ? 'DESC' : 'ASC'}` : undefined
return {
diff --git a/client/web/reporter/src/views/Report/List.vue b/client/web/reporter/src/views/Report/List.vue
index c24d768e7..f9d3cb726 100644
--- a/client/web/reporter/src/views/Report/List.vue
+++ b/client/web/reporter/src/views/Report/List.vue
@@ -54,8 +54,8 @@
{{ r.meta.name }}
-
- {{ (item.updatedAt || item.createdAt) | locFullDateTime }}
+
+ {{ (item.deletedAt || item.updatedAt || item.createdAt) | locFullDateTime }}
@@ -122,8 +122,8 @@ export default {
},
sorting: {
- sortBy: 'updatedAt',
- sortDesc: true,
+ sortBy: 'name',
+ sortDesc: false,
},
}
},
@@ -145,14 +145,18 @@ export default {
return [
{
key: 'name',
+ label: this.$t('columns.name'),
+ sortable: true,
tdClass: 'text-nowrap',
},
{
key: 'handle',
+ label: this.$t('columns.handle'),
sortable: true,
},
{
- key: 'updatedAt',
+ key: 'changedAt',
+ label: this.$t('columns.changedAt'),
sortable: true,
class: 'text-right text-nowrap',
},
diff --git a/client/web/workflow/src/mixins/listHelpers.js b/client/web/workflow/src/mixins/listHelpers.js
index f91db383f..0ca2dd7cf 100644
--- a/client/web/workflow/src/mixins/listHelpers.js
+++ b/client/web/workflow/src/mixins/listHelpers.js
@@ -10,7 +10,7 @@ export default {
filter: {},
pagination: {
- limit: 10,
+ limit: 11,
pageCursor: undefined,
prevPage: '',
nextPage: '',
@@ -123,9 +123,13 @@ export default {
}, 300),
encodeListParams () {
- const { sortBy, sortDesc } = this.sorting
+ let { sortBy, sortDesc } = this.sorting
const { limit, pageCursor } = this.pagination
+ if (sortBy === 'changedAt') {
+ sortBy = 'coalesce(deletedAt, updatedAt, createdAt)'
+ }
+
const sort = sortBy ? `${sortBy} ${sortDesc ? 'DESC' : 'ASC'}` : undefined
return {
diff --git a/client/web/workflow/src/views/Workflow/List.vue b/client/web/workflow/src/views/Workflow/List.vue
index 0788e54f8..00ed4d874 100644
--- a/client/web/workflow/src/views/Workflow/List.vue
+++ b/client/web/workflow/src/views/Workflow/List.vue
@@ -130,8 +130,8 @@
/>
-
- {{ (item.updatedAt || item.createdAt) | locFullDateTime }}
+
+ {{ (item.deletedAt || item.updatedAt || item.createdAt) | locFullDateTime }}
@@ -212,17 +212,19 @@ export default {
return [
{
key: 'handle',
- label: this.$t('general:name'),
+ label: this.$t('general:columns.name'),
sortable: true,
tdClass: 'text-nowrap',
},
{
key: 'enabled',
+ label: this.$t('general:columns.enabled'),
sortable: true,
class: 'text-center',
},
{
key: 'steps',
+ label: this.$t('general:columns.steps'),
tdClass: 'align-middle',
class: 'text-center',
formatter: steps => {
@@ -230,7 +232,8 @@ export default {
},
},
{
- key: 'updatedAt',
+ key: 'changedAt',
+ label: this.$t('general:columns.changedAt'),
sortable: true,
class: 'text-right text-nowrap',
},
diff --git a/locale/en/corteza-webapp-compose/block.yaml b/locale/en/corteza-webapp-compose/block.yaml
index e55cb8c28..6d6dd70da 100644
--- a/locale/en/corteza-webapp-compose/block.yaml
+++ b/locale/en/corteza-webapp-compose/block.yaml
@@ -71,6 +71,10 @@ chart:
addGauge: Gauge chart
addGeneric: Generic chart
createFailed: Could not create a chart
+ columns:
+ name: Name
+ handle: Handle
+ changedAt: Last change
configure:
label: Configure chart
reportLabel: Report {{l}}
diff --git a/locale/en/corteza-webapp-compose/module.yaml b/locale/en/corteza-webapp-compose/module.yaml
index b4c20e227..bbcd1f3f0 100644
--- a/locale/en/corteza-webapp-compose/module.yaml
+++ b/locale/en/corteza-webapp-compose/module.yaml
@@ -193,6 +193,12 @@ newPlaceholder: Name used on the list of modules
noModule: No modules
noModuleFilter: No module matches your search
+list:
+ columns:
+ name: Name
+ handle: Handle
+ changedAt: Last change
+
recordPage:
create: Create record page
edit: Edit record page
diff --git a/locale/en/corteza-webapp-compose/namespace.yaml b/locale/en/corteza-webapp-compose/namespace.yaml
index 4317478e9..cf8201122 100644
--- a/locale/en/corteza-webapp-compose/namespace.yaml
+++ b/locale/en/corteza-webapp-compose/namespace.yaml
@@ -73,3 +73,5 @@ manage:
sidebar:
configure: Namespace pages
hide: Hide sidebar on namespace public pages
+ slug: Short name
+ enabled: Enabled
diff --git a/locale/en/corteza-webapp-reporter/list.yaml b/locale/en/corteza-webapp-reporter/list.yaml
index 42e843306..1c8f0325d 100644
--- a/locale/en/corteza-webapp-reporter/list.yaml
+++ b/locale/en/corteza-webapp-reporter/list.yaml
@@ -9,3 +9,7 @@ title: Reports
tooltip:
permissions: Report permissions
untitledTitle: Untitled report
+columns:
+ name: Name
+ handle: Handle
+ changedAt: Last change
diff --git a/locale/en/corteza-webapp-workflow/general.yaml b/locale/en/corteza-webapp-workflow/general.yaml
index c869fe613..d1d509a08 100644
--- a/locale/en/corteza-webapp-workflow/general.yaml
+++ b/locale/en/corteza-webapp-workflow/general.yaml
@@ -46,3 +46,8 @@ resourceList:
tooltip:
permissions: Workflow permissions
+columns:
+ name: Name
+ enabled: Enabled
+ steps: Steps
+ changedAt: Last change