From 2b2c8402977d2a82c43698e1daee61c8d412e5a4 Mon Sep 17 00:00:00 2001 From: Penar Musaraj Date: Tue, 15 Dec 2020 12:35:14 -0500 Subject: [PATCH] DEV: Fix JS errors in styleguide (#11494) Replaces latest topic list component with basic topic list (the former no longer exists). And fixes the display of the topic footer buttons. --- .../javascripts/discourse/lib/dummy-data.js.es6 | 12 +++++++++--- .../styleguide/organisms/03-topic-footer-buttons.hbs | 4 +--- .../styleguide/organisms/basic-topic-list.hbs | 3 +++ .../styleguide/organisms/latest-topic-list.hbs | 3 --- plugins/styleguide/config/locales/client.en.yml | 4 ++-- 5 files changed, 15 insertions(+), 11 deletions(-) create mode 100644 plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/basic-topic-list.hbs delete mode 100644 plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/latest-topic-list.hbs diff --git a/plugins/styleguide/assets/javascripts/discourse/lib/dummy-data.js.es6 b/plugins/styleguide/assets/javascripts/discourse/lib/dummy-data.js.es6 index 1ace401581..56b8b75be3 100644 --- a/plugins/styleguide/assets/javascripts/discourse/lib/dummy-data.js.es6 +++ b/plugins/styleguide/assets/javascripts/discourse/lib/dummy-data.js.es6 @@ -1,3 +1,4 @@ +import EmberObject from "@ember/object"; import NavItem from "discourse/models/nav-item"; let topicId = 2000000; @@ -114,9 +115,14 @@ export function createData(store) { }; let topic = createTopic(); - topic.set("category", categories[0]); - topic.get("details").setProperties({ - can_create_post: true, + topic.setProperties({ + details: EmberObject.create({ + can_create_post: true, + can_invite_to: false, + can_delete: false, + can_close_topic: false, + }), + category: categories[0], suggested_topics: [topic, topic, topic], }); diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/03-topic-footer-buttons.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/03-topic-footer-buttons.hbs index 0e415beac8..e7edad4509 100644 --- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/03-topic-footer-buttons.hbs +++ b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/03-topic-footer-buttons.hbs @@ -1,7 +1,5 @@ {{#styleguide-example title="topic-footer-buttons - logged in"}} - {{topic-footer-buttons - canInviteTo=true - topic=dummy.topic}} + {{topic-footer-buttons topic=dummy.topic}} {{/styleguide-example}} {{#styleguide-example title="topic-footer-buttons - anonymous"}} diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/basic-topic-list.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/basic-topic-list.hbs new file mode 100644 index 0000000000..76c85a0b50 --- /dev/null +++ b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/basic-topic-list.hbs @@ -0,0 +1,3 @@ +{{#styleguide-example title="basic-topic-list" class="half-size"}} + {{basic-topic-list topics=dummy.topics}} +{{/styleguide-example}} diff --git a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/latest-topic-list.hbs b/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/latest-topic-list.hbs deleted file mode 100644 index 6a3d7e77c7..0000000000 --- a/plugins/styleguide/assets/javascripts/discourse/templates/styleguide/organisms/latest-topic-list.hbs +++ /dev/null @@ -1,3 +0,0 @@ -{{#styleguide-example title="latest-topic-list" class="half-size"}} - {{latest-topic-list topics=dummy.topics}} -{{/styleguide-example}} diff --git a/plugins/styleguide/config/locales/client.en.yml b/plugins/styleguide/config/locales/client.en.yml index b9e2bf77ee..1706901aff 100644 --- a/plugins/styleguide/config/locales/client.en.yml +++ b/plugins/styleguide/config/locales/client.en.yml @@ -49,8 +49,8 @@ en: title: "Topic Statuses" topic_list: title: "Topic List" - latest_topic_list: - title: "Latest Topic List" + basic_topic_list: + title: "Basic Topic List" footer_message: title: "Footer Message" signup_cta: