Skip to content

A platform for community discussion. Free, open, simple.

DEV: Fix MoreTopics styleguide page issues (#39540)

Jarek Radosz137fc974f4cd
diff --git a/plugins/styleguide/assets/javascripts/discourse/components/sections/organisms/more-topics.gjs b/plugins/styleguide/assets/javascripts/discourse/components/sections/organisms/more-topics.gjs
index 8fedd30901b..38f53766c9d 100644
--- a/plugins/styleguide/assets/javascripts/discourse/components/sections/organisms/more-topics.gjs
+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/organisms/more-topics.gjs
@@ -1,13 +1,40 @@
import Component from "@glimmer/component";
+import { tracked } from "@glimmer/tracking";
+import { action } from "@ember/object";
+import BasicTopicList from "discourse/components/basic-topic-list";
import MoreTopics from "discourse/components/more-topics";
-import RelatedMessages from "discourse/components/related-messages";
-import SuggestedTopics from "discourse/components/suggested-topics";
import { withPluginApi } from "discourse/lib/plugin-api";
+import ComboBox from "discourse/select-kit/components/combo-box";
+import StyleguideComponent from "discourse/plugins/styleguide/discourse/components/styleguide/component";
+import Controls from "discourse/plugins/styleguide/discourse/components/styleguide/controls";
+import Row from "discourse/plugins/styleguide/discourse/components/styleguide/controls/row";
import StyleguideExample from "discourse/plugins/styleguide/discourse/components/styleguide-example";
let TAB_ADDED = false;
+const VARIANTS = [
+ { id: "topic", name: "Topic" },
+ { id: "pmTopic", name: "Private message" },
+];
+
+class OtherTopics extends Component {
+ get topics() {
+ return this.args.topic?.suggestedTopics?.slice().reverse();
+ }
+
+ <template>
+ <div class="more-topics__list">
+ <h3 class="more-topics__list-title">Other topics</h3>
+ <div class="topics">
+ <BasicTopicList @topics={{this.topics}} @listContext="other" />
+ </div>
+ </div>
+ </template>
+}
+
export default class MoreTopicsOrganism extends Component {
+ @tracked variant = "topic";
+
constructor() {
super(...arguments);
@@ -16,7 +43,7 @@ export default class MoreTopicsOrganism extends Component {
api.registerMoreTopicsTab({
id: "other-topics",
name: "Other topics",
- component: SuggestedTopics,
+ component: OtherTopics,
condition: () =>
api.container.lookup("service:router").currentRouteName ===
"styleguide.show",
@@ -27,21 +54,31 @@ export default class MoreTopicsOrganism extends Component {
}
}
- <template>
- <StyleguideExample @title="<SuggestedTopics>">
- <SuggestedTopics @topic={{@dummy.topic}} />
- </StyleguideExample>
+ get currentTopic() {
+ return this.args.dummy[this.variant];
+ }
- <StyleguideExample @title="<RelatedMessages>">
- <RelatedMessages @topic={{@dummy.pmTopic}} />
- </StyleguideExample>
+ @action
+ selectVariant(value) {
+ this.variant = value;
+ }
- <StyleguideExample @title="<MoreTopics> - with tabs">
- <MoreTopics @topic={{@dummy.topic}} />
- </StyleguideExample>
+ <template>
+ <StyleguideExample @title="<MoreTopics>">
+ <StyleguideComponent>
+ <MoreTopics @topic={{this.currentTopic}} />
+ </StyleguideComponent>
- <StyleguideExample @title="<MoreTopics> - with tabs, and posters column">
- <MoreTopics @topic={{@dummy.pmTopic}} />
+ <Controls>
+ {{! template-lint-disable no-potential-path-strings}}
+ <Row @name="@topic type">
+ <ComboBox
+ @value={{this.variant}}
+ @content={{VARIANTS}}
+ @onChange={{this.selectVariant}}
+ />
+ </Row>
+ </Controls>
</StyleguideExample>
</template>
}
diff --git a/plugins/styleguide/assets/javascripts/discourse/lib/dummy-data.js b/plugins/styleguide/assets/javascripts/discourse/lib/dummy-data.js
index 70ab3377043..7cbeea56a0e 100644
--- a/plugins/styleguide/assets/javascripts/discourse/lib/dummy-data.js
+++ b/plugins/styleguide/assets/javascripts/discourse/lib/dummy-data.js
@@ -202,6 +202,32 @@ export function createData(store) {
posters: [],
},
],
+ suggested_topics: [
+ {
+ id: 200006,
+ title: "Suggested Topic A",
+ fancy_title: "Suggested Topic A",
+ slug: "suggested-a",
+ posts_count: 6,
+ views: 120,
+ like_count: 3,
+ created_at: "2017-03-06T12:30:00.000Z",
+ visible: true,
+ posters: [],
+ },
+ {
+ id: 200007,
+ title: "Suggested Topic B",
+ fancy_title: "Suggested Topic B",
+ slug: "suggested-b",
+ posts_count: 4,
+ views: 80,
+ like_count: 2,
+ created_at: "2017-03-07T12:30:00.000Z",
+ visible: true,
+ posters: [],
+ },
+ ],
});
const bunchOfTopics = [
diff --git a/plugins/styleguide/assets/stylesheets/styleguide.scss b/plugins/styleguide/assets/stylesheets/styleguide.scss
index dbc5887250a..460afd5dea9 100644
--- a/plugins/styleguide/assets/stylesheets/styleguide.scss
+++ b/plugins/styleguide/assets/stylesheets/styleguide.scss
@@ -279,3 +279,9 @@
z-index: 0;
}
}
+
+.more-topics-examples {
+ .more-topics__container {
+ flex-grow: 1;
+ }
+}
diff --git a/plugins/styleguide/spec/system/smoke_test_spec.rb b/plugins/styleguide/spec/system/smoke_test_spec.rb
index b5126fe9d8f..d2bbfa102fe 100644
--- a/plugins/styleguide/spec/system/smoke_test_spec.rb
+++ b/plugins/styleguide/spec/system/smoke_test_spec.rb
@@ -114,9 +114,6 @@ RSpec.describe "Styleguide Smoke Test" do
sections.each do |section, items|
items.each do |item|
it "renders the #{section}: #{item[:title]} page correctly" do
- # TODO: fix more-topics page flake
- skip "Skipping smoke test for more-topics page" if item[:href] == "/organisms/more-topics"
-
visit "/styleguide/#{item[:href]}"
expect(page).to have_css(".styleguide-contents h1.section-title", text: item[:title])