Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

fix: dbx was setting to null when there were no values in array (#659)

Guilherme Oenning664c239cf934
diff --git a/app/pkg/dbx/dbx.go b/app/pkg/dbx/dbx.go
index 7aa7a701b..d34010864 100644
--- a/app/pkg/dbx/dbx.go
+++ b/app/pkg/dbx/dbx.go
@@ -309,7 +309,9 @@ func (trx *Trx) Select(data interface{}, command string, args ...interface{}) er
items = reflect.Append(items, item)
}
- reflect.Indirect(reflect.ValueOf(data)).Set(items)
+ if items.Len() > 0 {
+ reflect.Indirect(reflect.ValueOf(data)).Set(items)
+ }
return nil
}
diff --git a/app/pkg/dbx/dbx_test.go b/app/pkg/dbx/dbx_test.go
index 027348823..849dbd0c4 100644
--- a/app/pkg/dbx/dbx_test.go
+++ b/app/pkg/dbx/dbx_test.go
@@ -1,6 +1,7 @@
package dbx_test
import (
+ "encoding/json"
"io/ioutil"
"os"
"testing"
@@ -254,6 +255,28 @@ func TestArray(t *testing.T) {
Expect(result.Tags[1]).Equals(int64(10))
}
+func TestArray_Empty(t *testing.T) {
+ RegisterT(t)
+ db := dbx.New()
+ defer db.Close()
+
+ trx, _ := db.Begin()
+ defer trx.Rollback()
+
+ type postTags struct {
+ ID int `db:"id"`
+ Slug string `db:"slug"`
+ }
+
+ result := []*postTags{}
+ err := trx.Select(&result, "SELECT id, name FROM Tags WHERE id = -1")
+ Expect(err).IsNil()
+ Expect(result).HasLen(0)
+ bytes, err := json.Marshal(result)
+ Expect(err).IsNil()
+ Expect(string(bytes)).Equals("[]")
+}
+
func TestByteArray(t *testing.T) {
RegisterT(t)
db := dbx.New()
diff --git a/public/components/common/Logo.tsx b/public/components/common/Logo.tsx
index 5243d2d08..9f6b217cb 100644
--- a/public/components/common/Logo.tsx
+++ b/public/components/common/Logo.tsx
@@ -5,6 +5,7 @@ type Size = 24 | 50 | 100 | 200;
interface TenantLogoProps {
size: Size;
+ useFiderIfEmpty?: boolean;
}
export const TenantLogoURL = (size: Size): string | undefined => {
@@ -19,10 +20,16 @@ export const TenantLogo = (props: TenantLogoProps) => {
const tenant = Fider.session.tenant;
if (tenant && tenant.logoID > 0) {
return <img src={TenantLogoURL(props.size)} alt={tenant.name} />;
+ } else if (props.useFiderIfEmpty) {
+ return <img src="https://getfider.com/images/logo-100x100.png" alt="Fider" />;
}
return null;
};
+TenantLogo.defaultProps = {
+ useFiderIfEmpty: false
+};
+
interface OAuthProviderLogoProps {
option: {
provider?: string;
diff --git a/public/pages/Error/Error.page.tsx b/public/pages/Error/Error.page.tsx
index 6f56299ef..c7843a868 100644
--- a/public/pages/Error/Error.page.tsx
+++ b/public/pages/Error/Error.page.tsx
@@ -14,31 +14,34 @@ interface ErrorPageProps {
}
const defaultProps: Partial<ErrorPageProps> = {
- title: "Whoops!",
- message: "An unexpected rendering error has occurred.",
+ title: "Shoot! Well, this is unexpected…",
+ message: "An error has occurred and we're working to fix the problem!",
showError: () => !Fider.isProduction()
};
export const ErrorPage: React.SFC<ErrorPageProps> = ({
- title = "Whoops!",
- message = "An unexpected rendering error has occurred.",
+ title = "Shoot! Well, this is unexpected…",
+ message = "An error has occurred and we're working to fix the problem!",
error,
errorInfo,
showError
}: ErrorPageProps) => {
return (
<div id="p-error" className="container failure-page">
- <TenantLogo size={100} />
- <div className="content">
- <h2>{title}</h2>
- <p>{message}</p>
- {showError && showError() && (
- <pre className="error">
- {error.toString()}
- {errorInfo.componentStack}
- </pre>
- )}
- </div>
+ <TenantLogo size={100} useFiderIfEmpty={true} />
+ <h1>{title}</h1>
+ <p>{message}</p>
+ {Fider.settings && (
+ <span>
+ Take me back to <a href={Fider.settings.baseURL}>{Fider.settings.baseURL}</a> home page.
+ </span>
+ )}
+ {showError && showError() && (
+ <pre className="error">
+ {error.toString()}
+ {errorInfo.componentStack}
+ </pre>
+ )}
</div>
);
};