[WIP] Broken PageList component.

client/src/components/Page/PageList.vue

@@ -0,0 +1,194 @@
+<template>
+    <div>
+        <b-alert v-bind="alertAttrs">{{ message }}</b-alert>
+        <b-row class="mb-3">
+            <b-col cols="6">
+                <index-filter v-bind="filterAttrs" id="page-search" v-model="filter"> </index-filter>
+            </b-col>
+            <b-col>
+                <PageIndexActions :root="root" class="float-right" />
+            </b-col>
+        </b-row>
+        <b-table :fields="fields" v-model="itemsModel" v-bind="indexTableAttrs">
+            <template v-slot:empty>
+                <loading-span v-if="loading" message="Loading pages" />
+                <b-alert v-else id="no-pages" variant="info" show>
+                    <div v-if="isFiltered">
+                        No matching entries found for: <span class="font-weight-bold">{{ filter }}</span
+                        >.
+                    </div>
+                    <div v-else>No pages found. You may create a new page.</div>
+                </b-alert>
+            </template>
+            <template v-slot:cell(title)="row">
+                <PageDropdown
+                    :page="row.item"
+                    :root="root"
+                    @onAdd="onAdd"
+                    @onRemove="onRemove"
+                    @onUpdate="onUpdate"
+                    @onSuccess="onSuccess"
+                    @onError="onError" />
+            </template>
+            <template v-slot:cell(tags)="row">
+                <Tags
+                    :index="row.index"
+                    :tags="row.item.tags"
+                    @input="onTags"
+                    @tag-click="onTagClick"
+                    :disabled="published" />
+            </template>
+            <template v-slot:cell(published)="row">
+                <SharingIndicators :object="row.item" @filter="(filter) => appendFilter(filter)" />
+            </template>
+            <template v-slot:cell(url)="row">
+                <PageUrl
+                    :root="root"
+                    :owner="row.item.username"
+                    :slug="row.item.slug"
+                    @clickOwner="(username) => appendTagFilter('user', username)" />
+            </template>
+            <template v-slot:cell(update_time)="data">
+                <UtcDate :date="data.value" mode="elapsed" />
+            </template>
+        </b-table>
+        <b-pagination
+            v-model="currentPage"
+            v-if="rows >= perPage"
+            class="gx-pages-grid-pager"
+            v-bind="paginationAttrs"></b-pagination>
+    </div>
+</template>
+<script>
+import _l from "utils/localization";
+import { getAppRoot } from "onload/loadConfig";
+// import { Services } from "./services";
+import { pagesProvider } from "components/providers/PageProvider";
+import Tags from "components/Common/Tags";
+import PageDropdown from "./PageDropdown";
+import UtcDate from "components/UtcDate";
+import paginationMixin from "components/Workflow/paginationMixin";
+import filtersMixin from "components/Indices/filtersMixin";
+import PageIndexActions from "./PageIndexActions";
+import PageUrl from "./PageUrl";
+
+import SharingIndicators from "components/Indices/SharingIndicators";
+
+const helpHtml = `<div>
+<p>This textbox box can be used to filter the pages displayed.
+
+<p>Text entered here will be searched against workflow names and tags. Additionally, advanced
+filtering tags can be used to refine the search more precisely. Tags are of the form
+<code>&lt;tag_name&gt;:&lt;tag_value&gt;</code> or <code>&lt;tag_name&gt;:'&lt;tag_value&gt;'</code>.
+For instance to search just for RNAseq in the workflow name, <code>name:rnsseq</code> can be used.
+Notice by default the search is not case-sensitive.
+
+If the quoted version of tag is used, the search is not case sensitive and only full matches will be
+returned. So <code>name:'RNAseq'</code> would show only pages named exactly <code>RNAseq</code>.
+
+<p>The available tags are:
+<dl>
+    <dt><code>title</code></dt>
+    <dd>This filters only against the page title.</dd>
+    <dt><code>tag</code></dt>
+    <dd>This filters only against the page tag. You may also just click on a tag in your list of workflows to filter on that tag using this directly.</dd>
+    <dt><code>is:published</code></dt>
+    <dd>This filters the workflows such that only published workflows are shown. You may also just click on the "published" icon of a worklfow in your list to filter on this directly.</dd>
+    <dt><code>is:shared</code></dt>
+    <dd>This filters the workflows such that only workflows shared from another user directly with you are are shown. You may also just click on the "shared with me" icon of a worklfow in your list to filter on this directly.</dd>
+</dl>
+</div>
+`;
+
+const TITLE_FIELD = { key: "title", label: _l("Title"), sortable: true };
+const TAGS_FIELD = { key: "tags", label: _l("Tags"), sortable: false };
+const URL_FIELD = { key: "url", label: _l("Public URL"), sortable: false };
+const UPDATED_FIELD = { label: _l("Updated"), key: "update_time", sortable: true };
+const SHARING_FIELD = { label: _l("Sharing"), key: "published", sortable: false };
+// const OWNER_FIELD = { key: "owner", label: _l("Owner"), sortable: true };
+
+const PERSONAL_FIELDS = [TITLE_FIELD, URL_FIELD, TAGS_FIELD, UPDATED_FIELD, SHARING_FIELD];
+const PUBLISHED_FIELDS = [TITLE_FIELD, URL_FIELD, TAGS_FIELD, UPDATED_FIELD];
+
+export default {
+    components: {
+        UtcDate,
+        Tags,
+        PageIndexActions,
+        SharingIndicators,
+        PageDropdown,
+        PageUrl,
+    },
+    props: {
+        published: {
+            // Render the published workflows version of this grid.
+            type: Boolean,
+            default: true,
+        },
+    },
+    mixins: [paginationMixin, filtersMixin],
+    data() {
+        const fields = this.published ? PUBLISHED_FIELDS : PERSONAL_FIELDS;
+        const implicitFilter = this.published ? "is:published" : null;
+        return {
+            tableId: "page-table",
+            fields: fields,
+            titleSearch: _l("Search Pages"),
+            itemsModel: [],
+            items: [],
+            helpHtml: helpHtml,
+            perPage: this.rowsPerPage(this.defaultPerPage || 50),
+            dataProvider: pagesProvider,
+            implicitFilter: implicitFilter,
+        };
+    },
+    created() {
+        this.root = getAppRoot();
+        // this.services = new Services({ root: this.root });
+    },
+    watch: {
+        filter(val) {
+            this.refresh();
+        },
+    },
+    computed: {
+        dataProviderParameters() {
+            const extraParams = { search: this.effectiveFilter };
+            if (this.published) {
+                extraParams.show_published = true;
+                extraParams.show_shared = false;
+            }
+            return extraParams;
+        },
+    },
+    methods: {
+        onTags: function (tags, index) {
+            const workflow = this.itemsModel[index];
+            workflow.tags = tags;
+            this.services
+                .updateWorkflow(workflow.id, {
+                    tags: workflow.tags,
+                })
+                .catch((error) => {
+                    this.onError(error);
+                });
+        },
+        onTagClick: function (tag) {
+            this.appendTagFilter("tag", tag.text);
+        },
+        onAdd: function (workflow) {
+            if (this.currentPage == 1) {
+                this.refresh();
+            } else {
+                this.currentPage = 1;
+            }
+        },
+        onRemove: function (id) {
+            this.refresh();
+        },
+        onUpdate: function (id, data) {
+            this.refresh();
+        },
+    },
+};
+</script>

