Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
import { dateI18n, getSettings } from '@wordpress/date';
import apiFetch from '@wordpress/api-fetch';
import { formatPrice } from '@dokan/utilities';
import { AdminDataViews as DataViews, DokanButton } from '@dokan/components';
import { DataViews, DokanButton } from '@dokan/components';
import DateRangePicker from '@src/components/DateRangePicker';
import {
ArrowLeft,
Expand Down Expand Up @@ -147,20 +147,10 @@ const ReverseWithdrawalTransactionPage = ( { params, navigate } ) => {
fields: fields.map( ( f ) => f.id ),
} );

const tabs = [
const tabItems = [
{
name: 'list',
icon: () => {
return (
<div className="flex items-center gap-1.5 px-2 text-black text-sm font-semibold">
{ __(
'List of Transactions',
'dokan-lite'
) }
</div>
);
},
title: __( 'List of Transactions', 'dokan-lite' ),
value: 'list',
label: __( 'List of Transactions', 'dokan-lite' ),
},
];

Expand Down Expand Up @@ -402,7 +392,6 @@ const ReverseWithdrawalTransactionPage = ( { params, navigate } ) => {
return (
<div
id="reverse-withdrawal-transactions"
className="rounded-md shadow-sm pt-3"
>
{ header }

Expand Down Expand Up @@ -432,36 +421,38 @@ const ReverseWithdrawalTransactionPage = ( { params, navigate } ) => {
} ) }
</div>

<DataViews
data={ data }
fields={ fields }
namespace="reverse-withdrawal-transactions"
defaultLayouts={ {
table: { density: 'comfortable' },
list: {},
} }
getItemId={ ( item ) => item.id }
view={ view }
onChangeView={ setView }
isLoading={ isLoading }
emptyIcon={ <ArrowRightLeft size={ 52 } /> }
emptyTitle={ __( 'No transaction found', 'dokan-lite' ) }
paginationInfo={ {
totalItems,
totalPages: Math.ceil( totalItems / view.perPage ),
} }
tabs={ {
tabs,
onSelect: () => {},
initialTabName: 'list',
} }
filter={ {
fields: filterFields,
onFilterRemove: ( filterId ) =>
clearSingleFilter( filterId ),
onReset: () => clearFilter(),
} }
/>
<div className="dokan-admin-dashboard-datatable">
<DataViews
data={ data }
fields={ fields }
namespace="reverse-withdrawal-transactions"
defaultLayouts={ {
table: { density: 'comfortable' },
list: {},
} }
getItemId={ ( item ) => item.id }
view={ view }
onChangeView={ setView }
isLoading={ isLoading }
emptyIcon={ <ArrowRightLeft size={ 52 } /> }
emptyTitle={ __( 'No transaction found', 'dokan-lite' ) }
paginationInfo={ {
totalItems,
totalPages: Math.ceil( totalItems / view.perPage ),
} }
tabs={ {
items: tabItems,
onSelect: () => {},
defaultValue: 'list',
} }
filter={ {
fields: filterFields,
onFilterRemove: ( filterId ) =>
clearSingleFilter( filterId ),
onReset: () => clearFilter(),
} }
/>
</div>
</div>
);
};
Expand Down
80 changes: 37 additions & 43 deletions src/admin/dashboard/pages/reverse-withdrawal/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { RawHTML, useEffect, useState, useCallback } from '@wordpress/element';
import { dateI18n, getSettings } from '@wordpress/date';
import apiFetch from '@wordpress/api-fetch';
import { formatPrice } from '@dokan/utilities';
import { DokanButton, AdminDataViews as DataViews } from '@dokan/components';
import { DokanButton, DataViews } from '@dokan/components';
import {
House,
Calendar,
Expand Down Expand Up @@ -100,18 +100,10 @@ const ReverseWithdrawalPage = ( props ) => {
),
} );

// Create tabs for "List of Data" header
const tabs = [
const tabItems = [
{
name: 'list',
icon: () => {
return (
<div className="flex items-center gap-1.5 px-2 text-black text-sm font-semibold">
{ __( 'List of Data', 'dokan-lite' ) }
</div>
);
},
title: __( 'List of Data', 'dokan-lite' ),
value: 'list',
label: __( 'List of Data', 'dokan-lite' ),
},
];

Expand Down Expand Up @@ -346,7 +338,7 @@ const ReverseWithdrawalPage = ( props ) => {
];

return (
<div className="rounded-md shadow-sm pt-3">
<div>
<div className="flex justify-between items-center mb-6">
<h1 className="text-2xl font-bold text-gray-900">
{ __( 'Reverse Withdrawal', 'dokan-lite' ) }
Expand Down Expand Up @@ -387,36 +379,38 @@ const ReverseWithdrawalPage = ( props ) => {
} ) }
</div>

<DataViews
data={ data }
namespace="reverse-withdrawal-data-view"
defaultLayouts={ {
table: { density: 'comfortable' },
list: {},
} }
fields={ fields }
getItemId={ ( item ) => item.vendor_id }
onChangeView={ setView }
paginationInfo={ {
totalItems,
totalPages: Math.ceil( totalItems / view.perPage ),
} }
view={ view }
isLoading={ isLoading }
emptyIcon={ <ArrowRightLeft size={ 52 } /> }
emptyTitle={ __( 'No transaction found', 'dokan-lite' ) }
tabs={ {
tabs,
onSelect: () => {},
initialTabName: 'list',
} }
filter={ {
fields: filterFields,
onFilterRemove: ( filterId ) =>
clearSingleFilter( filterId ),
onReset: () => clearFilter(),
} }
/>
<div className="dokan-admin-dashboard-datatable">
<DataViews
data={ data }
namespace="reverse-withdrawal-data-view"
defaultLayouts={ {
table: { density: 'comfortable' },
list: {},
} }
fields={ fields }
getItemId={ ( item ) => item.vendor_id }
onChangeView={ setView }
paginationInfo={ {
totalItems,
totalPages: Math.ceil( totalItems / view.perPage ),
} }
view={ view }
isLoading={ isLoading }
emptyIcon={ <ArrowRightLeft size={ 52 } /> }
emptyTitle={ __( 'No transaction found', 'dokan-lite' ) }
tabs={ {
items: tabItems,
onSelect: () => {},
defaultValue: 'list',
} }
filter={ {
fields: filterFields,
onFilterRemove: ( filterId ) =>
clearSingleFilter( filterId ),
onReset: () => clearFilter(),
} }
/>
</div>

{ showAddModal && (
<AddReverseWithdrawModal
Expand Down
11 changes: 11 additions & 0 deletions src/components/dataviews/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,17 @@
height: 65px;
min-height: 65px;
}

// When the DataViews has only a single tab, it acts as a section
// title (e.g. Reverse Withdrawal's "List of Data"). Neutralise the
// active-tab accent so the label reads as plain heading text.
[data-slot="tabs-list"] [data-slot="tabs-trigger"]:only-child {
color: #25252d !important;
font-weight: 700 !important;
font-size: 16px !important;
border-bottom-color: transparent !important;
cursor: default !important;
}
}
}
}
Expand Down
Loading