PR#413: Some improvements on the basic IRC widget - fedora-hubs

Aurélien Bompard • 6 years ago

fe715c9

Aurélien Bompard • 6 years ago

747043b

hubs/defaults.py

file modified

+13 -1

		`@@ -123,7 +123,19 @@`
		`)`
		`hub.widgets.append(widget)`

		`- # TODO - set up irc widget with the right irc channel`
		`+ # IRC`
		`+ if irc_channel and irc_network:`
		`+ hub.config.chat_domain = irc_network`
		`+ hub.config.chat_channel = irc_channel`
bowlofeggs commented 6 years ago I recommend a few tests to assert this if statement works as expected.
		`+ hub.widgets.append(`
		`+ hubs.models.Widget(`
		`+ plugin='irc', index=2,`
		`+ _config=json.dumps({`
		`+ 'height': 450,`
		`+ })`
		`+ )`
		`+ )`
bowlofeggs commented 6 years ago Should the widget append() be inside the if statement?
		`+`
		`# TODO - set up mailing list with the right mailing list.`

		`# TODO - set up feed with aggregate of users stuff unless we have some`

file modified

+24 -5

		`@@ -8,17 +8,35 @@`
		`class IRCWidget extends React.Component {`

		`render() {`
		`+ const domain = this.props.hub.config.chat_domain;`
		`+ const channel = this.props.hub.config.chat_channel;`
		`+ let content;`
		`+ if (!domain \|\| !channel) {`
		`+ content = "No IRC channel configured.";`
		`+ if (this.props.currentUser.can_config_hub) {`
		`+ content += " Go to \"Hubs settings\" to configure it.";`
		`+ }`
bowlofeggs commented 6 years ago Oh I suppose this is why we don't want that append inside the if block above.
		`+ content = (`
		`+ <p className="text-warning p-2">`
		`+ <em>{content}</em>`
		`+ </p>`
		`+ );`
		`+ } else {`
		`+ content = (`
		`+ <ChatClient`
		`+ domain={domain}`
		`+ channel={channel}`
		`+ height={this.props.widget.config.height}`
		`+ />`
		`+ );`
		`+ }`
		`return (`
		`<WidgetChrome`
		`widget={this.props.widget}`
		`editMode={this.props.editMode}`
		`>`
		`<div className="IRCWidget">`
		`- <ChatClient`
		`- domain={this.props.hub.config.chat_domain}`
		`- channel={this.props.hub.config.chat_channel}`
		`- height={this.props.widget.config.height}`
		`- />`
		`+ {content}`
		`</div>`
		`</WidgetChrome>`
		`);`
		`@@ -34,6 +52,7 @@`
		`const mapStateToProps = (state) => {`
		`return {`
		`hub: state.entities.hub,`
		`+ currentUser: state.currentUser,`
		`}`
		`};`