client/src/entry/analysis/router.js

@@ -22,9 +22,9 @@ import DatasetError from "components/DatasetInformation/DatasetError";
 import DatasetList from "components/Dataset/DatasetList";
 import DisplayStructured from "components/DisplayStructured";
 import FormGeneric from "components/Form/FormGeneric";
-import Grid from "components/Grid/Grid";
 import GridShared from "components/Grid/GridShared";
 import GridHistory from "components/Grid/GridHistory";
+import PageList from "components/Page/PageList";
 import HistoryImport from "components/HistoryImport";
 import HistoryView from "components/HistoryView";
 import HistoryInvocations from "components/Workflow/HistoryInvocations";
@@ -254,11 +254,9 @@ export function getRouter(Galaxy) {
                     },
                     {
                         path: "pages/:actionId",
-                        component: GridShared,
+                        component: PageList,
                         props: (route) => ({
-                            actionId: route.params.actionId,
-                            item: "page",
-                            plural: "Pages",
+                            published: route.props.actionId == "list_published" ? "shared" : "user",
                         }),
                     },
                     {

client/src/utils/navigation/navigation.yml

@@ -458,6 +458,8 @@ pages:
     submit: '#submit'
     export: '.markdown-pdf-export'
     dropdown: '[data-page-dropdown*="${id}"]'
+    index_table: "#page-table"
+    index_rows: "#page-table > tbody > tr:not(.b-table-empty-row, [style*='display: none'])"
 
   editor:
     selectors:

lib/galaxy/model/__init__.py

@@ -8877,6 +8877,8 @@ class Page(Base, Dictifiable, RepresentById):
         "importable",
         "deleted",
         "username",
+        "create_time",
+        "update_time",
     ]
 
     def to_dict(self, view="element"):

