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