discourse
/
discourse-calendar
mirror of https://github.com/discourse/discourse-calendar.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FEATURE: allows to add a url to an event (#52)

This commit is contained in:
Joffrey JAFFEUX 2020-08-03 08:58:52 +02:00 committed by GitHub
parent f4738ca442
commit c6b531d741
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 124 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/discourse_post_event/events_controller.rb
View File

@ -92,6 +92,7 @@ module DiscoursePostEvent
:starts_at,
:ends_at,
:status,
:url,
raw_invitees: []
)
end

1
app/models/discourse_post_event/event.rb
View File

@ -162,6 +162,7 @@ module DiscoursePostEvent
name: event_params[:name],
starts_at: event_params[:start] || event.starts_at,
ends_at: event_params[:end],
url: event_params[:"url"],
status: event_params[:status].present? ? Event.statuses[event_params[:status].to_sym] : event.status,
raw_invitees: event_params[:"allowed-groups"] ? event_params[:"allowed-groups"].split(',') : nil
}

1
app/serializers/discourse_post_event/event_serializer.rb
View File

@ -17,6 +17,7 @@ module DiscoursePostEvent
attributes :can_update_attendance
attributes :is_expired
attributes :should_display_invitees
attributes :url
def can_act_on_discourse_post_event
scope.can_act_on_discourse_post_event?(object)

8
assets/javascripts/discourse/controllers/discourse-post-event-builder.js.es6
View File

