Skip to content

Commit

Permalink
#9744 Update the imports of the "TableNext" component to the newly re…
Browse files Browse the repository at this point in the history 
…named "Table" and migrate native tables with class "pkpTable" (#10369)

* #9744 Update imports of table components

* #9744 Migrate native tables to new table component

* #9744 Update cypress test query selector for jobs page tests
  • Loading branch information
@blesildaramirez
blesildaramirez committed Sep 12, 2024
1 parent d465b5a commit f2f64dd
Show file tree
Hide file tree
Showing 5 changed files with 97 additions and 102 deletions.
20 changes: 10 additions & 10 deletions cypress/tests/integration/Jobs.cy.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ describe('Jobs tests', function() {
cy.get('a:contains("View Jobs")').click();
cy.waitJQuery();

cy.get('.pkpTable')
cy.get('table')
.find('td:contains("queuedTestJob")')
.should('have.length', 2)
.should('be.visible');
Expand All @@ -33,7 +33,7 @@ describe('Jobs tests', function() {
cy.reload();
cy.waitJQuery();

cy.get('.pkpTable')
cy.get('table')
.find('td:contains("queuedTestJob")')
.should('have.length', 0);

Expand Down Expand Up @@ -61,7 +61,7 @@ describe('Jobs tests', function() {
cy.waitJQuery();

// check for 4 failed job rows
cy.get('.pkpTable')
cy.get('table')
.find('td:contains("queuedTestJob")')
.should('have.length', 4)
.should('be.visible');
Expand All @@ -70,7 +70,7 @@ describe('Jobs tests', function() {
cy.get('button:contains("Try Again")').first().click();

// check for 3 failed job rows
cy.get('.pkpTable')
cy.get('table')
.find('td:contains("queuedTestJob")')
.should('have.length', 3)
.should('be.visible');
Expand All @@ -79,7 +79,7 @@ describe('Jobs tests', function() {
cy.get('button:contains("Delete")').first().click();

// check for 2 failed job rows
cy.get('.pkpTable')
cy.get('table')
.find('td:contains("queuedTestJob")')
.should('have.length', 2);

Expand All @@ -89,7 +89,7 @@ describe('Jobs tests', function() {
cy.waitJQuery();

// Check for one job in queue which just redispatch from failed job page
cy.get('.pkpTable')
cy.get('table')
.find('td:contains("queuedTestJob")')
.should('have.length', 1);

Expand All @@ -100,7 +100,7 @@ describe('Jobs tests', function() {

// Check details page of a failed job
cy.get('a:contains("Details")').first().click();
cy.get('.pkpTable')
cy.get('table')
.find('td:contains("Payload")')
.should('have.length', 1);

Expand All @@ -113,7 +113,7 @@ describe('Jobs tests', function() {
cy.wait(2000); // Wait for UI to update and complete ajax request

// check for 0 failed job rows after requeue all action
cy.get('.pkpTable')
cy.get('table')
.find('td:contains("queuedTestJob")')
.should('have.length', 0);

Expand All @@ -126,7 +126,7 @@ describe('Jobs tests', function() {
cy.waitJQuery();

// Check for 2 more jobs(in totla 3) in queue which just redispatch via requeue all action
cy.get('.pkpTable')
cy.get('table')
.find('td:contains("queuedTestJob")')
.should('have.length', 3);

Expand All @@ -136,7 +136,7 @@ describe('Jobs tests', function() {
cy.reload();
cy.waitJQuery();

cy.get('.pkpTable')
cy.get('table')
.find('td:contains("queuedTestJob")')
.should('have.length', 0);

Expand Down
12 changes: 6 additions & 6 deletions js/load.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,12 @@ import Orderer from '@/components/Orderer/Orderer.vue';
import Pagination from '@/components/Pagination/Pagination.vue';
import ProgressBar from '@/components/ProgressBar/ProgressBar.vue';
import Search from '@/components/Search/Search.vue';
import Table from '@/components/TableNext/Table.vue';
import TableCell from '@/components/TableNext/TableCell.vue';
import TableColumn from '@/components/TableNext/TableColumn.vue';
import TableHeader from '@/components/TableNext/TableHeader.vue';
import TableBody from '@/components/TableNext/TableBody.vue';
import TableRow from '@/components/TableNext/TableRow.vue';
import Table from '@/components/Table/Table.vue';
import TableCell from '@/components/Table/TableCell.vue';
import TableColumn from '@/components/Table/TableColumn.vue';
import TableHeader from '@/components/Table/TableHeader.vue';
import TableBody from '@/components/Table/TableBody.vue';
import TableRow from '@/components/Table/TableRow.vue';
import Tooltip from '@/components/Tooltip/Tooltip.vue';

// Form components from UI Library
Expand Down
114 changes: 54 additions & 60 deletions templates/admin/systemInfo.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,79 +35,73 @@
<p><a href="{url versionCheck=1}">{translate key="admin.version.checkForUpdates"}</a></p>
{/if}

<h2 id="versionHistory">{translate key="admin.versionHistory"}</h2>
<h2 id="versionHistory" class="mt-5">{translate key="admin.versionHistory"}</h2>

<table class="pkpTable" aria-labelledby="versionHistory">
<thead>
<tr>
<th>{translate key="admin.version"}</th>
<th>{translate key="admin.versionMajor"}</th>
<th>{translate key="admin.versionMinor"}</th>
<th>{translate key="admin.versionRevision"}</th>
<th>{translate key="admin.versionBuild"}</th>
<th>{translate key="admin.dateInstalled"}</th>
</tr>
</thead>
<tbody>
<pkp-table labelled-by="versionHistory">
<pkp-table-header>
<pkp-table-column>{translate key="admin.version"}</pkp-table-column>
<pkp-table-column>{translate key="admin.versionMajor"}</pkp-table-column>
<pkp-table-column>{translate key="admin.versionMinor"}</pkp-table-column>
<pkp-table-column>{translate key="admin.versionRevision"}</pkp-table-column>
<pkp-table-column>{translate key="admin.versionBuild"}</pkp-table-column>
<pkp-table-column>{translate key="admin.dateInstalled"}</pkp-table-column>
</pkp-table-header>
<pkp-table-body>
{foreach from=$versionHistory item="version"}
<tr>
<td>{$version->getVersionString(false)}</td>
<td>{$version->getMajor()}</td>
<td>{$version->getMinor()}</td>
<td>{$version->getRevision()}</td>
<td>{$version->getBuild()}</td>
<td>{$version->getDateInstalled()|date_format:$dateFormatShort}</td>
</tr>
<pkp-table-row>
<pkp-table-cell>{$version->getVersionString(false)}</pkp-table-cell>
<pkp-table-cell>{$version->getMajor()}</pkp-table-cell>
<pkp-table-cell>{$version->getMinor()}</pkp-table-cell>
<pkp-table-cell>{$version->getRevision()}</pkp-table-cell>
<pkp-table-cell>{$version->getBuild()}</pkp-table-cell>
<pkp-table-cell>{$version->getDateInstalled()|date_format:$dateFormatShort}</pkp-table-cell>
</pkp-table-row>
{/foreach}
</tbody>
</table>
</pkp-table-body>
</pkp-table>

<h2 id="serverInformation">{translate key="admin.serverInformation"}</h2>
<h2 id="serverInformation" class="mt-5">{translate key="admin.serverInformation"}</h2>

<table class="pkpTable" aria-labelledby="serverInformation">
<thead>
<tr>
<th>{translate key="admin.systemInfo.settingName"}</th>
<th>{translate key="admin.systemInfo.settingValue"}</th>
</tr>
</thead>
<tbody>
<pkp-table labelled-by="serverInformation">
<pkp-table-header>
<pkp-table-column>{translate key="admin.systemInfo.settingName"}</pkp-table-column>
<pkp-table-column>{translate key="admin.systemInfo.settingValue"}</pkp-table-column>
</pkp-table-header>
<pkp-table-body>
{foreach from=$serverInfo item="value" key="name"}
<tr>
<td>{translate key=$name}</td>
<td>{$value|escape}</td>
</tr>
<pkp-table-row>
<pkp-table-cell>{translate key=$name}</pkp-table-cell>
<pkp-table-cell>{$value|escape}</pkp-table-cell>
</pkp-table-row>
{/foreach}
</tbody>
</table>
</pkp-table-body>
</pkp-table>

<h2>{translate key="admin.systemConfiguration"}</h2>
<h2 id="systemConfiguration{$key}" class="mt-5">{translate key="admin.systemConfiguration"}</h2>

<table class="pkpTable" aria-labelledby="systemConfiguration{$key}">
<thead>
<tr>
<th>{translate key="admin.systemInfo.settingName"}</th>
<th>{translate key="admin.systemInfo.settingValue"}</th>
</tr>
</thead>
<pkp-table labelled-by="systemConfiguration{$key}">
<pkp-table-header>
<pkp-table-column>{translate key="admin.systemInfo.settingName"}</pkp-table-column>
<pkp-table-column>{translate key="admin.systemInfo.settingValue"}</pkp-table-column>
</pkp-table-header>
{foreach from=$configData item="settings" key="category"}
<tbody>
<tr>
<td colspan="2" class="app--admin__systemInfoGroup">{$category}</td>
</tr>
<pkp-table-body>
<pkp-table-row>
<pkp-table-cell colspan="2" class="app--admin__systemInfoGroup">{$category}</pkp-table-cell>
</pkp-table-row>
{foreach from=$settings item="value" key="name"}
<tr>
<td>{$name|escape}</td>
{if \PKP\config\Config::isSensitive($category, $name)}
<td>**************</td>
{else}
<td>{$value|escape}</td>
{/if}
</tr>
<pkp-table-row>
<pkp-table-cell>{$name|escape}</pkp-table-cell>
{if \PKP\config\Config::isSensitive($category, $name)}
<pkp-table-cell>**************</pkp-table-cell>
{else}
<pkp-table-cell>{$value|escape}</pkp-table-cell>
{/if}
</pkp-table-row>
{/foreach}
</tbody>
</pkp-table-body>
{/foreach}
</table>
</pkp-table>


<a href="{url op="phpinfo"}" target="_blank">{translate key="admin.phpInfo"}</a>
Expand Down
27 changes: 15 additions & 12 deletions templates/controllers/modals/submission/viewSubmissionMetadata.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,28 +15,31 @@
{$publication->getLocalizedData('abstract')|strip_unsafe_html}
</div>
{if $additionalMetadata || $dataAvailability}
<table class="pkpTable">
<pkp-table>
{foreach $additionalMetadata as $metadata}
<tr>
<pkp-table-row>
{foreach $metadata as $metadataItem}
{if $metadataItem@iteration % 2 != 0}
<th scope="row">{$metadataItem|escape}</th>
<pkp-table-cell :is-row-header="true">{$metadataItem|escape}</pkp-table-cell>
{else}
<td>{$metadataItem|escape}</td>
<pkp-table-cell>{$metadataItem|escape}</pkp-table-cell>
{/if}
{/foreach}
</tr>
</pkp-table-row>
{/foreach}
{if $dataAvailability}
<tr>
<th scope="row">
<pkp-table-row>
<pkp-table-cell :is-row-header="true">
{translate key="submission.dataAvailability"}
</th>
<td>
</pkp-table-cell>
<pkp-table-cell>
{$dataAvailability|strip_unsafe_html}
</td>
</tr>
</pkp-table-cell>
</pkp-table-row>
{/if}
</table>
</pkp-table>
{/if}
</div>
<script type="text/javascript">
pkp.registry.init('viewSubmissionMetadata', 'Page', {$additionalMetadata|json_encode});
</script>
26 changes: 12 additions & 14 deletions templates/stats/users.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,22 +21,20 @@
</pkp-button>
</template>
</pkp-header>
<table class="pkpTable" labelled-by="usersTableLabel">
<thead>
<tr>
<th>{translate key="common.name"}</th>
<th>{translate key="stats.total"}</th>
</tr>
</thead>
<tbody>
<pkp-table labelled-by="usersTableLabel">
<table-header>
<table-column>{translate key="common.name"}</table-column>
<table-column>{translate key="stats.total"}</table-column>
</table-header>
<table-body>
{foreach from=$userStats item=$row}
<tr>
<td>{$row.name}</td>
<td>{$row.value}</td>
</tr>
<table-row>
<table-cell>{$row.name}</table-cell>
<table-cell>{$row.value}</table-cell>
</table-row>
{/foreach}
</tbody>
</table>
</table-body>
</pkp-table>
</div>
</div>
{/block}

0 comments on commit f2f64dd

Please sign in to comment.