Open platform to collect and prioritize feedback
feature: part 1 of image upload on posts (#705)
Guilherme Oenning02eb5663d36c
diff --git a/app/actions/oauth.go b/app/actions/oauth.goindex 41df49eb3..3a1d37900 100644--- a/app/actions/oauth.go+++ b/app/actions/oauth.go@@ -49,6 +49,7 @@ func (input *CreateEditOAuthConfig) Validate(user *models.User, services *app.SeIsRequired: false,MinHeight: 24,MinWidth: 24,+ ExactRatio: true,MaxKilobytes: 50,})if err != nil {diff --git a/app/actions/settings.go b/app/actions/settings.goindex de4b12390..ef1d52937 100644--- a/app/actions/settings.go+++ b/app/actions/settings.go@@ -46,6 +46,7 @@ func (input *UpdateUserSettings) Validate(user *models.User, services *app.ServiIsRequired: input.Model.AvatarType == models.AvatarTypeCustom,MinHeight: 50,MinWidth: 50,+ ExactRatio: true,MaxKilobytes: 100,})if err != nil {diff --git a/app/actions/tenant.go b/app/actions/tenant.goindex 2bea9067b..8faec3994 100644--- a/app/actions/tenant.go+++ b/app/actions/tenant.go@@ -105,6 +105,7 @@ func (input *UpdateTenantSettings) Validate(user *models.User, services *app.SerMinHeight: 200,MinWidth: 200,MaxKilobytes: 100,+ ExactRatio: true,})if err != nil {return validate.Error(err)diff --git a/app/handlers/admin.go b/app/handlers/admin.goindex ee3830c01..df8f04f92 100644--- a/app/handlers/admin.go+++ b/app/handlers/admin.go@@ -2,8 +2,8 @@ package handlersimport ("github.com/getfider/fider/app/actions"- "github.com/getfider/fider/app/pkg/errors""github.com/getfider/fider/app/pkg/web"+ webutil "github.com/getfider/fider/app/pkg/web/util")// GeneralSettingsPage is the general settings page@@ -37,9 +37,9 @@ func UpdateSettings() web.HandlerFunc {return c.HandleValidation(result)}- err := handleImageUpload(c, input.Model.Logo, "logos")+ err := webutil.ProcessImageUpload(c, input.Model.Logo, "logos")if err != nil {- return errors.Wrap(err, "failed to upload new tenant logo")+ return c.Failure(err)}err = c.Services().Tenants.UpdateSettings(input.Model)@@ -141,9 +141,9 @@ func SaveOAuthConfig() web.HandlerFunc {return c.HandleValidation(result)}- err := handleImageUpload(c, input.Model.Logo, "logos")+ err := webutil.ProcessImageUpload(c, input.Model.Logo, "logos")if err != nil {- return errors.Wrap(err, "failed to upload new OAuth logo")+ return c.Failure(err)}err = c.Services().Tenants.SaveOAuthConfig(input.Model)diff --git a/app/handlers/common.go b/app/handlers/common.goindex c33f84680..1e11e63ea 100644--- a/app/handlers/common.go+++ b/app/handlers/common.go@@ -9,11 +9,9 @@ import ("github.com/getfider/fider/app""github.com/getfider/fider/app/models"- "github.com/getfider/fider/app/pkg/blob""github.com/getfider/fider/app/pkg/env""github.com/getfider/fider/app/pkg/errors""github.com/getfider/fider/app/pkg/log"- "github.com/getfider/fider/app/pkg/rand""github.com/getfider/fider/app/pkg/web")@@ -156,20 +154,6 @@ func validateKey(kind models.EmailVerificationKind, c web.Context) (*models.Emaireturn result, nil}-func handleImageUpload(c web.Context, img *models.ImageUpload, preffix string) error {- if img.Remove {- img.BlobKey = ""- } else if img.Upload != nil && len(img.Upload.Content) > 0 {- bkey := fmt.Sprintf("%s/%s-%s", preffix, rand.String(64), blob.SanitizeFileName(img.Upload.FileName))- err := c.Services().Blobs.Put(bkey, img.Upload.Content, img.Upload.ContentType)- if err != nil {- return err- }- img.BlobKey = bkey- }- return nil-}-func between(n, min, max int) int {if n > max {return maxdiff --git a/app/handlers/images.go b/app/handlers/images.goindex 4c113537d..c1e8b0254 100644--- a/app/handlers/images.go+++ b/app/handlers/images.go@@ -165,7 +165,7 @@ func ViewUploadedImage() web.HandlerFunc {return c.Failure(err)}- size = between(size, 50, 2000)+ size = between(size, 0, 2000)logo, err := c.Services().Blobs.Get(bkey)if err != nil {diff --git a/app/handlers/settings.go b/app/handlers/settings.goindex 272dbfdae..67b37e5db 100644--- a/app/handlers/settings.go+++ b/app/handlers/settings.go@@ -7,8 +7,8 @@ import ("github.com/getfider/fider/app/tasks""github.com/getfider/fider/app/actions"- "github.com/getfider/fider/app/pkg/errors""github.com/getfider/fider/app/pkg/web"+ webutil "github.com/getfider/fider/app/pkg/web/util")// ChangeUserEmail register the intent of changing user email@@ -83,8 +83,8 @@ func UpdateUserSettings() web.HandlerFunc {return c.HandleValidation(result)}- if err = handleImageUpload(c, input.Model.Avatar, "avatars"); err != nil {- return errors.Wrap(err, "failed to upload new user custom avatar")+ if err = webutil.ProcessImageUpload(c, input.Model.Avatar, "avatars"); err != nil {+ return c.Failure(err)}if err = c.Services().Users.Update(input.Model); err != nil {diff --git a/app/models/identity.go b/app/models/identity.goindex c7de5a311..00b55ddca 100644--- a/app/models/identity.go+++ b/app/models/identity.go@@ -249,7 +249,7 @@ type UpdateTenantAdvancedSettings struct {//ImageUpload is the input model used to upload/remove an imagetype ImageUpload struct {- BlobKey string+ BlobKey string `json:"bkey"`Upload *ImageUploadData `json:"upload"`Remove bool `json:"remove"`}diff --git a/app/pkg/img/img.go b/app/pkg/img/img.goindex fb55666e3..3695f65c2 100644--- a/app/pkg/img/img.go+++ b/app/pkg/img/img.go@@ -81,7 +81,10 @@ func Resize(size int) ImageOperation {if size >= srcH && size >= srcW {return src}- return imaging.Resize(src, size, 0, imaging.Lanczos)+ if srcW > srcH {+ return imaging.Resize(src, size, 0, imaging.Lanczos)+ }+ return imaging.Resize(src, 0, size, imaging.Lanczos)}}diff --git a/app/pkg/img/img_test.go b/app/pkg/img/img_test.goindex 44bfd40fc..e7df9b830 100644--- a/app/pkg/img/img_test.go+++ b/app/pkg/img/img_test.go@@ -63,6 +63,7 @@ var resizeTestCases = []struct {{"/app/pkg/img/testdata/logo6.jpg", "/app/pkg/img/testdata/logo6-200x200.jpg", 200, 0, false},{"/app/pkg/img/testdata/logo7.gif", "/app/pkg/img/testdata/logo7-200x200.gif", 200, 0, false},{"/app/pkg/img/testdata/logo7.gif", "/app/pkg/img/testdata/logo7-1000-1000.gif", 1000, 0, false},+ {"/app/pkg/img/testdata/logo8.png", "/app/pkg/img/testdata/logo8-200h.gif", 200, 0, false},}func TestImageResize(t *testing.T) {diff --git a/app/pkg/img/testdata/logo8-200h.gif b/app/pkg/img/testdata/logo8-200h.gifnew file mode 100755index 000000000..aabc78c2bBinary files /dev/null and b/app/pkg/img/testdata/logo8-200h.gif differdiff --git a/app/pkg/img/testdata/logo8.png b/app/pkg/img/testdata/logo8.pngnew file mode 100644index 000000000..2797d1c4dBinary files /dev/null and b/app/pkg/img/testdata/logo8.png differdiff --git a/app/pkg/validate/upload.go b/app/pkg/validate/upload.goindex 16ae5b037..a279226d7 100644--- a/app/pkg/validate/upload.go+++ b/app/pkg/validate/upload.go@@ -12,6 +12,7 @@ type ImageUploadOpts struct {IsRequired boolMinWidth intMinHeight int+ ExactRatio boolMaxKilobytes int}@@ -38,7 +39,7 @@ func ImageUpload(upload *models.ImageUpload, opts ImageUploadOpts) ([]string, ermessages = append(messages, fmt.Sprintf("The image must have minimum dimensions of %dx%d pixels.", opts.MinWidth, opts.MinHeight))}- if logo.Width != logo.Height {+ if opts.ExactRatio && logo.Width != logo.Height {messages = append(messages, "The image must have an aspect ratio of 1:1.")}diff --git a/app/pkg/validate/upload_test.go b/app/pkg/validate/upload_test.goindex 7d6e33041..bbe08256b 100644--- a/app/pkg/validate/upload_test.go+++ b/app/pkg/validate/upload_test.go@@ -38,12 +38,38 @@ func TestValidateImageUpload(t *testing.T) {MinHeight: 200,MinWidth: 200,MaxKilobytes: 100,+ ExactRatio: true,})Expect(messages).HasLen(testCase.count)Expect(err).IsNil()}}+func TestValidateImageUpload_ExactRatio(t *testing.T) {+ RegisterT(t)++ img, _ := ioutil.ReadFile(env.Path("/app/pkg/img/testdata/logo3-200w.gif"))+ opts := validate.ImageUploadOpts{+ IsRequired: false,+ MaxKilobytes: 200,+ }++ upload := &models.ImageUpload{+ Upload: &models.ImageUploadData{+ Content: img,+ },+ }+ opts.ExactRatio = true+ messages, err := validate.ImageUpload(upload, opts)+ Expect(messages).HasLen(1)+ Expect(err).IsNil()++ opts.ExactRatio = false+ messages, err = validate.ImageUpload(upload, opts)+ Expect(messages).HasLen(0)+ Expect(err).IsNil()+}+func TestValidateImageUpload_Nil(t *testing.T) {RegisterT(t)@@ -52,6 +78,7 @@ func TestValidateImageUpload_Nil(t *testing.T) {MinHeight: 200,MinWidth: 200,MaxKilobytes: 50,+ ExactRatio: true,})Expect(messages).HasLen(0)Expect(err).IsNil()@@ -61,6 +88,7 @@ func TestValidateImageUpload_Nil(t *testing.T) {MinHeight: 200,MinWidth: 200,MaxKilobytes: 50,+ ExactRatio: true,})Expect(messages).HasLen(0)Expect(err).IsNil()@@ -87,6 +115,7 @@ func TestValidateImageUpload_Required(t *testing.T) {MinHeight: 200,MinWidth: 200,MaxKilobytes: 50,+ ExactRatio: true,})Expect(messages).HasLen(testCase.count)Expect(err).IsNil()diff --git a/app/pkg/web/util/webutil.go b/app/pkg/web/util/webutil.goindex 83b3b0a52..9efeae7df 100644--- a/app/pkg/web/util/webutil.go+++ b/app/pkg/web/util/webutil.go@@ -1,13 +1,16 @@package webutilimport (+ "fmt""net/http""time""github.com/getfider/fider/app/models"+ "github.com/getfider/fider/app/pkg/blob""github.com/getfider/fider/app/pkg/env""github.com/getfider/fider/app/pkg/errors""github.com/getfider/fider/app/pkg/jwt"+ "github.com/getfider/fider/app/pkg/rand""github.com/getfider/fider/app/pkg/web")@@ -87,3 +90,16 @@ func GetOAuthBaseURL(ctx web.Context) string {return oauthBaseURL}++// ProcessImageUpload uploads image to blob (if it's a new one)+func ProcessImageUpload(c web.Context, img *models.ImageUpload, preffix string) error {+ if img.Upload != nil && len(img.Upload.Content) > 0 {+ bkey := fmt.Sprintf("%s/%s-%s", preffix, rand.String(64), blob.SanitizeFileName(img.Upload.FileName))+ err := c.Services().Blobs.Put(bkey, img.Upload.Content, img.Upload.ContentType)+ if err != nil {+ return errors.Wrap(err, "failed to upload new blob")+ }+ img.BlobKey = bkey+ }+ return nil+}diff --git a/app/storage/inmemory/tenant.go b/app/storage/inmemory/tenant.goindex 366c02069..78633e4ce 100644--- a/app/storage/inmemory/tenant.go+++ b/app/storage/inmemory/tenant.go@@ -92,6 +92,10 @@ func (s *TenantStorage) IsCNAMEAvailable(cname string) (bool, error) {// UpdateSettings of current tenantfunc (s *TenantStorage) UpdateSettings(settings *models.UpdateTenantSettings) error {+ if settings.Logo.Remove {+ settings.Logo.BlobKey = ""+ }+for _, tenant := range s.tenants {if tenant.ID == s.current.ID {tenant.Invitation = settings.Invitationdiff --git a/app/storage/postgres/tenant.go b/app/storage/postgres/tenant.goindex 5cc335b23..2ff2dc9ee 100644--- a/app/storage/postgres/tenant.go+++ b/app/storage/postgres/tenant.go@@ -179,13 +179,12 @@ func (s *TenantStorage) GetByDomain(domain string) (*models.Tenant, error) {// UpdateSettings of current tenantfunc (s *TenantStorage) UpdateSettings(settings *models.UpdateTenantSettings) error {- bkey := ""- if settings.Logo != nil {- bkey = settings.Logo.BlobKey+ if settings.Logo.Remove {+ settings.Logo.BlobKey = ""}query := "UPDATE tenants SET name = $1, invitation = $2, welcome_message = $3, cname = $4, logo_bkey = $5 WHERE id = $6"- _, err := s.trx.Execute(query, settings.Title, settings.Invitation, settings.WelcomeMessage, settings.CNAME, bkey, s.current.ID)+ _, err := s.trx.Execute(query, settings.Title, settings.Invitation, settings.WelcomeMessage, settings.CNAME, settings.Logo.BlobKey, s.current.ID)if err != nil {return errors.Wrap(err, "failed update tenant settings")}@@ -289,6 +288,10 @@ func (s *TenantStorage) SetKeyAsVerified(key string) error {func (s *TenantStorage) SaveOAuthConfig(config *models.CreateEditOAuthConfig) error {var err error+ if config.Logo.Remove {+ config.Logo.BlobKey = ""+ }+if config.ID == 0 {query := `INSERT INTO oauth_providers (tenant_id, provider, display_name, status,diff --git a/app/storage/postgres/tenant_test.go b/app/storage/postgres/tenant_test.goindex d9484e1c8..97af1dfb9 100644--- a/app/storage/postgres/tenant_test.go+++ b/app/storage/postgres/tenant_test.go@@ -119,6 +119,7 @@ func TestTenantStorage_GetByDomain_CNAME(t *testing.T) {tenants.UpdateSettings(&models.UpdateTenantSettings{Title: "My Domain Inc.",CNAME: "feedback.mycompany.com",+ Logo: &models.ImageUpload{},})tenant, err = tenants.GetByDomain("feedback.mycompany.com")diff --git a/app/storage/postgres/user.go b/app/storage/postgres/user.goindex 0f885fbbf..08eacf95b 100644--- a/app/storage/postgres/user.go+++ b/app/storage/postgres/user.go@@ -156,6 +156,9 @@ func (s *UserStorage) RegisterProvider(userID int, provider *models.UserProvider// Update user profilefunc (s *UserStorage) Update(settings *models.UpdateUserSettings) error {+ if settings.Avatar.Remove {+ settings.Avatar.BlobKey = ""+ }cmd := "UPDATE users SET name = $3, avatar_type = $4, avatar_bkey = $5 WHERE id = $1 AND tenant_id = $2"_, err := s.trx.Execute(cmd, s.user.ID, s.tenant.ID, settings.Name, settings.AvatarType, settings.Avatar.BlobKey)if err != nil {diff --git a/public/components/common/form/ImageUploader.scss b/public/components/common/form/ImageUploader.scssindex 2c4c2e7d3..5a6a27912 100644--- a/public/components/common/form/ImageUploader.scss+++ b/public/components/common/form/ImageUploader.scss@@ -17,14 +17,17 @@display: inline-block;img {padding: 5px;+ min-width: 50px;+ min-height: 50px;border: 1px solid $gray-light;cursor: pointer;}.c-button {font-weight: 600;position: absolute;- top: -12px;- right: -12px;+ border-color: $red;+ top: 4px;+ right: 0px;border-radius: 50%;padding: 4px 6px;}diff --git a/public/components/common/form/ImageUploader.tsx b/public/components/common/form/ImageUploader.tsxindex 135ce3dda..07c5904ef 100644--- a/public/components/common/form/ImageUploader.tsx+++ b/public/components/common/form/ImageUploader.tsx@@ -9,13 +9,13 @@ import { FaRegImage } from "react-icons/fa";import { ImageUpload } from "@fider/models";interface ImageUploaderProps {- instanceId?: string;+ instanceID?: string;field: string;label?: string;bkey?: string;disabled?: boolean;previewMaxWidth: number;- onChange(state: ImageUpload, instanceId?: string): void;+ onChange(state: ImageUpload, instanceID?: string, previewURL?: string): void;}interface ImageUploaderState extends ImageUpload {@@ -53,7 +53,7 @@ export class ImageUploader extends React.Component<ImageUploaderProps, ImageUplopreviewURL: `data:${file.type};base64,${base64}`},() => {- this.props.onChange(this.state, this.props.instanceId);+ this.props.onChange(this.state, this.props.instanceID, this.state.previewURL);});}@@ -72,7 +72,15 @@ export class ImageUploader extends React.Component<ImageUploaderProps, ImageUplopreviewURL: undefined},() => {- this.props.onChange(this.state, this.props.instanceId);+ this.props.onChange(+ {+ bkey: this.state.bkey,+ remove: this.state.remove,+ upload: this.state.upload+ },+ this.props.instanceID,+ this.state.previewURL+ );});};diff --git a/public/components/common/form/ImageViewer.scss b/public/components/common/form/ImageViewer.scssnew file mode 100644index 000000000..db5bbeac8--- /dev/null+++ b/public/components/common/form/ImageViewer.scss@@ -0,0 +1,13 @@+@import '~@fider/assets/styles/variables.scss';++.c-image-viewer {+ display: inline-block;+ cursor: pointer;+ margin-top: 10px;+ img {+ vertical-align: top;+ }+ + .c-image-viewer {+ margin-left: 10px;+ }+}\ No newline at end of filediff --git a/public/components/common/form/ImageViewer.tsx b/public/components/common/form/ImageViewer.tsxnew file mode 100644index 000000000..045886758--- /dev/null+++ b/public/components/common/form/ImageViewer.tsx@@ -0,0 +1,73 @@+import React from "react";+import { uploadedImageURL } from "@fider/services";+import { Modal, Button, Loader } from "@fider/components";++import "./ImageViewer.scss";++interface ImageViewerProps {+ bkey: string;+}++interface ImageViewerState {+ showModal: boolean;+ loadedThumbnail: boolean;+ loadedPreview: boolean;+}++export class ImageViewer extends React.Component<ImageViewerProps, ImageViewerState> {+ constructor(props: ImageViewerProps) {+ super(props);++ this.state = {+ showModal: false,+ loadedThumbnail: false,+ loadedPreview: false+ };+ }++ private openModal = () => {+ if (this.state.loadedThumbnail) {+ this.setState({ showModal: true });+ }+ };++ private closeModal = async () => {+ this.setState({ showModal: false });+ };++ private onThumbnailLoad = () => {+ this.setState({ loadedThumbnail: true });+ };++ private onPreviewLoad = () => {+ this.setState({ loadedPreview: true });+ };++ private modal() {+ return (+ <Modal.Window isOpen={this.state.showModal} center={false} size="fluid">+ <Modal.Content>+ {!this.state.loadedPreview && <Loader />}+ <img onLoad={this.onPreviewLoad} src={uploadedImageURL(this.props.bkey, 1500)} />+ </Modal.Content>++ <Modal.Footer>+ <Button color="cancel" onClick={this.closeModal}>+ Close+ </Button>+ </Modal.Footer>+ </Modal.Window>+ );+ }++ public render() {+ const previewURL = uploadedImageURL(this.props.bkey, 200);+ return (+ <div className="c-image-viewer">+ {this.modal()}+ {!this.state.loadedThumbnail && <Loader />}+ <img onClick={this.openModal} onLoad={this.onThumbnailLoad} src={previewURL} />+ </div>+ );+ }+}diff --git a/public/components/common/form/MultiImageUploader.scss b/public/components/common/form/MultiImageUploader.scssindex de154f94e..cd0516e61 100644--- a/public/components/common/form/MultiImageUploader.scss+++ b/public/components/common/form/MultiImageUploader.scss@@ -1,7 +1,9 @@.c-multi-image-uploader {- display: flex;- flex-wrap: wrap;- .c-image-upload {- margin-right: 10px;+ .c-multi-image-uploader-instances {+ display: flex;+ flex-wrap: wrap;+ .c-image-upload {+ margin-right: 10px;+ }}}\ No newline at end of filediff --git a/public/components/common/form/MultiImageUploader.tsx b/public/components/common/form/MultiImageUploader.tsxindex a83effad5..f1d611287 100644--- a/public/components/common/form/MultiImageUploader.tsx+++ b/public/components/common/form/MultiImageUploader.tsx@@ -1,10 +1,15 @@import React from "react";import { ImageUploader } from "./ImageUploader";-import "./MultiImageUploader.scss";import { ImageUpload } from "@fider/models";+import { ValidationContext, hasError, DisplayError } from "@fider/components";+import { classSet } from "@fider/services";++import "./MultiImageUploader.scss";interface MultiImageUploaderProps {+ field: string;maxUploads: number;+ bkeys?: string[];previewMaxWidth: number;onChange?: (uploads: ImageUpload[]) => void;}@@ -19,54 +24,70 @@ interface MultiImageUploaderInstances {interface MultiImageUploaderState {count: number;instances: MultiImageUploaderInstances;+ removed: ImageUpload[];}export class MultiImageUploader extends React.Component<MultiImageUploaderProps, MultiImageUploaderState> {constructor(props: MultiImageUploaderProps) {super(props);+ let count = 1;const instances = {};- this.addNewElement(instances);- this.state = {- instances,- count: 1- };+ if (props.bkeys) {+ for (const bkey of props.bkeys) {+ count++;+ this.addNewElement(instances, bkey);+ }+ }++ if (count <= this.props.maxUploads) {+ count++;+ this.addNewElement(instances);+ }++ this.state = { instances, count, removed: [] };}- private imageUploaded = (upload: ImageUpload, instanceId: string) => {+ private imageUploaded = (upload: ImageUpload, instanceID: string) => {const instances = { ...this.state.instances };+ const removed = [...this.state.removed];let count = this.state.count;if (upload.remove) {- delete instances[instanceId];+ if (upload.bkey) {+ removed.push(upload);+ }+ delete instances[instanceID];if (--count === this.props.maxUploads) {this.addNewElement(instances);}} else {- instances[instanceId].upload = upload;+ instances[instanceID].upload = upload;count++;if (count <= this.props.maxUploads) {this.addNewElement(instances);}}- this.setState({ instances, count }, this.triggerOnChange);+ this.setState({ instances, count, removed }, this.triggerOnChange);};private triggerOnChange() {if (this.props.onChange) {const uploads = Object.keys(this.state.instances).map(k => this.state.instances[k].upload)+ .concat(this.state.removed).filter(x => !!x) as ImageUpload[];this.props.onChange(uploads);}}- private addNewElement(instances: MultiImageUploaderInstances) {+ private addNewElement(instances: MultiImageUploaderInstances, bkey?: string) {const id = btoa(Math.random().toString());instances[id] = {element: (<ImageUploaderkey={id}- instanceId={id}+ bkey={bkey}+ instanceID={id}field="attachment"previewMaxWidth={this.props.previewMaxWidth}onChange={this.imageUploaded}@@ -77,6 +98,21 @@ export class MultiImageUploader extends React.Component<MultiImageUploaderProps,public render() {const elements = Object.keys(this.state.instances).map(k => this.state.instances[k].element);- return <div className="c-multi-image-uploader">{elements}</div>;+ return (+ <ValidationContext.Consumer>+ {ctx => (+ <div+ className={classSet({+ "c-form-field": true,+ "c-multi-image-uploader": true,+ "m-error": hasError(this.props.field, ctx.error)+ })}+ >+ <div className="c-multi-image-uploader-instances">{elements}</div>+ <DisplayError fields={[this.props.field]} error={ctx.error} />+ </div>+ )}+ </ValidationContext.Consumer>+ );}}diff --git a/public/components/common/index.tsx b/public/components/common/index.tsxindex 10c91c961..b15399db7 100644--- a/public/components/common/index.tsx+++ b/public/components/common/index.tsx@@ -9,6 +9,7 @@ export * from "./form/DisplayError";export * from "./form/Select";export * from "./form/Field";export * from "./form/Checkbox";+export * from "./form/ImageViewer";export * from "./MultiLineText";export * from "./EnvironmentInfo";export * from "./TenantStatusInfo";diff --git a/public/pages/Administration/components/OAuthForm.tsx b/public/pages/Administration/components/OAuthForm.tsxindex bea8c9b36..e268e0c92 100644--- a/public/pages/Administration/components/OAuthForm.tsx+++ b/public/pages/Administration/components/OAuthForm.tsx@@ -24,6 +24,7 @@ export interface OAuthFormState {jsonUserEmailPath: string;logoBlobKey?: string;logo?: ImageUpload;+ logoURL?: string;error?: Failure;}@@ -79,8 +80,8 @@ export class OAuthForm extends React.Component<OAuthFormProps, OAuthFormState> {this.setState({ displayName });};- private setLogo = (logo: ImageUpload, previewURL: string) => {- this.setState({ logo });+ private setLogo = (logo: ImageUpload, instanceID: string, previewURL: string) => {+ this.setState({ logo, logoURL: previewURL, logoBlobKey: "" });};private setStatus = async (enabled: boolean) => {