From 3395a30c1221e4b89081893c2f9303160e95587b Mon Sep 17 00:00:00 2001 From: Sanjay Date: Tue, 13 Jul 2021 16:47:57 +0530 Subject: [PATCH 01/13] Improve date format selection UI #66 --- server/meeting.go | 9 ++- server/meeting_test.go | 22 +++--- .../meeting_settings/meeting_settings.jsx | 76 ++++++++++++++----- 3 files changed, 76 insertions(+), 31 deletions(-) diff --git a/server/meeting.go b/server/meeting.go index 7bfad8b..eed7c10 100644 --- a/server/meeting.go +++ b/server/meeting.go @@ -16,7 +16,7 @@ var ( type Meeting struct { ChannelID string `json:"channelId"` Schedule []time.Weekday `json:"schedule"` - HashtagFormat string `json:"hashtagFormat"` // Default: {ChannelName}-Jan02 + HashtagFormat string `json:"hashtagFormat"` // Default: {ChannelName}-Jan-2 } // GetMeeting returns a meeting @@ -37,9 +37,10 @@ func (p *Plugin) GetMeeting(channelID string) (*Meeting, error) { if err != nil { return nil, err } + paddedChannelName := strings.ReplaceAll(channel.Name, "-", "_") meeting = &Meeting{ Schedule: []time.Weekday{time.Thursday}, - HashtagFormat: strings.Join([]string{fmt.Sprintf("%.15s", channel.Name), "{{ Jan02 }}"}, "-"), + HashtagFormat: strings.Join([]string{fmt.Sprintf("%.15s", paddedChannelName), "{{ Jan 2 }}"}, "_"), ChannelID: channelID, } } @@ -92,8 +93,10 @@ func (p *Plugin) GenerateHashtag(channelID string, nextWeek bool, weekday int) ( prefix = matchGroups[1] hashtagFormat = strings.TrimSpace(matchGroups[2]) postfix = matchGroups[3] + formattedDate := meetingDate.Format(hashtagFormat) + formattedDate = strings.ReplaceAll(formattedDate, " ", "_") - hashtag = fmt.Sprintf("#%s%v%s", prefix, meetingDate.Format(hashtagFormat), postfix) + hashtag = fmt.Sprintf("#%s%v%s", prefix, formattedDate, postfix) } else { hashtag = fmt.Sprintf("#%s", meeting.HashtagFormat) } diff --git a/server/meeting_test.go b/server/meeting_test.go index 4e24e25..a8b5b72 100644 --- a/server/meeting_test.go +++ b/server/meeting_test.go @@ -55,9 +55,9 @@ func TestPlugin_GenerateHashtag(t *testing.T) { meeting: &Meeting{ ChannelID: "QA", Schedule: []time.Weekday{time.Wednesday}, - HashtagFormat: "{{Jan02}}", + HashtagFormat: "{{Jan 2}}", }}, - want: "#" + assertNextWeekdayDate(time.Wednesday, true).Format("Jan02"), + want: "#" + strings.ReplaceAll(assertNextWeekdayDate(time.Wednesday, true).Format("Jan 2"), " ", "_"), wantErr: false, }, { @@ -67,9 +67,9 @@ func TestPlugin_GenerateHashtag(t *testing.T) { meeting: &Meeting{ ChannelID: "QA Backend", Schedule: []time.Weekday{time.Monday}, - HashtagFormat: "QA-{{January 02 2006}}", + HashtagFormat: "QA_{{January 02 2006}}", }}, - want: "#QA-" + assertNextWeekdayDate(time.Monday, true).Format("January 02 2006"), + want: "#QA_" + strings.ReplaceAll(assertNextWeekdayDate(time.Monday, true).Format("January 02 2006"), " ", "_"), wantErr: false, }, { @@ -81,7 +81,7 @@ func TestPlugin_GenerateHashtag(t *testing.T) { Schedule: []time.Weekday{time.Monday}, HashtagFormat: "{{January 02 2006}}.vue", }}, - want: "#" + assertNextWeekdayDate(time.Monday, false).Format("January 02 2006") + ".vue", + want: "#" + strings.ReplaceAll(assertNextWeekdayDate(time.Monday, false).Format("January 02 2006"), " ", "_") + ".vue", wantErr: false, }, { @@ -93,7 +93,7 @@ func TestPlugin_GenerateHashtag(t *testing.T) { Schedule: []time.Weekday{time.Monday}, HashtagFormat: "React {{January 02 2006}} Born", }}, - want: "#React " + assertNextWeekdayDate(time.Monday, false).Format("January 02 2006") + " Born", + want: "#React " + strings.ReplaceAll(assertNextWeekdayDate(time.Monday, false).Format("January 02 2006"), " ", "_") + " Born", wantErr: false, }, { @@ -105,7 +105,7 @@ func TestPlugin_GenerateHashtag(t *testing.T) { Schedule: []time.Weekday{time.Monday}, HashtagFormat: "January 02 2006 {{January 02 2006}} January 02 2006", }}, - want: "#January 02 2006 " + assertNextWeekdayDate(time.Monday, false).Format("January 02 2006") + " January 02 2006", + want: "#January 02 2006 " + strings.ReplaceAll(assertNextWeekdayDate(time.Monday, false).Format("January 02 2006"), " ", "_") + " January 02 2006", wantErr: false, }, { @@ -117,7 +117,7 @@ func TestPlugin_GenerateHashtag(t *testing.T) { Schedule: []time.Weekday{time.Monday}, HashtagFormat: "{{ January 02 2006 }}", }}, - want: "#" + assertNextWeekdayDate(time.Monday, false).Format("January 02 2006"), + want: "#" + strings.ReplaceAll(assertNextWeekdayDate(time.Monday, false).Format("January 02 2006"), " ", "_"), wantErr: false, }, { @@ -129,7 +129,7 @@ func TestPlugin_GenerateHashtag(t *testing.T) { Schedule: []time.Weekday{time.Monday}, HashtagFormat: "{{ Mon Jan _2 }}", }}, - want: "#" + assertNextWeekdayDate(time.Monday, false).Format("Mon Jan _2"), + want: "#" + strings.ReplaceAll(assertNextWeekdayDate(time.Monday, false).Format("Mon Jan _2"), " ", "_"), wantErr: false, }, } @@ -176,7 +176,7 @@ func TestPlugin_GetMeeting(t *testing.T) { }, want: &Meeting{ Schedule: []time.Weekday{time.Thursday}, - HashtagFormat: "Short-{{ Jan02 }}", + HashtagFormat: "Short_{{ Jan 2 }}", ChannelID: "#short.name.channel", }, wantErr: false, @@ -190,7 +190,7 @@ func TestPlugin_GetMeeting(t *testing.T) { }, want: &Meeting{ Schedule: []time.Weekday{time.Thursday}, - HashtagFormat: "Very Long Chann-{{ Jan02 }}", + HashtagFormat: "Very Long Chann_{{ Jan 2 }}", ChannelID: "#long.name.channel", }, wantErr: false, diff --git a/webapp/src/components/meeting_settings/meeting_settings.jsx b/webapp/src/components/meeting_settings/meeting_settings.jsx index 47ee439..e518a94 100644 --- a/webapp/src/components/meeting_settings/meeting_settings.jsx +++ b/webapp/src/components/meeting_settings/meeting_settings.jsx @@ -17,8 +17,9 @@ export default class MeetingSettingsModal extends React.PureComponent { super(props); this.state = { - hashtag: '{{Jan02}}', + hashtagPrefix: 'Prefix', weekdays: [1], + dateFormat: '1-2', }; } @@ -28,9 +29,13 @@ export default class MeetingSettingsModal extends React.PureComponent { } if (this.props.meeting && this.props.meeting !== prevProps.meeting) { + const splitResult = this.props.meeting.hashtagFormat.split('{{');// we know, date Format is preceded by {{ + const hashtagPrefix = splitResult[0]; + const dateFormat = splitResult[1].substring(0, splitResult[1].length - 2); // remove trailing }} // eslint-disable-next-line react/no-did-update-set-state this.setState({ - hashtag: this.props.meeting.hashtagFormat, + hashtagPrefix, + dateFormat, weekdays: this.props.meeting.schedule || [], }); } @@ -38,10 +43,16 @@ export default class MeetingSettingsModal extends React.PureComponent { handleHashtagChange = (e) => { this.setState({ - hashtag: e.target.value, + hashtagPrefix: e.target.value, }); } + handleDateFormat = (event) => { + this.setState({ + dateFormat: event.target.value, + }); + }; + handleCheckboxChanged = (e) => { const changeday = Number(e.target.value); let changedWeekdays = Object.assign([], this.state.weekdays); @@ -62,7 +73,7 @@ export default class MeetingSettingsModal extends React.PureComponent { onSave = () => { this.props.saveMeetingSettings({ channelId: this.props.channelId, - hashtagFormat: this.state.hashtag, + hashtagFormat: `${this.state.hashtagPrefix}{{${this.state.dateFormat}}}`, schedule: this.state.weekdays.sort(), }); @@ -118,19 +129,50 @@ export default class MeetingSettingsModal extends React.PureComponent {
- - -