@ -67,7 +67,6 @@ export default Controller.extend(ModalFunctionality, {
.then(post => {
const raw = post.raw;
const newRaw = this._removeRawEvent(raw);
const props = {
raw: newRaw,
edit_reason: I18n.t("discourse_post_event.destroy_event")
@ -150,6 +149,10 @@ export default Controller.extend(ModalFunctionality, {
eventParams.name = this.model.eventModel.name;
}
if (this.model.eventModel.url) {
eventParams.url = this.model.eventModel.url;
}
if (this.endsAt) {
eventParams.end = moment(this.endsAt)
.utc()
@ -170,13 +173,12 @@ export default Controller.extend(ModalFunctionality, {
return raw.replace(eventRegex, "");
},
_replaceRawEvent(eventparams, raw) {
_replaceRawEvent(eventParams, raw) {
const eventRegex = new RegExp(`\\[event\\s(.*?)\\]`, "m");
const eventMatches = raw.match(eventRegex);
if (eventMatches && eventMatches[1]) {
const markdownParams = [];
const eventParams = this._buildEventParams();
Object.keys(eventParams).forEach(eventParam => {
const value = eventParams[eventParam];
if (value && value.length) {

1
assets/javascripts/discourse/models/discourse-post-event-event.js.es6
View File

@ -6,6 +6,7 @@ const ATTRIBUTES = {
starts_at: {},
ends_at: {},
raw_invitees: {},
url: {},
status: {
transform(value) {
return STATUSES[value];

9
assets/javascripts/discourse/templates/modal/discourse-post-event-builder.hbs
View File

@ -11,6 +11,7 @@
clearable=true
onChange=(action "onChangeDates")
}}
{{#event-field class="name" label="discourse_post_event.builder_modal.name.label"}}
{{input
value=(readonly model.eventModel.name)
@ -19,6 +20,14 @@
}}
{{/event-field}}
{{#event-field class="url" label="discourse_post_event.builder_modal.url.label"}}
{{input
value=(readonly model.eventModel.url)
placeholderKey="discourse_post_event.builder_modal.url.placeholder"
input=(action (mut model.eventModel.url) value="target.value")
}}
{{/event-field}}
{{#event-field label="discourse_post_event.builder_modal.status.label"}}
<label class="radio-label">
{{radio-button

25
assets/javascripts/discourse/widgets/discourse-post-event-url.js.es6 Normal file
View File

@ -0,0 +1,25 @@
import RawHtml from "discourse/widgets/raw-html";
import { iconNode } from "discourse-common/lib/icon-library";
import { h } from "virtual-dom";
import { createWidget } from "discourse/widgets/widget";
export default createWidget("discourse-post-event-url", {
tagName: "section.event-url",
html(attrs) {
return [
iconNode("link"),
h(
"a.url",
{
attributes: {
href: attrs.url,
target: "_blank",
rel: "noopener noreferrer"
}
},
attrs.url
)
];
}
});

10
assets/javascripts/discourse/widgets/discourse-post-event.js.es6
View File

@ -180,6 +180,16 @@ export default createWidget("discourse-post-event", {
</section>
{{/if}}
{{#if this.state.eventModel.url}}
<hr />
{{attach widget="discourse-post-event-url"
attrs=(hash
url=this.state.eventModel.url
)
}}
{{/if}}
<hr />
{{attach widget="discourse-post-event-dates"

5
assets/javascripts/initializers/discourse-post-event-decorator.js.es6
View File

@ -85,6 +85,7 @@ function _attachWidget(api, cooked, eventModel) {
eventContainer.innerHTML = "";
const datesHeight = 50;
const urlHeight = 50;
const headerHeight = 75;
const bordersHeight = 10;
const separatorsHeight = 4;
@ -100,6 +101,10 @@ function _attachWidget(api, cooked, eventModel) {
widgetHeight += 60;
}
if (eventModel.url) {
widgetHeight += urlHeight;
}
eventContainer.classList.add("is-loading");
eventContainer.style.height = `${widgetHeight}px`;

4
assets/javascripts/lib/discourse-markdown/discourse-post-event-block.js.es6
View File

@ -27,6 +27,10 @@ const rule = {
token.attrs.push(["data-allowed-groups", info.attrs.allowedGroups]);
}
if (info.attrs.url) {
token.attrs.push(["data-url", info.attrs.url]);
}
return true;
}
};

3
assets/stylesheets/common/discourse-post-event-builder.scss
View File

@ -62,7 +62,8 @@
margin: 1em 0;
flex-direction: column;
&.name {
&.name,
&.url {
input {
width: 100%;
}

23
assets/stylesheets/common/discourse-post-event.scss
View File

@ -8,6 +8,7 @@
margin: 5px 0;
flex-direction: column;
flex: 1 0 auto;
max-width: 100%;
.widget-dropdown {
margin: 0;
@ -271,20 +272,32 @@
margin: 0;
}
.event-url,
.event-dates {
display: flex;
align-items: center;
padding: 0 1em;
height: 50px;
.participants {
margin-left: 0.5em;
color: $primary-medium;
}
flex: 1;
.d-icon {
color: $primary-high;
}
}
.event-url {
.url {
margin-left: 1em;
max-width: 80%;
@include ellipsis;
}
}
.event-dates {
.participants {
margin-left: 0.5em;
color: $primary-medium;
}
.date {
color: $primary-high;

3
config/locales/client.en.yml
View File

@ -315,6 +315,9 @@ en:
create: Create
update: Save
attach: Create event
url:
label: URL
placeholder: Optional
name:
label: Event name
placeholder: Optional, defaults to topic title

11
db/migrate/20200729094848_add_url_column_to_event.rb Normal file
View File

@ -0,0 +1,11 @@
# frozen_string_literal: true
class AddUrlColumnToEvent < ActiveRecord::Migration[6.0]
def up
add_column :discourse_post_event_events, :url, :string, limit: 1000
end
def down
remove_column :discourse_post_event_events, :url
end
end

1
lib/discourse_post_event/event_parser.rb
View File

@ -5,6 +5,7 @@ VALID_OPTIONS = [
:end,
:status,
:"allowed-groups",
:url,
:name
]

13
spec/acceptance/post_spec.rb
View File

@ -80,6 +80,19 @@ describe Post do
expect(post.event.name).to be_blank
end
it 'works with url attribute' do
url = 'https://www.discourse.org'
post = create_post_with_event(user, "url=\"#{url}\"").reload
expect(post.event.url).to eq(url)
post = create_post_with_event(user, 'url=""').reload
expect(post.event.url).to be_blank
post = create_post_with_event(user, 'url=').reload
expect(post.event.url).to be_blank
end
it 'works with status attribute' do
post = create_post_with_event(user, 'status="private"').reload
expect(post.event.status).to eq(DiscoursePostEvent::Event.statuses[:private])

14
spec/requests/post_events_controller_spec.rb → spec/requests/events_controller_spec.rb
View File

@ -141,6 +141,20 @@ module DiscoursePostEvent
let(:event) { Fabricate(:event, post: post1) }
context 'when we update the event' do
context 'when an url is defined' do
it 'changes the url' do
url = 'https://www.google.fr'
put "/discourse-post-event/events/#{event.id}.json", params: {
event: { url: url }
}
event.reload
expect(event.url).to eq(url)
end
end
context 'when status changes from standalone to private' do
it 'changes the status, raw_invitees and invitees' do
event.update!(status: Event.statuses[:standalone])