Feature/upload config and blob from UI #803

postrowinski · 2023-04-24T11:36:39Z

Your checklist for this pull request

I've read the contributing guideline.
I've tested my changes by building and running the project, and testing changed functionality (if applicable)
I've added automated tests for my change (if applicable, optional)
I've updated documentation to reflect my change (if applicable)

What is the current behaviour?

From UI, you can only add file/sample.

What is the new behaviour?

I change upload to dropdown with options to file/config/blob

Config form layout:

Blob form layout:

Test plan

Closing issues

closes #677

…ad view

…hook-form

…d Attributes components

…ig-and-blob-from-ui

# Conflicts: # mwdb/web/src/commons/ui/index.jsx

# Conflicts: # mwdb/web/package-lock.json # mwdb/web/package.json # mwdb/web/src/commons/hooks/index.js # mwdb/web/src/commons/ui/index.jsx

…mmons

…o-common-ui # Conflicts: # mwdb/web/package-lock.json # mwdb/web/src/commons/auth/provider.tsx # mwdb/web/src/commons/ui/index.jsx # mwdb/web/src/components/Profile/Views/ProfileCapabilities.jsx # mwdb/web/src/components/Settings/Views/AccessControl.jsx

# Conflicts: # mwdb/web/src/commons/api/index.jsx

…d-types-to-components-rich-attribute

…ature/add-types-to-components-settings # Conflicts: # mwdb/web/src/commons/api/index.tsx # mwdb/web/src/components/Profile/ProfileView.tsx # mwdb/web/src/components/Profile/common/CapabilitiesSelect.tsx # mwdb/web/src/components/Profile/common/CapabilitiesTable.tsx # mwdb/web/src/types/context.ts

…to feature/upload-config-and-blob-from-ui # Conflicts: # mwdb/web/src/App.jsx # mwdb/web/src/commons/api/index.jsx # mwdb/web/src/components/Navigation.tsx # mwdb/web/src/components/Views/UploadView.tsx

# Conflicts: # mwdb/web/src/commons/api/index.tsx # mwdb/web/src/commons/navigation/AppRoutes.tsx # mwdb/web/src/commons/plugins/Extendable.tsx # mwdb/web/src/commons/plugins/Extension.tsx # mwdb/web/src/components/AttributesAddModal.tsx # mwdb/web/src/components/Navigation.tsx # mwdb/web/src/components/RelationsNode.tsx # mwdb/web/src/components/ShowObject/common/RelationsTab.tsx # mwdb/web/src/components/UploadButton.tsx # mwdb/web/src/components/Views/RelationsPlotView.tsx # mwdb/web/src/components/Views/UploadView.tsx # mwdb/web/src/components/Views/UserLoginView.tsx

psrok1

Looks good, although I would change it a bit as described in comments.

psrok1 · 2023-10-10T10:39:57Z

mwdb/web/src/commons/navigation/AppRoutes.tsx

-                    path="upload"
+                    path="file_upload"


I woyld leave that path for compatibility

psrok1 · 2023-10-10T10:41:33Z

mwdb/web/src/commons/ui/Label.tsx