lib/galaxy/schema/schema.py

@@ -3120,6 +3120,8 @@ class PageSummary(PageSummaryBase):
         title="List of revisions",
         description="The history with the encoded ID of each revision of the Page.",
     )
+    create_time: Optional[datetime] = CreateTimeField
+    update_time: Optional[datetime] = UpdateTimeField
 
 
 class PageDetails(PageSummary):

lib/galaxy/selenium/navigates_galaxy.py

@@ -1250,6 +1250,16 @@ def clear_tooltips(self):
         action_chains.move_to_element(center_element).perform()
         self.wait_for_selector_absent_or_hidden(".b-tooltip", wait_type=WAIT_TYPES.UX_POPUP)
 
+    def pages_index_table_elements(self):
+        pages = self.components.pages
+        pages.index_table.wait_for_visible()
+        return pages.index_rows.all()
+
+    def page_index_click_option(self, option_title, page_id):
+        self.components.pages.dropdown(id=page_id).wait_for_and_click()
+        if not self.select_dropdown_item(option_title):
+            raise AssertionError(f"Failed to find page action option with title [{option_title}]")
+
     def workflow_index_open(self):
         self.home()
         self.click_masthead_workflow()

lib/galaxy_test/selenium/test_pages_index.py

@@ -0,0 +1,34 @@
+from .framework import (
+    retry_assertion_during_transitions,
+    selenium_test,
+    SeleniumTestCase,
+)
+
+
+class PagesTestCase(SeleniumTestCase):
+
+    ensure_registered = True
+
+    @selenium_test
+    def test_page_deletion(self):
+        page_response = self.new_page()
+        page_id = page_response["id"]
+        self.navigate_to_pages()
+        self._assert_showing_n_pages(1)
+        self.components.pages.dropdown(id=page_id).wait_for_visible()
+        self.page_index_click_option("Delete", page_id)
+        self.accept_alert()
+        self.components.pages.dropdown(id=page_id).wait_for_absent_or_hidden()
+        self._assert_showing_n_pages(0)
+
+    def new_page(self):
+        slug = self._get_random_name()
+        response = self.dataset_populator.new_page(slug=slug)
+        return response
+
+    @retry_assertion_during_transitions
+    def _assert_showing_n_pages(self, n):
+        actual_count = len(self.pages_index_table_elements())
+        if actual_count != n:
+            message = f"Expected {n} pages to be displayed, based on DOM found {actual_count} page index rows."
+            raise AssertionError(message)