diff --git a/src/containers/Projects/containers/ProjectDetails/ProjectDetailActionsBar.tsx b/src/containers/Projects/containers/ProjectDetails/ProjectDetailActionsBar.tsx
index 37a28a430..7d100f694 100644
--- a/src/containers/Projects/containers/ProjectDetails/ProjectDetailActionsBar.tsx
+++ b/src/containers/Projects/containers/ProjectDetails/ProjectDetailActionsBar.tsx
@@ -23,7 +23,7 @@ import { compose } from 'utils';
*/
function ProjectDetailActionsBar({
// #withSettings
- timeSheetsTableSize,
+ timesheetsTableSize,
// #withSettingsActions
addSetting,
@@ -33,7 +33,7 @@ function ProjectDetailActionsBar({
// Handle table row size change.
const handleTableRowSizeChange = (size) => {
- addSetting('timeSheets', 'tableSize', size);
+ addSetting('timesheets', 'tableSize', size);
};
// Handle the refresh button click.
@@ -77,7 +77,7 @@ function ProjectDetailActionsBar({
/>
@@ -95,7 +95,7 @@ function ProjectDetailActionsBar({
}
export default compose(
withSettingsActions,
- withSettings(({ timeSheetsSettings }) => ({
- timeSheetsTableSize: timeSheetsSettings?.tableSize,
+ withSettings(({ timesheetsSettings }) => ({
+ timesheetsTableSize: timesheetsSettings?.tableSize,
})),
)(ProjectDetailActionsBar);
diff --git a/src/containers/Projects/containers/ProjectDetails/ProjectDetailTabs.tsx b/src/containers/Projects/containers/ProjectDetails/ProjectDetailTabs.tsx
index 7226c97f7..d6529e1c6 100644
--- a/src/containers/Projects/containers/ProjectDetails/ProjectDetailTabs.tsx
+++ b/src/containers/Projects/containers/ProjectDetails/ProjectDetailTabs.tsx
@@ -2,7 +2,7 @@ import React from 'react';
import styled from 'styled-components';
import intl from 'react-intl-universal';
import { Tabs, Tab } from '@blueprintjs/core';
-import TimeSheetDataTable from './TimeSheetDataTable';
+import TimesheetDataTable from './TimesheetDataTable';
/**
* Project detail tabs.
@@ -21,7 +21,7 @@ export default function ProjectDetailTabs() {
}
+ panel={}
/>
[
{
diff --git a/src/containers/Projects/containers/ProjectDetails/TimeSheetDataTable/index.tsx b/src/containers/Projects/containers/ProjectDetails/TimeSheetDataTable/index.tsx
index c6fe58baa..7e14c94db 100644
--- a/src/containers/Projects/containers/ProjectDetails/TimeSheetDataTable/index.tsx
+++ b/src/containers/Projects/containers/ProjectDetails/TimeSheetDataTable/index.tsx
@@ -5,13 +5,13 @@ import { DataTable, TableFastCell } from 'components';
import TableVirtualizedListRows from 'components/Datatable/TableVirtualizedRows';
import TableSkeletonRows from 'components/Datatable/TableSkeletonRows';
import TableSkeletonHeader from 'components/Datatable/TableHeaderSkeleton';
-import { useTimeSheetColumns, ActionsMenu } from './components';
+import { useTimesheetColumns, ActionsMenu } from './components';
import { TableStyle } from '../../../../../common';
import withSettings from '../../../../Settings/withSettings';
import { compose } from 'utils';
-const TimeSheet = [
+const Timesheet = [
{
id: 1,
data: '2020-01-01',
@@ -23,23 +23,23 @@ const TimeSheet = [
];
/**
- * TimeSheet DataTable.
+ * Timesheet DataTable.
* @returns
*/
-function TimeSheetDataTable({
+function TimesheetDataTable({
// #withSettings
- timeSheetsTableSize,
+ timesheetsTableSize,
}) {
// Retrieve timesheet table columns.
- const columns = useTimeSheetColumns();
+ const columns = useTimesheetColumns();
// Handle delete timesheet.
- const handleDeleteTimeSheet = () => {};
+ const handleDeleteTimesheet = () => {};
return (
-
);
}
export default compose(
- withSettings(({ timeSheetsSettings }) => ({
- timeSheetsTableSize: timeSheetsSettings?.tableSize,
+ withSettings(({ timesheetsSettings }) => ({
+ timesheetsTableSize: timesheetsSettings?.tableSize,
})),
-)(TimeSheetDataTable);
+)(TimesheetDataTable);
-const TimeSheetsTable = styled(DataTable)`
+const TimesheetsTable = styled(DataTable)`
.table .tbody {
.tbody-inner .tr.no-results {
.td {
diff --git a/src/containers/Settings/withSettings.js b/src/containers/Settings/withSettings.js
index 3d3911185..60091face 100644
--- a/src/containers/Settings/withSettings.js
+++ b/src/containers/Settings/withSettings.js
@@ -23,7 +23,7 @@ export default (mapState) => {
vendorsCreditNoteSetting: state.settings.data.vendorCredit,
warehouseTransferSettings: state.settings.data.warehouseTransfers,
projectSettings:state.settings.data.projects,
- timeSheetsSettings:state.settings.data.timeSheets
+ timesheetsSettings:state.settings.data.timesheets
};
return mapState ? mapState(mapped, state, props) : mapped;
};
diff --git a/src/store/settings/settings.reducer.js b/src/store/settings/settings.reducer.js
index b57bceebf..c399ee02f 100644
--- a/src/store/settings/settings.reducer.js
+++ b/src/store/settings/settings.reducer.js
@@ -64,7 +64,7 @@ const initialState = {
projects: {
tableSize: 'medium',
},
- timeSheets: {
+ timesheets: {
tableSize: 'medium',
},
},