Compare commits
4 Commits
8a0bc22124
...
01be1ab29a
| Author | SHA1 | Date | |
|---|---|---|---|
| 01be1ab29a | |||
| 6e11c92862 | |||
| 842ada9f33 | |||
| 8109b8dce2 |
@ -44,6 +44,8 @@ import {
|
|||||||
getSidebarMenuSections
|
getSidebarMenuSections
|
||||||
} from '../../../database/Sidebars'
|
} from '../../../database/Sidebars'
|
||||||
|
|
||||||
|
import { useAppUpdateContext } from '../context/AppUpdateContext'
|
||||||
|
|
||||||
const { Text } = Typography
|
const { Text } = Typography
|
||||||
|
|
||||||
const DashboardNavigation = () => {
|
const DashboardNavigation = () => {
|
||||||
@ -64,7 +66,7 @@ const DashboardNavigation = () => {
|
|||||||
const isMobile = useMediaQuery({ maxWidth: 768 })
|
const isMobile = useMediaQuery({ maxWidth: 768 })
|
||||||
const { platform, isElectron, isFullScreen, setSidebarViewMenu } =
|
const { platform, isElectron, isFullScreen, setSidebarViewMenu } =
|
||||||
useContext(ElectronContext)
|
useContext(ElectronContext)
|
||||||
|
const { availableUpdate, checkForUpdates } = useAppUpdateContext()
|
||||||
const mainMenuItems = useMemo(
|
const mainMenuItems = useMemo(
|
||||||
() => [
|
() => [
|
||||||
{
|
{
|
||||||
@ -314,6 +316,16 @@ const DashboardNavigation = () => {
|
|||||||
</Popover>
|
</Popover>
|
||||||
</Space>
|
</Space>
|
||||||
) : null}
|
) : null}
|
||||||
|
{isElectron && availableUpdate ? (
|
||||||
|
<Tag
|
||||||
|
icon={<CloudIcon />}
|
||||||
|
style={{ cursor: 'pointer', margin: '2px 0 0 0' }}
|
||||||
|
color='cyan'
|
||||||
|
onClick={() => checkForUpdates()}
|
||||||
|
>
|
||||||
|
Update Available
|
||||||
|
</Tag>
|
||||||
|
) : null}
|
||||||
</Flex>
|
</Flex>
|
||||||
{isOtherApp ? <DashboardWindowButtons /> : null}
|
{isOtherApp ? <DashboardWindowButtons /> : null}
|
||||||
</Flex>
|
</Flex>
|
||||||
|
|||||||
@ -461,7 +461,7 @@ const ObjectChildTable = ({
|
|||||||
rowKey={resolvedRowKey}
|
rowKey={resolvedRowKey}
|
||||||
scroll={scrollConfig}
|
scroll={scrollConfig}
|
||||||
locale={{ emptyText }}
|
locale={{ emptyText }}
|
||||||
bordered={true}
|
bordered={minimal}
|
||||||
style={{ maxWidth: minimal ? '100%' : maxWidth, minWidth: 0 }}
|
style={{ maxWidth: minimal ? '100%' : maxWidth, minWidth: 0 }}
|
||||||
className='rollup-table'
|
className='rollup-table'
|
||||||
/>
|
/>
|
||||||
@ -479,7 +479,7 @@ const ObjectChildTable = ({
|
|||||||
size={size}
|
size={size}
|
||||||
rowKey={resolvedRowKey}
|
rowKey={resolvedRowKey}
|
||||||
scroll={scrollConfig}
|
scroll={scrollConfig}
|
||||||
bordered={true}
|
bordered={minimal}
|
||||||
locale={{ emptyText }}
|
locale={{ emptyText }}
|
||||||
pagination={false}
|
pagination={false}
|
||||||
className={hasRollups ? 'child-table-rollups' : 'child-table'}
|
className={hasRollups ? 'child-table-rollups' : 'child-table'}
|
||||||
|
|||||||
@ -82,6 +82,8 @@ export const AppUpdateProvider = ({ children }) => {
|
|||||||
const runningCheckRef = useRef(null)
|
const runningCheckRef = useRef(null)
|
||||||
const updateCheckDependenciesRef = useRef({})
|
const updateCheckDependenciesRef = useRef({})
|
||||||
|
|
||||||
|
const [modelWidth, setModelWidth] = useState(650)
|
||||||
|
|
||||||
updateCheckDependenciesRef.current = {
|
updateCheckDependenciesRef.current = {
|
||||||
fetchAppUpdateBranches,
|
fetchAppUpdateBranches,
|
||||||
fetchAppUpdateCurrent,
|
fetchAppUpdateCurrent,
|
||||||
@ -191,6 +193,7 @@ export const AppUpdateProvider = ({ children }) => {
|
|||||||
setNoUpdateOpen(false)
|
setNoUpdateOpen(false)
|
||||||
setAvailableUpdate(null)
|
setAvailableUpdate(null)
|
||||||
setInstallingUpdate(update)
|
setInstallingUpdate(update)
|
||||||
|
setModelWidth(550)
|
||||||
setUpdateProgress({
|
setUpdateProgress({
|
||||||
phase: 'preparing',
|
phase: 'preparing',
|
||||||
percent: 0,
|
percent: 0,
|
||||||
@ -256,10 +259,12 @@ export const AppUpdateProvider = ({ children }) => {
|
|||||||
<Text>There are no new software updates available.</Text>
|
<Text>There are no new software updates available.</Text>
|
||||||
</Modal>
|
</Modal>
|
||||||
<Modal
|
<Modal
|
||||||
title={installingUpdate ? 'Software Update' : 'Software Update Available'}
|
title={
|
||||||
|
installingUpdate ? 'Software Update' : 'Software Update Available'
|
||||||
|
}
|
||||||
open={updateModalOpen}
|
open={updateModalOpen}
|
||||||
footer={null}
|
footer={null}
|
||||||
width={650}
|
width={modelWidth}
|
||||||
centered
|
centered
|
||||||
closable={!updateModalBusy}
|
closable={!updateModalBusy}
|
||||||
maskClosable={!updateModalBusy}
|
maskClosable={!updateModalBusy}
|
||||||
|
|||||||
@ -302,6 +302,14 @@ export const Invoice = {
|
|||||||
required: true
|
required: true
|
||||||
},
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
name: 'paidAt',
|
||||||
|
label: 'Paid At',
|
||||||
|
type: 'dateTime',
|
||||||
|
readOnly: true,
|
||||||
|
columnWidth: 175
|
||||||
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
name: 'to',
|
name: 'to',
|
||||||
label: 'To',
|
label: 'To',
|
||||||
@ -333,13 +341,7 @@ export const Invoice = {
|
|||||||
readOnly: true,
|
readOnly: true,
|
||||||
columnWidth: 175
|
columnWidth: 175
|
||||||
},
|
},
|
||||||
{
|
|
||||||
name: 'paidAt',
|
|
||||||
label: 'Paid At',
|
|
||||||
type: 'dateTime',
|
|
||||||
readOnly: true,
|
|
||||||
columnWidth: 175
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
name: 'totalAmountWithTax',
|
name: 'totalAmountWithTax',
|
||||||
label: 'Total Amount w/ Tax',
|
label: 'Total Amount w/ Tax',
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user