{'Hashtag is formatted using the '} - {'Go time package.'} - {' Embed a date by surrounding what January 2, 2006 would look like with double curly braces, i.e. {{Jan02}}'} +

+
+ + +
+
+ +
+ +
+
+ +

+

+ {'You may use underscore'}{'_'}{'.'} {'Other special characters including'} {'-'}{','} {'not allowed.'} +
+ {'Date would be appended to Hashtag Prefix, according to format chosen.'}

From 69ef21a32d6987a3c1bdb88c983defd3bdefe11d Mon Sep 17 00:00:00 2001 From: sanjaydemansol <85980820+sanjaydemansol@users.noreply.github.com> Date: Mon, 13 Sep 2021 07:34:19 +0530 Subject: [PATCH 02/13] Update webapp/src/components/meeting_settings/meeting_settings.jsx Co-authored-by: Jason Frerich --- webapp/src/components/meeting_settings/meeting_settings.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/src/components/meeting_settings/meeting_settings.jsx b/webapp/src/components/meeting_settings/meeting_settings.jsx index e518a94..a2fe790 100644 --- a/webapp/src/components/meeting_settings/meeting_settings.jsx +++ b/webapp/src/components/meeting_settings/meeting_settings.jsx @@ -170,7 +170,7 @@ export default class MeetingSettingsModal extends React.PureComponent { role='alert' style={{marginBottom: '3px'}} > - {'You may use underscore'}{'_'}{'.'} {'Other special characters including'} {'-'}{','} {'not allowed.'} + {'Prefixes may use underscore'}{'_'}{'.'} {'Other special characters including'} {'-'} {'are not allowed.'} {'Date would be appended to Hashtag Prefix, according to format chosen.'}

From 066a6ef45b2ddec020fe76c975830fc61b7fb710 Mon Sep 17 00:00:00 2001 From: sanjaydemansol <85980820+sanjaydemansol@users.noreply.github.com> Date: Mon, 13 Sep 2021 07:34:25 +0530 Subject: [PATCH 03/13] Update webapp/src/components/meeting_settings/meeting_settings.jsx Co-authored-by: Jason Frerich --- webapp/src/components/meeting_settings/meeting_settings.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/src/components/meeting_settings/meeting_settings.jsx b/webapp/src/components/meeting_settings/meeting_settings.jsx index a2fe790..fd19468 100644 --- a/webapp/src/components/meeting_settings/meeting_settings.jsx +++ b/webapp/src/components/meeting_settings/meeting_settings.jsx @@ -172,7 +172,7 @@ export default class MeetingSettingsModal extends React.PureComponent { > {'Prefixes may use underscore'}{'_'}{'.'} {'Other special characters including'} {'-'} {'are not allowed.'} - {'Date would be appended to Hashtag Prefix, according to format chosen.'} + {'Date would be appended to Hashtag Prefix, according to the chosen format.'}

From 177bcb98df1eac237fdf7b5f14e2977fe71f9679 Mon Sep 17 00:00:00 2001 From: sanjaydemansol <85980820+sanjaydemansol@users.noreply.github.com> Date: Mon, 13 Sep 2021 07:34:42 +0530 Subject: [PATCH 04/13] Update webapp/src/components/meeting_settings/meeting_settings.jsx Co-authored-by: Jason Frerich --- webapp/src/components/meeting_settings/meeting_settings.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webapp/src/components/meeting_settings/meeting_settings.jsx b/webapp/src/components/meeting_settings/meeting_settings.jsx index fd19468..5b40773 100644 --- a/webapp/src/components/meeting_settings/meeting_settings.jsx +++ b/webapp/src/components/meeting_settings/meeting_settings.jsx @@ -154,8 +154,8 @@ export default class MeetingSettingsModal extends React.PureComponent { style={{height: '35px', border: '1px solid #ced4da'}} className='form-select' > - - + + From 40c77e096486ad2cff0e712037c8a61e3e115c77 Mon Sep 17 00:00:00 2001 From: Sanjay Date: Thu, 3 Feb 2022 18:27:56 +0530 Subject: [PATCH 05/13] - Feedback resloved --- .../meeting_settings/meeting_settings.jsx | 73 +++++++++++++------ 1 file changed, 52 insertions(+), 21 deletions(-) diff --git a/webapp/src/components/meeting_settings/meeting_settings.jsx b/webapp/src/components/meeting_settings/meeting_settings.jsx index 5b40773..848b1d1 100644 --- a/webapp/src/components/meeting_settings/meeting_settings.jsx +++ b/webapp/src/components/meeting_settings/meeting_settings.jsx @@ -3,6 +3,8 @@ import PropTypes from 'prop-types'; import {Modal} from 'react-bootstrap'; +import Select from 'react-select' + export default class MeetingSettingsModal extends React.PureComponent { static propTypes = { visible: PropTypes.bool.isRequired, @@ -13,13 +15,48 @@ export default class MeetingSettingsModal extends React.PureComponent { saveMeetingSettings: PropTypes.func.isRequired, }; + options = [ + { value: 'Jan 2', label: 'month_day' }, + { value: '2 Jan', label: 'day_month' }, + { value: '1 2', label: 'month_day' }, + { value: '2 1', label: 'day_month' }, + { value: '2006 1 2', label: 'year_month_day' }, + ]; + + customStyles = { + menuList: (provided, state) => ({ + ...provided, + height: 188 + }), + control: (provided, state) => ({ + ...provided, + height: 34, + minHeight: 34, + border: '1px solid #ced4da', + boxShadow: state.isFocused ? 0 : '1px solid #ced4da', + '&:hover': { + border: '1px solid #ced4da' + } + }), + indicatorsContainer: (provided, state) => ({ + ...provided, + height: 34, + }), + singleValue: (provided, state) => { + const opacity = state.isDisabled ? 0.5 : 1; + const transition = 'opacity 300ms'; + + return { ...provided, opacity, transition }; + } + } + constructor(props) { super(props); this.state = { hashtagPrefix: 'Prefix', weekdays: [1], - dateFormat: '1-2', + dateFormat: '1-2', // dateFormat will be an object type => { value: string, label: string } }; } @@ -31,7 +68,8 @@ export default class MeetingSettingsModal extends React.PureComponent { if (this.props.meeting && this.props.meeting !== prevProps.meeting) { const splitResult = this.props.meeting.hashtagFormat.split('{{');// we know, date Format is preceded by {{ const hashtagPrefix = splitResult[0]; - const dateFormat = splitResult[1].substring(0, splitResult[1].length - 2); // remove trailing }} + const dateFormatValue = splitResult[1].substring(0, splitResult[1].length - 2).trim(); // remove trailing }} + const dateFormat = this.options.filter(i => i.value === dateFormatValue)[0]; // extract value object // eslint-disable-next-line react/no-did-update-set-state this.setState({ hashtagPrefix, @@ -47,10 +85,8 @@ export default class MeetingSettingsModal extends React.PureComponent { }); } - handleDateFormat = (event) => { - this.setState({ - dateFormat: event.target.value, - }); + handleDateFormat = (newValue, actionMeta) => { + this.setState({ dateFormat: newValue }); }; handleCheckboxChanged = (e) => { @@ -73,7 +109,7 @@ export default class MeetingSettingsModal extends React.PureComponent { onSave = () => { this.props.saveMeetingSettings({ channelId: this.props.channelId, - hashtagFormat: `${this.state.hashtagPrefix}{{${this.state.dateFormat}}}`, + hashtagFormat: `${this.state.hashtagPrefix}{{${this.state.dateFormat.value}}}`, schedule: this.state.weekdays.sort(), }); @@ -119,7 +155,7 @@ export default class MeetingSettingsModal extends React.PureComponent { {'Channel Agenda Settings'} - +

- + styles={this.customStyles} + isSearchable={false} + value={this.state.dateFormat} + options={this.options} + onChange={this.handleDateFormat.bind(this)} + />
From fc2be6201db062e5a7781a3d39b22f00634dc09d Mon Sep 17 00:00:00 2001 From: Sanjay Date: Thu, 3 Feb 2022 19:13:21 +0530 Subject: [PATCH 06/13] - fix linting --- .../meeting_settings/meeting_settings.jsx | 46 ++++++++++--------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/webapp/src/components/meeting_settings/meeting_settings.jsx b/webapp/src/components/meeting_settings/meeting_settings.jsx index 848b1d1..45282fc 100644 --- a/webapp/src/components/meeting_settings/meeting_settings.jsx +++ b/webapp/src/components/meeting_settings/meeting_settings.jsx @@ -3,7 +3,7 @@ import PropTypes from 'prop-types'; import {Modal} from 'react-bootstrap'; -import Select from 'react-select' +import Select from 'react-select'; export default class MeetingSettingsModal extends React.PureComponent { static propTypes = { @@ -16,18 +16,20 @@ export default class MeetingSettingsModal extends React.PureComponent { }; options = [ - { value: 'Jan 2', label: 'month_day' }, - { value: '2 Jan', label: 'day_month' }, - { value: '1 2', label: 'month_day' }, - { value: '2 1', label: 'day_month' }, - { value: '2006 1 2', label: 'year_month_day' }, + {value: 'Jan 2', label: 'month_day'}, + {value: '2 Jan', label: 'day_month'}, + {value: '1 2', label: 'month_day'}, + {value: '2 1', label: 'day_month'}, + {value: '2006 1 2', label: 'year_month_day'}, ]; customStyles = { - menuList: (provided, state) => ({ - ...provided, - height: 188 - }), + menuList: (provided) => { + return ({ + ...provided, + height: 188, + }); + }, control: (provided, state) => ({ ...provided, height: 34, @@ -35,19 +37,21 @@ export default class MeetingSettingsModal extends React.PureComponent { border: '1px solid #ced4da', boxShadow: state.isFocused ? 0 : '1px solid #ced4da', '&:hover': { - border: '1px solid #ced4da' - } - }), - indicatorsContainer: (provided, state) => ({ - ...provided, - height: 34, + border: '1px solid #ced4da', + }, }), + indicatorsContainer: (provided) => { + return ({ + ...provided, + height: 34, + }); + }, singleValue: (provided, state) => { const opacity = state.isDisabled ? 0.5 : 1; const transition = 'opacity 300ms'; - return { ...provided, opacity, transition }; - } + return {...provided, opacity, transition}; + }, } constructor(props) { @@ -69,7 +73,7 @@ export default class MeetingSettingsModal extends React.PureComponent { const splitResult = this.props.meeting.hashtagFormat.split('{{');// we know, date Format is preceded by {{ const hashtagPrefix = splitResult[0]; const dateFormatValue = splitResult[1].substring(0, splitResult[1].length - 2).trim(); // remove trailing }} - const dateFormat = this.options.filter(i => i.value === dateFormatValue)[0]; // extract value object + const dateFormat = this.options.filter((i) => i.value === dateFormatValue)[0]; // extract value object // eslint-disable-next-line react/no-did-update-set-state this.setState({ hashtagPrefix, @@ -85,8 +89,8 @@ export default class MeetingSettingsModal extends React.PureComponent { }); } - handleDateFormat = (newValue, actionMeta) => { - this.setState({ dateFormat: newValue }); + handleDateFormat = (newValue) => { + this.setState({dateFormat: newValue}); }; handleCheckboxChanged = (e) => { From dbca404902db3abd6ebbba30ac58d5f57e18118f Mon Sep 17 00:00:00 2001 From: GuNa Skr Date: Fri, 11 Mar 2022 21:21:39 +0530 Subject: [PATCH 07/13] #66 in the Dark theme The User is not able to see the Data/Text --- .../meeting_settings/meeting_settings.jsx | 35 +++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/webapp/src/components/meeting_settings/meeting_settings.jsx b/webapp/src/components/meeting_settings/meeting_settings.jsx index 45282fc..8d98f33 100644 --- a/webapp/src/components/meeting_settings/meeting_settings.jsx +++ b/webapp/src/components/meeting_settings/meeting_settings.jsx @@ -24,10 +24,39 @@ export default class MeetingSettingsModal extends React.PureComponent { ]; customStyles = { + menu: (provided) => { + return { + ...provided, + background: 'var(--center-channel-bg)', + color: 'var(--center-channel-color)', + }; + }, + option: (provided, { isFocused, isDisabled, isSelected }) => { + const bgColor = isFocused + ? { + backgroundColor: 'var(--button-bg)', + color: 'var(--button-color)', + } + : {}; + + return { + ...provided, + ...bgColor, + ':active': { + ...provided[':active'], + backgroundColor: !isDisabled + ? isSelected + ? 'var(--button-bg)' + : 'var(--center-channel-bg)' + : undefined, + }, + }; + }, menuList: (provided) => { return ({ ...provided, height: 188, + color: 'var(--center-channel-color)', }); }, control: (provided, state) => ({ @@ -39,6 +68,7 @@ export default class MeetingSettingsModal extends React.PureComponent { '&:hover': { border: '1px solid #ced4da', }, + background: 'var(--center-channel-bg)', }), indicatorsContainer: (provided) => { return ({ @@ -49,8 +79,9 @@ export default class MeetingSettingsModal extends React.PureComponent { singleValue: (provided, state) => { const opacity = state.isDisabled ? 0.5 : 1; const transition = 'opacity 300ms'; - - return {...provided, opacity, transition}; + const color = 'var(--center-channel-color)'; + const background = 'var(--center-channel-bg)'; + return { ...provided, opacity, transition, color, background }; }, } From 080b4d837a8b6d1bff7e7643480794903f1bc1b5 Mon Sep 17 00:00:00 2001 From: guna-demansol Date: Mon, 14 Mar 2022 21:17:33 +0530 Subject: [PATCH 08/13] #66 dark theme issue CircleCi error fixes --- .../meeting_settings/meeting_settings.jsx | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/webapp/src/components/meeting_settings/meeting_settings.jsx b/webapp/src/components/meeting_settings/meeting_settings.jsx index 8d98f33..484024e 100644 --- a/webapp/src/components/meeting_settings/meeting_settings.jsx +++ b/webapp/src/components/meeting_settings/meeting_settings.jsx @@ -1,9 +1,9 @@ -import React from 'react'; import PropTypes from 'prop-types'; +import React from 'react'; +import { Modal } from 'react-bootstrap'; +import Select from 'react-select'; -import {Modal} from 'react-bootstrap'; -import Select from 'react-select'; export default class MeetingSettingsModal extends React.PureComponent { static propTypes = { @@ -31,24 +31,24 @@ export default class MeetingSettingsModal extends React.PureComponent { color: 'var(--center-channel-color)', }; }, - option: (provided, { isFocused, isDisabled, isSelected }) => { - const bgColor = isFocused - ? { - backgroundColor: 'var(--button-bg)', - color: 'var(--button-color)', - } - : {}; + option: (provided, {isFocused, isDisabled, isSelected}) => { + const bgColor = isFocused ? + { + backgroundColor: 'var(--button-bg)', + color: 'var(--button-color)', + }: + {}; return { ...provided, ...bgColor, ':active': { ...provided[':active'], - backgroundColor: !isDisabled - ? isSelected - ? 'var(--button-bg)' - : 'var(--center-channel-bg)' - : undefined, + backgroundColor: isDisabled ? + undefined : + isSelected ? + 'var(--button-bg)': + 'var(--center-channel-bg)' }, }; }, @@ -81,7 +81,7 @@ export default class MeetingSettingsModal extends React.PureComponent { const transition = 'opacity 300ms'; const color = 'var(--center-channel-color)'; const background = 'var(--center-channel-bg)'; - return { ...provided, opacity, transition, color, background }; + return {...provided, opacity, transition, color, background}; }, } From 13865c0253925298cf74eec2901ccf15ae7a6fa3 Mon Sep 17 00:00:00 2001 From: guna-demansol Date: Mon, 14 Mar 2022 21:36:51 +0530 Subject: [PATCH 09/13] #66 dark theme issue CircleCi error fixes --- .../meeting_settings/meeting_settings.jsx | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/webapp/src/components/meeting_settings/meeting_settings.jsx b/webapp/src/components/meeting_settings/meeting_settings.jsx index 484024e..dfc1869 100644 --- a/webapp/src/components/meeting_settings/meeting_settings.jsx +++ b/webapp/src/components/meeting_settings/meeting_settings.jsx @@ -1,10 +1,8 @@ import PropTypes from 'prop-types'; import React from 'react'; -import { Modal } from 'react-bootstrap'; +import {Modal} from 'react-bootstrap'; import Select from 'react-select'; - - export default class MeetingSettingsModal extends React.PureComponent { static propTypes = { visible: PropTypes.bool.isRequired, @@ -36,7 +34,7 @@ export default class MeetingSettingsModal extends React.PureComponent { { backgroundColor: 'var(--button-bg)', color: 'var(--button-color)', - }: + } : {}; return { @@ -44,11 +42,9 @@ export default class MeetingSettingsModal extends React.PureComponent { ...bgColor, ':active': { ...provided[':active'], - backgroundColor: isDisabled ? - undefined : - isSelected ? - 'var(--button-bg)': - 'var(--center-channel-bg)' + backgroundColor: isSelected ? + 'var(--button-bg)' : + 'var(--center-channel-bg)', }, }; }, From 2edb8c898b418d2f71bdbde1f958435b463d4498 Mon Sep 17 00:00:00 2001 From: guna-demansol Date: Mon, 14 Mar 2022 21:41:22 +0530 Subject: [PATCH 10/13] #66 dark theme issue CircleCi error fixes --- webapp/src/components/meeting_settings/meeting_settings.jsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/webapp/src/components/meeting_settings/meeting_settings.jsx b/webapp/src/components/meeting_settings/meeting_settings.jsx index dfc1869..0201c1a 100644 --- a/webapp/src/components/meeting_settings/meeting_settings.jsx +++ b/webapp/src/components/meeting_settings/meeting_settings.jsx @@ -29,7 +29,7 @@ export default class MeetingSettingsModal extends React.PureComponent { color: 'var(--center-channel-color)', }; }, - option: (provided, {isFocused, isDisabled, isSelected}) => { + option: (provided, {isFocused, isSelected}) => { const bgColor = isFocused ? { backgroundColor: 'var(--button-bg)', @@ -43,8 +43,8 @@ export default class MeetingSettingsModal extends React.PureComponent { ':active': { ...provided[':active'], backgroundColor: isSelected ? - 'var(--button-bg)' : - 'var(--center-channel-bg)', + 'var(--button-bg)' : + 'var(--center-channel-bg)', }, }; }, From d6dad997134c566f2939d8a4f389235716452440 Mon Sep 17 00:00:00 2001 From: guna-demansol Date: Tue, 15 Mar 2022 19:28:00 +0530 Subject: [PATCH 11/13] #66 removing
tag as per comment --- webapp/src/components/meeting_settings/meeting_settings.jsx | 1 - 1 file changed, 1 deletion(-) diff --git a/webapp/src/components/meeting_settings/meeting_settings.jsx b/webapp/src/components/meeting_settings/meeting_settings.jsx index 0201c1a..44e3290 100644 --- a/webapp/src/components/meeting_settings/meeting_settings.jsx +++ b/webapp/src/components/meeting_settings/meeting_settings.jsx @@ -213,7 +213,6 @@ export default class MeetingSettingsModal extends React.PureComponent { style={{padding: '5px', minWidth: '175px'}} > -