Skip to content
This repository has been archived by the owner on Apr 28, 2024. It is now read-only.

feat: add refresh button to table #122

Merged
merged 4 commits into from
May 4, 2023
Merged

feat: add refresh button to table #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4676ca0
feat: add refresh button to table
codezuma Apr 26, 2023
5af5741
Merge branch 'develop' into feature/issue_#113/add-refresh-button-to-…
paraswaykole May 4, 2023
fe82f5c
Delete .yarnrc.yml
paraswaykole May 4, 2023
3b0721a
Delete yarn.lock
paraswaykole May 4, 2023
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
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ app.db
build/bin
node_modules
frontend/dist
build/darwin/gon-notarize.json
build/darwin/gon-notarize.json
4 changes: 0 additions & 4 deletions development.env.sample
View file
Open in desktop

This file was deleted.

9 changes: 8 additions & 1 deletion frontend/desktop/src/components/dbfragments/jsontable/jsontable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,12 @@ type JsonTablePropType = {
mName: string,
isInteractive: boolean,
showHeader?: boolean,
onRefresh:()=> void,
onFilterChanged: (newFilter: string[] | undefined) => void,
onSortChanged: (newSort: string[] | undefined) => void,
}

const JsonTable = ({ queryData, dbConnection, mName, isInteractive, showHeader, onFilterChanged, onSortChanged }: JsonTablePropType) => {
const JsonTable = ({ queryData, dbConnection, mName, isInteractive, showHeader, onFilterChanged, onSortChanged ,onRefresh}: JsonTablePropType) => {

const dispatch = useAppDispatch()

Expand Down Expand Up @@ -176,6 +177,12 @@ const JsonTable = ({ queryData, dbConnection, mName, isInteractive, showHeader,
<i className="fas fa-pen" />
</span>
</button>
<button className="button is-primary" onClick={onRefresh}>
<span className="icon is-small">
<i className="fas fa-refresh" />
</span>
Refresh
</button>
</div>
</React.Fragment>}
{isInteractive && isEditing && <React.Fragment>
Expand Down
2 changes: 2 additions & 0 deletions frontend/desktop/src/components/dbfragments/query.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ const DBQueryFragment = () => {
mName={''}
onFilterChanged={() => { }}
onSortChanged={() => { }}
onRefresh={()=>{}}
isInteractive={false} />
}
{dbConnection!.type === DBConnType.MONGO &&
Expand All @@ -130,6 +131,7 @@ const DBQueryFragment = () => {
mName={''}
onFilterChanged={() => { }}
onSortChanged={() => { }}
onRefresh={()=>{}}
isInteractive={false} />
}
</React.Fragment>
Expand Down
7 changes: 7 additions & 0 deletions frontend/desktop/src/components/dbfragments/showdata.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,10 @@ const DBShowDataFragment = () => {
setQuerySort(newSort)
}

const onRefresh = () => {
fetchData(false);
}

const rowsLength = queryData ? (queryData.rows ? queryData.rows.length : queryData.data.length) : 0
const queryOffsetRangeEnd = (rowsLength ?? 0) === queryLimit ?
queryOffset + queryLimit : queryOffset + (rowsLength ?? 0)
Expand All @@ -106,6 +110,7 @@ const DBShowDataFragment = () => {
querySort={querySort}
isInteractive={true}
showHeader={true}
onRefresh={onRefresh}
onFilterChanged={onFilterChanged}
onSortChanged={onSortChanged}
/>
Expand All @@ -119,6 +124,7 @@ const DBShowDataFragment = () => {
querySort={querySort}
isInteractive={true}
showHeader={true}
onRefresh={onRefresh}
onFilterChanged={onFilterChanged}
onSortChanged={onSortChanged}
/>
Expand All @@ -130,6 +136,7 @@ const DBShowDataFragment = () => {
queryData={queryData}
isInteractive={true}
showHeader={true}
onRefresh={onRefresh}
onFilterChanged={onFilterChanged}
onSortChanged={onSortChanged}
/>
Expand Down
17 changes: 14 additions & 3 deletions frontend/desktop/src/components/dbfragments/table/table.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,13 @@ type TablePropType = {
mName: string,
isInteractive: boolean,
showHeader?: boolean,
onRefresh:()=>void,
querySort?: string[],
onFilterChanged: (newFilter: string[] | undefined) => void,
onSortChanged: (newSort: string[] | undefined) => void,
}

const Table = ({ queryData, dbConnection, mSchema, mName, isInteractive, showHeader, querySort, onFilterChanged, onSortChanged }: TablePropType) => {
const Table = ({ queryData, dbConnection, mSchema, mName, isInteractive, showHeader, querySort, onFilterChanged, onSortChanged ,onRefresh}: TablePropType) => {

const dispatch = useAppDispatch()

Expand Down Expand Up @@ -240,14 +241,21 @@ const Table = ({ queryData, dbConnection, mSchema, mName, isInteractive, showHea
</div>
</div>
{isInteractive && !isEditing && <React.Fragment>
<div className="column is-3 is-flex is-justify-content-flex-end">
<Button
<div className="column is-3 gap-3 is-flex is-justify-content-flex-end">
<button style={{marginRight:16}} className="button mgr-medium" onClick={onRefresh}>
<span className="icon is-small">
<i className="fas fa-refresh" />
</span>
<span>Refresh</span>
</button>
<Button
className="is-primary"
icon={<i className="fas fa-pen"/>}
onClick={() => { setIsEditing(true) }}
/>
</div>
</React.Fragment>}

{isInteractive && isEditing && <React.Fragment>
<div className="column is-3 is-flex is-justify-content-flex-end">
<Button
Expand All @@ -269,8 +277,11 @@ const Table = ({ queryData, dbConnection, mSchema, mName, isInteractive, showHea
/>
</div>
</React.Fragment>}


</div>
</div>}

{isAdding &&
<AddModal
queryData={queryData}
Expand Down
1 change: 1 addition & 0 deletions frontend/desktop/src/styles/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,5 @@ $modal-background-background-color: rgba(50, 50, 50, 0.86);
$modal-card-head-background-color: #262626;
$modal-card-title-color: white;


@import "../../node_modules/bulma/bulma.sass";
Loading