Skip to content

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

UX: Move gamification leaderboard create and edit to dedicated admin … (#44952)

David Battersbyfd6bac51f348
diff --git a/plugins/discourse-gamification/admin/assets/javascripts/admin/components/admin-create-leaderboard.gjs b/plugins/discourse-gamification/admin/assets/javascripts/admin/components/admin-create-leaderboard.gjs
index 4831ae6e34f..9aab1348757 100644
--- a/plugins/discourse-gamification/admin/assets/javascripts/admin/components/admin-create-leaderboard.gjs
+++ b/plugins/discourse-gamification/admin/assets/javascripts/admin/components/admin-create-leaderboard.gjs
@@ -40,9 +40,8 @@ export default class AdminCreateLeaderboard extends Component {
message: i18n("gamification.leaderboard.create_success"),
},
});
- this.args.onCancel();
this.router.transitionTo(
- "adminPlugins.show.discourse-gamification-leaderboards.show",
+ "adminPlugins.show.discourse-gamification-leaderboards.edit",
leaderboard.id
);
} catch (err) {
@@ -52,40 +51,42 @@ export default class AdminCreateLeaderboard extends Component {
}
}
+ @action
+ cancel() {
+ this.router.transitionTo(
+ "adminPlugins.show.discourse-gamification-leaderboards"
+ );
+ }
+
<template>
- <div class="new-leaderboard-container">
- <Form
- class="new-leaderboard-form"
- @data={{this.formData}}
- @onSubmit={{this.createNewLeaderboard}}
- as |form|
+ <Form
+ class="new-leaderboard-form"
+ @data={{this.formData}}
+ @onSubmit={{this.createNewLeaderboard}}
+ as |form|
+ >
+ <form.Field
+ class="new-leaderboard__name"
+ @name="name"
+ @title={{i18n "gamification.leaderboard.name"}}
+ @type="input"
+ @validation="required"
+ as |field|
>
- <form.Row>
- <form.Field
- class="new-leaderboard__name"
- @name="name"
- @showTitle={{false}}
- @title={{i18n "gamification.leaderboard.name"}}
- @type="input"
- @validation="required"
- as |field|
- >
- <field.Control
- placeholder={{i18n "gamification.leaderboard.name_placeholder"}}
- />
- </form.Field>
+ <field.Control
+ placeholder={{i18n "gamification.leaderboard.name_placeholder"}}
+ />
+ </form.Field>
- </form.Row>
- <form.Actions>
- <form.Submit />
+ <form.Actions>
+ <form.Submit />
- <form.Button
- class="new-leaderboard__cancel form-kit__button btn-default"
- @action={{@onCancel}}
- @label="gamification.cancel"
- />
- </form.Actions>
- </Form>
- </div>
+ <form.Button
+ class="new-leaderboard__cancel btn-default"
+ @action={{this.cancel}}
+ @label="gamification.cancel"
+ />
+ </form.Actions>
+ </Form>
</template>
}
diff --git a/plugins/discourse-gamification/admin/assets/javascripts/admin/components/admin-edit-leaderboard.gjs b/plugins/discourse-gamification/admin/assets/javascripts/admin/components/admin-edit-leaderboard.gjs
index 053d2c5e031..3adedbeb780 100644
--- a/plugins/discourse-gamification/admin/assets/javascripts/admin/components/admin-edit-leaderboard.gjs
+++ b/plugins/discourse-gamification/admin/assets/javascripts/admin/components/admin-edit-leaderboard.gjs
@@ -4,6 +4,8 @@ import { fn } from "@ember/helper";
import { action } from "@ember/object";
import didUpdate from "@ember/render-modifiers/modifiers/did-update";
import { service } from "@ember/service";
+import AdminConfigAreaCard from "discourse/admin/components/admin-config-area-card";
+import AdminConfigAreaCardSection from "discourse/admin/components/admin-config-area-card-section";
import BackButton from "discourse/components/back-button";
import Form from "discourse/components/form";
import { ajax } from "discourse/lib/ajax";
@@ -157,351 +159,382 @@ export default class AdminEditLeaderboard extends Component {
@label="gamification.back_to_leaderboards"
@route="adminPlugins.show.discourse-gamification-leaderboards"
/>
- <Form
- class="edit-create-leaderboard-form"
- @data={{this.formData}}
- @onSubmit={{this.save}}
- as |form|
- >
- <form.Field
- @name="name"
- @title={{i18n "gamification.leaderboard.name"}}
- @type="input"
- @validation="required"
- as |field|
- >
- <field.Control />
- </form.Field>
-
- <form.Section
- @subtitle={{i18n
- "gamification.leaderboard.section.time_period_description"
- }}
- @title={{i18n "gamification.leaderboard.section.time_period"}}
- >
- <form.Row as |row|>
- <row.Col @size={{6}}>
+ <AdminConfigAreaCard @heading="gamification.leaderboard.edit">
+ <:content>
+ <Form
+ class="edit-create-leaderboard-form"
+ @data={{this.formData}}
+ @onSubmit={{this.save}}
+ as |form|
+ >
+ <form.Field
+ @name="name"
+ @title={{i18n "gamification.leaderboard.name"}}
+ @type="input"
+ @validation="required"
+ as |field|
+ >
+ <field.Control />
+ </form.Field>
+
+ <form.Section
+ @subtitle={{i18n
+ "gamification.leaderboard.section.time_period_description"
+ }}
+ @title={{i18n "gamification.leaderboard.section.time_period"}}
+ >
+ <form.Row as |row|>
+ <row.Col @size={{6}}>
+ <form.Field
+ @name="from_date"
+ @title={{i18n "gamification.leaderboard.date.from"}}
+ @type="input-date"
+ as |field|
+ >
+ <field.Control />
+ </form.Field>
+ </row.Col>
+
+ <row.Col @size={{6}}>
+ <form.Field
+ @name="to_date"
+ @title={{i18n "gamification.leaderboard.date.to"}}
+ @type="input-date"
+ as |field|
+ >
+ <field.Control />
+ </form.Field>
+ </row.Col>
+ </form.Row>
+
<form.Field
- @name="from_date"
- @title={{i18n "gamification.leaderboard.date.from"}}
- @type="input-date"
+ @name="period_filter_disabled"
+ @title={{i18n "gamification.leaderboard.period_filter_disabled"}}
+ @type="toggle"
as |field|
>
<field.Control />
</form.Field>
- </row.Col>
- <row.Col @size={{6}}>
<form.Field
- @name="to_date"
- @title={{i18n "gamification.leaderboard.date.to"}}
- @type="input-date"
+ @name="default_period"
+ @title={{i18n "gamification.leaderboard.default_period"}}
+ @type="custom"
as |field|
>
- <field.Control />
+ <field.Control>
+ <PeriodInput @onChange={{field.set}} @value={{field.value}} />
+ </field.Control>
</form.Field>
- </row.Col>
- </form.Row>
-
- <form.Field
- @name="period_filter_disabled"
- @title={{i18n "gamification.leaderboard.period_filter_disabled"}}
- @type="toggle"
- as |field|
- >
- <field.Control />
- </form.Field>
-
- <form.Field
- @name="default_period"
- @title={{i18n "gamification.leaderboard.default_period"}}
- @type="custom"
- as |field|
- >
- <field.Control>
- <PeriodInput @onChange={{field.set}} @value={{field.value}} />
- </field.Control>
- </form.Field>
- </form.Section>
-
- <form.Section
- @subtitle={{i18n "gamification.leaderboard.section.groups_description"}}
- @title={{i18n "gamification.leaderboard.section.groups"}}
- >
- <form.Field
- @name="included_groups_ids"
- @title={{i18n "gamification.leaderboard.included_groups"}}
- @type="custom"
- as |field|
- >
- <field.Control>
- <GroupChooser
- @content={{this.siteGroups}}
- @id="leaderboard-edit__included-groups"
- @labelProperty="name"
- @onChange={{field.set}}
- @value={{field.value}}
- />
- </field.Control>
- </form.Field>
-
- <form.Field
- @name="excluded_groups_ids"
- @title={{i18n "gamification.leaderboard.excluded_groups"}}
- @type="custom"
- as |field|
- >
- <field.Control>
- <GroupChooser
- @content={{this.siteGroups}}
- @id="leaderboard-edit__excluded-groups"
- @labelProperty="name"
- @onChange={{field.set}}
- @value={{field.value}}
- />
- </field.Control>
- </form.Field>
-
- <form.Field
- @name="visible_to_groups_ids"
- @title={{i18n "gamification.leaderboard.visible_to_groups"}}
- @type="custom"
- as |field|
- >
- <field.Control>
- <GroupChooser
- @content={{this.siteGroups}}
- @id="leaderboard-edit__visible-groups"
- @labelProperty="name"
- @onChange={{field.set}}
- @value={{field.value}}
- />
- </field.Control>
- </form.Field>
- </form.Section>
-
- <details class="leaderboard-scoring-details">
- <summary>{{i18n
- "gamification.leaderboard.scoring_configuration"
- }}</summary>
-
- <p class="leaderboard-scoring-details__description">{{i18n
- "gamification.leaderboard.scoring_configuration_description"
- }}</p>
-
- <form.Section
- @title={{i18n "gamification.leaderboard.scorable_categories"}}
- >
- <form.Field
- @description={{i18n
- "gamification.leaderboard.scorable_categories_help"
+ </form.Section>
+
+ <form.Section
+ @subtitle={{i18n
+ "gamification.leaderboard.section.groups_description"
}}
- @name="scorable_category_ids"
- @title={{i18n "gamification.leaderboard.scorable_categories"}}
- @type="custom"
- as |field|
+ @title={{i18n "gamification.leaderboard.section.groups"}}
>
- <field.Control>
- <div
- {{didUpdate
- (fn this.syncSelectedScorableCategories field.value)
- field.value
- }}
- >
- <CategorySelector
- @categories={{this.selectedScorableCategories}}
- @onChange={{fn this.onCategoryChange field.set}}
+ <form.Field
+ @name="included_groups_ids"
+ @title={{i18n "gamification.leaderboard.included_groups"}}
+ @type="custom"
+ as |field|
+ >
+ <field.Control>
+ <GroupChooser
+ @content={{this.siteGroups}}
+ @id="leaderboard-edit__included-groups"
+ @labelProperty="name"
+ @onChange={{field.set}}
+ @value={{field.value}}
/>
- </div>
- </field.Control>
- </form.Field>
- </form.Section>
+ </field.Control>
+ </form.Field>
- <form.Section
- @subtitle={{i18n "gamification.leaderboard.score_overrides_help"}}
- @title={{i18n "gamification.leaderboard.score_overrides"}}
- >
- <form.Row as |row|>
- <row.Col @size={{6}}>
- <form.Field
- @name="score_override_like_given"
- @title={{i18n "gamification.leaderboard.weight.like_given"}}
- @type="input-number"
- as |field|
- >
- <field.Control min="0" step="1" />
- </form.Field>
- </row.Col>
- <row.Col @size={{6}}>
- <form.Field
- @name="score_override_like_received"
- @title={{i18n "gamification.leaderboard.weight.like_received"}}
- @type="input-number"
- as |field|
- >
- <field.Control min="0" step="1" />
- </form.Field>
- </row.Col>
- </form.Row>
-
- <form.Row as |row|>
- <row.Col @size={{6}}>
- <form.Field
- @name="score_override_post_created"
- @title={{i18n "gamification.leaderboard.weight.post_created"}}
- @type="input-number"
- as |field|
- >
- <field.Control min="0" step="1" />
- </form.Field>
- </row.Col>
- <row.Col @size={{6}}>
- <form.Field
- @name="score_override_topic_created"
- @title={{i18n "gamification.leaderboard.weight.topic_created"}}
- @type="input-number"
- as |field|
- >
- <field.Control min="0" step="1" />
- </form.Field>
- </row.Col>
- </form.Row>
-
- <form.Row as |row|>
- <row.Col @size={{6}}>
- <form.Field
- @name="score_override_solution"
- @title={{i18n "gamification.leaderboard.weight.solution"}}
- @type="input-number"
- as |field|
- >
- <field.Control min="0" step="1" />
- </form.Field>
- </row.Col>
- <row.Col @size={{6}}>
- <form.Field
- @name="score_override_flag_created"
- @title={{i18n "gamification.leaderboard.weight.flag_created"}}
- @type="input-number"
- as |field|
- >
- <field.Control min="0" step="1" />
- </form.Field>
- </row.Col>
- </form.Row>
-
- <form.Row as |row|>
- <row.Col @size={{6}}>
- <form.Field
- @name="score_override_day_visited"
- @title={{i18n "gamification.leaderboard.weight.day_visited"}}
- @type="input-number"
- as |field|
- >
- <field.Control min="0" step="1" />
- </form.Field>
- </row.Col>
- <row.Col @size={{6}}>
- <form.Field
- @name="score_override_user_invited"
- @title={{i18n "gamification.leaderboard.weight.user_invited"}}
- @type="input-number"
- as |field|
- >
- <field.Control min="0" step="1" />
- </form.Field>
- </row.Col>
- </form.Row>
-
- <form.Row as |row|>
- <row.Col @size={{6}}>
- <form.Field
- @name="score_override_post_read"
- @title={{i18n "gamification.leaderboard.weight.post_read"}}
- @type="input-number"
- as |field|
- >
- <field.Control min="0" step="1" />
- </form.Field>
- </row.Col>
- <row.Col @size={{6}}>
- <form.Field
- @name="score_override_time_read"
- @title={{i18n "gamification.leaderboard.weight.time_read"}}
- @type="input-number"
- as |field|
- >
- <field.Control min="0" step="1" />
- </form.Field>
- </row.Col>
- </form.Row>
-
- <form.Row as |row|>
- <row.Col @size={{6}}>
- <form.Field
- @name="score_override_reaction_given"
- @title={{i18n "gamification.leaderboard.weight.reaction_given"}}
- @type="input-number"
- as |field|
- >
- <field.Control min="0" step="1" />
- </form.Field>
- </row.Col>
- <row.Col @size={{6}}>
- <form.Field
- @name="score_override_reaction_received"
- @title={{i18n
- "gamification.leaderboard.weight.reaction_received"
- }}
- @type="input-number"
- as |field|
- >
- <field.Control min="0" step="1" />
- </form.Field>
- </row.Col>
- </form.Row>
-
- <form.Row as |row|>
- <row.Col @size={{6}}>
- <form.Field
- @name="score_override_chat_message_created"
- @title={{i18n
- "gamification.leaderboard.weight.chat_message_created"
- }}
- @type="input-number"
- as |field|
- >
- <field.Control min="0" step="1" />
- </form.Field>
- </row.Col>
- <row.Col @size={{6}}>
- <form.Field
- @name="score_override_chat_reaction_given"
- @title={{i18n
- "gamification.leaderboard.weight.chat_reaction_given"
- }}
- @type="input-number"
- as |field|
- >
- <field.Control min="0" step="1" />
- </form.Field>
- </row.Col>
- </form.Row>
+ <form.Field
+ @name="excluded_groups_ids"
+ @title={{i18n "gamification.leaderboard.excluded_groups"}}
+ @type="custom"
+ as |field|
+ >
+ <field.Control>
+ <GroupChooser
+ @content={{this.siteGroups}}
+ @id="leaderboard-edit__excluded-groups"
+ @labelProperty="name"
+ @onChange={{field.set}}
+ @value={{field.value}}
+ />
+ </field.Control>
+ </form.Field>
- <form.Field
- @name="score_override_chat_reaction_received"
- @title={{i18n
- "gamification.leaderboard.weight.chat_reaction_received"
- }}
- @type="input-number"
- as |field|
+ <form.Field
+ @name="visible_to_groups_ids"
+ @title={{i18n "gamification.leaderboard.visible_to_groups"}}
+ @type="custom"
+ as |field|
+ >
+ <field.Control>
+ <GroupChooser
+ @content={{this.siteGroups}}
+ @id="leaderboard-edit__visible-groups"
+ @labelProperty="name"
+ @onChange={{field.set}}
+ @value={{field.value}}
+ />
+ </field.Control>
+ </form.Field>
+ </form.Section>
+
+ <AdminConfigAreaCardSection
+ class="leaderboard-scoring"
+ @collapsable={{true}}
+ @collapsed={{true}}
+ @heading={{i18n "gamification.leaderboard.scoring_configuration"}}
>
- <field.Control min="0" step="1" />
- </form.Field>
- </form.Section>
- </details>
+ <:content>
+ <p class="leaderboard-scoring__description">{{i18n
+ "gamification.leaderboard.scoring_configuration_description"
+ }}</p>
- <form.Submit />
- </Form>
+ <form.Section
+ @title={{i18n "gamification.leaderboard.scorable_categories"}}
+ >
+ <form.Field
+ @description={{i18n
+ "gamification.leaderboard.scorable_categories_help"
+ }}
+ @name="scorable_category_ids"
+ @title={{i18n "gamification.leaderboard.scorable_categories"}}
+ @type="custom"
+ as |field|
+ >
+ <field.Control>
+ <div
+ {{didUpdate
+ (fn this.syncSelectedScorableCategories field.value)
+ field.value
+ }}
+ >
+ <CategorySelector
+ @categories={{this.selectedScorableCategories}}
+ @onChange={{fn this.onCategoryChange field.set}}
+ />
+ </div>
+ </field.Control>
+ </form.Field>
+ </form.Section>
+
+ <form.Section
+ @subtitle={{i18n
+ "gamification.leaderboard.score_overrides_help"
+ }}
+ @title={{i18n "gamification.leaderboard.score_overrides"}}
+ >
+ <form.Row as |row|>
+ <row.Col @size={{6}}>
+ <form.Field
+ @name="score_override_like_given"
+ @title={{i18n
+ "gamification.leaderboard.weight.like_given"
+ }}
+ @type="input-number"
+ as |field|
+ >
+ <field.Control min="0" step="1" />
+ </form.Field>
+ </row.Col>
+ <row.Col @size={{6}}>
+ <form.Field
+ @name="score_override_like_received"
+ @title={{i18n
+ "gamification.leaderboard.weight.like_received"
+ }}
+ @type="input-number"
+ as |field|
+ >
+ <field.Control min="0" step="1" />
+ </form.Field>
+ </row.Col>
+ </form.Row>
+
+ <form.Row as |row|>
+ <row.Col @size={{6}}>
+ <form.Field
+ @name="score_override_post_created"
+ @title={{i18n
+ "gamification.leaderboard.weight.post_created"
+ }}
+ @type="input-number"
+ as |field|
+ >
+ <field.Control min="0" step="1" />
+ </form.Field>
+ </row.Col>
+ <row.Col @size={{6}}>
+ <form.Field
+ @name="score_override_topic_created"
+ @title={{i18n
+ "gamification.leaderboard.weight.topic_created"
+ }}
+ @type="input-number"
+ as |field|
+ >
+ <field.Control min="0" step="1" />
+ </form.Field>
+ </row.Col>
+ </form.Row>
+
+ <form.Row as |row|>
+ <row.Col @size={{6}}>
+ <form.Field
+ @name="score_override_solution"
+ @title={{i18n "gamification.leaderboard.weight.solution"}}
+ @type="input-number"
+ as |field|
+ >
+ <field.Control min="0" step="1" />
+ </form.Field>
+ </row.Col>
+ <row.Col @size={{6}}>
+ <form.Field
+ @name="score_override_flag_created"
+ @title={{i18n
+ "gamification.leaderboard.weight.flag_created"
+ }}
+ @type="input-number"
+ as |field|
+ >
+ <field.Control min="0" step="1" />
+ </form.Field>
+ </row.Col>
+ </form.Row>
+
+ <form.Row as |row|>
+ <row.Col @size={{6}}>
+ <form.Field
+ @name="score_override_day_visited"
+ @title={{i18n
+ "gamification.leaderboard.weight.day_visited"
+ }}
+ @type="input-number"
+ as |field|
+ >
+ <field.Control min="0" step="1" />
+ </form.Field>
+ </row.Col>
+ <row.Col @size={{6}}>
+ <form.Field
+ @name="score_override_user_invited"
+ @title={{i18n
+ "gamification.leaderboard.weight.user_invited"
+ }}
+ @type="input-number"
+ as |field|
+ >
+ <field.Control min="0" step="1" />
+ </form.Field>
+ </row.Col>
+ </form.Row>
+
+ <form.Row as |row|>
+ <row.Col @size={{6}}>
+ <form.Field
+ @name="score_override_post_read"
+ @title={{i18n
+ "gamification.leaderboard.weight.post_read"
+ }}
+ @type="input-number"
+ as |field|
+ >
+ <field.Control min="0" step="1" />
+ </form.Field>
+ </row.Col>
+ <row.Col @size={{6}}>
+ <form.Field
+ @name="score_override_time_read"
+ @title={{i18n
+ "gamification.leaderboard.weight.time_read"
+ }}
+ @type="input-number"
+ as |field|
+ >
+ <field.Control min="0" step="1" />
+ </form.Field>
+ </row.Col>
+ </form.Row>
+
+ <form.Row as |row|>
+ <row.Col @size={{6}}>
+ <form.Field
+ @name="score_override_reaction_given"
+ @title={{i18n
+ "gamification.leaderboard.weight.reaction_given"
+ }}
+ @type="input-number"
+ as |field|
+ >
+ <field.Control min="0" step="1" />
+ </form.Field>
+ </row.Col>
+ <row.Col @size={{6}}>
+ <form.Field
+ @name="score_override_reaction_received"
+ @title={{i18n
+ "gamification.leaderboard.weight.reaction_received"
+ }}
+ @type="input-number"
+ as |field|
+ >
+ <field.Control min="0" step="1" />
+ </form.Field>
+ </row.Col>
+ </form.Row>
+
+ <form.Row as |row|>
+ <row.Col @size={{6}}>
+ <form.Field
+ @name="score_override_chat_message_created"
+ @title={{i18n
+ "gamification.leaderboard.weight.chat_message_created"
+ }}
+ @type="input-number"
+ as |field|
+ >
+ <field.Control min="0" step="1" />
+ </form.Field>
+ </row.Col>
+ <row.Col @size={{6}}>
+ <form.Field
+ @name="score_override_chat_reaction_given"
+ @title={{i18n
+ "gamification.leaderboard.weight.chat_reaction_given"
+ }}
+ @type="input-number"
+ as |field|
+ >
+ <field.Control min="0" step="1" />
+ </form.Field>
+ </row.Col>
+ </form.Row>
+
+ <form.Field
+ @name="score_override_chat_reaction_received"
+ @title={{i18n
+ "gamification.leaderboard.weight.chat_reaction_received"
+ }}
+ @type="input-number"
+ as |field|
+ >
+ <field.Control min="0" step="1" />
+ </form.Field>
+ </form.Section>
+ </:content>
+ </AdminConfigAreaCardSection>
+
+ <form.Submit />
+ </Form>
+ </:content>
+ </AdminConfigAreaCard>
</template>
}
diff --git a/plugins/discourse-gamification/admin/assets/javascripts/discourse/controllers/admin-plugins/show/discourse-gamification-leaderboards/index.js b/plugins/discourse-gamification/admin/assets/javascripts/discourse/controllers/admin-plugins/show/discourse-gamification-leaderboards/index.js
index 1f0033334f3..56664ddd831 100644
--- a/plugins/discourse-gamification/admin/assets/javascripts/discourse/controllers/admin-plugins/show/discourse-gamification-leaderboards/index.js
+++ b/plugins/discourse-gamification/admin/assets/javascripts/discourse/controllers/admin-plugins/show/discourse-gamification-leaderboards/index.js
@@ -12,13 +12,6 @@ export default class AdminPluginsShowDiscourseGamificationLeaderboardsIndexContr
@service dialog;
@service toasts;
- creatingNew = false;
-
- @action
- resetNewLeaderboard() {
- this.set("creatingNew", false);
- }
-
@action
async destroyLeaderboard(leaderboard, closeMenu) {
await closeMenu();
diff --git a/plugins/discourse-gamification/admin/assets/javascripts/discourse/routes/admin-plugins/show/discourse-gamification-leaderboards/edit.js b/plugins/discourse-gamification/admin/assets/javascripts/discourse/routes/admin-plugins/show/discourse-gamification-leaderboards/edit.js
new file mode 100644
index 00000000000..560f1bbd81a
--- /dev/null
+++ b/plugins/discourse-gamification/admin/assets/javascripts/discourse/routes/admin-plugins/show/discourse-gamification-leaderboards/edit.js
@@ -0,0 +1,27 @@
+import { ajax } from "discourse/lib/ajax";
+import DiscourseRoute from "discourse/routes/discourse";
+import GamificationLeaderboard from "discourse/plugins/discourse-gamification/discourse/models/gamification-leaderboard";
+
+export default class DiscourseGamificationLeaderboardEdit extends DiscourseRoute {
+ model(params) {
+ const leaderboardsData = this.modelFor(
+ "adminPlugins.show.discourse-gamification-leaderboards"
+ );
+ const id = parseInt(params.id, 10);
+
+ const leaderboard = leaderboardsData.leaderboards.find(
+ (item) => item.id === id
+ );
+ if (leaderboard) {
+ return leaderboard;
+ }
+
+ return ajax(
+ `/admin/plugins/discourse-gamification/leaderboards/${id}`
+ ).then((response) => GamificationLeaderboard.create(response.leaderboard));
+ }
+
+ titleToken() {
+ return this.currentModel?.name;
+ }
+}
diff --git a/plugins/discourse-gamification/admin/assets/javascripts/discourse/routes/admin-plugins/show/discourse-gamification-leaderboards/new.js b/plugins/discourse-gamification/admin/assets/javascripts/discourse/routes/admin-plugins/show/discourse-gamification-leaderboards/new.js
new file mode 100644
index 00000000000..28fd1397bb5
--- /dev/null
+++ b/plugins/discourse-gamification/admin/assets/javascripts/discourse/routes/admin-plugins/show/discourse-gamification-leaderboards/new.js
@@ -0,0 +1,8 @@
+import DiscourseRoute from "discourse/routes/discourse";
+import { i18n } from "discourse-i18n";
+
+export default class DiscourseGamificationLeaderboardNew extends DiscourseRoute {
+ titleToken() {
+ return i18n("gamification.leaderboard.new");
+ }
+}
diff --git a/plugins/discourse-gamification/admin/assets/javascripts/discourse/routes/admin-plugins/show/discourse-gamification-leaderboards/show.js b/plugins/discourse-gamification/admin/assets/javascripts/discourse/routes/admin-plugins/show/discourse-gamification-leaderboards/show.js
index b5708b32b7d..30494369d65 100644
--- a/plugins/discourse-gamification/admin/assets/javascripts/discourse/routes/admin-plugins/show/discourse-gamification-leaderboards/show.js
+++ b/plugins/discourse-gamification/admin/assets/javascripts/discourse/routes/admin-plugins/show/discourse-gamification-leaderboards/show.js
@@ -1,27 +1,14 @@
-import { ajax } from "discourse/lib/ajax";
+import { service } from "@ember/service";
import DiscourseRoute from "discourse/routes/discourse";
-import GamificationLeaderboard from "discourse/plugins/discourse-gamification/discourse/models/gamification-leaderboard";
+// Keeps links to the old `leaderboards/:id` edit URL working.
export default class DiscourseGamificationLeaderboardShow extends DiscourseRoute {
- model(params) {
- const leaderboardsData = this.modelFor(
- "adminPlugins.show.discourse-gamification-leaderboards"
- );
- const id = parseInt(params.id, 10);
+ @service router;
- const leaderboard = leaderboardsData.leaderboards.find(
- (item) => item.id === id
+ beforeModel(transition) {
+ this.router.replaceWith(
+ "adminPlugins.show.discourse-gamification-leaderboards.edit",
+ transition.to.params.id
);
- if (leaderboard) {
- return leaderboard;
- }
-
- return ajax(
- `/admin/plugins/discourse-gamification/leaderboards/${id}`
- ).then((response) => GamificationLeaderboard.create(response.leaderboard));
- }
-
- titleToken() {
- return this.currentModel?.name;
}
}
diff --git a/plugins/discourse-gamification/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-gamification-leaderboards/show.gjs b/plugins/discourse-gamification/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-gamification-leaderboards/edit.gjs
similarity index 100%
rename from plugins/discourse-gamification/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-gamification-leaderboards/show.gjs
rename to plugins/discourse-gamification/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-gamification-leaderboards/edit.gjs
diff --git a/plugins/discourse-gamification/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-gamification-leaderboards/index.gjs b/plugins/discourse-gamification/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-gamification-leaderboards/index.gjs
index 88451784c37..78037f86b55 100644
--- a/plugins/discourse-gamification/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-gamification-leaderboards/index.gjs
+++ b/plugins/discourse-gamification/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-gamification-leaderboards/index.gjs
@@ -10,7 +10,6 @@ import DUserLink from "discourse/ui-kit/d-user-link";
import dAvatar from "discourse/ui-kit/helpers/d-avatar";
import dFormatDate from "discourse/ui-kit/helpers/d-format-date";
import { i18n } from "discourse-i18n";
-import AdminCreateLeaderboard from "discourse/plugins/discourse-gamification/admin/components/admin-create-leaderboard";
export default <template>
<DBreadcrumbsItem
@@ -24,9 +23,9 @@ export default <template>
{{#if @controller.model.leaderboards}}
<actions.Primary
class="leaderboard-admin__btn-new"
- @action={{fn (mut @controller.creatingNew) true}}
@icon="plus"
@label="gamification.leaderboard.new"
+ @route="adminPlugins.show.discourse-gamification-leaderboards.new"
/>
<actions.Default
@@ -38,10 +37,6 @@ export default <template>
</:actions>
</DPageSubheader>
- {{#if @controller.creatingNew}}
- <AdminCreateLeaderboard @onCancel={{@controller.resetNewLeaderboard}} />
- {{/if}}
-
<div class="leaderboards">
{{#if @controller.model.leaderboards}}
<table class="d-table">
@@ -70,7 +65,7 @@ export default <template>
<LinkTo
class="d-table__overview-link"
@model={{leaderboard.id}}
- @route="gamificationLeaderboard.byName"
+ @route="adminPlugins.show.discourse-gamification-leaderboards.edit"
>
<div class="d-table__overview-name">
{{leaderboard.name}}
@@ -108,7 +103,7 @@ export default <template>
<LinkTo
class="btn btn-default leaderboard-admin__edit btn-text btn-small"
@model={{leaderboard}}
- @route="adminPlugins.show.discourse-gamification-leaderboards.show"
+ @route="adminPlugins.show.discourse-gamification-leaderboards.edit"
>{{i18n "gamification.edit"}}</LinkTo>
<DMenu
@@ -120,6 +115,15 @@ export default <template>
>
<:content as |menu|>
<DDropdownMenu as |dropdown|>
+ <dropdown.item>
+ <DButton
+ class="btn-transparent leaderboard-admin__view"
+ @icon="eye"
+ @label="gamification.leaderboard.view"
+ @route="gamificationLeaderboard.byName"
+ @routeModels={{leaderboard.id}}
+ />
+ </dropdown.item>
<dropdown.item>
<DButton
class="btn-transparent --danger leaderboard-admin__delete"
@@ -142,13 +146,11 @@ export default <template>
</tbody>
</table>
{{else}}
- {{#unless @controller.creatingNew}}
- <AdminConfigAreaEmptyList
- @ctaAction={{fn (mut @controller.creatingNew) true}}
- @ctaLabel="gamification.leaderboard.cta"
- @emptyLabel="gamification.leaderboard.none"
- />
- {{/unless}}
+ <AdminConfigAreaEmptyList
+ @ctaLabel="gamification.leaderboard.cta"
+ @ctaRoute="adminPlugins.show.discourse-gamification-leaderboards.new"
+ @emptyLabel="gamification.leaderboard.none"
+ />
{{/if}}
</div>
</div>
diff --git a/plugins/discourse-gamification/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-gamification-leaderboards/new.gjs b/plugins/discourse-gamification/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-gamification-leaderboards/new.gjs
new file mode 100644
index 00000000000..e4b5dd17a77
--- /dev/null
+++ b/plugins/discourse-gamification/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-gamification-leaderboards/new.gjs
@@ -0,0 +1,18 @@
+import AdminConfigAreaCard from "discourse/admin/components/admin-config-area-card";
+import BackButton from "discourse/components/back-button";
+import AdminCreateLeaderboard from "discourse/plugins/discourse-gamification/admin/components/admin-create-leaderboard";
+
+export default <template>
+ <div class="admin-detail">
+ <BackButton
+ @label="gamification.back_to_leaderboards"
+ @route="adminPlugins.show.discourse-gamification-leaderboards"
+ />
+
+ <AdminConfigAreaCard @heading="gamification.leaderboard.new">
+ <:content>
+ <AdminCreateLeaderboard />
+ </:content>
+ </AdminConfigAreaCard>
+ </div>
+</template>
diff --git a/plugins/discourse-gamification/assets/javascripts/discourse/admin-discourse-gamification-plugin-route-map.js b/plugins/discourse-gamification/assets/javascripts/discourse/admin-discourse-gamification-plugin-route-map.js
index e42e0656838..01553611fae 100644
--- a/plugins/discourse-gamification/assets/javascripts/discourse/admin-discourse-gamification-plugin-route-map.js
+++ b/plugins/discourse-gamification/assets/javascripts/discourse/admin-discourse-gamification-plugin-route-map.js
@@ -8,6 +8,8 @@ export default {
"discourse-gamification-leaderboards",
{ path: "leaderboards" },
function () {
+ this.route("new");
+ this.route("edit", { path: "/:id/edit" });
this.route("show", { path: "/:id" });
}
);
diff --git a/plugins/discourse-gamification/assets/stylesheets/admin/leaderboard.scss b/plugins/discourse-gamification/assets/stylesheets/admin/leaderboard.scss
index 3b102be7f5f..b37672ab8df 100644
--- a/plugins/discourse-gamification/assets/stylesheets/admin/leaderboard.scss
+++ b/plugins/discourse-gamification/assets/stylesheets/admin/leaderboard.scss
@@ -7,16 +7,7 @@
}
}
-.leaderboard-scoring-details {
- margin-top: 1em;
-
- > summary {
- font-size: var(--font-up-1);
- font-weight: 700;
- cursor: pointer;
- padding: 0.5em 0;
- }
-
+.leaderboard-scoring {
&__description {
color: var(--primary-medium);
margin: 0 0 1em;
@@ -26,9 +17,3 @@
margin-top: 1.5em;
}
}
-
-.new-leaderboard-container {
- .form-kit__row {
- padding-top: 0;
- }
-}
diff --git a/plugins/discourse-gamification/config/locales/client.en.yml b/plugins/discourse-gamification/config/locales/client.en.yml
index d5df62d71f5..ebeafa82a5c 100644
--- a/plugins/discourse-gamification/config/locales/client.en.yml
+++ b/plugins/discourse-gamification/config/locales/client.en.yml
@@ -21,6 +21,8 @@ en:
name: "Name"
name_placeholder: "Name..."
new: "New leaderboard"
+ edit: "Edit leaderboard"
+ view: "View leaderboard"
create_success: "Leaderboard created"
delete_success: "Leaderboard deleted"
save_success: "Leaderboard saved"
diff --git a/plugins/discourse-gamification/config/routes.rb b/plugins/discourse-gamification/config/routes.rb
index 871d70eed7a..887dd44ad02 100644
--- a/plugins/discourse-gamification/config/routes.rb
+++ b/plugins/discourse-gamification/config/routes.rb
@@ -10,6 +10,8 @@ Discourse::Application.routes.draw do
scope "/admin/plugins/discourse-gamification", constraints: StaffConstraint.new do
get "/leaderboards" => "discourse_gamification/admin_gamification_leaderboard#index"
+ get "/leaderboards/new" => "admin/plugins#index"
+ get "/leaderboards/:id/edit" => "admin/plugins#index"
get "/leaderboards/:id" => "discourse_gamification/admin_gamification_leaderboard#show"
end
diff --git a/plugins/discourse-gamification/spec/system/admin_leaderboards_spec.rb b/plugins/discourse-gamification/spec/system/admin_leaderboards_spec.rb
index 10e4cd0ced8..a4bf1a7ac7e 100644
--- a/plugins/discourse-gamification/spec/system/admin_leaderboards_spec.rb
+++ b/plugins/discourse-gamification/spec/system/admin_leaderboards_spec.rb
@@ -22,7 +22,7 @@ describe "Admin leaderboards" do
expect(admin_leaderboard_page.full_form.field("name").value).to eq("My leaderboard")
expect(page).to have_current_path(
- "/admin/plugins/discourse-gamification/leaderboards/#{DiscourseGamification::GamificationLeaderboard.last.id}",
+ "/admin/plugins/discourse-gamification/leaderboards/#{DiscourseGamification::GamificationLeaderboard.last.id}/edit",
)
admin_leaderboard_page.full_form.field("from_date").fill_in(12.months.ago.end_of_month)
@@ -58,6 +58,52 @@ describe "Admin leaderboards" do
expect(leaderboard.reload.name).to eq("Coolest dudettes")
end
+ it "opens the edit page from the leaderboard name" do
+ visit("/admin/plugins/discourse-gamification")
+
+ admin_leaderboard_page.click_leaderboard_name(leaderboard)
+
+ expect(page).to have_current_path(
+ "/admin/plugins/discourse-gamification/leaderboards/#{leaderboard.id}/edit",
+ )
+ expect(admin_leaderboard_page.full_form.field("name").value).to eq("Coolest duders")
+ end
+
+ it "opens the public leaderboard from the row menu" do
+ visit("/admin/plugins/discourse-gamification")
+
+ admin_leaderboard_page.view_leaderboard(leaderboard)
+
+ expect(page).to have_current_path("/leaderboard/#{leaderboard.id}")
+ end
+
+ it "loads the new and edit pages directly" do
+ visit("/admin/plugins/discourse-gamification/leaderboards/new")
+ expect(admin_leaderboard_page.new_form.field("name")).to be_present
+
+ visit("/admin/plugins/discourse-gamification/leaderboards/#{leaderboard.id}/edit")
+ expect(admin_leaderboard_page.full_form.field("name").value).to eq("Coolest duders")
+ end
+
+ it "redirects the old edit URL" do
+ visit("/admin/plugins/discourse-gamification/leaderboards/#{leaderboard.id}")
+
+ expect(page).to have_current_path(
+ "/admin/plugins/discourse-gamification/leaderboards/#{leaderboard.id}/edit",
+ )
+ end
+
+ it "keeps score overrides when saving with the scoring section collapsed" do
+ leaderboard.update!(score_overrides: { "like_given" => 5 })
+
+ visit("/admin/plugins/discourse-gamification/leaderboards/#{leaderboard.id}/edit")
+ admin_leaderboard_page.full_form.field("name").fill_in("Coolest dudettes")
+ admin_leaderboard_page.full_form.submit
+
+ expect(page).to have_content(I18n.t("js.gamification.leaderboard.save_success"))
+ expect(leaderboard.reload.score_overrides).to eq({ "like_given" => 5 })
+ end
+
it "shows the creator and opens their user card" do
creator = User.find(leaderboard.created_by_id)
user_card = PageObjects::Components::UserCard.new
diff --git a/plugins/discourse-gamification/spec/system/page_objects/pages/admin_leaderboards.rb b/plugins/discourse-gamification/spec/system/page_objects/pages/admin_leaderboards.rb
index fe518f4af3d..88d93cd9de0 100644
--- a/plugins/discourse-gamification/spec/system/page_objects/pages/admin_leaderboards.rb
+++ b/plugins/discourse-gamification/spec/system/page_objects/pages/admin_leaderboards.rb
@@ -36,14 +36,28 @@ module PageObjects
find("#leaderboard-admin__row-#{leaderboard.id} .leaderboard-admin__edit").click
end
+ def click_leaderboard_name(leaderboard)
+ find("#leaderboard-admin__row-#{leaderboard.id} .d-table__overview-link").click
+ end
+
+ def view_leaderboard(leaderboard)
+ row_menu(leaderboard).option(".leaderboard-admin__view").click
+ end
+
def delete_leaderboard(leaderboard)
+ row_menu(leaderboard).option(".leaderboard-admin__delete").click
+ end
+
+ private
+
+ def row_menu(leaderboard)
menu =
PageObjects::Components::DMenu.new(
"#leaderboard-admin__row-#{leaderboard.id} .leaderboard-admin-menu-trigger",
"leaderboard-admin-menu",
)
menu.expand
- menu.option(".leaderboard-admin__delete").click
+ menu
end
end
end