diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/dashboards/redirect-management/dashboard-redirect-management.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/dashboards/redirect-management/dashboard-redirect-management.element.ts
index ba0d403d23..5767b3e8d4 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/dashboards/redirect-management/dashboard-redirect-management.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/dashboards/redirect-management/dashboard-redirect-management.element.ts
@@ -41,6 +41,10 @@ export class UmbDashboardRedirectManagementElement extends UmbLitElement {
}
uui-pagination {
display: inline-block;
+ }
+ .pagination {
+ display: flex;
+ justify-content: center;
margin-top: var(--uui-size-space-5);
}
@@ -75,7 +79,7 @@ export class UmbDashboardRedirectManagementElement extends UmbLitElement {
];
@property({ type: Number, attribute: 'items-per-page' })
- itemsPerPage = 20;
+ itemsPerPage = 5;
@state()
private _redirectData?: RedirectUrl[];
@@ -117,9 +121,8 @@ export class UmbDashboardRedirectManagementElement extends UmbLitElement {
}
private async _getTrackerStatus() {
- //TODO: This resource calls the wrong api
const { data } = await tryExecuteAndNotify(this, RedirectManagementResource.getRedirectManagementStatus());
- //if (data && data.status) this._trackerStatus = data.status === RedirectStatus.ENABLED ? true : false;
+ if (data && data.status) this._trackerStatus = data.status === RedirectStatus.ENABLED ? true : false;
}
private _removeRedirectHandler(data: RedirectUrl) {
@@ -243,7 +246,9 @@ export class UmbDashboardRedirectManagementElement extends UmbLitElement {
${this._total && this._total > 0
- ? html`
${this.renderTable()}
`
+ ? html`
+ ${this.renderTable()}
+
`
: this._filter?.length
? this._renderZeroResults()
: this.renderNoRedirects()} `;
@@ -309,9 +314,11 @@ export class UmbDashboardRedirectManagementElement extends UmbLitElement {
private _renderPagination() {
if (this._total && Math.ceil(this._total / this.itemsPerPage) > 1) {
- return html``;
+ return html``;
} else return nothing;
}
}
diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/domains/redirect-management.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/redirect-management.handlers.ts
index ccfcf0d373..b60e0430a4 100644
--- a/src/Umbraco.Web.UI.Client/src/core/mocks/domains/redirect-management.handlers.ts
+++ b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/redirect-management.handlers.ts
@@ -1,13 +1,12 @@
import { rest } from 'msw';
-import { toNumber } from 'lodash-es';
import { umbracoPath } from '@umbraco-cms/utils';
import { PagedRedirectUrl, RedirectUrl, RedirectStatus, RedirectUrlStatus } from '@umbraco-cms/backend-api';
export const handlers = [
rest.get(umbracoPath('/redirect-management'), (_req, res, ctx) => {
const filter = _req.url.searchParams.get('filter');
- const skip = toNumber(_req.url.searchParams.get('skip'));
- const take = toNumber(_req.url.searchParams.get('take'));
+ const skip = parseInt(_req.url.searchParams.get('skip') ?? '0', 10);
+ const take = parseInt(_req.url.searchParams.get('take') ?? '20', 10);
if (filter) {
const filtered: RedirectUrl[] = [];
@@ -34,6 +33,7 @@ export const handlers = [
rest.get(umbracoPath('/redirect-management/:key'), async (_req, res, ctx) => {
const key = _req.params.key as string;
if (!key) return res(ctx.status(404));
+ if (key === 'status') return res(ctx.status(200), ctx.json(UrlTracker));
const PagedRedirectUrlObject = _getRedirectUrlByKey(key);
@@ -49,9 +49,9 @@ export const handlers = [
return res(ctx.status(200), ctx.json(PagedRedirectUrlObject));
}),
- rest.get(umbracoPath('/redirect-management/status'), (_req, res, ctx) => {
+ /*rest.get(umbracoPath('/redirect-management/status'), (_req, res, ctx) => {
return res(ctx.status(200), ctx.json(UrlTracker));
- }),
+ }),*/
rest.post(umbracoPath('/redirect-management/status'), async (_req, res, ctx) => {
UrlTracker.status = UrlTracker.status === RedirectStatus.ENABLED ? RedirectStatus.DISABLED : RedirectStatus.ENABLED;