Open platform to collect and prioritize feedback
refactor: move file upload to ImageUploader component (#463)
Guilherme Oenningf9419b4d31c5
diff --git a/app/cmd/routes.go b/app/cmd/routes.goindex 03e69c234..53eda137f 100644--- a/app/cmd/routes.go+++ b/app/cmd/routes.go@@ -47,7 +47,7 @@ func routes(r *web.Engine) *web.Engine {{tenantAssets.Use(middlewares.ClientCache(72 * time.Hour))tenantAssets.Get("/avatars/:size/:id/:name", handlers.Avatar())- tenantAssets.Get("/logo/:size/:id", handlers.Logo())+ tenantAssets.Get("/images/:size/:id", handlers.ViewUploadedImage())tenantAssets.Get("/custom/:md5.css", func(c web.Context) error {return c.Blob(http.StatusOK, "text/css", []byte(c.Tenant().CustomCSS))})diff --git a/app/handlers/images.go b/app/handlers/images.goindex 939669fa4..ffc0be047 100644--- a/app/handlers/images.go+++ b/app/handlers/images.go@@ -63,8 +63,8 @@ func Avatar() web.HandlerFunc {}}-//Logo returns tenant logo by its ID on a given size-func Logo() web.HandlerFunc {+//ViewUploadedImage returns any uploaded image by given ID and size+func ViewUploadedImage() web.HandlerFunc {return func(c web.Context) error {id, err := c.ParamAsInt("id")if err != nil {@@ -76,7 +76,7 @@ func Logo() web.HandlerFunc {return c.Failure(err)}- logo, err := c.Services().Tenants.GetLogo(id)+ logo, err := c.Services().Tenants.GetUpload(id)if err != nil {return c.Failure(err)}diff --git a/app/pkg/web/renderer.go b/app/pkg/web/renderer.goindex 08400f0ea..bd3a37f88 100644--- a/app/pkg/web/renderer.go+++ b/app/pkg/web/renderer.go@@ -120,8 +120,8 @@ func (r *Renderer) Render(w io.Writer, name string, props Props, ctx *Context) {m["__fontBundle"] = ctx.GlobalAssetsURL("/assets/fonts/%s", r.assets["icons.woff2"])if ctx.Tenant() != nil && ctx.Tenant().LogoID > 0 {- m["__logo"] = ctx.TenantAssetsURL("/logo/200/%d", ctx.Tenant().LogoID)- m["__favicon"] = ctx.TenantAssetsURL("/logo/50/%d", ctx.Tenant().LogoID)+ m["__logo"] = ctx.TenantAssetsURL("/images/200/%d", ctx.Tenant().LogoID)+ m["__favicon"] = ctx.TenantAssetsURL("/images/50/%d", ctx.Tenant().LogoID)} else {m["__logo"] = "https://getfider.com/images/logo-100x100.png"m["__favicon"] = ctx.GlobalAssetsURL("/favicon.ico")diff --git a/app/storage/inmemory/tenant.go b/app/storage/inmemory/tenant.goindex 861c75457..cecd52b7a 100644--- a/app/storage/inmemory/tenant.go+++ b/app/storage/inmemory/tenant.go@@ -179,8 +179,8 @@ func (s *TenantStorage) SetKeyAsVerified(key string) error {return nil}-// GetLogo returns tenant logo by id-func (s *TenantStorage) GetLogo(id int) (*models.Upload, error) {+// GetUpload returns upload by id+func (s *TenantStorage) GetUpload(id int) (*models.Upload, error) {if s.tenantLogos != nil {logo, ok := s.tenantLogos[id]if !ok {diff --git a/app/storage/postgres/tenant.go b/app/storage/postgres/tenant.goindex 9fda3b713..d8bc8c153 100644--- a/app/storage/postgres/tenant.go+++ b/app/storage/postgres/tenant.go@@ -156,39 +156,65 @@ func (s *TenantStorage) UpdateSettings(settings *models.UpdateTenantSettings) ers.current.CNAME = settings.CNAMEs.current.WelcomeMessage = settings.WelcomeMessage+ // Only update tenant logo if there's a changeif settings.Logo != nil {var newLogoID sql.NullInt64+ // If there's an upload, save itif !settings.Logo.Remove && len(settings.Logo.Upload.Content) > 0 {- err := s.trx.Get(&newLogoID, `- INSERT INTO uploads (tenant_id, size, content_type, file, created_on)- VALUES ($1, $2, $3, $4, $5) RETURNING id- `, s.current.ID, len(settings.Logo.Upload.Content), http.DetectContentType(settings.Logo.Upload.Content), settings.Logo.Upload.Content, time.Now(),- )+ uploadID, err := s.SaveNewUpload(settings.Logo.Upload.Content)if err != nil {return errors.Wrap(err, "failed to upload new tenant logo")}+ newLogoID.Scan(uploadID)}+ // Update current tenant logo to either new ID or nullquery := "UPDATE tenants SET logo_id = $1 WHERE id = $2"_, err = s.trx.Execute(query, newLogoID, s.current.ID)if err != nil {return errors.Wrap(err, "failed update tenant logo")}- if s.current.LogoID > 0 {- query := "DELETE FROM uploads WHERE id = $1 AND tenant_id = $2"- _, err = s.trx.Execute(query, s.current.LogoID, s.current.ID)- if err != nil {- return errors.Wrap(err, "failed delete old tenant logo")- }+ // Remove upload based on old tenant logo ID+ err := s.RemoveUpload(s.current.LogoID)+ if err != nil {+ return errors.Wrap(err, "failed delete old tenant logo")}++ // Update reference to new logo IDs.current.LogoID = int(newLogoID.Int64)}return nil}+// SaveNewUpload saves given content and return upload id+func (s *TenantStorage) SaveNewUpload(content []byte) (int, error) {+ var newID int+ err := s.trx.Get(&newID, `+ INSERT INTO uploads (tenant_id, size, content_type, file, created_on)+ VALUES ($1, $2, $3, $4, $5) RETURNING id+ `, s.current.ID, len(content), http.DetectContentType(content), content, time.Now(),+ )+ if err != nil {+ return 0, errors.Wrap(err, "failed to save new upload")+ }+ return newID, nil+}++// RemoveUpload by given id+func (s *TenantStorage) RemoveUpload(uploadID int) error {+ if uploadID > 0 {+ query := "DELETE FROM uploads WHERE id = $1 AND tenant_id = $2"+ _, err := s.trx.Execute(query, uploadID, s.current.ID)+ if err != nil {+ return errors.Wrap(err, "failed delete upload")+ }+ }+ return nil+}+// UpdateAdvancedSettings of current tenantfunc (s *TenantStorage) UpdateAdvancedSettings(settings *models.UpdateTenantAdvancedSettings) error {query := "UPDATE tenants SET custom_css = $1 WHERE id = $2"@@ -276,21 +302,19 @@ func (s *TenantStorage) SetKeyAsVerified(key string) error {return nil}-// GetLogo returns tenant logo by id-func (s *TenantStorage) GetLogo(id int) (*models.Upload, error) {+// GetUpload returns upload by id+func (s *TenantStorage) GetUpload(id int) (*models.Upload, error) {upload := &models.Upload{}err := s.trx.Get(upload, `- SELECT content_type, size, file FROM tenants- INNER JOIN uploads- ON uploads.tenant_id = tenants.id- AND uploads.id = tenants.logo_id- WHERE tenants.id = $1 AND uploads.id = $2+ SELECT content_type, size, file+ FROM uploads+ WHERE tenant_id = $1 AND id = $2`, s.current.ID, id)if err == app.ErrNotFound {return nil, app.ErrNotFound}if err != nil {- return nil, errors.Wrap(err, "failed to get logo from tenant")+ return nil, errors.Wrap(err, "failed to get upload from tenant")}return upload, nil}diff --git a/app/storage/postgres/tenant_test.go b/app/storage/postgres/tenant_test.goindex 008e3ffac..51b0f883a 100644--- a/app/storage/postgres/tenant_test.go+++ b/app/storage/postgres/tenant_test.go@@ -199,7 +199,7 @@ func TestTenantStorage_UpdateSettings_WithLogo(t *testing.T) {err := tenants.UpdateSettings(settings)Expect(err).IsNil()- upload, err := tenants.GetLogo(tenant.LogoID)+ upload, err := tenants.GetUpload(tenant.LogoID)Expect(err).IsNil()Expect(upload.Content).Equals(logo)Expect(upload.Size).Equals(len(logo))@@ -240,7 +240,7 @@ func TestTenantStorage_UpdateSettings_ReplaceLogo(t *testing.T) {Expect(err).IsNil()firstLogoID := tenant.LogoID- upload, err := tenants.GetLogo(firstLogoID)+ upload, err := tenants.GetUpload(firstLogoID)Expect(err).IsNil()Expect(upload.Content).Equals(logo)Expect(upload.Size).Equals(len(logo))@@ -254,13 +254,13 @@ func TestTenantStorage_UpdateSettings_ReplaceLogo(t *testing.T) {Expect(tenant.LogoID).NotEquals(firstLogoID)- upload, err = tenants.GetLogo(tenant.LogoID)+ upload, err = tenants.GetUpload(tenant.LogoID)Expect(err).IsNil()Expect(upload.Content).Equals(newLogo)Expect(upload.Size).Equals(len(newLogo))Expect(upload.ContentType).Equals("text/html; charset=utf-8")- upload, err = tenants.GetLogo(firstLogoID)+ upload, err = tenants.GetUpload(firstLogoID)Expect(err).Equals(app.ErrNotFound)Expect(upload).IsNil()}diff --git a/app/storage/storage.go b/app/storage/storage.goindex 582923c7c..c53584c4e 100644--- a/app/storage/storage.go+++ b/app/storage/storage.go@@ -71,7 +71,7 @@ type Tenant interface {SaveVerificationKey(key string, duration time.Duration, request models.NewEmailVerification) errorFindVerificationByKey(kind models.EmailVerificationKind, key string) (*models.EmailVerification, error)SetKeyAsVerified(key string) error- GetLogo(id int) (*models.Upload, error)+ GetUpload(id int) (*models.Upload, error)}// Tag contains read and write operations for tagsdiff --git a/public/components/common/Logo.tsx b/public/components/common/Logo.tsxindex ccfdcc6b4..9fee26856 100644--- a/public/components/common/Logo.tsx+++ b/public/components/common/Logo.tsx@@ -2,20 +2,21 @@ import * as React from "react";import { Fider } from "@fider/services";interface LogoProps {- url?: string;- size?: 50 | 100 | 200;+ size: 50 | 100 | 200;}-export const Logo = (props: LogoProps) => {+export const LogoUrl = (size: 50 | 100 | 200): string | undefined => {const tenant = Fider.session.tenant;- if (props.url) {- return <img src={props.url} />;+ if (tenant && tenant.logoId > 0) {+ return `${Fider.settings.assetsURL}/images/${size}/${Fider.session.tenant.logoId}`;}+ return undefined;+};- const size = props.size || 200;+export const Logo = (props: LogoProps) => {+ const tenant = Fider.session.tenant;if (tenant && tenant.logoId > 0) {- return <img src={`${Fider.settings.assetsURL}/logo/${size}/${tenant.logoId}`} alt={tenant.name} />;+ return <img src={LogoUrl(props.size)} alt={tenant.name} />;}-return null;};diff --git a/public/components/common/form/ImageUploader.scss b/public/components/common/form/ImageUploader.scssnew file mode 100644index 000000000..a790207ba--- /dev/null+++ b/public/components/common/form/ImageUploader.scss@@ -0,0 +1,15 @@+@import '~@fider/assets/styles/variables.scss';++.c-image-upload {+ input[type='file'] {+ display: none;+ }++ img.preview {+ background-color: $white;+ padding: 10px;+ border: 1px solid rgba(34, 36, 38, 0.15);+ border-radius: 3px;+ margin-right: 10px;+ }+}\ No newline at end of filediff --git a/public/components/common/form/ImageUploader.tsx b/public/components/common/form/ImageUploader.tsxnew file mode 100644index 000000000..39a20531c--- /dev/null+++ b/public/components/common/form/ImageUploader.tsx@@ -0,0 +1,118 @@+import "./ImageUploader.scss";++import * as React from "react";+import { ValidationContext } from "./Form";+import { DisplayError, hasError } from "./DisplayError";+import { classSet, fileToBase64 } from "@fider/services";+import { Button, ButtonClickEvent } from "@fider/components";++interface ImageUploaderProps {+ field: string;+ label?: string;+ defaultImageUrl?: string;+ disabled?: boolean;+ previewMaxWidth: number;+ onChange(state: ImageUploaderState, previewUrl?: string): void;+}++interface ImageUploaderState extends ImageUploadState {+ previewUrl?: string;+}++export interface ImageUploadState {+ upload?: {+ content?: string;+ contentType?: string;+ };+ remove: boolean;+}++export class ImageUploader extends React.Component<ImageUploaderProps, ImageUploaderState> {+ private fileSelector?: HTMLInputElement | null;+ constructor(props: ImageUploaderProps) {+ super(props);+ this.state = {+ upload: undefined,+ remove: false,+ previewUrl: this.props.defaultImageUrl+ };+ }++ public fileChanged = async (e: React.ChangeEvent<HTMLInputElement>) => {+ if (e.target.files && e.target.files[0]) {+ const file = e.target.files[0];+ const base64 = await fileToBase64(file);+ this.setState(+ {+ upload: {+ content: base64,+ contentType: file.type,+ action: "upload"+ },+ remove: false,+ previewUrl: `data:${file.type};base64,${base64}`+ },+ () => {+ this.props.onChange(this.state, this.state.previewUrl);+ }+ );+ }+ };++ public removeFile = async (e: ButtonClickEvent) => {+ this.setState(+ {+ remove: true,+ upload: undefined+ },+ () => {+ this.props.onChange(this.state, this.state.previewUrl);+ }+ );+ };++ public selectFile = async (e: ButtonClickEvent) => {+ if (this.fileSelector) {+ this.fileSelector.click();+ }+ };++ public render() {+ const isUploading = !!this.state.upload;+ const hasFile = (!this.state.remove && this.props.defaultImageUrl) || isUploading;++ const imgStyles: React.CSSProperties = {+ maxWidth: `${this.props.previewMaxWidth}px`+ };++ return (+ <ValidationContext.Consumer>+ {ctx => (+ <div+ className={classSet({+ "c-form-field": true,+ "c-image-upload": true,+ "m-error": hasError(this.props.field, ctx.error)+ })}+ >+ <label htmlFor={`input-${this.props.field}`}>{this.props.label}</label>+ {hasFile && <img className="preview" src={this.state.previewUrl} style={imgStyles} />}+ <input ref={e => (this.fileSelector = e)} type="file" onChange={this.fileChanged} />+ <DisplayError fields={[this.props.field]} error={ctx.error} />+ <div>+ <Button size="tiny" onClick={this.selectFile} disabled={this.props.disabled}>+ {hasFile ? "Change" : "Upload"}+ </Button>+ {hasFile && (+ <Button onClick={this.removeFile} size="tiny" disabled={this.props.disabled}>+ Remove+ </Button>+ )}+ </div>+ {this.props.children}+ </div>+ )}+ </ValidationContext.Consumer>+ );+ }+}diff --git a/public/components/common/index.tsx b/public/components/common/index.tsxindex f7ac117b1..beb8327fe 100644--- a/public/components/common/index.tsx+++ b/public/components/common/index.tsx@@ -1,6 +1,7 @@export * from "./Button";export * from "./form/Form";export * from "./form/Input";+export * from "./form/ImageUploader";export * from "./form/TextArea";export * from "./form/RadioButton";export * from "./form/DisplayError";diff --git a/public/pages/Administration/pages/GeneralSettings.page.tsx b/public/pages/Administration/pages/GeneralSettings.page.tsxindex ce8f05346..70cde88f8 100644--- a/public/pages/Administration/pages/GeneralSettings.page.tsx+++ b/public/pages/Administration/pages/GeneralSettings.page.tsx@@ -2,7 +2,16 @@ import "./GeneralSettings.page.scss";import * as React from "react";-import { Button, ButtonClickEvent, TextArea, DisplayError, Logo, Form, Input, Field } from "@fider/components/common";+import {+ Button,+ ButtonClickEvent,+ TextArea,+ Form,+ Input,+ ImageUploader,+ ImageUploadState,+ LogoUrl+} from "@fider/components/common";import { actions, Failure, fileToBase64, Fider } from "@fider/services";import { AdminBasePage } from "../components";@@ -11,13 +20,7 @@ interface GeneralSettingsPageProps {}interface GeneralSettingsPageState {- logo?: {- upload?: {- content?: string;- contentType?: string;- };- remove: boolean;- };+ logo?: ImageUploadState;title: string;invitation: string;welcomeMessage: string;@@ -112,19 +115,15 @@ export class GeneralSettingsPage extends AdminBasePage<GeneralSettingsPageProps,this.setState({ invitation });};+ private setLogo = (logo: ImageUploadState): void => {+ this.setState({ logo });+ };+private setCNAME = (cname: string): void => {this.setState({ cname });};public content() {- const isRemoving = this.state.logo ? this.state.logo.remove : false;- const isUploading = this.state.logo ? !!this.state.logo.upload : false;- const hasFile = (Fider.session.tenant.logoId > 0 && !isRemoving) || isUploading;- const previewUrl =- isUploading && this.state.logo && this.state.logo.upload- ? `data:${this.state.logo.upload.contentType};base64,${this.state.logo.upload.content}`- : undefined;-return (<Form error={this.state.error}><Input@@ -151,25 +150,19 @@ export class GeneralSettingsPage extends AdminBasePage<GeneralSettingsPageProps,onChange={this.setInvitation}/>- <Field label="Logo" className="c-logo-upload">- {hasFile && <Logo size={200} url={previewUrl} />}- <input ref={e => (this.fileSelector = e)} type="file" onChange={this.fileChanged} />- <DisplayError fields={["logo"]} error={this.state.error} />- <div>- <Button size="tiny" onClick={this.selectFile} disabled={!Fider.session.user.isAdministrator}>- {hasFile ? "Change" : "Upload"}- </Button>- {hasFile && (- <Button onClick={this.removeFile} size="tiny" disabled={!Fider.session.user.isAdministrator}>- Remove- </Button>- )}- </div>+ <ImageUploader+ label="Logo"+ field="logo"+ defaultImageUrl={LogoUrl(200)}+ previewMaxWidth={200}+ disabled={!Fider.session.user.isAdministrator}+ onChange={this.setLogo}+ ><p className="info">We accept JPG, GIF and PNG images, smaller than 100KB and with an aspect ratio of 1:1 with minimumdimensions of 200x200 pixels.</p>- </Field>+ </ImageUploader>{!Fider.isSingleHostMode() && (<Inputdiff --git a/public/services/markdown.spec.ts b/public/services/markdown.spec.tsindex f91ffcc07..45e72521a 100644--- a/public/services/markdown.spec.ts+++ b/public/services/markdown.spec.ts@@ -7,9 +7,9 @@ const testCases = [expectedSimple: '<p>Visit <a href="https://github.com" target="_blank">GitHub</a> to learn more.</p>'},{- input: "My Picture ",- expectedFull: '<p>My Picture <img src="http://demo.dev.fider.io:3000/logo/100/28" alt="" /></p>',- expectedSimple: '<p>My Picture !<a href="http://demo.dev.fider.io:3000/logo/100/28" target="_blank"></a></p>'+ input: "My Picture ",+ expectedFull: '<p>My Picture <img src="http://demo.dev.fider.io:3000/images/100/28" alt="" /></p>',+ expectedSimple: '<p>My Picture !<a href="http://demo.dev.fider.io:3000/images/100/28" target="_blank"></a></p>'}];