Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement auto import for array subtables #1302

Merged
merged 3 commits into from
Jul 4, 2023
Merged
Changes from 2 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
16 changes: 13 additions & 3 deletions src/components/Table/EmptyTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,27 @@ export default function EmptyTable() {
: false;
let contents = <></>;

if (tableSettings.isCollection !== false && hasData) {
if (
(tableSettings.isCollection !== false ||
tableSettings.subTableKey?.length) &&
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rishipurwar1 how is tableSettings.subTableKey?.length used here, could we just remove tableSettings.isCollection !== false part of the condition?

Copy link
Contributor Author

@rishipurwar1 rishipurwar1 Jun 17, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

how is tableSettings.subTableKey?.length used here

I used it to check whether an array subTable key exists or not, if it exists and hasData flag is true, then show the "import existing data" template.

could we just remove tableSettings.isCollection !== false part of the condition?

Yes, we can do that. That way, we only need to check for the hasData flag, if it's true then show the "import existing data" template.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated the if condition.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@iamanishroy what do you think? is there any other conditions we should watch out for?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 👍

hasData
) {
contents = (
<>
<div>
<Typography variant="h6" component="h2" gutterBottom>
Get started
</Typography>
<Typography>
There is existing data in the Firestore collection:
{tableSettings.isCollection === false
? "There is existing data in the Array Sub Table:"
: "There is existing data in the Firestore collection:"}
<br />
<code>{tableSettings.collection}</code>
<code>
{tableSettings.collection}
{tableSettings.subTableKey?.length &&
`.${tableSettings.subTableKey}`}
</code>
</Typography>
</div>

Expand Down