@@ -24,6 +25,7 @@ export function Label(props: Props) {
    return (
        <label className={setClassName()} htmlFor={htmlFor}>
            {label}
+            {children ?? children}


Isn't ?? children no-op here?

psrok1 · 2023-10-10T10:44:32Z

mwdb/web/src/components/Upload/common/UploadDropdown.tsx

+import { UploadButton } from "../../UploadButton";
+
+export function UploadDropdown() {
+    const uploadElement = [


I would hide additional dropdown elements when user doesn't have capability to upload configs or blobs. If no upload is possible, button should be hidden. If only one type is possible, I would make it single button described as Upload (for files), Upload blob (for blobs), Upload config (for configs)

psrok1 · 2023-10-10T10:46:14Z

I see that my merge was incomplete, we should ensure that all new features made in between are included. Right now I see that 3rd party sharing is missing.

psrok1

I've made some hands-on on this code and found more issues. Another part of the review

psrok1 · 2023-10-10T15:00:19Z

mwdb/web/src/commons/api/index.tsx

+    UploadConfigRequest,
+    UploadConfigResponse,
+    UploadBlobRequest,
+    UploadBlobReponse,


Suggested change

UploadBlobReponse,

UploadBlobResponse,

psrok1 · 2023-10-10T15:00:51Z

mwdb/web/src/types/api.ts

+export type UploadFileRequest = {
+    file: File;
+    parent?: string;
+    upload_as?: string;


This field is no longer used, as we have shareWith for that.

Suggested change

upload_as?: string;

psrok1 · 2023-10-10T15:01:37Z

mwdb/web/src/types/api.ts

+    family: string;
+    parent?: string;
+    config_type?: string;
+    attributes?: Attribute[];


missing shareWith and share3rdParty. I think it would be nice to split the common fields from specialized fields in that scheme (if possible)

psrok1 · 2023-10-10T15:01:52Z

mwdb/web/src/types/api.ts

+    parent?: string;
+    shareWith: string;
+    group: string;
+    attributes: Attribute[];


missing share3rdParty

psrok1 · 2023-10-10T15:02:47Z

mwdb/web/src/components/Upload/Views/UploadFileView.tsx

+                                </Autocomplete>
+                            </div>
+                        )}
+                        <Attributes


We need to add sharing with 3rd party button. I would add prettified version

Suggested change

<Attributes

<ShowIf condition={

!config.config[

"is_3rd_party_sharing_consent_enabled"

]

}

>

<div className="input-group mb-3">

<div className="input-group-prepend">

<label

className="input-group-text"

>

Share with 3rd party services

</label>

</div>

<div className="input-group-append form-control" style={{

alignItems: "center",

height: "32pt",

}}>

<div className="material-switch make-horizontal">

<input

{...register("share3rdParty" as keyof FormValues)}

type="checkbox"

id="share_3rd_party"

onChange={updateSharing3rdParty}

/>

<label

htmlFor={"share_3rd_party"}

className="bg-primary"

/>

</div>

</div>

<div className="form-hint">

Object can be shared automatically with 3rd party services

</div>

</div>

</ShowIf>

<Attributes

psrok1 · 2023-10-10T15:04:30Z

mwdb/web/src/types/api.ts

@@ -317,3 +327,25 @@ export type OauthRemoveSingleProviderResponse = Response<null>;
 export type OauthGetLogoutLinkResponse = Response<{
    url: string;
 }>;
+
+export type UploadConfigRequest = {


I would place these declarations after UploadFileRequest and Response for better readability

postrowinski added 7 commits April 19, 2023 14:53

add basic routing for upload config and blob and add basic configUplo…

7848576

…ad view

add full working with api config form TODO: try to refactor to react-…

7f362a9

…hook-form

change layout for config and file upload

bd9303e

change native form states to react-hook-forms in UploadConfig

4f14d5a

rewrite UploadFile to react-hook-forms and separate UploadDropzone an…

07272c7

…d Attributes components

add upload blob form

ad34346

Merge remote-tracking branch 'origin/master' into feature/upload-conf…

6a24951

…ig-and-blob-from-ui

postrowinski requested a review from psrok1 April 24, 2023 11:37

postrowinski added 6 commits May 2, 2023 08:45

init commit to rewrite api to typescript

9b7ceae

add some types to api

ec5fc96

add full types to api

3501921

uncomment include in tsconfig

3bc6c20

init commit adding types to commons/ui

5faf4ce

add some rewrite components in commons/ui

e4bdc35

postrowinski marked this pull request as ready for review May 8, 2023 09:43

postrowinski added 15 commits May 8, 2023 15:02

add rest commons/ui components

9484233

Merge branch 'master' into feature/upload-config-and-blob-from-ui

40051fd

# Conflicts: # mwdb/web/src/commons/ui/index.jsx

Merge branch 'master' into feature/add-types-to-common-ui

c541752

# Conflicts: # mwdb/web/package-lock.json # mwdb/web/package.json # mwdb/web/src/commons/hooks/index.js # mwdb/web/src/commons/ui/index.jsx

add almost all type to commons folder (only without plugins)

f9bec86

fix rest types in commons folder

d5d6114

fix import in jest write hooks test and type rest missing types in co…

db245a1

…mmons

add types to react-select and fix conflicts after merge

d97dbaa

prettier fix

240bfa3

init commit

fc739c4

rewrite all components/Profile files

1c78a91

Merge branch 'master' into feature/add-types-to-components-profile

0fa647e

# Conflicts: # mwdb/web/src/commons/api/index.jsx

fix conflicts

649cff8

Merge branch 'master' into feature/add-types-to-common-ui

dd1312a

# Conflicts: # mwdb/web/src/commons/api/index.jsx

fix conflicts

aa5dbe9

postrowinski and others added 22 commits May 23, 2023 09:55

Merge branch 'feature/add-types-to-components-remote' into feature/ad…

b3172f4

…d-types-to-components-rich-attribute

fix conflits after merge with richAttributes

341f74d

rewrite components/showobject/actions

b66fd6e

rewrite most of components/showObject

5b110de

rewrite rest components/showobjects

50aaf92

rewrite some components in components folder

d3a129a

rewrite components/showobject/actions

f049941

rewrite most of components/showObject

0f59c68

rewrite rest components/showobjects

ed3a68b

Fix imports in CommentBox.jsx

c9f834b

rewrite all files in components folder

8db6b23

fixes after review to components/showobject

878bbd7

fix conficts after merge showobject into component

24b1231

prettier fix

03aa9ca

fix prettier and add format script

e485239

change rest default import and rewrite app file to tsx

08a9e8a

Merge branch 'feature/add-types-to-app-file-and-check-all-imports' in…

6e8df93

…to feature/upload-config-and-blob-from-ui # Conflicts: # mwdb/web/src/App.jsx # mwdb/web/src/commons/api/index.jsx # mwdb/web/src/components/Navigation.tsx # mwdb/web/src/components/Views/UploadView.tsx

rewrite components in config blob file to typescript

9bb8789

fix errors after merge conflicts

feb625c

Merge branch 'master' into feature/upload-config-and-blob-from-ui

7808120

psrok1 requested changes Oct 10, 2023

View reviewed changes

postrowinski and others added 2 commits October 11, 2023 14:31

fixes after review

6d1f929

Merge branch 'master' into feature/upload-config-and-blob-from-ui

4ed8dbd

psrok1 approved these changes Nov 3, 2023

View reviewed changes

psrok1 merged commit a450b83 into master Nov 3, 2023
12 checks passed

psrok1 deleted the feature/upload-config-and-blob-from-ui branch November 3, 2023 12:35

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feature/upload config and blob from UI #803

Feature/upload config and blob from UI #803

postrowinski commented Apr 24, 2023 •

edited

Loading

psrok1 left a comment

psrok1 Oct 10, 2023

psrok1 Oct 10, 2023

psrok1 Oct 10, 2023

psrok1 commented Oct 10, 2023 •

edited

Loading

psrok1 left a comment

psrok1 Oct 10, 2023

psrok1 Oct 10, 2023

psrok1 Oct 10, 2023

psrok1 Oct 10, 2023

psrok1 Oct 10, 2023

psrok1 Oct 10, 2023

-                        <Attributes
+                        <ShowIf condition={
+                                !config.config[
+                                    "is_3rd_party_sharing_consent_enabled"
+                                ]
+                            }
+                        >
+                            <div className="input-group mb-3">
+                                <div className="input-group-prepend">
+                                    <label
+                                        className="input-group-text"
+                                    >
+                                        Share with 3rd party services
+                                    </label>
+                                </div>
+                                <div className="input-group-append form-control" style={{
+                                    alignItems: "center",
+                                    height: "32pt",
+                                }}>
+                                    <div className="material-switch make-horizontal">
+                                        <input
+                                            {...register("share3rdParty" as keyof FormValues)}
+                                            type="checkbox"
+                                            id="share_3rd_party"
+                                            onChange={updateSharing3rdParty}
+                                        />
+                                        <label
+                                            htmlFor={"share_3rd_party"}
+                                            className="bg-primary"
+                                        />
+                                    </div>
+                                </div>
+                                <div className="form-hint">
+                                    Object can be shared automatically with 3rd party services
+                                </div>
+                            </div>
+                        </ShowIf>
+                        <Attributes

Feature/upload config and blob from UI #803

Feature/upload config and blob from UI #803

Conversation

postrowinski commented Apr 24, 2023 • edited Loading

psrok1 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

psrok1 commented Oct 10, 2023 • edited Loading

psrok1 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

postrowinski commented Apr 24, 2023 •

edited

Loading

psrok1 commented Oct 10, 2023 •

edited

Loading