Skip to content

Add s3 support for generate CRUD #6264

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.

Sign up for GitHub

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

Merged
rishabhrathod01 merged 18 commits into from
Aug 20, 2021
Merged

Add s3 support for generate CRUD #6264

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
986570b
Add s3 support for generate CRUD
Jul 29, 2021
258bfd8
Refactor the prop name
Jul 30, 2021
1e4d1a9
Merge branch 'release' into feature/add-s3-crud-support
Aug 3, 2021
836ae3a
Merge branch 'release' into feature/add-s3-crud-support
Aug 3, 2021
f1e1e74
Add useS3BucketList hook WIP
Aug 3, 2021
6438b05
Dropdown enchancement & Fix small issues
Jul 30, 2021
dce1ed5
Add fetch all sheets query
Aug 2, 2021
b67a926
Add Query to get all S3 buckets
Aug 4, 2021
67c9d9e
Fix dropdown open issue
Aug 4, 2021
99317bb
Remove defaultIsOpen prop from dropdown
Aug 4, 2021
eae53b9
Resolve comments
Aug 4, 2021
e2411c0
Merge branch 'release' into feature/add-s3-crud-support
Aug 6, 2021
a8e6669
Merge branch 'release' into feature/add-s3-crud-support
Aug 17, 2021
9a1a57d
Add S3 cypress test
Aug 17, 2021
37f55b0
Fix cypress test yml config
Aug 18, 2021
1a4fa6b
Fix generate page cypress test
Aug 18, 2021
e16e353
Merge branch 'release' into feature/add-s3-crud-support
Aug 19, 2021
0f49354
Merge branch 'release' into feature/add-s3-crud-support
Aug 20, 2021
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
4 changes: 3 additions & 1 deletion app/client/src/components/ads/Dropdown.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ export type DropdownProps = CommonComponentProps &
width?: string;
height?: string;
showLabelOnly?: boolean;
showOptionsOnLoad?: boolean;
Comment thread
rishabhrathod01 marked this conversation as resolved.
Outdated
optionWidth?: string;
dropdownHeight?: string;
dropdownMaxHeight?: string;
Expand Down Expand Up @@ -450,8 +451,9 @@ export default function Dropdown(props: DropdownProps) {
SelectedValueNode = DefaultDropDownValueNode,
renderOption,
errorMsg = "",
showOptionsOnLoad = false,
} = { ...props };
const [isOpen, setIsOpen] = useState<boolean>(false);
const [isOpen, setIsOpen] = useState<boolean>(showOptionsOnLoad);
const [selected, setSelected] = useState<DropdownOption>(props.selected);

useEffect(() => {
Expand Down
10 changes: 8 additions & 2 deletions app/client/src/pages/Editor/GeneratePage/components/GeneratePageForm/GeneratePageForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,6 +406,9 @@ function GeneratePageForm() {
const isGoogleSheetPlugin =
selectedDatasourcePluginPackageName === PLUGIN_PACKAGE_NAME.GOOGLE_SHEETS;

const showSearchableColumnDropdown =
PLUGIN_PACKAGE_NAME.S3 !== selectedDatasourcePluginPackageName;

return (
<div>
<Wrapper>
Expand Down Expand Up @@ -435,6 +438,7 @@ function GeneratePageForm() {
)}
selected={selectedDatasource}
showLabelOnly
showOptionsOnLoad
width={DROPDOWN_DIMENSION.WIDTH}
/>
</SelectWrapper>
Expand All @@ -457,6 +461,7 @@ function GeneratePageForm() {
options={datasourceTableOptions}
selected={selectedTable}
showLabelOnly
showOptionsOnLoad
width={DROPDOWN_DIMENSION.WIDTH}
/>
</SelectWrapper>
Expand All @@ -472,7 +477,7 @@ function GeneratePageForm() {
type="button"
/>
)}
{selectedTable.value ? (
{selectedTable.value && showSearchableColumnDropdown && (
<SelectWrapper>
<Label>
Select a searchable {columnLabel} from
Expand All @@ -487,10 +492,11 @@ function GeneratePageForm() {
options={selectedTableColumnOptions}
selected={selectedColumn}
showLabelOnly
showOptionsOnLoad
width={DROPDOWN_DIMENSION.WIDTH}
/>
</SelectWrapper>
) : null}
)}
</>
) : (
<GoogleSheetForm
Expand Down
3 changes: 1 addition & 2 deletions app/client/src/selectors/entitiesSelector.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,8 +254,7 @@ export const getGenerateCRUDEnabledPluginMap = createSelector(
plugins.map((plugin) => {
if (
plugin.generateCRUDPageComponent &&
plugin.packageName !== PLUGIN_PACKAGE_NAME.GOOGLE_SHEETS &&
plugin.packageName !== PLUGIN_PACKAGE_NAME.S3
plugin.packageName !== PLUGIN_PACKAGE_NAME.GOOGLE_SHEETS
) {
pluginIdGenerateCRUDPageEnabled[plugin.id] = plugin.packageName;
}
Expand Down