From a0b128676bea38bc426171bf89ccb1376dd901cc Mon Sep 17 00:00:00 2001
From: Kelani Tolulope <kelanik8@gmail.com>
Date: Fri, 14 Apr 2023 14:44:47 +0100
Subject: [PATCH 1/3] Fix sortlng for admin automation sessions list

---
 client/web/admin/src/views/Automation/Session/List.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client/web/admin/src/views/Automation/Session/List.vue b/client/web/admin/src/views/Automation/Session/List.vue
index 448276803..b21711d28 100644
--- a/client/web/admin/src/views/Automation/Session/List.vue
+++ b/client/web/admin/src/views/Automation/Session/List.vue
@@ -93,7 +93,6 @@ export default {
       filter: {
         status: undefined,
         completed: 1,
-        sort: 'createdAt DESC',
       },
 
       sorting: {

From 7fcfb40d2e888ea7a540876c9f5c7a5d0fa5d775 Mon Sep 17 00:00:00 2001
From: Vivek Patel <ervicpatelwork@gmail.com>
Date: Wed, 19 Apr 2023 17:56:31 +0530
Subject: [PATCH 2/3] Fix issue with session list

It fixes issue of sorting and pagination for the status column due to Its stringify interpretation.
---
 server/automation/rest/session.go |  8 ++++++++
 server/pkg/filter/pagination.go   | 10 +++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/server/automation/rest/session.go b/server/automation/rest/session.go
index 6f0e7b252..29982b396 100644
--- a/server/automation/rest/session.go
+++ b/server/automation/rest/session.go
@@ -67,6 +67,14 @@ func (ctrl Session) List(ctx context.Context, r *request.SessionList) (interface
 		return nil, err
 	}
 
+	// fixes issue with sorting of status column and pagination
+	// need to improve on cursor for this
+	if f.Paging.PageCursor != nil {
+		for _, status := range r.Status {
+			f.Paging.PageCursor.Set("status", status, false)
+		}
+	}
+
 	f.IncTotal = r.IncTotal
 
 	if f.Sorting, err = filter.NewSorting(r.Sort); err != nil {
diff --git a/server/pkg/filter/pagination.go b/server/pkg/filter/pagination.go
index 512b3ef15..473d5b3a8 100644
--- a/server/pkg/filter/pagination.go
+++ b/server/pkg/filter/pagination.go
@@ -252,7 +252,7 @@ func (p *PagingCursor) UnmarshalJSON(in []byte) error {
 		}
 	}
 
-	if err := json.Unmarshal(in, &aux); err != nil {
+	if err = json.Unmarshal(in, &aux); err != nil {
 		return err
 	}
 
@@ -287,10 +287,10 @@ func (p *PagingCursor) Decode(cursor string) error {
 }
 
 // Sort returns:
-//  - sort if cursor is nil
-//  - sort from cursor when sort is empty
-//  - sort from cursor when sort is compatible with cursor
-//  - error if sort & cursor are incompatible
+//   - sort if cursor is nil
+//   - sort from cursor when sort is empty
+//   - sort from cursor when sort is compatible with cursor
+//   - error if sort & cursor are incompatible
 func (p *PagingCursor) Sort(sort SortExprSet) (SortExprSet, error) {
 	if p == nil {
 		return sort, nil

From a386fa420b01026de7ab9ca0ac52749cb4e965f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C5=BEe=20Fortun?= <joze.fortun@gmail.com>
Date: Tue, 18 Apr 2023 11:51:04 +0200
Subject: [PATCH 3/3] Adjust admin automation sessions UI/UX

---
 .../admin/src/themes/corteza-base/custom.scss |  7 +-
 .../src/views/Automation/Scripts/Index.vue    |  1 +
 .../src/views/Automation/Session/List.vue     | 86 ++++++++++++++++---
 .../src/views/System/Actionlog/Index.vue      |  3 +-
 lib/vue/src/components/input/CInputSearch.vue |  6 +-
 .../components/resourceList/CResourceList.vue | 11 ++-
 6 files changed, 93 insertions(+), 21 deletions(-)

diff --git a/client/web/admin/src/themes/corteza-base/custom.scss b/client/web/admin/src/themes/corteza-base/custom.scss
index e9110150d..7d563d029 100644
--- a/client/web/admin/src/themes/corteza-base/custom.scss
+++ b/client/web/admin/src/themes/corteza-base/custom.scss
@@ -59,7 +59,12 @@ th {
 
 // custom height for resource lists with buttons
 .custom-resource-list-height {
-  height: calc(100vh - 115px);
+  height: calc(100vh - 120px);
+}
+
+// custom height for resource lists without buttons
+.custom-resource-list-height-no-buttons {
+  height: calc(100vh - 105px);
 }
 
 // to remove the gap on top of the sticky header table
diff --git a/client/web/admin/src/views/Automation/Scripts/Index.vue b/client/web/admin/src/views/Automation/Scripts/Index.vue
index 920dcce96..6d0f3acbe 100644
--- a/client/web/admin/src/views/Automation/Scripts/Index.vue
+++ b/client/web/admin/src/views/Automation/Scripts/Index.vue
@@ -1,5 +1,6 @@
 <template>
   <b-container
+    fluid="xl"
     class="d-flex flex-column h-100 py-3"
   >
     <c-content-header
diff --git a/client/web/admin/src/views/Automation/Session/List.vue b/client/web/admin/src/views/Automation/Session/List.vue
index b21711d28..51f45022c 100644
--- a/client/web/admin/src/views/Automation/Session/List.vue
+++ b/client/web/admin/src/views/Automation/Session/List.vue
@@ -1,6 +1,7 @@
 <template>
   <b-container
     fluid="xl"
+    class="d-flex flex-column h-100 py-3"
   >
     <c-content-header
       :title="$t('title')"
@@ -25,17 +26,45 @@
       }"
       sticky-header
       hide-search
-      class="custom-resource-height"
+      hide-total
+      class="custom-resource-list-height-no-buttons"
     >
       <template #header>
-        <c-resource-list-status-filter
-          v-model="filter.completed"
-          :label="$t('filterForm.inProgress.label')"
-          :excluded-label="$t('filterForm.excluded.label')"
-          :inclusive-label="$t('filterForm.inclusive.label')"
-          :exclusive-label="$t('filterForm.exclusive.label')"
-          @change="filterList"
-        />
+        <b-row>
+          <b-col
+            cols="12"
+            sm="5"
+          >
+            <b-form-group
+              :label="$t('columns.sessionID')"
+              label-class="text-primary"
+              class="mb-2"
+            >
+              <c-input-search
+                :value="filter.sessionID"
+                size="sm"
+                @input="filterBySessionID"
+              />
+            </b-form-group>
+          </b-col>
+
+          <b-col
+            cols="12"
+            sm="5"
+          >
+            <b-form-group
+              :label="$t('columns.workflowID')"
+              label-class="text-primary"
+            >
+              <c-input-search
+                :value="filter.workflowID"
+                size="sm"
+                @input="filterByWorkflowID"
+              />
+            </b-form-group>
+          </b-col>
+        </b-row>
+
         <b-form-radio-group
           v-model="filter.status"
           :options="statusOptions"
@@ -49,6 +78,24 @@
         </span>
       </template>
 
+      <template #sessionID="{ item }">
+        <a
+          href="javascript:;"
+          @click="filterBySessionID(item.sessionID)"
+        >
+          {{ item.sessionID }}
+        </a>
+      </template>
+
+      <template #workflowID="{ item }">
+        <a
+          href="javascript:;"
+          @click="filterByWorkflowID(item.workflowID)"
+        >
+          {{ item.workflowID }}
+        </a>
+      </template>
+
       <template #actions="{ item }">
         <b-button
           size="sm"
@@ -67,11 +114,12 @@
 <script>
 import listHelpers from 'corteza-webapp-admin/src/mixins/listHelpers'
 import { components } from '@cortezaproject/corteza-vue'
-const { CResourceList } = components
+const { CResourceList, CInputSearch } = components
 
 export default {
   components: {
     CResourceList,
+    CInputSearch,
   },
 
   mixins: [
@@ -91,7 +139,10 @@ export default {
       editRoute: 'automation.session.edit',
 
       filter: {
-        status: undefined,
+        // Use null not undefined!
+        sessionID: null,
+        workflowID: null,
+        status: null,
         completed: 1,
       },
 
@@ -109,7 +160,6 @@ export default {
         },
         {
           key: 'status',
-          sortable: true,
         },
         {
           key: 'eventType',
@@ -135,7 +185,7 @@ export default {
   computed: {
     statusOptions () {
       return [
-        { value: undefined, text: this.$t('filterForm.all.label') },
+        { value: null, text: this.$t('filterForm.all.label') },
         { value: 0, text: this.$t('filterForm.started.label') },
         { value: 1, text: this.$t('filterForm.prompted.label') },
         { value: 2, text: this.$t('filterForm.suspended.label') },
@@ -153,6 +203,16 @@ export default {
     rowClass (item) {
       return { 'text-primary': item && !!item.completedAt }
     },
+
+    filterBySessionID (sessionID) {
+      this.filter.sessionID = sessionID || null
+      this.filterList()
+    },
+
+    filterByWorkflowID (workflowID) {
+      this.filter.workflowID = workflowID || null
+      this.filterList()
+    },
   },
 }
 </script>
diff --git a/client/web/admin/src/views/System/Actionlog/Index.vue b/client/web/admin/src/views/System/Actionlog/Index.vue
index 121fec281..23c269ded 100644
--- a/client/web/admin/src/views/System/Actionlog/Index.vue
+++ b/client/web/admin/src/views/System/Actionlog/Index.vue
@@ -1,6 +1,7 @@
 <template>
   <b-container
-    class="py-3"
+    fluid="xl"
+    class="d-flex flex-column h-100 py-3"
   >
     <c-content-header
       :title="$t('title')"
diff --git a/lib/vue/src/components/input/CInputSearch.vue b/lib/vue/src/components/input/CInputSearch.vue
index 64de35da5..1c9b023f8 100644
--- a/lib/vue/src/components/input/CInputSearch.vue
+++ b/lib/vue/src/components/input/CInputSearch.vue
@@ -1,5 +1,7 @@
 <template>
-  <b-input-group>
+  <b-input-group
+    :size="size"
+  >
     <b-input
       ref="searchInput"
       data-test-id="input-search"
@@ -10,7 +12,6 @@
       :disabled="disabled"
       :placeholder="placeholder"
       :autocomplete="autocomplete"
-      :size="size"
       class="h-100 pr-0 border-light border-right-0 text-truncate bg-white"
       @update="search"
       @keyup.enter="submitQuery"
@@ -23,6 +24,7 @@
         v-if="showSubmittable"
         variant="link"
         :disabled="disabled"
+        class="py-0"
         :class="{
           'search-icon-border': showSubmittableAndClearable,
           'cursor-default': !isSubmittable
diff --git a/lib/vue/src/components/resourceList/CResourceList.vue b/lib/vue/src/components/resourceList/CResourceList.vue
index 87f59d314..e99ed17f5 100644
--- a/lib/vue/src/components/resourceList/CResourceList.vue
+++ b/lib/vue/src/components/resourceList/CResourceList.vue
@@ -122,7 +122,10 @@
       </b-table>
     </b-card-body>
 
-    <template #footer>
+    <template
+      v-if="showFooter"
+      #footer
+    >
       <div
         class="d-flex align-items-center justify-content-between"
       >
@@ -138,7 +141,7 @@
         </div>
 
         <b-button-group
-          v-if="showPagination"
+          v-if="!hidePagination"
         >
           <b-button
             :disabled="!hasPrevPage"
@@ -328,8 +331,8 @@ export default {
       return !!this.pagination.nextPage
     },
 
-    showPagination () {
-      return !this.hidePagination && (this.hasPrevPage || this.hasNextPage)
+    showFooter () {
+      return !(this.hideTotal && this.hidePagination)
     }
   },