DEV: Update linting
This commit is contained in:
parent
3b1ffefbe4
commit
6b34483f6f
|
@ -97,4 +97,4 @@ DEPENDENCIES
|
|||
syntax_tree
|
||||
|
||||
BUNDLED WITH
|
||||
2.6.5
|
||||
2.6.6
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
<div class="reviewable-filter discourse-assign-assign-to-filter">
|
||||
<label class="filter-label">{{i18n "discourse_assign.assigned_to"}}</label>
|
||||
|
||||
<EmailGroupUserChooser
|
||||
autocomplete="off"
|
||||
@value={{this.additionalFilters.assigned_to}}
|
||||
@value={{this.outletArgs.additionalFilters.assigned_to}}
|
||||
@onChange={{this.updateAssignedTo}}
|
||||
@options={{hash
|
||||
maximum=1
|
||||
|
@ -10,5 +10,6 @@
|
|||
includeGroups=false
|
||||
groupMembersOf=this.allowedGroups
|
||||
}}
|
||||
autocomplete="off"
|
||||
/>
|
||||
</div>
|
|
@ -1,22 +1,24 @@
|
|||
import Component from "@ember/component";
|
||||
import { action } from "@ember/object";
|
||||
import { service } from "@ember/service";
|
||||
|
||||
export default class AssignedToFilter extends Component {
|
||||
static shouldRender(args) {
|
||||
return args.additionalFilters;
|
||||
}
|
||||
|
||||
@service site;
|
||||
@service siteSettings;
|
||||
|
||||
groupIDs = (this.siteSettings.assign_allowed_on_groups || "")
|
||||
.split("|")
|
||||
.filter(Boolean);
|
||||
allowedGroups = this.site.groups
|
||||
.filter((group) => this.groupIDs.includes(group.id.toString()))
|
||||
.mapBy("name");
|
||||
|
||||
export default {
|
||||
@action
|
||||
updateAssignedTo(selected) {
|
||||
this.set("additionalFilters.assigned_to", selected.firstObject);
|
||||
},
|
||||
|
||||
shouldRender(args) {
|
||||
return args.additionalFilters;
|
||||
},
|
||||
|
||||
setupComponent(args, component) {
|
||||
const groupIDs = (component.siteSettings.assign_allowed_on_groups || "")
|
||||
.split("|")
|
||||
.filter(Boolean);
|
||||
const groupNames = this.site.groups
|
||||
.filter((group) => groupIDs.includes(group.id.toString()))
|
||||
.mapBy("name");
|
||||
component.set("allowedGroups", groupNames);
|
||||
},
|
||||
};
|
||||
this.set("outletArgs.additionalFilters.assigned_to", selected.firstObject);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,11 +1,12 @@
|
|||
<div class="control-group">
|
||||
<label class="control-label" for="search-assigned-to">{{i18n
|
||||
"search.advanced.assigned.label"
|
||||
}}</label>
|
||||
<label class="control-label" for="search-assigned-to">
|
||||
{{i18n "search.advanced.assigned.label"}}
|
||||
</label>
|
||||
|
||||
<div class="controls">
|
||||
<EmailGroupUserChooser
|
||||
@value={{this.searchedTerms.assigned}}
|
||||
@onChange={{action "onChangeAssigned"}}
|
||||
@value={{this.outletArgs.searchedTerms.assigned}}
|
||||
@onChange={{this.onChangeAssigned}}
|
||||
@options={{hash
|
||||
maximum=1
|
||||
excludeCurrentUser=false
|
||||
|
|
|
@ -1,16 +1,20 @@
|
|||
import Component from "@ember/component";
|
||||
import { action } from "@ember/object";
|
||||
import { service } from "@ember/service";
|
||||
|
||||
export default {
|
||||
shouldRender(args, component) {
|
||||
export default class AssignedAdvancedSearch extends Component {
|
||||
static shouldRender(args, component) {
|
||||
return component.currentUser?.can_assign;
|
||||
},
|
||||
}
|
||||
|
||||
@service currentUser;
|
||||
|
||||
@action
|
||||
onChangeAssigned(value) {
|
||||
this.onChangeSearchedTermField(
|
||||
this.outletArgs.onChangeSearchedTermField(
|
||||
"assigned",
|
||||
"updateSearchTermForAssignedUsername",
|
||||
value
|
||||
);
|
||||
},
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,11 +1,12 @@
|
|||
<h3>{{i18n "discourse_assign.assign.title"}}</h3>
|
||||
|
||||
<section class="field">
|
||||
<div class="enable-accepted-answer">
|
||||
<label class="checkbox-label">
|
||||
<Input
|
||||
@type="checkbox"
|
||||
@checked={{readonly this.category.enable_unassigned_filter}}
|
||||
{{on "change" (action "onChangeSetting" value="target.checked")}}
|
||||
@checked={{readonly this.outletArgs.category.enable_unassigned_filter}}
|
||||
{{on "change" (this.onChangeSetting value="target.checked")}}
|
||||
/>
|
||||
{{i18n "discourse_assign.add_unassigned_filter"}}
|
||||
</label>
|
||||
|
|
|
@ -1,11 +1,12 @@
|
|||
import Component from "@ember/component";
|
||||
import { action } from "@ember/object";
|
||||
|
||||
export default {
|
||||
export default class AssignSettings extends Component {
|
||||
@action
|
||||
onChangeSetting(value) {
|
||||
this.set(
|
||||
"category.custom_fields.enable_unassigned_filter",
|
||||
"outletArgs.category.custom_fields.enable_unassigned_filter",
|
||||
value ? "true" : "false"
|
||||
);
|
||||
},
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
@ -5,6 +5,7 @@ import { i18n } from "discourse-i18n";
|
|||
|
||||
export default class UserActivityAssigned extends UserTopicListRoute {
|
||||
@service router;
|
||||
|
||||
templateName = "user-activity-assigned";
|
||||
controllerName = "user-activity-assigned";
|
||||
|
||||
|
|
10
package.json
10
package.json
|
@ -1,11 +1,11 @@
|
|||
{
|
||||
"private": true,
|
||||
"devDependencies": {
|
||||
"@discourse/lint-configs": "2.7.0",
|
||||
"ember-template-lint": "6.1.0",
|
||||
"eslint": "9.20.1",
|
||||
"prettier": "2.8.8",
|
||||
"stylelint": "16.14.1"
|
||||
"@discourse/lint-configs": "2.11.1",
|
||||
"ember-template-lint": "7.0.1",
|
||||
"eslint": "9.22.0",
|
||||
"prettier": "3.5.3",
|
||||
"stylelint": "16.16.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">= 22",
|
||||
|
|
1465
pnpm-lock.yaml
1465
pnpm-lock.yaml
File diff suppressed because it is too large
Load Diff
|
@ -21,9 +21,11 @@ module(
|
|||
timezone: "Asia/Calcutta",
|
||||
};
|
||||
|
||||
await render(<template>
|
||||
<GroupAssignedFilter @showAvatar={{true}} @filter={{filter}} />
|
||||
</template>);
|
||||
await render(
|
||||
<template>
|
||||
<GroupAssignedFilter @showAvatar={{true}} @filter={{filter}} />
|
||||
</template>
|
||||
);
|
||||
|
||||
assert.dom(".assign-username").hasText("Ahmed");
|
||||
assert.dom(".assign-name").hasText("Ahmed Gagan");
|
||||
|
|
Loading…
Reference in New Issue