diff --git a/assets/src/bundles/vault/vault-table-row.ejs b/assets/src/bundles/vault/vault-table-row.ejs --- a/assets/src/bundles/vault/vault-table-row.ejs +++ b/assets/src/bundles/vault/vault-table-row.ejs @@ -5,7 +5,7 @@ See top-level LICENSE file for more information %> -<% if (cookingTask.object_type === 'directory') { %> +<% if (cookingTask.swhid.match(/^swh:1:dir:.*/)) { %> unknown <% } %> - - <%= cookingTask.object_type %> + + <%= cookingTask.bundle_type %> id: <%= cookingTask.swhid %> diff --git a/cypress/integration/vault.spec.js b/cypress/integration/vault.spec.js --- a/cypress/integration/vault.spec.js +++ b/cypress/integration/vault.spec.js @@ -268,6 +268,10 @@ .should('have.text', this.directory) .should('have.attr', 'href', browseDirectoryUrl); + cy.get(`#vault-task-${CSS.escape(this.directory)}`) + .invoke('attr', 'title') + .should('contain', 'the directory can be extracted'); + cy.get(`#vault-task-${CSS.escape(this.directory)} .vault-dl-link button`) .click(); @@ -352,6 +356,10 @@ .should('have.text', this.revision) .should('have.attr', 'href', browseRevisionUrl); + cy.get(`#vault-task-${CSS.escape(this.revision)}`) + .invoke('attr', 'title') + .should('contain', 'the git repository can be imported'); + cy.get(`#vault-task-${CSS.escape(this.revision)} .vault-dl-link button`) .click(); diff --git a/swh/web/common/utils.py b/swh/web/common/utils.py --- a/swh/web/common/utils.py +++ b/swh/web/common/utils.py @@ -34,14 +34,20 @@ "branch": "mdi mdi-source-branch", "branches": "mdi mdi-source-branch", "content": "mdi mdi-file-document", + "cnt": "mdi mdi-file-document", "directory": "mdi mdi-folder", + "dir": "mdi mdi-folder", "origin": "mdi mdi-source-repository", + "ori": "mdi mdi-source-repository", "person": "mdi mdi-account", "revisions history": "mdi mdi-history", "release": "mdi mdi-tag", + "rel": "mdi mdi-tag", "releases": "mdi mdi-tag", "revision": "mdi mdi-rotate-90 mdi-source-commit", + "rev": "mdi mdi-rotate-90 mdi-source-commit", "snapshot": "mdi mdi-camera", + "snp": "mdi mdi-camera", "visits": "mdi mdi-calendar-month", } diff --git a/swh/web/templates/browse/vault-ui.html b/swh/web/templates/browse/vault-ui.html --- a/swh/web/templates/browse/vault-ui.html +++ b/swh/web/templates/browse/vault-ui.html @@ -34,7 +34,7 @@ Origin - Object type + Bundle type Object info Cooking status