Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

general fixes + planned status (#214)

Guilherme Oenning88034809be72
diff --git a/app/actions/idea.go b/app/actions/idea.go
index a31a8f5df..d1b086306 100644
--- a/app/actions/idea.go
+++ b/app/actions/idea.go
@@ -122,7 +122,7 @@ func (input *SetResponse) IsAuthorized(user *models.User) bool {
func (input *SetResponse) Validate(services *app.Services) *validate.Result {
result := validate.Success()
- if input.Model.Status < models.IdeaNew || input.Model.Status > models.IdeaDeclined {
+ if input.Model.Status < models.IdeaNew || input.Model.Status > models.IdeaPlanned {
result.AddFieldFailure("status", "Status is invalid.")
}
diff --git a/app/models/feedback.go b/app/models/feedback.go
index 086bc7913..8908764ba 100644
--- a/app/models/feedback.go
+++ b/app/models/feedback.go
@@ -98,4 +98,6 @@ var (
IdeaCompleted = 2
//IdeaDeclined is used when organizers decide to decline an idea
IdeaDeclined = 3
+ //IdeaPlanned is used when organizers have accepted an idea and it's on the roadmap
+ IdeaPlanned = 4
)
diff --git a/app/storage/postgres/idea.go b/app/storage/postgres/idea.go
index eb5776b0a..12cf30bad 100644
--- a/app/storage/postgres/idea.go
+++ b/app/storage/postgres/idea.go
@@ -274,11 +274,7 @@ func (s *IdeaStorage) AddSupporter(number, userID int) error {
return err
}
- if err := s.trx.Execute(`INSERT INTO idea_supporters (user_id, idea_id, created_on) VALUES ($1, $2, $3)`, userID, idea.ID, time.Now()); err != nil {
- return err
- }
-
- return nil
+ return s.trx.Execute(`INSERT INTO idea_supporters (user_id, idea_id, created_on) VALUES ($1, $2, $3)`, userID, idea.ID, time.Now())
}
// RemoveSupporter removes user from idea list of supporters
@@ -305,11 +301,7 @@ func (s *IdeaStorage) RemoveSupporter(number, userID int) error {
return err
}
- if err := s.trx.Execute(`DELETE FROM idea_supporters WHERE user_id = $1 AND idea_id = $2`, userID, idea.ID); err != nil {
- return err
- }
-
- return nil
+ return s.trx.Execute(`DELETE FROM idea_supporters WHERE user_id = $1 AND idea_id = $2`, userID, idea.ID)
}
// SetResponse changes current idea response
@@ -319,14 +311,16 @@ func (s *IdeaStorage) SetResponse(number int, text string, userID, status int) e
return err
}
- if err := s.trx.Execute(`
+ respondedOn := time.Now()
+ if idea.Status == status {
+ respondedOn = idea.Response.RespondedOn
+ }
+
+ return s.trx.Execute(`
UPDATE ideas
SET response = $3, response_date = $4, response_user_id = $5, status = $6
WHERE id = $1 and tenant_id = $2
- `, idea.ID, s.tenant.ID, text, time.Now(), userID, status); err != nil {
- return err
- }
- return nil
+ `, idea.ID, s.tenant.ID, text, respondedOn, userID, status)
}
// SupportedBy returns a list of Idea ID supported by given user
diff --git a/app/storage/postgres/idea_test.go b/app/storage/postgres/idea_test.go
index b8eb249a3..76ddf652a 100644
--- a/app/storage/postgres/idea_test.go
+++ b/app/storage/postgres/idea_test.go
@@ -253,6 +253,27 @@ func TestIdeaStorage_SetResponse(t *testing.T) {
Expect(idea.Response.User.ID).To(Equal(1))
}
+func TestIdeaStorage_SetResponse_ChangeText(t *testing.T) {
+ SetupDatabaseTest(t)
+ defer TeardownDatabaseTest()
+
+ tenants := postgres.NewTenantStorage(trx)
+ ideas := postgres.NewIdeaStorage(trx)
+ ideas.SetCurrentTenant(demoTenant(tenants))
+ idea, _ := ideas.Add("My new idea", "with this description", 1)
+ ideas.SetResponse(idea.Number, "We liked this idea", 1, models.IdeaStarted)
+ idea, _ = ideas.GetByID(idea.ID)
+ respondedOn := idea.Response.RespondedOn
+
+ ideas.SetResponse(idea.Number, "We liked this idea and we'll work on it", 1, models.IdeaStarted)
+ idea, _ = ideas.GetByID(idea.ID)
+ Expect(idea.Response.RespondedOn).To(Equal(respondedOn))
+
+ ideas.SetResponse(idea.Number, "We finished it", 1, models.IdeaCompleted)
+ idea, _ = ideas.GetByID(idea.ID)
+ Expect(idea.Response.RespondedOn).Should(BeTemporally(">", respondedOn))
+}
+
func TestIdeaStorage_AddSupporter_ClosedIdea(t *testing.T) {
SetupDatabaseTest(t)
defer TeardownDatabaseTest()
diff --git a/app/storage/postgres/tag.go b/app/storage/postgres/tag.go
index 557e2b9c2..0eb3604fc 100644
--- a/app/storage/postgres/tag.go
+++ b/app/storage/postgres/tag.go
@@ -116,14 +116,10 @@ func (s *TagStorage) AssignTag(tagID, ideaID, userID int) error {
return nil
}
- if err := s.trx.Execute(
+ return s.trx.Execute(
`INSERT INTO idea_tags (tag_id, idea_id, created_on, created_by_id) VALUES ($1, $2, $3, $4)`,
tagID, ideaID, time.Now(), userID,
- ); err != nil {
- return err
- }
-
- return nil
+ )
}
// UnassignTag removes a tag from an idea
diff --git a/public/models/idea.ts b/public/models/idea.ts
index c3f7765fd..6cf453ce0 100644
--- a/public/models/idea.ts
+++ b/public/models/idea.ts
@@ -18,14 +18,16 @@ export interface Idea {
export class IdeaStatus {
constructor(public value: number,
public title: string,
+ public slug: string,
public show: boolean,
public closed: boolean,
public color: string) { }
- public static New = new IdeaStatus(0, 'New', false, false, 'black');
- public static Started = new IdeaStatus(1, 'Started', true, false, 'blue');
- public static Completed = new IdeaStatus(2, 'Completed', true, true, 'green');
- public static Declined = new IdeaStatus(3, 'Declined', true, true, 'red');
+ public static Open = new IdeaStatus(0, 'Open', 'open', false, false, '');
+ public static Started = new IdeaStatus(1, 'Started', 'started', true, false, 'blue');
+ public static Completed = new IdeaStatus(2, 'Completed', 'completed', true, true, 'green');
+ public static Declined = new IdeaStatus(3, 'Declined', 'declined', true, true, 'red');
+ public static Planned = new IdeaStatus(4, 'Planned', 'planned', true, true, 'violet');
public static Get(value: number): IdeaStatus {
for (const status of IdeaStatus.All) {
@@ -37,8 +39,9 @@ export class IdeaStatus {
}
public static All = [
- IdeaStatus.New,
+ IdeaStatus.Open,
IdeaStatus.Started,
+ IdeaStatus.Planned,
IdeaStatus.Completed,
IdeaStatus.Declined
];
diff --git a/public/pages/admin/AdminHomePage.tsx b/public/pages/admin/AdminHomePage.tsx
index a61d5f019..f8e01f30c 100644
--- a/public/pages/admin/AdminHomePage.tsx
+++ b/public/pages/admin/AdminHomePage.tsx
@@ -131,11 +131,9 @@ export class AdminHomePage extends React.Component<{}, AdminHomePageState> {
<div className="info">
{
this.state.cname ? [
- <p key={0}>Input following record into your domain DNS zone records:</p>,
+ <p key={0}>Enter the following record into your DNS zone records:</p>,
<p key={1}><strong>{this.state.cname}</strong> CNAME <strong>{this.session.getCurrentTenant().subdomain}{this.session.getAppSettings().domain}</strong></p>,
- <div key={2} className="ui negative message">
- <p>Custom Domain is a <strong>experimental feature</strong> and you're invited to test it. In case of any issue, feedback or question, please contact us at <a href="mailto:[email protected]">[email protected]</a>.</p>
- </div>
+ <p key={2}>Please note that it may take up to 72 hours for the change to take effect worldwide due to DNS propagation.</p>
] :
<p>Custom domains allow you to access your app via your own domain name (for example, <code>feedback.yourcomany.com</code>).</p>
}
diff --git a/public/pages/site/HomePage/HomePage.scss b/public/pages/site/HomePage/HomePage.scss
index 67e2f4250..770cefbe1 100644
--- a/public/pages/site/HomePage/HomePage.scss
+++ b/public/pages/site/HomePage/HomePage.scss
@@ -29,6 +29,15 @@
}
}
+ .ideas-filter {
+ .item {
+ .label {
+ font-size: 8px;
+ margin-left: 5px;
+ }
+ }
+ }
+
.tags-filter.has-selection {
i.filter {
vertical-align: middle;
diff --git a/public/pages/site/HomePage/HomePage.tsx b/public/pages/site/HomePage/HomePage.tsx
index f8bbf6d81..ef2d3765f 100644
--- a/public/pages/site/HomePage/HomePage.tsx
+++ b/public/pages/site/HomePage/HomePage.tsx
@@ -225,7 +225,11 @@ We'd love to hear what you're thinking about. What can we do better? This is the
<div className="ui grid">
{
!this.state.searching && <div className="ten wide mobile ten wide tablet twelve wide computer column filter-column">
- <IdeaFilter activeFilter={this.state.activeFilter} filterChanged={(name) => this.filterChanged(name)} />
+ <IdeaFilter
+ ideas={this.allIdeas}
+ activeFilter={this.state.activeFilter}
+ filterChanged={(name) => this.filterChanged(name)}
+ />
</div>
}
<div className={!this.state.searching ? `six wide mobile six wide tablet four wide computer column` : 'column'}>
diff --git a/public/pages/site/HomePage/IdeaFilter.tsx b/public/pages/site/HomePage/IdeaFilter.tsx
index 6a2c8269a..70226acbd 100644
--- a/public/pages/site/HomePage/IdeaFilter.tsx
+++ b/public/pages/site/HomePage/IdeaFilter.tsx
@@ -4,6 +4,7 @@ import { Idea, IdeaStatus } from '@fider/models';
export type IdeaFilterFunction = (ideas: Idea[]) => Idea[];
interface IdeaFilterProps {
+ ideas: Idea[];
activeFilter: string;
filterChanged: (name: string) => void;
}
@@ -12,6 +13,8 @@ const filterers: {[key: string]: (idea: Idea) => boolean} = {
'recent': (idea: Idea) => idea.status !== IdeaStatus.Completed.value && idea.status !== IdeaStatus.Declined.value,
'most-wanted': (idea: Idea) => idea.status !== IdeaStatus.Completed.value && idea.status !== IdeaStatus.Declined.value,
'most-discussed': (idea: Idea) => idea.status !== IdeaStatus.Completed.value && idea.status !== IdeaStatus.Declined.value,
+ 'planned': (idea: Idea) => idea.status === IdeaStatus.Planned.value,
+ 'started': (idea: Idea) => idea.status === IdeaStatus.Started.value,
'completed': (idea: Idea) => idea.status === IdeaStatus.Completed.value,
'declined': (idea: Idea) => idea.status === IdeaStatus.Declined.value
};
@@ -20,6 +23,8 @@ const names: {[key: string]: string} = {
'recent': 'recent',
'most-wanted': 'most wanted',
'most-discussed': 'most discussed',
+ 'planned': 'planned',
+ 'started': 'started',
'completed': 'completed',
'declined': 'declined'
};
@@ -28,8 +33,10 @@ const sorterers: {[key: string]: (left: Idea, right: Idea) => number} = {
'recent': (left: Idea, right: Idea) => new Date(right.createdOn).getTime() - new Date(left.createdOn).getTime(),
'most-wanted': (left: Idea, right: Idea) => right.totalSupporters - left.totalSupporters,
'most-discussed': (left: Idea, right: Idea) => right.totalComments - left.totalComments,
- 'completed': (left: Idea, right: Idea) => new Date(left.response.respondedOn).getTime() - new Date(left.response.respondedOn).getTime(),
- 'declined': (left: Idea, right: Idea) => new Date(left.response.respondedOn).getTime() - new Date(left.response.respondedOn).getTime()
+ 'planned': (left: Idea, right: Idea) => new Date(right.response.respondedOn).getTime() - new Date(left.response.respondedOn).getTime(),
+ 'started': (left: Idea, right: Idea) => new Date(right.response.respondedOn).getTime() - new Date(left.response.respondedOn).getTime(),
+ 'completed': (left: Idea, right: Idea) => new Date(right.response.respondedOn).getTime() - new Date(left.response.respondedOn).getTime(),
+ 'declined': (left: Idea, right: Idea) => new Date(right.response.respondedOn).getTime() - new Date(left.response.respondedOn).getTime()
};
export class IdeaFilter extends React.Component<IdeaFilterProps, {}> {
@@ -61,22 +68,33 @@ export class IdeaFilter extends React.Component<IdeaFilterProps, {}> {
activeFilter = 'recent';
}
+ const grouped = this.props.ideas.reduce<{ [status: number]: number }>((group, idea) => {
+ group[idea.status] = (group[idea.status] || 0) + 1;
+ return group;
+ }, {});
+
+ const statusFilterItems = IdeaStatus.All.filter((s) => s.show && grouped[s.value]).map((s) => (
+ <div key={s.value} className={`item ${activeFilter === s.slug && 'active'}`} data-value={s.slug} data-text={s.title.toLowerCase()}>
+ {s.title}
+ <a className="ui mini circular label">{grouped[s.value]}</a>
+ </div>
+ ));
+
return (
<h4 className="ui header">
<div className="content">
- Showing {' '}
- <div className="ui inline dropdown" ref={(e) => this.element = e!}>
- <div className="text">{names[activeFilter]}</div>
- <i className="dropdown icon" />
- <div className="menu">
- <div className="header">What do you want to see?</div>
- <div className={`item ${activeFilter === 'recent' && 'active'}`} data-value="recent" data-text="recent">Recent</div>
- <div className={`item ${activeFilter === 'most-wanted' && 'active'}`} data-value="most-wanted" data-text="most wanted">Most Wanted</div>
- <div className={`item ${activeFilter === 'most-discussed' && 'active'}`} data-value="most-discussed" data-text="most discussed">Most Discussed</div>
- <div className={`item ${activeFilter === 'completed' && 'active'}`} data-value="completed" data-text="completed">Completed</div>
- <div className={`item ${activeFilter === 'declined' && 'active'}`} data-value="declined" data-text="declined">Declined</div>
- </div>
- </div>
+ Showing {' '}
+ <div className="ideas-filter ui inline dropdown" ref={(e) => this.element = e!}>
+ <div className="text">{names[activeFilter]}</div>
+ <i className="dropdown icon" />
+ <div className="menu">
+ <div className="header">What do you want to see?</div>
+ <div className={`item ${activeFilter === 'recent' && 'active'}`} data-value="recent" data-text="recent">Recent</div>
+ <div className={`item ${activeFilter === 'most-wanted' && 'active'}`} data-value="most-wanted" data-text="most wanted">Most Wanted</div>
+ <div className={`item ${activeFilter === 'most-discussed' && 'active'}`} data-value="most-discussed" data-text="most discussed">Most Discussed</div>
+ {statusFilterItems}
+ </div>
+ </div>
</div>
</h4>
);
diff --git a/public/pages/site/ShowIdeaPage/ResponseForm.tsx b/public/pages/site/ShowIdeaPage/ResponseForm.tsx
index d4f734ff5..4229d138f 100644
--- a/public/pages/site/ShowIdeaPage/ResponseForm.tsx
+++ b/public/pages/site/ShowIdeaPage/ResponseForm.tsx
@@ -1,6 +1,6 @@
import * as React from 'react';
-import { User, Comment, Idea } from '@fider/models';
+import { User, Comment, Idea, IdeaStatus } from '@fider/models';
import { Button, DisplayError, Textarea } from '@fider/components/common';
import { inject, injectables } from '@fider/di';
@@ -71,10 +71,7 @@ export class ResponseForm extends React.Component<ResponseFormProps, ResponseFor
defaultValue={this.props.idea.status.toString()}
onChange={(e) => this.setState({ status: parseInt(e.currentTarget.value, 10) })}
>
- <option value="0">Open</option>
- <option value="1">Started</option>
- <option value="2">Completed</option>
- <option value="3">Declined</option>
+ {IdeaStatus.All.map((s) => <option key={s.value} value={s.value.toString()}>{s.title}</option>)}
</select>
</div>
</div>
diff --git a/public/services/Session.ts b/public/services/Session.ts
index 54f1ef7c8..e876af59d 100644
--- a/public/services/Session.ts
+++ b/public/services/Session.ts
@@ -2,97 +2,97 @@ import { User, CurrentUser, AppSettings, Tenant } from '@fider/models';
import { injectable } from '@fider/di';
export interface Session {
- getCurrentUser(): CurrentUser | undefined;
- getCurrentTenant(): Tenant;
- isAdmin(): boolean;
- isCollaborator(): boolean;
- set<T>(key: string, value: T): void;
- get<T>(key: string): T;
- getArray<T>(key: string): T[];
- getAppSettings(): AppSettings;
- isSingleHostMode(): boolean;
- isProduction(): boolean;
- setCache(key: string, value: string): void;
- getCache(key: string): string | null;
- removeCache(...key: string[]): void;
+ getCurrentUser(): CurrentUser | undefined;
+ getCurrentTenant(): Tenant;
+ isAdmin(): boolean;
+ isCollaborator(): boolean;
+ set<T>(key: string, value: T): void;
+ get<T>(key: string): T;
+ getArray<T>(key: string): T[];
+ getAppSettings(): AppSettings;
+ isSingleHostMode(): boolean;
+ isProduction(): boolean;
+ setCache(key: string, value: string): void;
+ getCache(key: string): string | null;
+ removeCache(...key: string[]): void;
}
@injectable()
export class BrowserSession implements Session {
- private w: any;
-
- constructor(window: Window) {
- this.w = window;
- this.w.getCurrentUser = this.getCurrentUser.bind(this);
- this.w.set = this.set.bind(this);
- this.w.get = this.get.bind(this);
- }
-
- public getCurrentUser(): CurrentUser | undefined {
- const w: any = window;
- if (`_email` in w) {
- w[`_user`].email = w[`_email`];
- }
- return w[`_user`] as CurrentUser;
- }
-
- public getCurrentTenant(): Tenant {
- const w: any = window;
- return w[`_tenant`] as Tenant;
- }
-
- public isAdmin(): boolean {
- const user = this.getCurrentUser();
- return !!user && user.role === 3;
- }
-
- public isCollaborator(): boolean {
- const user = this.getCurrentUser();
- return !!user && user.role >= 2;
+ private w: any;
+
+ constructor(window: Window) {
+ this.w = window;
+ this.w.getCurrentUser = this.getCurrentUser.bind(this);
+ this.w.set = this.set.bind(this);
+ this.w.get = this.get.bind(this);
+ }
+
+ public getCurrentUser(): CurrentUser | undefined {
+ const w: any = window;
+ if (`_email` in w) {
+ w[`_user`].email = w[`_email`];
}
-
- public set<T>(key: string, value: T): void {
- this.w[`_${key}`] = value;
- }
-
- public get<T>(key: string): T {
- return this.w[`_${key}`];
+ return w[`_user`] as CurrentUser;
+ }
+
+ public getCurrentTenant(): Tenant {
+ const w: any = window;
+ return w[`_tenant`] as Tenant;
+ }
+
+ public isAdmin(): boolean {
+ const user = this.getCurrentUser();
+ return !!user && user.role === 3;
+ }
+
+ public isCollaborator(): boolean {
+ const user = this.getCurrentUser();
+ return !!user && user.role >= 2;
+ }
+
+ public set<T>(key: string, value: T): void {
+ this.w[`_${key}`] = value;
+ }
+
+ public get<T>(key: string): T {
+ return this.w[`_${key}`];
+ }
+
+ public getArray<T>(key: string): T[] {
+ return this.w[`_${key}`] || [];
+ }
+
+ public getAppSettings(): AppSettings {
+ return this.get<AppSettings>('settings');
+ }
+
+ public isSingleHostMode(): boolean {
+ return this.getAppSettings().mode.toLowerCase() === 'single';
+ }
+
+ public isProduction(): boolean {
+ return this.getAppSettings().environment.toLowerCase() === 'production';
+ }
+
+ public setCache(key: string, value: string): void {
+ if (this.w.sessionStorage) {
+ this.w.sessionStorage.setItem(key, value);
}
+ }
- public getArray<T>(key: string): T[] {
- return this.w[`_${key}`] || [];
+ public getCache(key: string): string | null {
+ if (this.w.sessionStorage) {
+ return this.w.sessionStorage.getItem(key);
}
-
- public getAppSettings(): AppSettings {
- return this.get<AppSettings>('settings');
- }
-
- public isSingleHostMode(): boolean {
- return this.getAppSettings().mode.toLowerCase() === 'single';
- }
-
- public isProduction(): boolean {
- return this.getAppSettings().environment.toLowerCase() === 'production';
- }
-
- public setCache(key: string, value: string): void {
- if (this.w.sessionStorage) {
- this.w.sessionStorage.setItem(key, value);
- }
- }
-
- public getCache(key: string): string | null {
- if (this.w.sessionStorage) {
- return this.w.sessionStorage.getItem(key);
- }
- return null;
- }
-
- public removeCache(...keys: string[]): void {
- if (this.w.sessionStorage && keys) {
- for (const key of keys) {
- return this.w.sessionStorage.removeItem(key);
- }
- }
+ return null;
+ }
+
+ public removeCache(...keys: string[]): void {
+ if (this.w.sessionStorage && keys) {
+ for (const key of keys) {
+ this.w.sessionStorage.removeItem(key);
+ }
}
+ }
}
diff --git a/tests/lib/mailgun/index.ts b/tests/lib/mailgun/index.ts
index 44df0f3c1..af6904c50 100644
--- a/tests/lib/mailgun/index.ts
+++ b/tests/lib/mailgun/index.ts
@@ -21,9 +21,9 @@ export const mailgun = {
if (events.data.items.length > 0 && events.data.items[0].message.headers.to === to) {
messageUrl = events.data.items[0].storage.url;
} else {
- delay(2000);
+ await delay(5000);
}
- } while (!messageUrl || count === 3);
+ } while (!messageUrl && count < 3);
if (count === 3) {
throw new Error(`Message not found for ${to}.`);