A platform for community discussion. Free, open, simple.
DEV: Consolidate reusable components into ui-kit (#38703)
Sérgio Saquetim1654d529ef10
diff --git a/frontend/discourse/admin/components/admin-area-settings.gjs b/frontend/discourse/admin/components/admin-area-settings.gjsindex 17acae2d2ca..b43a5dca680 100644--- a/frontend/discourse/admin/components/admin-area-settings.gjs+++ b/frontend/discourse/admin/components/admin-area-settings.gjs@@ -7,10 +7,10 @@ import AdminConfigAreaEmptyList from "discourse/admin/components/admin-config-arimport AdminFilteredSiteSettings from "discourse/admin/components/admin-filtered-site-settings";import AdminSiteSettingsChangesBanner from "discourse/admin/components/admin-site-settings-changes-banner";import SiteSetting from "discourse/admin/models/site-setting";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";import { ajax } from "discourse/lib/ajax";import { bind } from "discourse/lib/decorators";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";import { i18n } from "discourse-i18n";export default class AdminAreaSettings extends Component {@@ -93,11 +93,11 @@ export default class AdminAreaSettings extends Component {@settings={{this.settings}}/>{{else}}- <ConditionalLoadingSpinner @condition={{this.loading}}>+ <DConditionalLoadingSpinner @condition={{this.loading}}><AdminConfigAreaEmptyList@emptyLabelTranslated={{i18n "admin.settings.not_found"}}/>- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner>{{/if}}</div>diff --git a/frontend/discourse/admin/components/admin-badges-award.gjs b/frontend/discourse/admin/components/admin-badges-award.gjsindex 3d7701db235..7be89268753 100644--- a/frontend/discourse/admin/components/admin-badges-award.gjs+++ b/frontend/discourse/admin/components/admin-badges-award.gjs@@ -5,11 +5,11 @@ import { action } from "@ember/object";import { LinkTo } from "@ember/routing";import { service } from "@ember/service";import AdminBadgesList from "discourse/admin/components/admin-badges-list";-import DButton from "discourse/components/d-button";-import icon from "discourse/helpers/d-icon";-import iconOrImage from "discourse/helpers/icon-or-image";import { ajax } from "discourse/lib/ajax";import { extractError } from "discourse/lib/ajax-error";+import DButton from "discourse/ui-kit/d-button";+import dIcon from "discourse/ui-kit/helpers/d-icon";+import dIconOrImage from "discourse/ui-kit/helpers/d-icon-or-image";import { i18n } from "discourse-i18n";export default class AdminBadgesAward extends Component {@@ -110,7 +110,7 @@ export default class AdminBadgesAward extends Component {{{#if @badge}}<form class="form-horizontal"><div class="badge-preview control-group">- {{iconOrImage @badge}}+ {{dIconOrImage @badge}}<span class="badge-display-name">{{@badge.name}}</span></div><div class="control-group">@@ -147,7 +147,7 @@ export default class AdminBadgesAward extends Component {class="btn-primary"/><LinkTo @route="adminBadges.index" class="btn btn-normal">- {{icon "xmark"}}+ {{dIcon "xmark"}}<span>{{i18n "cancel"}}</span></LinkTo></form>@@ -157,15 +157,15 @@ export default class AdminBadgesAward extends Component {{{#if this.resultsMessage}}<p>{{#if this.success}}- {{icon "check" class="bulk-award-status-icon success"}}+ {{dIcon "check" class="bulk-award-status-icon success"}}{{else}}- {{icon "xmark" class="bulk-award-status-icon failure"}}+ {{dIcon "xmark" class="bulk-award-status-icon failure"}}{{/if}}{{this.resultsMessage}}</p>{{#if this.unmatchedEntries.length}}<p>- {{icon+ {{dIcon"triangle-exclamation"class="bulk-award-status-icon failure"}}diff --git a/frontend/discourse/admin/components/admin-badges-list.gjs b/frontend/discourse/admin/components/admin-badges-list.gjsindex 0d7ef2e5253..8bcd8e2a368 100644--- a/frontend/discourse/admin/components/admin-badges-list.gjs+++ b/frontend/discourse/admin/components/admin-badges-list.gjs@@ -2,7 +2,7 @@ import Component from "@glimmer/component";import { LinkTo } from "@ember/routing";import { service } from "@ember/service";import AdminFilterControls from "discourse/admin/components/admin-filter-controls";-import BadgeButton from "discourse/components/badge-button";+import DBadgeButton from "discourse/ui-kit/d-badge-button";import { i18n } from "discourse-i18n";export default class AdminBadgesList extends Component {@@ -35,7 +35,7 @@ export default class AdminBadgesList extends Component {{{#each filteredBadges as |badge|}}<li class="admin-badge-list-item"><LinkTo @route={{this.selectedRoute}} @model={{badge.id}}>- <BadgeButton @badge={{badge}} />+ <DBadgeButton @badge={{badge}} />{{#if badge.newBadge}}<span class="list-badge">{{i18n"filters.new.lower_title"diff --git a/frontend/discourse/admin/components/admin-badges-show.gjs b/frontend/discourse/admin/components/admin-badges-show.gjsindex ad9ddefb589..b016022ae01 100644--- a/frontend/discourse/admin/components/admin-badges-show.gjs+++ b/frontend/discourse/admin/components/admin-badges-show.gjs@@ -9,13 +9,13 @@ import AdminBadgesList from "discourse/admin/components/admin-badges-list";import BadgePreviewModal from "discourse/admin/components/modal/badge-preview";import Form from "discourse/components/form";import PluginOutlet from "discourse/components/plugin-outlet";-import icon from "discourse/helpers/d-icon";-import iconOrImage from "discourse/helpers/icon-or-image";import lazyHash from "discourse/helpers/lazy-hash";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import getURL from "discourse/lib/get-url";import { sanitize } from "discourse/lib/text";+import dIcon from "discourse/ui-kit/helpers/d-icon";+import dIconOrImage from "discourse/ui-kit/helpers/d-icon-or-image";import { i18n } from "discourse-i18n";const FORM_FIELDS = [@@ -251,7 +251,7 @@ export default class AdminBadgesShow extends Component {><h2 class="current-badge-header">- {{iconOrImage data}}+ {{dIconOrImage data}}<span class="badge-display-name">{{data.name}}</span></h2>@@ -277,7 +277,7 @@ export default class AdminBadgesShow extends Component {@route="adminSiteText"@query={{hash q=(concat this.textCustomizationPrefix "name")}}>- {{icon "pencil"}}+ {{dIcon "pencil"}}</LinkTo></form.Container>{{else}}@@ -366,7 +366,7 @@ export default class AdminBadgesShow extends Component {q=(concat this.textCustomizationPrefix "description")}}>- {{icon "pencil"}}+ {{dIcon "pencil"}}</LinkTo></form.Container>{{else}}@@ -396,7 +396,7 @@ export default class AdminBadgesShow extends Component {q=(concat this.textCustomizationPrefix "long_description")}}>- {{icon "pencil"}}+ {{dIcon "pencil"}}</LinkTo></form.Container>{{else}}diff --git a/frontend/discourse/admin/components/admin-badges.gjs b/frontend/discourse/admin/components/admin-badges.gjsindex e12c2216345..f33d27007d8 100644--- a/frontend/discourse/admin/components/admin-badges.gjs+++ b/frontend/discourse/admin/components/admin-badges.gjs@@ -2,9 +2,9 @@ import Component from "@glimmer/component";import { action } from "@ember/object";import { service } from "@ember/service";import EditBadgeGroupingsModal from "discourse/admin/components/modal/edit-badge-groupings";-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DPageHeader from "discourse/components/d-page-header";-import NavItem from "discourse/components/nav-item";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DNavItem from "discourse/ui-kit/d-nav-item";+import DPageHeader from "discourse/ui-kit/d-page-header";import { i18n } from "discourse-i18n";export default class AdminBadges extends Component {@@ -67,12 +67,12 @@ export default class AdminBadges extends Component {/></:actions><:tabs>- <NavItem+ <DNavItem@route="adminBadges.settings"@label="settings"class="admin-badges-tabs__settings"/>- <NavItem+ <DNavItem@route="adminBadges.index"@label="admin.config.badges.title"@currentWhen="adminBadges.show adminBadges.index"diff --git a/frontend/discourse/admin/components/admin-config-area-card-section.gjs b/frontend/discourse/admin/components/admin-config-area-card-section.gjsindex c2bd70a2d98..b8c6f3b2cb0 100644--- a/frontend/discourse/admin/components/admin-config-area-card-section.gjs+++ b/frontend/discourse/admin/components/admin-config-area-card-section.gjs@@ -3,8 +3,8 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { on } from "@ember/modifier";import { action } from "@ember/object";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";export default class AdminConfigAreaCardSection extends Component {@tracked collapsed = this.args.collapsed;@@ -24,7 +24,7 @@ export default class AdminConfigAreaCardSection extends Component {<template><section class="admin-config-area-card-section" ...attributes><div- class={{concatClass+ class={{dConcatClass"admin-config-area-card-section__header-wrapper"(if @collapsable "collapsable")}}@@ -33,7 +33,7 @@ export default class AdminConfigAreaCardSection extends Component {><h4 class="admin-config-area-card-section__title">{{@heading}}</h4>{{#if @collapsable}}- {{icon this.headerCaretIcon}}+ {{dIcon this.headerCaretIcon}}{{/if}}</div>{{#unless this.collapsed}}diff --git a/frontend/discourse/admin/components/admin-config-area-card.gjs b/frontend/discourse/admin/components/admin-config-area-card.gjsindex 02543b53956..1de6cb976a7 100644--- a/frontend/discourse/admin/components/admin-config-area-card.gjs+++ b/frontend/discourse/admin/components/admin-config-area-card.gjs@@ -2,9 +2,9 @@import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";-import DButton from "discourse/components/d-button";-import icon from "discourse/helpers/d-icon";import { or } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class AdminConfigAreaCard extends Component {@@ -75,7 +75,7 @@ export default class AdminConfigAreaCard extends Component {@action={{this.toggleCardDisplay}}class="admin-config-area-card__toggle-button btn-transparent">- {{icon this.headerCaretIcon}}+ {{dIcon this.headerCaretIcon}}</DButton>{{/if}}</div>diff --git a/frontend/discourse/admin/components/admin-config-area-cards/install-theme-card.gjs b/frontend/discourse/admin/components/admin-config-area-cards/install-theme-card.gjsindex 731b47ccf92..1d83d53233b 100644--- a/frontend/discourse/admin/components/admin-config-area-cards/install-theme-card.gjs+++ b/frontend/discourse/admin/components/admin-config-area-cards/install-theme-card.gjs@@ -1,7 +1,7 @@import Component from "@glimmer/component";import AdminConfigAreaCard from "discourse/admin/components/admin-config-area-card";-import DButton from "discourse/components/d-button";-import icon from "discourse/helpers/d-icon";+import DButton from "discourse/ui-kit/d-button";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class InstallThemeCard extends Component {@@ -58,7 +58,7 @@ export default class InstallThemeCard extends Component {target="_blank">{{i18n resource.key}}- {{icon "up-right-from-square"}}+ {{dIcon "up-right-from-square"}}</a>{{/each}}</div>diff --git a/frontend/discourse/admin/components/admin-config-area-empty-list.gjs b/frontend/discourse/admin/components/admin-config-area-empty-list.gjsindex 65d6cd8fc66..ef5263ac6e8 100644--- a/frontend/discourse/admin/components/admin-config-area-empty-list.gjs+++ b/frontend/discourse/admin/components/admin-config-area-empty-list.gjs@@ -1,7 +1,7 @@import Component from "@glimmer/component";import { trustHTML } from "@ember/template";-import DButton from "discourse/components/d-button";-import concatClass from "discourse/helpers/concat-class";+import DButton from "discourse/ui-kit/d-button";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";export default class AdminConfigAreaEmptyList extends Component {@@ -22,7 +22,7 @@ export default class AdminConfigAreaEmptyList extends Component {{{#if @ctaLabel}}<DButton@label={{@ctaLabel}}- class={{concatClass+ class={{dConcatClass"btn-default btn-small admin-config-area-empty-list__cta-button"@ctaClass}}diff --git a/frontend/discourse/admin/components/admin-config-areas/api-keys-new.gjs b/frontend/discourse/admin/components/admin-config-areas/api-keys-new.gjsindex 631dd197f86..b7fb7b6f273 100644--- a/frontend/discourse/admin/components/admin-config-areas/api-keys-new.gjs+++ b/frontend/discourse/admin/components/admin-config-areas/api-keys-new.gjs@@ -6,16 +6,16 @@ import { service } from "@ember/service";import ApiKeyUrlsModal from "discourse/admin/components/modal/api-key-urls";import { API_KEY_SCOPE_MODES } from "discourse/admin/lib/constants";import BackButton from "discourse/components/back-button";-import ConditionalLoadingSection from "discourse/components/conditional-loading-section";-import DButton from "discourse/components/d-button";import Form from "discourse/components/form";-import icon from "discourse/helpers/d-icon";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import { bind } from "discourse/lib/decorators";import { clipboardCopy } from "discourse/lib/utilities";import EmailGroupUserChooser from "discourse/select-kit/components/email-group-user-chooser";import { eq } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSection from "discourse/ui-kit/d-conditional-loading-section";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class AdminConfigAreasApiKeysNew extends Component {@@ -207,7 +207,7 @@ export default class AdminConfigAreasApiKeysNew extends Component {{{#if this.generatedApiKey}}<div class="generated-api-key-container"><div class="alert alert-warning">- {{icon "triangle-exclamation"}}+ {{dIcon "triangle-exclamation"}}<span>{{i18n "admin.api.not_shown_again"}}</span></div>@@ -268,7 +268,7 @@ export default class AdminConfigAreasApiKeysNew extends Component {/></div>{{else}}- <ConditionalLoadingSection @isLoading={{this.loadingScopes}}>+ <DConditionalLoadingSection @isLoading={{this.loadingScopes}}><Form@onSubmit={{this.save}}@data={{this.formData}}@@ -443,7 +443,7 @@ export default class AdminConfigAreasApiKeysNew extends Component {/></form.Actions></Form>- </ConditionalLoadingSection>+ </DConditionalLoadingSection>{{/if}}</div></div>diff --git a/frontend/discourse/admin/components/admin-config-areas/api-keys-show.gjs b/frontend/discourse/admin/components/admin-config-areas/api-keys-show.gjsindex bad84671feb..412bfa79e37 100644--- a/frontend/discourse/admin/components/admin-config-areas/api-keys-show.gjs+++ b/frontend/discourse/admin/components/admin-config-areas/api-keys-show.gjs@@ -9,11 +9,11 @@ import { service } from "@ember/service";import AdminFormRow from "discourse/admin/components/admin-form-row";import ApiKeyUrlsModal from "discourse/admin/components/modal/api-key-urls";import BackButton from "discourse/components/back-button";-import DButton from "discourse/components/d-button";import DTooltip from "discourse/float-kit/components/d-tooltip";-import avatar from "discourse/helpers/avatar";-import formatDate from "discourse/helpers/format-date";import { popupAjaxError } from "discourse/lib/ajax-error";+import DButton from "discourse/ui-kit/d-button";+import dAvatar from "discourse/ui-kit/helpers/d-avatar";+import dFormatDate from "discourse/ui-kit/helpers/d-format-date";import { i18n } from "discourse-i18n";export default class AdminConfigAreasApiKeysShow extends Component {@@ -131,7 +131,7 @@ export default class AdminConfigAreasApiKeysShow extends Component {<AdminFormRow @label="admin.api.user">{{#if @apiKey.user}}<LinkTo @route="adminUser" @model={{@apiKey.user}}>- {{avatar @apiKey.user imageSize="small"}}+ {{dAvatar @apiKey.user imageSize="small"}}{{@apiKey.user.username}}</LinkTo>{{else}}@@ -140,16 +140,16 @@ export default class AdminConfigAreasApiKeysShow extends Component {</AdminFormRow><AdminFormRow @label="admin.api.created">- {{formatDate @apiKey.created_at leaveAgo="true"}}+ {{dFormatDate @apiKey.created_at leaveAgo="true"}}</AdminFormRow><AdminFormRow @label="admin.api.updated">- {{formatDate @apiKey.updated_at leaveAgo="true"}}+ {{dFormatDate @apiKey.updated_at leaveAgo="true"}}</AdminFormRow><AdminFormRow @label="admin.api.last_used">{{#if @apiKey.last_used_at}}- {{formatDate @apiKey.last_used_at leaveAgo="true"}}+ {{dFormatDate @apiKey.last_used_at leaveAgo="true"}}{{else}}{{i18n "admin.api.never_used"}}{{/if}}@@ -157,7 +157,7 @@ export default class AdminConfigAreasApiKeysShow extends Component {<AdminFormRow @label="admin.api.revoked">{{#if @apiKey.revoked_at}}- {{formatDate @apiKey.revoked_at leaveAgo="true"}}+ {{dFormatDate @apiKey.revoked_at leaveAgo="true"}}{{else}}<span>{{i18n "no_value"}}</span>{{/if}}diff --git a/frontend/discourse/admin/components/admin-config-areas/color-palette.gjs b/frontend/discourse/admin/components/admin-config-areas/color-palette.gjsindex a8538fd916d..49420b1a44f 100644--- a/frontend/discourse/admin/components/admin-config-areas/color-palette.gjs+++ b/frontend/discourse/admin/components/admin-config-areas/color-palette.gjs@@ -6,12 +6,12 @@ import { LinkTo } from "@ember/routing";import { service } from "@ember/service";import AdminConfigAreaCard from "discourse/admin/components/admin-config-area-card";import ColorPaletteEditor from "discourse/admin/components/color-palette-editor";-import DButton from "discourse/components/d-button";import Form from "discourse/components/form";-import icon from "discourse/helpers/d-icon";import { ajax } from "discourse/lib/ajax";import { extractError } from "discourse/lib/ajax-error";import { clipboardCopy } from "discourse/lib/utilities";+import DButton from "discourse/ui-kit/d-button";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class AdminConfigAreasColorPalette extends Component {@@ -261,7 +261,7 @@ export default class AdminConfigAreasColorPalette extends Component {<div class="admin-config-area__primary-content"><div class="admin-config-color-palettes__back"><LinkTo @route="adminConfig.colorPalettes">- {{icon "angle-left"}}+ {{dIcon "angle-left"}}{{i18n "admin.customize.colors.back_to_colors"}}</LinkTo></div>@@ -330,7 +330,7 @@ export default class AdminConfigAreasColorPalette extends Component {</div>{{#if this.installedWithTheme}}<div class="admin-config-color-palettes__theme-owner">- {{icon "circle-info"}}+ {{dIcon "circle-info"}}<span>{{i18n "admin.customize.theme_owner"}}<LinkTo@route="adminCustomizeThemes.show"diff --git a/frontend/discourse/admin/components/admin-config-areas/components.gjs b/frontend/discourse/admin/components/admin-config-areas/components.gjsindex bfc8a3a4b98..bc08828f66e 100644--- a/frontend/discourse/admin/components/admin-config-areas/components.gjs+++ b/frontend/discourse/admin/components/admin-config-areas/components.gjs@@ -10,15 +10,8 @@ import AdminConfigAreaEmptyList from "discourse/admin/components/admin-config-arimport AdminFilterControls from "discourse/admin/components/admin-filter-controls";import InstallComponentModal from "discourse/admin/components/modal/install-theme";import { COMPONENTS } from "discourse/admin/models/theme";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DButton from "discourse/components/d-button";-import DPageSubheader from "discourse/components/d-page-subheader";-import DToggleSwitch from "discourse/components/d-toggle-switch";-import DropdownMenu from "discourse/components/dropdown-menu";-import LoadMore from "discourse/components/load-more";import PluginOutlet from "discourse/components/plugin-outlet";import DMenu from "discourse/float-kit/components/d-menu";-import icon from "discourse/helpers/d-icon";import lazyHash from "discourse/helpers/lazy-hash";import { ajax } from "discourse/lib/ajax";import { extractErrorInfo } from "discourse/lib/ajax-error";@@ -26,6 +19,13 @@ import discourseDebounce from "discourse/lib/debounce";import { INPUT_DELAY } from "discourse/lib/environment";import getURL from "discourse/lib/get-url";import { descriptionForRemoteUrl } from "discourse/lib/popular-themes";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";+import DLoadMore from "discourse/ui-kit/d-load-more";+import DPageSubheader from "discourse/ui-kit/d-page-subheader";+import DToggleSwitch from "discourse/ui-kit/d-toggle-switch";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";const STATUS_FILTER_OPTIONS = [@@ -235,7 +235,10 @@ export default class AdminConfigAreasComponents extends Component {@loading={{this.loading}}><:content>- <LoadMore @action={{this.loadMore}} @rootMargin="0px 0px 250px 0px">+ <DLoadMore+ @action={{this.loadMore}}+ @rootMargin="0px 0px 250px 0px"+ ><PluginOutlet@name="admin-config-area-components-above-table"@outletArgs={{lazyHash components=this.components}}@@ -264,12 +267,12 @@ export default class AdminConfigAreasComponents extends Component {{{/each}}</tbody></table>- <ConditionalLoadingSpinner @condition={{this.loadingMore}} />- </LoadMore>+ <DConditionalLoadingSpinner @condition={{this.loadingMore}} />+ </DLoadMore></:content></AdminFilterControls>{{/if}}- <ConditionalLoadingSpinner @condition={{this.loading}}>+ <DConditionalLoadingSpinner @condition={{this.loading}}>{{#unless this.hasComponents}}<AdminConfigAreaEmptyList@emptyLabel="admin.config_areas.themes_and_components.components.no_components"@@ -279,7 +282,7 @@ export default class AdminConfigAreasComponents extends Component {/></AdminConfigAreaEmptyList>{{/unless}}- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner></div></template>}@@ -490,7 +493,7 @@ class ComponentRow extends Component {<a href={{@component.remote_theme.about_url}}>{{i18n"admin.config_areas.themes_and_components.components.learn_more"}}- {{icon "up-right-from-square"}}+ {{dIcon "up-right-from-square"}}</a>{{/if}}</div>@@ -551,7 +554,7 @@ class ComponentRow extends Component {@triggerClass="btn-default"><:content>- <DropdownMenu as |dropdown|>+ <DDropdownMenu as |dropdown|><dropdown.item><DButtonclass="btn-transparent admin-config-components__preview"@@ -607,7 +610,7 @@ class ComponentRow extends Component {@action={{this.delete}}/></dropdown.item>- </DropdownMenu>+ </DDropdownMenu></:content></DMenu></div>diff --git a/frontend/discourse/admin/components/admin-config-areas/emojis-list.gjs b/frontend/discourse/admin/components/admin-config-areas/emojis-list.gjsindex d680aefb457..22b6af6f593 100644--- a/frontend/discourse/admin/components/admin-config-areas/emojis-list.gjs+++ b/frontend/discourse/admin/components/admin-config-areas/emojis-list.gjs@@ -2,8 +2,8 @@ import Component from "@glimmer/component";import { fn } from "@ember/helper";import { service } from "@ember/service";import AdminConfigAreaEmptyList from "discourse/admin/components/admin-config-area-empty-list";-import DButton from "discourse/components/d-button";import ComboBox from "discourse/select-kit/components/combo-box";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";export default class AdminConfigAreasEmojisList extends Component {diff --git a/frontend/discourse/admin/components/admin-config-areas/themes.gjs b/frontend/discourse/admin/components/admin-config-areas/themes.gjsindex 38791631e87..2a6f6ee9aef 100644--- a/frontend/discourse/admin/components/admin-config-areas/themes.gjs+++ b/frontend/discourse/admin/components/admin-config-areas/themes.gjs@@ -6,10 +6,10 @@ import { isPresent } from "@ember/utils";import InstallThemeModal from "discourse/admin/components/modal/install-theme";import ThemesGrid from "discourse/admin/components/themes-grid";import { THEMES } from "discourse/admin/models/theme";-import DPageSubheader from "discourse/components/d-page-subheader";import PluginOutlet from "discourse/components/plugin-outlet";import lazyHash from "discourse/helpers/lazy-hash";import getURL from "discourse/lib/get-url";+import DPageSubheader from "discourse/ui-kit/d-page-subheader";import { i18n } from "discourse-i18n";export default class AdminConfigAreasThemes extends Component {diff --git a/frontend/discourse/admin/components/admin-config-areas/upcoming-change-badges.gjs b/frontend/discourse/admin/components/admin-config-areas/upcoming-change-badges.gjsindex 83c6e74c18b..bba5f005721 100644--- a/frontend/discourse/admin/components/admin-config-areas/upcoming-change-badges.gjs+++ b/frontend/discourse/admin/components/admin-config-areas/upcoming-change-badges.gjs@@ -1,16 +1,16 @@import Component from "@glimmer/component";import { concat } from "@ember/helper";import DTooltip from "discourse/float-kit/components/d-tooltip";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";const UpcomingChangeBadge = <template><span- class={{concatClass "upcoming-change__badge" "--has-tooltip" @badgeClass}}+ class={{dConcatClass "upcoming-change__badge" "--has-tooltip" @badgeClass}}><span class="upcoming-change__badge-content">- {{icon @icon}}+ {{dIcon @icon}}{{i18n @badgeLabelKey}}</span>{{yield}}@@ -62,7 +62,7 @@ export default class UpcomingChangeBadges extends Component {><span class="upcoming-change__badge-info">- {{icon "info"}}+ {{dIcon "info"}}</span></UpcomingChangeBadge></:trigger>diff --git a/frontend/discourse/admin/components/admin-config-areas/upcoming-change-item.gjs b/frontend/discourse/admin/components/admin-config-areas/upcoming-change-item.gjsindex 20730ed3f78..c43b7855962 100644--- a/frontend/discourse/admin/components/admin-config-areas/upcoming-change-item.gjs+++ b/frontend/discourse/admin/components/admin-config-areas/upcoming-change-item.gjs@@ -11,11 +11,8 @@ import { capitalize } from "@ember/string";import { trustHTML } from "@ember/template";import { modifier } from "ember-modifier";import UpcomingChangeBadges from "discourse/admin/components/admin-config-areas/upcoming-change-badges";-import DButton from "discourse/components/d-button";-import DSelect from "discourse/components/d-select";import GroupSelector from "discourse/components/group-selector";import DTooltip from "discourse/float-kit/components/d-tooltip";-import icon from "discourse/helpers/d-icon";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import { AUTO_GROUPS } from "discourse/lib/constants";@@ -24,6 +21,9 @@ import discourseLater from "discourse/lib/later";import lightbox from "discourse/lib/lightbox";import Group from "discourse/models/group";import { eq } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DSelect from "discourse/ui-kit/d-select";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class UpcomingChangeItem extends Component {@@ -283,7 +283,7 @@ export default class UpcomingChangeItem extends Component {<td class="d-table__cell --overview">{{#if @change.plugin}}<span class="upcoming-change__plugin">- {{icon "plug"}}+ {{dIcon "plug"}}{{@change.plugin}}</span>{{/if}}@@ -308,7 +308,7 @@ export default class UpcomingChangeItem extends Component {data-target-width={{@change.upcoming_change.image.width}}data-target-height={{@change.upcoming_change.image.height}}data-large-src={{@change.upcoming_change.image.url}}- >{{icon "far-image"}}+ >{{dIcon "far-image"}}{{i18n "admin.upcoming_changes.preview"}}</a>{{/if}}@@ -328,7 +328,7 @@ export default class UpcomingChangeItem extends Component {{{#if this.showPermanentSoonNotice}}<div class="upcoming-change__status-notice">- {{icon "triangle-exclamation"}}+ {{dIcon "triangle-exclamation"}}{{i18n "admin.upcoming_changes.permanent_soon_notice"}}</div>{{/if}}diff --git a/frontend/discourse/admin/components/admin-config-areas/webhooks-form.gjs b/frontend/discourse/admin/components/admin-config-areas/webhooks-form.gjsindex d36a4ac0a39..7d5ce40c270 100644--- a/frontend/discourse/admin/components/admin-config-areas/webhooks-form.gjs+++ b/frontend/discourse/admin/components/admin-config-areas/webhooks-form.gjs@@ -5,7 +5,6 @@ import { action } from "@ember/object";import { service } from "@ember/service";import WebhookEventChooser from "discourse/admin/components/webhook-event-chooser";import BackButton from "discourse/components/back-button";-import ConditionalLoadingSection from "discourse/components/conditional-loading-section";import Form from "discourse/components/form";import GroupSelector from "discourse/components/group-selector";import PluginOutlet from "discourse/components/plugin-outlet";@@ -14,6 +13,7 @@ import { popupAjaxError } from "discourse/lib/ajax-error";import { autoTrackedArray } from "discourse/lib/tracked-tools";import CategorySelector from "discourse/select-kit/components/category-selector";import { eq } from "discourse/truth-helpers";+import DConditionalLoadingSection from "discourse/ui-kit/d-conditional-loading-section";import { i18n } from "discourse-i18n";export default class AdminConfigAreasWebhookForm extends Component {@@ -114,7 +114,7 @@ export default class AdminConfigAreasWebhookForm extends Component {<div class="admin-config-area__primary-content"><div class="admin-config-area-card"><div class="web-hook-container">- <ConditionalLoadingSection @isLoading={{this.loadingExtras}}>+ <DConditionalLoadingSection @isLoading={{this.loadingExtras}}><p>{{i18n "admin.web_hooks.detailed_instruction"}}</p><Form@onSubmit={{this.save}}@@ -299,7 +299,7 @@ export default class AdminConfigAreasWebhookForm extends Component {/></form.Actions></Form>- </ConditionalLoadingSection>+ </DConditionalLoadingSection></div></div></div>diff --git a/frontend/discourse/admin/components/admin-config-areas/webhooks-list.gjs b/frontend/discourse/admin/components/admin-config-areas/webhooks-list.gjsindex 30c6c7ac381..9a3f89b559f 100644--- a/frontend/discourse/admin/components/admin-config-areas/webhooks-list.gjs+++ b/frontend/discourse/admin/components/admin-config-areas/webhooks-list.gjs@@ -3,10 +3,10 @@ import { action } from "@ember/object";import { service } from "@ember/service";import AdminConfigAreaEmptyList from "discourse/admin/components/admin-config-area-empty-list";import WebhookItem from "discourse/admin/components/webhook-item";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import LoadMore from "discourse/components/load-more";import { popupAjaxError } from "discourse/lib/ajax-error";import { removeValueFromArray } from "discourse/lib/array-tools";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DLoadMore from "discourse/ui-kit/d-load-more";import { i18n } from "discourse-i18n";export default class AdminConfigAreasWebhooksList extends Component {@@ -30,7 +30,7 @@ export default class AdminConfigAreasWebhooksList extends Component {<template><div class="container admin-api_keys">{{#if @webhooks.content}}- <LoadMore @action={{@webhooks.loadMore}}>+ <DLoadMore @action={{@webhooks.loadMore}}><table class="d-table admin-web_hooks__items"><thead class="d-table__header"><tr class="d-table__row">@@ -59,7 +59,7 @@ export default class AdminConfigAreasWebhooksList extends Component {{{#if @webhooks.loadingMore}}<tr class="d-table__row"><td class="d-table__cell" colspan="4">- <ConditionalLoadingSpinner+ <DConditionalLoadingSpinner@condition={{@webhooks.loadingMore}}/></td>@@ -67,7 +67,7 @@ export default class AdminConfigAreasWebhooksList extends Component {{{/if}}</tbody></table>- </LoadMore>+ </DLoadMore>{{else}}<AdminConfigAreaEmptyList@ctaLabel="admin.web_hooks.add"diff --git a/frontend/discourse/admin/components/admin-editable-field.gjs b/frontend/discourse/admin/components/admin-editable-field.gjsindex 2ebf402e2d6..5d1ec7a3825 100644--- a/frontend/discourse/admin/components/admin-editable-field.gjs+++ b/frontend/discourse/admin/components/admin-editable-field.gjs@@ -3,8 +3,8 @@ import Component from "@ember/component";import { on } from "@ember/modifier";import { action } from "@ember/object";import { tagName } from "@ember-decorators/component";-import DButton from "discourse/components/d-button";-import TextField from "discourse/components/text-field";+import DButton from "discourse/ui-kit/d-button";+import DTextField from "discourse/ui-kit/d-text-field";import { i18n } from "discourse-i18n";@tagName("")@@ -29,7 +29,7 @@ export default class AdminEditableField extends Component {<div class="field">{{i18n this.name}}</div><div class="value">{{#if this.editing}}- <TextField+ <DTextField@value={{this.buffer}}@autofocus="autofocus"@autocomplete="off"diff --git a/frontend/discourse/admin/components/admin-filter-controls.gjs b/frontend/discourse/admin/components/admin-filter-controls.gjsindex 8524fd753fb..b7bc1d29c6a 100644--- a/frontend/discourse/admin/components/admin-filter-controls.gjs+++ b/frontend/discourse/admin/components/admin-filter-controls.gjs@@ -5,13 +5,13 @@ import { action } from "@ember/object";import { trackedObject } from "@ember/reactive/collections";import didInsert from "@ember/render-modifiers/modifiers/did-insert";import { schedule } from "@ember/runloop";-import DButton from "discourse/components/d-button";-import DSelect from "discourse/components/d-select";-import FilterInput from "discourse/components/filter-input";-import concatClass from "discourse/helpers/concat-class";import { isTesting } from "discourse/lib/environment";import { resettableTracked } from "discourse/lib/tracked-tools";import { and, not } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DFilterInput from "discourse/ui-kit/d-filter-input";+import DSelect from "discourse/ui-kit/d-select";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";/*** admin filter controls component that support both client-side and server-side filtering@@ -243,14 +243,14 @@ export default class AdminFilterControls extends Component {{{#if this.showFilters}}<div- class={{concatClass+ class={{dConcatClass"admin-filter-controls"(if this.hasMultipleDropdowns "--multiple-dropdowns")}}{{didInsert this.setupComponent}}><div class="admin-filter-controls__inputs">- <FilterInput+ <DFilterInputplaceholder={{@inputPlaceholder}}@filterAction={{this.onTextFilterChange}}@value={{this.textFilter}}diff --git a/frontend/discourse/admin/components/admin-filtered-site-settings.gjs b/frontend/discourse/admin/components/admin-filtered-site-settings.gjsindex 77de63c5c52..18a3343a852 100644--- a/frontend/discourse/admin/components/admin-filtered-site-settings.gjs+++ b/frontend/discourse/admin/components/admin-filtered-site-settings.gjs@@ -7,9 +7,9 @@ import { isEmpty } from "@ember/utils";import AdminSiteSettingsFilterControls from "discourse/admin/components/admin-site-settings-filter-controls";import SiteSetting from "discourse/admin/components/site-setting";import SiteSettingFilter from "discourse/admin/lib/site-setting-filter";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";import PluginOutlet from "discourse/components/plugin-outlet";import discourseDebounce from "discourse/lib/debounce";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";import { i18n } from "discourse-i18n";export default class AdminFilteredSiteSettings extends Component {@@ -72,7 +72,7 @@ export default class AdminFilteredSiteSettings extends Component {@initialFilter={{@initialFilter}}/>- <ConditionalLoadingSpinner @condition={{this.loading}}>+ <DConditionalLoadingSpinner @condition={{this.loading}}><section class="admin-filtered-site-settings form-horizontal settings">{{#each this.visibleSettings as |setting|}}<SiteSetting @setting={{setting}} />@@ -82,7 +82,7 @@ export default class AdminFilteredSiteSettings extends Component {{{i18n "admin.site_settings.no_results"}}{{/if}}</section>- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner></PluginOutlet></template>}diff --git a/frontend/discourse/admin/components/admin-flag-item.gjs b/frontend/discourse/admin/components/admin-flag-item.gjsindex ab8e9ab98a4..fd7906a4bde 100644--- a/frontend/discourse/admin/components/admin-flag-item.gjs+++ b/frontend/discourse/admin/components/admin-flag-item.gjs@@ -8,14 +8,14 @@ import { LinkTo } from "@ember/routing";import { service } from "@ember/service";import { trustHTML } from "@ember/template";import { SYSTEM_FLAG_IDS } from "discourse/admin/lib/constants";-import DButton from "discourse/components/d-button";-import DToggleSwitch from "discourse/components/d-toggle-switch";-import DropdownMenu from "discourse/components/dropdown-menu";import DMenu from "discourse/float-kit/components/d-menu";-import concatClass from "discourse/helpers/concat-class";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import { not } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";+import DToggleSwitch from "discourse/ui-kit/d-toggle-switch";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";export default class AdminFlagItem extends Component {@@ -122,7 +122,7 @@ export default class AdminFlagItem extends Component {<template><tr- class={{concatClass+ class={{dConcatClass"d-table__row admin-flag-item"@flag.name_key(if this.isSaved "saved")@@ -181,7 +181,7 @@ export default class AdminFlagItem extends Component {@triggerClass="btn-default"><:content>- <DropdownMenu as |dropdown|>+ <DDropdownMenu as |dropdown|>{{#unless @isFirstFlag}}<dropdown.item><DButton@@ -213,7 +213,7 @@ export default class AdminFlagItem extends Component {@title={{this.deleteTitle}}/></dropdown.item>- </DropdownMenu>+ </DDropdownMenu></:content></DMenu>{{/if}}diff --git a/frontend/discourse/admin/components/admin-font-chooser.gjs b/frontend/discourse/admin/components/admin-font-chooser.gjsindex 45a64914399..b64d2a67524 100644--- a/frontend/discourse/admin/components/admin-font-chooser.gjs+++ b/frontend/discourse/admin/components/admin-font-chooser.gjs@@ -4,9 +4,9 @@ import { concat, fn } from "@ember/helper";import { action } from "@ember/object";import { dasherize } from "@ember/string";import { MAIN_FONTS, MORE_FONTS } from "discourse/admin/lib/constants";-import DButton from "discourse/components/d-button";-import concatClass from "discourse/helpers/concat-class";import { eq } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";export default class AdminFontChooser extends Component {@@ -28,7 +28,7 @@ export default class AdminFontChooser extends Component {{{#each MAIN_FONTS as |font|}}<DButton@action={{fn this.setButtonValue @field.set font.key}}- class={{concatClass+ class={{dConcatClass"admin-fonts-form__button-option font btn-flat"(concat "body-font-" (dasherize font.key))(if (eq @selectedFont font.key) "active")@@ -39,7 +39,7 @@ export default class AdminFontChooser extends Component {{{#each MORE_FONTS as |font|}}<DButton@action={{fn this.setButtonValue @field.set font.key}}- class={{concatClass+ class={{dConcatClass"admin-fonts-form__button-option font btn-flat"(concat "body-font-" (dasherize font.key))(if (eq @selectedFont font.key) "active")diff --git a/frontend/discourse/admin/components/admin-fonts-form.gjs b/frontend/discourse/admin/components/admin-fonts-form.gjsindex 0f0d2264c9d..dc13606adb1 100644--- a/frontend/discourse/admin/components/admin-fonts-form.gjs+++ b/frontend/discourse/admin/components/admin-fonts-form.gjs@@ -9,13 +9,13 @@ import {MAIN_FONTS,MORE_FONTS,} from "discourse/admin/lib/constants";-import DButton from "discourse/components/d-button";import Form from "discourse/components/form";import UpdateDefaultTextSize from "discourse/components/modal/update-default-text-size";-import concatClass from "discourse/helpers/concat-class";import { ajax } from "discourse/lib/ajax";import { bind } from "discourse/lib/decorators";import { eq } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";const ALL_FONTS = [...MAIN_FONTS, ...MORE_FONTS];@@ -163,7 +163,7 @@ export default class AdminFontsForm extends Component {{{#each DEFAULT_TEXT_SIZES as |textSize|}}<DButton@action={{fn this.setButtonValue field.set textSize}}- class={{concatClass+ class={{dConcatClass"admin-fonts-form__button-option text-size btn-flat"textSize(if (eq transientData.default_text_size textSize) "active")diff --git a/frontend/discourse/admin/components/admin-form-row.gjs b/frontend/discourse/admin/components/admin-form-row.gjsindex 473dee14054..a12cc3b38d6 100644--- a/frontend/discourse/admin/components/admin-form-row.gjs+++ b/frontend/discourse/admin/components/admin-form-row.gjs@@ -1,8 +1,8 @@/* eslint-disable ember/no-classic-components */import Component from "@ember/component";import { tagName } from "@ember-decorators/component";-import concatClass from "discourse/helpers/concat-class";import { eq } from "discourse/truth-helpers";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";@tagName("")@@ -12,7 +12,7 @@ export default class AdminFormRow extends Component {<div class="form-element label-area">{{#if this.label}}<label- class={{concatClass (if (eq @type "checkbox") "checkbox-label")}}+ class={{dConcatClass (if (eq @type "checkbox") "checkbox-label")}}>{{i18n this.label}}</label>{{else}} @@ -21,7 +21,7 @@ export default class AdminFormRow extends Component {<div class="form-element input-area">{{#if this.wrapLabel}}<label- class={{concatClass (if (eq @type "checkbox") "checkbox-label")}}+ class={{dConcatClass (if (eq @type "checkbox") "checkbox-label")}}>{{yield}}</label>{{else}}{{yield}}diff --git a/frontend/discourse/admin/components/admin-interpolation-keys.gjs b/frontend/discourse/admin/components/admin-interpolation-keys.gjsindex 8321108aacb..daa43b64aba 100644--- a/frontend/discourse/admin/components/admin-interpolation-keys.gjs+++ b/frontend/discourse/admin/components/admin-interpolation-keys.gjs@@ -1,6 +1,6 @@import { fn } from "@ember/helper";import { on } from "@ember/modifier";-import concatClass from "discourse/helpers/concat-class";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";function pillClass(item) {@@ -29,7 +29,7 @@ function pillTitle(item) {{{#each @keys as |item|}}{{#if item.isInvalid}}<span- class={{concatClass "interpolation-keys__pill" (pillClass item)}}+ class={{dConcatClass "interpolation-keys__pill" (pillClass item)}}title={{pillTitle item}}>{{item.key}}@@ -37,7 +37,7 @@ function pillTitle(item) {{{else}}<buttontype="button"- class={{concatClass "interpolation-keys__pill" (pillClass item)}}+ class={{dConcatClass "interpolation-keys__pill" (pillClass item)}}title={{pillTitle item}}{{on "click" (fn @onInsertKey item.key)}}>diff --git a/frontend/discourse/admin/components/admin-logo-form.gjs b/frontend/discourse/admin/components/admin-logo-form.gjsindex 4604d11d0fc..bfcb3e41b49 100644--- a/frontend/discourse/admin/components/admin-logo-form.gjs+++ b/frontend/discourse/admin/components/admin-logo-form.gjs@@ -6,11 +6,11 @@ import { trackedObject } from "@ember/reactive/collections";import { service } from "@ember/service";import AdminConfigAreaCardSection from "discourse/admin/components/admin-config-area-card-section";import SimpleList from "discourse/admin/components/simple-list";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";import Form from "discourse/components/form";import { ajax } from "discourse/lib/ajax";import { bind } from "discourse/lib/decorators";import getURL from "discourse/lib/get-url";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";import { i18n } from "discourse-i18n";export default class AdminLogoForm extends Component {@@ -123,7 +123,7 @@ export default class AdminLogoForm extends Component {}<template>- <ConditionalLoadingSpinner @condition={{this.loading}}>+ <DConditionalLoadingSpinner @condition={{this.loading}}><Form@onSubmit={{this.save}}@data={{this.formData}}@@ -387,6 +387,6 @@ export default class AdminLogoForm extends Component {</AdminConfigAreaCardSection><form.Submit /></Form>- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner></template>}diff --git a/frontend/discourse/admin/components/admin-notice.gjs b/frontend/discourse/admin/components/admin-notice.gjsindex d20d345349b..72923b49f96 100644--- a/frontend/discourse/admin/components/admin-notice.gjs+++ b/frontend/discourse/admin/components/admin-notice.gjs@@ -2,8 +2,8 @@ import Component from "@glimmer/component";import { action } from "@ember/object";import { service } from "@ember/service";import { trustHTML } from "@ember/template";-import DButton from "discourse/components/d-button";-import icon from "discourse/helpers/d-icon";+import DButton from "discourse/ui-kit/d-button";+import dIcon from "discourse/ui-kit/helpers/d-icon";export default class AdminNotice extends Component {@service currentUser;@@ -20,7 +20,7 @@ export default class AdminNotice extends Component {<template><div class="notice"><div class="message">- {{if @icon (icon @icon)}}+ {{if @icon (dIcon @icon)}}{{trustHTML @problem.message}}</div>{{#if this.canDismiss}}diff --git a/frontend/discourse/admin/components/admin-penalty-reason.gjs b/frontend/discourse/admin/components/admin-penalty-reason.gjsindex 0ffd3957e6f..28d1f2ba268 100644--- a/frontend/discourse/admin/components/admin-penalty-reason.gjs+++ b/frontend/discourse/admin/components/admin-penalty-reason.gjs@@ -3,9 +3,9 @@ import Component, { Textarea } from "@ember/component";import { action, computed } from "@ember/object";import { trustHTML } from "@ember/template";import { tagName } from "@ember-decorators/component";-import TextField from "discourse/components/text-field";import ComboBox from "discourse/select-kit/components/combo-box";import { eq } from "discourse/truth-helpers";+import DTextField from "discourse/ui-kit/d-text-field";import { i18n } from "discourse-i18n";const CUSTOM_REASON_KEY = "custom";@@ -73,7 +73,7 @@ export default class AdminPenaltyReason extends Component {/>{{#if this.isCustomReason}}- <TextField+ <DTextField@value={{this.customReason}}@onChange={{this.setCustomReason}}class="suspend-reason"@@ -91,7 +91,7 @@ export default class AdminPenaltyReason extends Component {/>{{#if this.isCustomReason}}- <TextField+ <DTextField@value={{this.customReason}}@onChange={{this.setCustomReason}}@placeholderKey="admin.user.silence_reason_placeholder"diff --git a/frontend/discourse/admin/components/admin-penalty-similar-users.gjs b/frontend/discourse/admin/components/admin-penalty-similar-users.gjsindex a9eeea657ef..1063c02c390 100644--- a/frontend/discourse/admin/components/admin-penalty-similar-users.gjs+++ b/frontend/discourse/admin/components/admin-penalty-similar-users.gjs@@ -5,12 +5,12 @@ import { fn, get, hash } from "@ember/helper";import { on } from "@ember/modifier";import { action } from "@ember/object";import { trustHTML } from "@ember/template";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import avatar from "discourse/helpers/avatar";-import formatDuration from "discourse/helpers/format-duration";-import number from "discourse/helpers/number";import { ajax } from "discourse/lib/ajax";import { not } from "discourse/truth-helpers";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import dAvatar from "discourse/ui-kit/helpers/d-avatar";+import dFormatDuration from "discourse/ui-kit/helpers/d-format-duration";+import dNumber from "discourse/ui-kit/helpers/d-number";import { i18n } from "discourse-i18n";export default class AdminPenaltySimilarUsers extends Component {@@ -67,7 +67,7 @@ export default class AdminPenaltySimilarUsers extends Component {}}</p>- <ConditionalLoadingSpinner @condition={{this.isLoading}}>+ <DConditionalLoadingSpinner @condition={{this.isLoading}}><table class="table"><thead><tr>@@ -91,17 +91,17 @@ export default class AdminPenaltySimilarUsers extends Component {{{on "click" (fn this.selectUserId user.id)}}/></td>- <td>{{avatar user imageSize="small"}} {{user.username}}</td>- <td>{{formatDuration user.last_seen_age}}</td>- <td>{{number user.topics_entered}}</td>- <td>{{number user.posts_read_count}}</td>- <td>{{formatDuration user.time_read}}</td>- <td>{{formatDuration user.created_at_age}}</td>+ <td>{{dAvatar user imageSize="small"}} {{user.username}}</td>+ <td>{{dFormatDuration user.last_seen_age}}</td>+ <td>{{dNumber user.topics_entered}}</td>+ <td>{{dNumber user.posts_read_count}}</td>+ <td>{{dFormatDuration user.time_read}}</td>+ <td>{{dFormatDuration user.created_at_age}}</td></tr>{{/each}}</tbody></table>- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner></div></template>}diff --git a/frontend/discourse/admin/components/admin-plugin-config-page.gjs b/frontend/discourse/admin/components/admin-plugin-config-page.gjsindex c343bf6f0f0..48fbec6201c 100644--- a/frontend/discourse/admin/components/admin-plugin-config-page.gjs+++ b/frontend/discourse/admin/components/admin-plugin-config-page.gjs@@ -1,9 +1,9 @@import Component from "@glimmer/component";import { service } from "@ember/service";-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DPageHeader from "discourse/components/d-page-header";-import NavItem from "discourse/components/nav-item";import { headerActionComponentForPlugin } from "discourse/lib/admin-plugin-header-actions";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DNavItem from "discourse/ui-kit/d-nav-item";+import DPageHeader from "discourse/ui-kit/d-page-header";import { i18n } from "discourse-i18n";import AdminPluginConfigArea from "./admin-plugin-config-area";@@ -50,14 +50,14 @@ export default class AdminPluginConfigPage extends Component {this.adminPluginNavManager.currentConfigNav.linksas |navLink|}}- <NavItem+ <DNavItem@route={{navLink.route}}@i18nLabel={{this.linkText navLink}}title={{this.linkText navLink}}class="admin-plugin-config-page__top-nav-item">{{this.linkText navLink}}- </NavItem>+ </DNavItem>{{/each}}</:tabs></DPageHeader>diff --git a/frontend/discourse/admin/components/admin-plugins-list-item.gjs b/frontend/discourse/admin/components/admin-plugins-list-item.gjsindex 19cb69a35e6..966f81610d1 100644--- a/frontend/discourse/admin/components/admin-plugins-list-item.gjs+++ b/frontend/discourse/admin/components/admin-plugins-list-item.gjs@@ -5,11 +5,11 @@ import { action } from "@ember/object";import { LinkTo } from "@ember/routing";import { service } from "@ember/service";import SiteSetting from "discourse/admin/models/site-setting";-import DToggleSwitch from "discourse/components/d-toggle-switch";import PluginOutlet from "discourse/components/plugin-outlet";-import icon from "discourse/helpers/d-icon";import lazyHash from "discourse/helpers/lazy-hash";import { popupAjaxError } from "discourse/lib/ajax-error";+import DToggleSwitch from "discourse/ui-kit/d-toggle-switch";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";import PluginCommitHash from "./plugin-commit-hash";@@ -132,7 +132,7 @@ export default class AdminPluginsListItem extends Component {target="_blank"class="admin-plugins-list__about-link">- {{icon "up-right-from-square"}}+ {{dIcon "up-right-from-square"}}{{i18n "admin.plugins.learn_more"}}</a>{{/if}}diff --git a/frontend/discourse/admin/components/admin-report-counters.gjs b/frontend/discourse/admin/components/admin-report-counters.gjsindex 5ba1e0f9402..548ac9928de 100644--- a/frontend/discourse/admin/components/admin-report-counters.gjs+++ b/frontend/discourse/admin/components/admin-report-counters.gjs@@ -1,8 +1,8 @@/* eslint-disable ember/no-classic-components */import Component from "@ember/component";import { tagName } from "@ember-decorators/component";-import icon from "discourse/helpers/d-icon";-import number from "discourse/helpers/number";+import dIcon from "discourse/ui-kit/helpers/d-icon";+import dNumber from "discourse/ui-kit/helpers/d-number";@tagName("")export default class AdminReportCounters extends Component {@@ -14,39 +14,39 @@ export default class AdminReportCounters extends Component {><div class="cell title">{{#if this.model.icon}}- {{icon this.model.icon}}+ {{dIcon this.model.icon}}{{/if}}<a href={{this.model.reportUrl}}>{{this.model.title}}</a></div><div class="cell value today-count">- {{number this.model.todayCount}}+ {{dNumber this.model.todayCount}}</div><divclass="cell value yesterday-count {{this.model.yesterdayTrend}}"title={{this.model.yesterdayCountTitle}}>- {{number this.model.yesterdayCount}}- {{icon this.model.yesterdayTrendIcon}}+ {{dNumber this.model.yesterdayCount}}+ {{dIcon this.model.yesterdayTrendIcon}}</div><divclass="cell value sevendays-count {{this.model.sevenDaysTrend}}"title={{this.model.sevenDaysCountTitle}}>- {{number this.model.lastSevenDaysCount}}- {{icon this.model.sevenDaysTrendIcon}}+ {{dNumber this.model.lastSevenDaysCount}}+ {{dIcon this.model.sevenDaysTrendIcon}}</div><divclass="cell value thirty-days-count {{this.model.thirtyDaysTrend}}"title={{this.model.thirtyDaysCountTitle}}>- {{number this.model.lastThirtyDaysCount}}+ {{dNumber this.model.lastThirtyDaysCount}}{{#if this.model.canDisplayTrendIcon}}- {{icon this.model.thirtyDaysTrendIcon}}+ {{dIcon this.model.thirtyDaysTrendIcon}}{{/if}}</div></div>diff --git a/frontend/discourse/admin/components/admin-report-inline-table.gjs b/frontend/discourse/admin/components/admin-report-inline-table.gjsindex 00264af5f85..1926ea3f460 100644--- a/frontend/discourse/admin/components/admin-report-inline-table.gjs+++ b/frontend/discourse/admin/components/admin-report-inline-table.gjs@@ -1,8 +1,8 @@/* eslint-disable ember/no-classic-components */import Component from "@ember/component";import { tagName } from "@ember-decorators/component";-import icon from "discourse/helpers/d-icon";-import number from "discourse/helpers/number";+import dIcon from "discourse/ui-kit/helpers/d-icon";+import dNumber from "discourse/ui-kit/helpers/d-number";@tagName("")export default class AdminReportInlineTable extends Component {@@ -13,12 +13,12 @@ export default class AdminReportInlineTable extends Component {<a class="table-cell user-{{data.key}}" href={{data.url}}><span class="label">{{#if data.icon}}- {{icon data.icon}}+ {{dIcon data.icon}}{{/if}}{{data.x}}</span><span class="value">- {{number data.y}}+ {{dNumber data.y}}</span></a>{{/each}}diff --git a/frontend/discourse/admin/components/admin-report-legacy.gjs b/frontend/discourse/admin/components/admin-report-legacy.gjsindex 80608c7af9f..4a35bc24014 100644--- a/frontend/discourse/admin/components/admin-report-legacy.gjs+++ b/frontend/discourse/admin/components/admin-report-legacy.gjs@@ -1,29 +1,29 @@import { concat, fn } from "@ember/helper";import didUpdate from "@ember/render-modifiers/modifiers/did-update";import AdminReport from "discourse/admin/components/admin-report";-import ConditionalLoadingSection from "discourse/components/conditional-loading-section";-import DButton from "discourse/components/d-button";-import DPageSubheader from "discourse/components/d-page-subheader";-import DateTimeInputRange from "discourse/components/date-time-input-range";import DTooltip from "discourse/float-kit/components/d-tooltip";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";-import number from "discourse/helpers/number";import { and } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSection from "discourse/ui-kit/d-conditional-loading-section";+import DDateTimeInputRange from "discourse/ui-kit/d-date-time-input-range";+import DPageSubheader from "discourse/ui-kit/d-page-subheader";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";+import dNumber from "discourse/ui-kit/helpers/d-number";import { i18n } from "discourse-i18n";<template><div- class={{concatClass "admin-report" @report.reportClasses}}+ class={{dConcatClass "admin-report" @report.reportClasses}}{{didUpdate @report.fetchOrRender @filters.startDate @filters.endDate}}>{{#unless @report.isHidden}}- <ConditionalLoadingSection @isLoading={{@report.isLoading}}>+ <DConditionalLoadingSection @isLoading={{@report.isLoading}}>{{#if(and @report.siteSettings.reporting_improvements @report.model.legacy)}}<div class="alert alert-info">- {{icon "triangle-exclamation"}}+ {{dIcon "triangle-exclamation"}}<span>{{i18n "admin.reports.legacy_warning"}}</span></div>{{/if}}@@ -46,7 +46,7 @@ import { i18n } from "discourse-i18n";@interactive={{@report.model.description_link.length}}><:trigger>- {{icon "circle-question"}}+ {{dIcon "circle-question"}}</:trigger><:content>{{#if @report.model.description_link}}@@ -71,17 +71,17 @@ import { i18n } from "discourse-i18n";<div class="trend {{@report.model.trend}}"><span class="value" title={{@report.model.trendTitle}}>{{#if @report.model.average}}- {{number @report.model.currentAverage}}{{#if+ {{dNumber @report.model.currentAverage}}{{#if@report.model.percent}}%{{/if}}{{else}}- {{number @report.model.currentTotal noTitle="true"}}{{#if+ {{dNumber @report.model.currentTotal noTitle="true"}}{{#if@report.model.percent}}%{{/if}}{{/if}}{{#if @report.model.trendIcon}}- {{icon @report.model.trendIcon class="icon"}}+ {{dIcon @report.model.trendIcon class="icon"}}{{/if}}</span></div>@@ -94,21 +94,21 @@ import { i18n } from "discourse-i18n";{{#if @report.showError}}{{#if @report.showTimeoutError}}<div class="alert alert-error report-alert timeout">- {{icon "triangle-exclamation"}}+ {{dIcon "triangle-exclamation"}}<span>{{i18n "admin.dashboard.timeout_error"}}</span></div>{{/if}}{{#if @report.showExceptionError}}<div class="alert alert-error report-alert exception">- {{icon "triangle-exclamation"}}+ {{dIcon "triangle-exclamation"}}<span>{{i18n "admin.dashboard.exception_error"}}</span></div>{{/if}}{{#if @report.showNotFoundError}}<div class="alert alert-error report-alert not-found">- {{icon "triangle-exclamation"}}+ {{dIcon "triangle-exclamation"}}<span>{{i18n "admin.dashboard.not_found_error"}}</span></div>{{/if}}@@ -131,12 +131,12 @@ import { i18n } from "discourse-i18n";{{else}}{{#if @report.rateLimitationString}}<div class="alert alert-error report-alert rate-limited">- {{icon "temperature-three-quarters"}}+ {{dIcon "temperature-three-quarters"}}<span>{{@report.rateLimitationString}}</span></div>{{else}}<div class="alert alert-info report-alert no-data">- {{icon "chart-pie"}}+ {{dIcon "chart-pie"}}{{#if @report.model.reportUrl}}<a href={{@report.model.reportUrl}} class="report-url"><span>@@ -195,7 +195,7 @@ import { i18n } from "discourse-i18n";</span><div class="input">- <DateTimeInputRange+ <DDateTimeInputRange@from={{@report.startDate}}@to={{@report.endDate}}@onChange={{@report.onChangeDateRange}}@@ -253,7 +253,7 @@ import { i18n } from "discourse-i18n";</div>{{/if}}</div>- </ConditionalLoadingSection>+ </DConditionalLoadingSection>{{/unless}}</div></template>diff --git a/frontend/discourse/admin/components/admin-report-new.gjs b/frontend/discourse/admin/components/admin-report-new.gjsindex 9541c20d6e9..3f9d4fb497c 100644--- a/frontend/discourse/admin/components/admin-report-new.gjs+++ b/frontend/discourse/admin/components/admin-report-new.gjs@@ -1,25 +1,25 @@import { concat, fn } from "@ember/helper";import didUpdate from "@ember/render-modifiers/modifiers/did-update";import AdminReport from "discourse/admin/components/admin-report";-import ConditionalLoadingSection from "discourse/components/conditional-loading-section";-import DButton from "discourse/components/d-button";-import DPageSubheader from "discourse/components/d-page-subheader";import DSegmentedControl from "discourse/components/d-segmented-control";-import DateTimeInputRange from "discourse/components/date-time-input-range";import DTooltip from "discourse/float-kit/components/d-tooltip";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";-import number from "discourse/helpers/number";import { and } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSection from "discourse/ui-kit/d-conditional-loading-section";+import DDateTimeInputRange from "discourse/ui-kit/d-date-time-input-range";+import DPageSubheader from "discourse/ui-kit/d-page-subheader";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";+import dNumber from "discourse/ui-kit/helpers/d-number";import { i18n } from "discourse-i18n";<template><div- class={{concatClass "admin-report" @report.reportClasses}}+ class={{dConcatClass "admin-report" @report.reportClasses}}{{didUpdate @report.fetchOrRender @filters.startDate @filters.endDate}}>{{#unless @report.isHidden}}- <ConditionalLoadingSection @isLoading={{@report.isLoading}}>+ <DConditionalLoadingSection @isLoading={{@report.isLoading}}>{{#if @report.showHeader}}{{#if(and@@ -27,7 +27,7 @@ import { i18n } from "discourse-i18n";)}}<div class="alert alert-info">- {{icon "triangle-exclamation"}}+ {{dIcon "triangle-exclamation"}}<span>{{i18n "admin.reports.legacy_warning"}}</span></div>{{/if}}@@ -45,7 +45,7 @@ import { i18n } from "discourse-i18n";@interactive={{@report.model.description_link.length}}><:trigger>- {{icon "circle-question"}}+ {{dIcon "circle-question"}}</:trigger><:content>{{#if @report.model.description_link}}@@ -70,17 +70,17 @@ import { i18n } from "discourse-i18n";<div class="trend {{@report.model.trend}}"><span class="value" title={{@report.model.trendTitle}}>{{#if @report.model.average}}- {{number @report.model.currentAverage}}{{#if+ {{dNumber @report.model.currentAverage}}{{#if@report.model.percent}}%{{/if}}{{else}}- {{number @report.model.currentTotal noTitle="true"}}{{#if+ {{dNumber @report.model.currentTotal noTitle="true"}}{{#if@report.model.percent}}%{{/if}}{{/if}}{{#if @report.model.trendIcon}}- {{icon @report.model.trendIcon class="icon"}}+ {{dIcon @report.model.trendIcon class="icon"}}{{/if}}</span></div>@@ -105,7 +105,7 @@ import { i18n } from "discourse-i18n";{{#if @report.showDatesOptions}}<div class="chart__dates">- <DateTimeInputRange+ <DDateTimeInputRange@from={{@report.startDate}}@to={{@report.endDate}}@onChange={{@report.onChangeDateRange}}@@ -118,7 +118,7 @@ import { i18n } from "discourse-i18n";<div class="chart__additional-filters">{{#each @report.model.available_filters as |filter|}}<div- class={{concatClass+ class={{dConcatClass"chart__filter"(concat "--" filter.id)}}@@ -146,21 +146,21 @@ import { i18n } from "discourse-i18n";{{#if @report.showError}}{{#if @report.showTimeoutError}}<div class="alert alert-error report-alert timeout">- {{icon "triangle-exclamation"}}+ {{dIcon "triangle-exclamation"}}<span>{{i18n "admin.dashboard.timeout_error"}}</span></div>{{/if}}{{#if @report.showExceptionError}}<div class="alert alert-error report-alert exception">- {{icon "triangle-exclamation"}}+ {{dIcon "triangle-exclamation"}}<span>{{i18n "admin.dashboard.exception_error"}}</span></div>{{/if}}{{#if @report.showNotFoundError}}<div class="alert alert-error report-alert not-found">- {{icon "triangle-exclamation"}}+ {{dIcon "triangle-exclamation"}}<span>{{i18n "admin.dashboard.not_found_error"}}</span></div>{{/if}}@@ -183,12 +183,12 @@ import { i18n } from "discourse-i18n";{{else}}{{#if @report.rateLimitationString}}<div class="alert alert-error report-alert rate-limited">- {{icon "temperature-three-quarters"}}+ {{dIcon "temperature-three-quarters"}}<span>{{@report.rateLimitationString}}</span></div>{{else}}<div class="alert alert-info report-alert no-data">- {{icon "chart-pie"}}+ {{dIcon "chart-pie"}}{{#if @report.model.reportUrl}}<a href={{@report.model.reportUrl}} class="report-url"><span>@@ -246,7 +246,7 @@ import { i18n } from "discourse-i18n";</div>{{/if}}</div>- </ConditionalLoadingSection>+ </DConditionalLoadingSection>{{/unless}}</div></template>diff --git a/frontend/discourse/admin/components/admin-report-storage-stats.gjs b/frontend/discourse/admin/components/admin-report-storage-stats.gjsindex 028cdabc12a..65a19e523b1 100644--- a/frontend/discourse/admin/components/admin-report-storage-stats.gjs+++ b/frontend/discourse/admin/components/admin-report-storage-stats.gjs@@ -3,9 +3,9 @@ import Component from "@ember/component";import { computed, set } from "@ember/object";import { trustHTML } from "@ember/template";import { tagName } from "@ember-decorators/component";-import icon from "discourse/helpers/d-icon";-import formatDate from "discourse/helpers/format-date";import getUrl from "discourse/lib/get-url";+import dFormatDate from "discourse/ui-kit/helpers/d-format-date";+import dIcon from "discourse/ui-kit/helpers/d-icon";import I18n, { i18n } from "discourse-i18n";@tagName("")@@ -68,7 +68,7 @@ export default class AdminReportStorageStats extends Component {{{#if this.showBackupStats}}<div class="backups"><h3 class="storage-stats-title">- <a href={{getUrl "/admin/backups"}}>{{icon "box-archive"}}+ <a href={{getUrl "/admin/backups"}}>{{dIcon "box-archive"}}{{i18n "admin.dashboard.backups"}}</a></h3><p>@@ -97,7 +97,7 @@ export default class AdminReportStorageStats extends Component {{{trustHTML(i18n"admin.dashboard.lastest_backup"- date=(formatDate+ date=(dFormatDatethis.backupStats.last_backup_taken_at leaveAgo="true"))@@ -108,7 +108,7 @@ export default class AdminReportStorageStats extends Component {{{/if}}<div class="uploads">- <h3 class="storage-stats-title">{{icon "upload"}}+ <h3 class="storage-stats-title">{{dIcon "upload"}}{{i18n "admin.dashboard.uploads"}}</h3><p>{{#if this.uploadStats.free_bytes}}diff --git a/frontend/discourse/admin/components/admin-report-table-cell.gjs b/frontend/discourse/admin/components/admin-report-table-cell.gjsindex d1fb7d9df82..c18f0e87559 100644--- a/frontend/discourse/admin/components/admin-report-table-cell.gjs+++ b/frontend/discourse/admin/components/admin-report-table-cell.gjs@@ -3,7 +3,7 @@ import Component from "@ember/component";import { computed, set } from "@ember/object";import { trustHTML } from "@ember/template";import { tagName } from "@ember-decorators/component";-import concatClass from "discourse/helpers/concat-class";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";@tagName("")export default class AdminReportTableCell extends Component {@@ -53,7 +53,7 @@ export default class AdminReportTableCell extends Component {<template><tdtitle={{this.value}}- class={{concatClass "admin-report-table-cell" this.type this.property}}+ class={{dConcatClass "admin-report-table-cell" this.type this.property}}...attributes>{{trustHTML this.formattedValue}}diff --git a/frontend/discourse/admin/components/admin-report-table-header.gjs b/frontend/discourse/admin/components/admin-report-table-header.gjsindex 47a53e13d4e..fd04539103b 100644--- a/frontend/discourse/admin/components/admin-report-table-header.gjs+++ b/frontend/discourse/admin/components/admin-report-table-header.gjs@@ -1,6 +1,6 @@import Component from "@glimmer/component";import { trustHTML } from "@ember/template";-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";export default class AdminReportTableHeader extends Component {diff --git a/frontend/discourse/admin/components/admin-report-table.gjs b/frontend/discourse/admin/components/admin-report-table.gjsindex 15dce0ec7dc..862207d57ae 100644--- a/frontend/discourse/admin/components/admin-report-table.gjs+++ b/frontend/discourse/admin/components/admin-report-table.gjs@@ -5,9 +5,9 @@ import { action, computed, set } from "@ember/object";import { tagName } from "@ember-decorators/component";import AdminReportTableHeader from "discourse/admin/components/admin-report-table-header";import AdminReportTableRow from "discourse/admin/components/admin-report-table-row";-import DButton from "discourse/components/d-button";-import concatClass from "discourse/helpers/concat-class";import { makeArray } from "discourse/lib/helpers";+import DButton from "discourse/ui-kit/d-button";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";const PAGES_LIMIT = 8;@@ -198,7 +198,7 @@ export default class AdminReportTable extends Component {<template><div- class={{concatClass+ class={{dConcatClass"admin-report-table"(if this.sortable "sortable")(if this.twoColumns "two-columns")diff --git a/frontend/discourse/admin/components/admin-reports.gjs b/frontend/discourse/admin/components/admin-reports.gjsindex d76f9d6a863..4cd8a61b029 100644--- a/frontend/discourse/admin/components/admin-reports.gjs+++ b/frontend/discourse/admin/components/admin-reports.gjs@@ -4,9 +4,9 @@ import { service } from "@ember/service";import AdminFilterControls from "discourse/admin/components/admin-filter-controls";import AdminSectionLandingItem from "discourse/admin/components/admin-section-landing-item";import AdminSectionLandingWrapper from "discourse/admin/components/admin-section-landing-wrapper";-import AsyncContent from "discourse/components/async-content";import { ajax } from "discourse/lib/ajax";import { bind } from "discourse/lib/decorators";+import DAsyncContent from "discourse/ui-kit/d-async-content";import { i18n } from "discourse-i18n";const REPORT_GROUPS = {@@ -153,7 +153,7 @@ export default class AdminReports extends Component {}<template>- <AsyncContent @asyncData={{this.loadReports}}>+ <DAsyncContent @asyncData={{this.loadReports}}><:content as |reports|><AdminFilterControls@array={{this.filterReports reports}}@@ -193,6 +193,6 @@ export default class AdminReports extends Component {</:content></AdminFilterControls></:content>- </AsyncContent>+ </DAsyncContent></template>}diff --git a/frontend/discourse/admin/components/admin-search.gjs b/frontend/discourse/admin/components/admin-search.gjsindex a5964a5194a..f8afd1b3463 100644--- a/frontend/discourse/admin/components/admin-search.gjs+++ b/frontend/discourse/admin/components/admin-search.gjs@@ -5,13 +5,13 @@ import { action } from "@ember/object";import didUpdate from "@ember/render-modifiers/modifiers/did-update";import { service } from "@ember/service";import { trustHTML } from "@ember/template";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import icon from "discourse/helpers/d-icon";import discourseDebounce from "discourse/lib/debounce";import { INPUT_DELAY } from "discourse/lib/environment";import { escapeExpression } from "discourse/lib/utilities";-import autoFocus from "discourse/modifiers/auto-focus";import { and, not } from "discourse/truth-helpers";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import dIcon from "discourse/ui-kit/helpers/d-icon";+import dAutoFocus from "discourse/ui-kit/modifiers/d-auto-focus";import { i18n } from "discourse-i18n";export default class AdminSearch extends Component {@@ -131,12 +131,12 @@ export default class AdminSearch extends Component {{{didUpdate this.initialFilterUpdated @initialFilter}}><div class="admin-search__input-group">- {{icon "magnifying-glass" class="admin-search__input-icon"}}+ {{dIcon "magnifying-glass" class="admin-search__input-icon"}}<inputtype="text"class="admin-search__input-field"value={{this.filter}}- {{autoFocus}}+ {{dAutoFocus}}{{on "input" this.changeSearchTerm}}{{on "keydown" this.handleSearchKeyDown}}placeholder={{i18n "admin.search.instructions"}}@@ -175,7 +175,7 @@ export default class AdminSearch extends Component {<divclass="admin-search__results {{if this.searchResults '--has-results'}}">- <ConditionalLoadingSpinner @condition={{this.showLoadingSpinner}}>+ <DConditionalLoadingSpinner @condition={{this.showLoadingSpinner}}>{{#each this.searchResults as |result|}}<div class="admin-search__result" data-result-type={{result.type}}><a@@ -186,7 +186,7 @@ export default class AdminSearch extends Component {><div class="admin-search__result-name">{{#if result.icon}}- {{icon result.icon}}+ {{dIcon result.icon}}{{/if}}<spanclass="admin-search__result-name-label"@@ -200,7 +200,7 @@ export default class AdminSearch extends Component {</a></div>{{/each}}- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner></div></template>}diff --git a/frontend/discourse/admin/components/admin-section-landing-item.gjs b/frontend/discourse/admin/components/admin-section-landing-item.gjsindex f1acb1cc64f..a0ad1da24f7 100644--- a/frontend/discourse/admin/components/admin-section-landing-item.gjs+++ b/frontend/discourse/admin/components/admin-section-landing-item.gjs@@ -1,21 +1,21 @@import Component from "@glimmer/component";import { hash } from "@ember/helper";import { LinkTo } from "@ember/routing";+import { and } from "discourse/truth-helpers";import {DangerButton,DefaultButton,PrimaryButton,-} from "discourse/components/d-page-action-button";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";-import element from "discourse/helpers/element";-import { and } from "discourse/truth-helpers";+} from "discourse/ui-kit/d-page-action-button";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dElement from "discourse/ui-kit/helpers/d-element";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class AdminSectionLandingItem extends Component {wrapperElement = (hasButtons) => {const makeClickable = this.args.titleRoute && !hasButtons;- return makeClickable ? LinkTo : element("div");+ return makeClickable ? LinkTo : dElement("div");};get title() {@@ -49,7 +49,7 @@ export default class AdminSectionLandingItem extends Component {<WrapperComponent@route={{@titleRoute}}@model={{@titleRouteModel}}- class={{concatClass+ class={{dConcatClass"admin-section-landing-item"(if @icon "--has-icon")}}@@ -60,7 +60,7 @@ export default class AdminSectionLandingItem extends Component {{{/if}}{{#if @icon}}<div class="admin-section-landing-item__icon">- {{icon @icon}}+ {{dIcon @icon}}</div>{{/if}}<div class="admin-section-landing-item__content">diff --git a/frontend/discourse/admin/components/admin-site-settings-category-nav.gjs b/frontend/discourse/admin/components/admin-site-settings-category-nav.gjsindex 1fe2f1bbb16..754cd241535 100644--- a/frontend/discourse/admin/components/admin-site-settings-category-nav.gjs+++ b/frontend/discourse/admin/components/admin-site-settings-category-nav.gjs@@ -4,8 +4,8 @@ import { action } from "@ember/object";import didInsert from "@ember/render-modifiers/modifiers/did-insert";import { LinkTo } from "@ember/routing";import { next } from "@ember/runloop";-import concatClass from "discourse/helpers/concat-class";import { waitForAnimationEnd } from "discourse/lib/animation-utils";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";export default class AdminSiteSettingsCategoryNav extends Component {get categories() {@@ -37,7 +37,7 @@ export default class AdminSiteSettingsCategoryNav extends Component {>{{#each this.categories as |category|}}<li- class={{concatClass+ class={{dConcatClass"admin-site-settings-category-nav__item"category.nameKey}}diff --git a/frontend/discourse/admin/components/admin-site-settings-filter-controls.gjs b/frontend/discourse/admin/components/admin-site-settings-filter-controls.gjsindex d21c3878bfc..097df4785c7 100644--- a/frontend/discourse/admin/components/admin-site-settings-filter-controls.gjs+++ b/frontend/discourse/admin/components/admin-site-settings-filter-controls.gjs@@ -6,8 +6,8 @@ import { action } from "@ember/object";import didInsert from "@ember/render-modifiers/modifiers/did-insert";import didUpdate from "@ember/render-modifiers/modifiers/did-update";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import { and, not } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";export default class AdminSiteSettingsFilterControls extends Component {diff --git a/frontend/discourse/admin/components/admin-theme-editor.gjs b/frontend/discourse/admin/components/admin-theme-editor.gjsindex 23bd6fc54af..27197b17235 100644--- a/frontend/discourse/admin/components/admin-theme-editor.gjs+++ b/frontend/discourse/admin/components/admin-theme-editor.gjs@@ -10,9 +10,9 @@ import { service } from "@ember/service";import { trustHTML } from "@ember/template";import { tagName } from "@ember-decorators/component";import AceEditor from "discourse/components/ace-editor";-import icon from "discourse/helpers/d-icon";import { isDocumentRTL } from "discourse/lib/text-direction";import { gt, lte } from "discourse/truth-helpers";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";const JS_DEFAULT_VALUE = `import { apiInitializer } from "discourse/lib/api";@@ -171,8 +171,8 @@ export default class AdminThemeEditor extends Component {title={{this.field.title}}class={{if target.edited "edited" "blank"}}>- {{#if target.error}}{{icon "triangle-exclamation"}}{{/if}}- {{#if target.icon}}{{icon target.icon}}{{/if}}+ {{#if target.error}}{{dIcon "triangle-exclamation"}}{{/if}}+ {{#if target.icon}}{{dIcon target.icon}}{{/if}}{{i18n (concat "admin.customize.theme." target.name)}}</LinkTo></li>@@ -209,8 +209,8 @@ export default class AdminThemeEditor extends Component {title={{field.title}}class={{if field.edited "edited" "blank"}}>- {{#if field.error}}{{icon "triangle-exclamation"}}{{/if}}- {{#if field.icon}}{{icon field.icon}}{{/if}}+ {{#if field.error}}{{dIcon "triangle-exclamation"}}{{/if}}+ {{#if field.icon}}{{dIcon field.icon}}{{/if}}{{field.translatedName}}</LinkTo></li>@@ -229,7 +229,7 @@ export default class AdminThemeEditor extends Component {</label>{{/if}}<a href {{on "click" this.toggleMaximize}} class="no-text">- {{icon this.maximizeIcon}}+ {{dIcon this.maximizeIcon}}</a></li></ul>diff --git a/frontend/discourse/admin/components/admin-user-exports-table.gjs b/frontend/discourse/admin/components/admin-user-exports-table.gjsindex 7a24f069fa6..69344b544de 100644--- a/frontend/discourse/admin/components/admin-user-exports-table.gjs+++ b/frontend/discourse/admin/components/admin-user-exports-table.gjs@@ -4,11 +4,11 @@ import { action, computed } from "@ember/object";import { service } from "@ember/service";import { isEmpty } from "@ember/utils";import UserExport from "discourse/admin/models/user-export";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DButton from "discourse/components/d-button";import { popupAjaxError } from "discourse/lib/ajax-error";import { bind } from "discourse/lib/decorators";import { exportEntity } from "discourse/lib/export-csv";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";import { i18n } from "discourse-i18n";const EXPORT_PROGRESS_CHANNEL = "/user-export-progress";@@ -108,7 +108,7 @@ export default class extends Component {{{/if}}</div><div class="controls">- <ConditionalLoadingSpinner @condition={{this.userExportReloading}}>+ <DConditionalLoadingSpinner @condition={{this.userExportReloading}}><DButton@action={{this.triggerUserExport}}@@ -116,7 +116,7 @@ export default class extends Component {@label="admin.user.exports.download.button"class="btn-default"/>- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner></div></div></section>diff --git a/frontend/discourse/admin/components/admin-user-field-item.gjs b/frontend/discourse/admin/components/admin-user-field-item.gjsindex b8f86bc1935..679b291a0a8 100644--- a/frontend/discourse/admin/components/admin-user-field-item.gjs+++ b/frontend/discourse/admin/components/admin-user-field-item.gjs@@ -5,9 +5,9 @@ import { service } from "@ember/service";import { trustHTML } from "@ember/template";import { USER_FIELD_FLAGS } from "discourse/admin/lib/constants";import UserField from "discourse/admin/models/user-field";-import DButton from "discourse/components/d-button";-import DropdownMenu from "discourse/components/dropdown-menu";import DMenu from "discourse/float-kit/components/d-menu";+import DButton from "discourse/ui-kit/d-button";+import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";import { i18n } from "discourse-i18n";export default class AdminUserFieldItem extends Component {@@ -100,7 +100,7 @@ export default class AdminUserFieldItem extends Component {@triggerClass="btn-default"><:content>- <DropdownMenu as |dropdown|>+ <DDropdownMenu as |dropdown|>{{#unless this.cantMoveUp}}<dropdown.item><DButton@@ -130,7 +130,7 @@ export default class AdminUserFieldItem extends Component {@action={{this.destroy}}/></dropdown.item>- </DropdownMenu>+ </DDropdownMenu></:content></DMenu></div>diff --git a/frontend/discourse/admin/components/admin-watched-word.gjs b/frontend/discourse/admin/components/admin-watched-word.gjsindex 0b2753e8084..bf31496d191 100644--- a/frontend/discourse/admin/components/admin-watched-word.gjs+++ b/frontend/discourse/admin/components/admin-watched-word.gjs@@ -1,8 +1,8 @@import Component from "@glimmer/component";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import { eq, or } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";export default class AdminWatchedWord extends Component {diff --git a/frontend/discourse/admin/components/admin-welcome-banner-form.gjs b/frontend/discourse/admin/components/admin-welcome-banner-form.gjsindex 5982dd8bc14..6f926ffa9f7 100644--- a/frontend/discourse/admin/components/admin-welcome-banner-form.gjs+++ b/frontend/discourse/admin/components/admin-welcome-banner-form.gjs@@ -4,13 +4,13 @@ import { fn, hash } from "@ember/helper";import { action } from "@ember/object";import { service } from "@ember/service";import { trustHTML } from "@ember/template";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DMultiSelect from "discourse/components/d-multi-select";import Form from "discourse/components/form";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import getURL from "discourse/lib/get-url";import ComboBox from "discourse/select-kit/components/combo-box";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DMultiSelect from "discourse/ui-kit/d-multi-select";import I18n, { i18n } from "discourse-i18n";export default class AdminWelcomeBannerForm extends Component {@@ -358,7 +358,7 @@ export default class AdminWelcomeBannerForm extends Component {}<template>- <ConditionalLoadingSpinner @condition={{this.isLoading}}>+ <DConditionalLoadingSpinner @condition={{this.isLoading}}><Form@onSubmit={{this.save}}@data={{this.formData}}@@ -625,6 +625,6 @@ export default class AdminWelcomeBannerForm extends Component {</form.Section><form.Submit /></Form>- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner></template>}diff --git a/frontend/discourse/admin/components/api-key-item.gjs b/frontend/discourse/admin/components/api-key-item.gjsindex 663ac138b6a..6cbdc406a1c 100644--- a/frontend/discourse/admin/components/api-key-item.gjs+++ b/frontend/discourse/admin/components/api-key-item.gjs@@ -3,13 +3,13 @@ import { fn } from "@ember/helper";import { action } from "@ember/object";import { LinkTo } from "@ember/routing";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import DropdownMenu from "discourse/components/dropdown-menu";import DMenu from "discourse/float-kit/components/d-menu";-import avatar from "discourse/helpers/avatar";-import icon from "discourse/helpers/d-icon";-import formatDate from "discourse/helpers/format-date";import { popupAjaxError } from "discourse/lib/ajax-error";+import DButton from "discourse/ui-kit/d-button";+import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";+import dAvatar from "discourse/ui-kit/helpers/d-avatar";+import dFormatDate from "discourse/ui-kit/helpers/d-format-date";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";const SCOPE_ICONS = {@@ -84,7 +84,7 @@ export default class ApiKeyItem extends Component {<div class="d-table__mobile-label">{{i18n "admin.api.user"}}</div>{{#if @apiKey.user}}<LinkTo @route="adminUser" @model={{@apiKey.user}}>- {{avatar @apiKey.user imageSize="small"}}+ {{dAvatar @apiKey.user imageSize="small"}}</LinkTo>{{else}}{{i18n "admin.api.all_users"}}@@ -94,22 +94,22 @@ export default class ApiKeyItem extends Component {<div class="d-table__mobile-label">{{i18n "admin.api.created"}}</div><div class="d-table__value-wrapper"><LinkTo @route="adminUser" @model={{@apiKey.createdBy}}>- {{avatar @apiKey.createdBy imageSize="small"}}+ {{dAvatar @apiKey.createdBy imageSize="small"}}</LinkTo>- {{formatDate @apiKey.created_at}}+ {{dFormatDate @apiKey.created_at}}</div></td><td class="d-table__cell --detail key-scope"><div class="d-table__mobile-label">{{i18n "admin.api.scope"}}</div><div class="d-table__value-wrapper">- {{icon this.scopeIcon}}+ {{dIcon this.scopeIcon}}{{this.scopeName}}</div></td><td class="d-table__cell --detail key-last-used"><div class="d-table__mobile-label">{{i18n "admin.api.last_used"}}</div>{{#if @apiKey.last_used_at}}- {{formatDate @apiKey.last_used_at}}+ {{dFormatDate @apiKey.last_used_at}}{{else}}{{i18n "admin.api.never_used"}}{{/if}}@@ -130,7 +130,7 @@ export default class ApiKeyItem extends Component {@triggerClass="btn-default"><:content>- <DropdownMenu as |dropdown|>+ <DDropdownMenu as |dropdown|>{{#if @apiKey.revoked_at}}<dropdown.item><DButton@@ -151,7 +151,7 @@ export default class ApiKeyItem extends Component {/></dropdown.item>{{/if}}- </DropdownMenu>+ </DDropdownMenu></:content></DMenu></div>diff --git a/frontend/discourse/admin/components/bulk-user-delete-confirmation.gjs b/frontend/discourse/admin/components/bulk-user-delete-confirmation.gjsindex bc5f5b3f6b8..cff275e3964 100644--- a/frontend/discourse/admin/components/bulk-user-delete-confirmation.gjs+++ b/frontend/discourse/admin/components/bulk-user-delete-confirmation.gjs@@ -5,11 +5,11 @@ import { action } from "@ember/object";import { trackedArray } from "@ember/reactive/collections";import { service } from "@ember/service";import { modifier as modifierFn } from "ember-modifier";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";import { ajax } from "discourse/lib/ajax";import { extractError } from "discourse/lib/ajax-error";import { bind } from "discourse/lib/decorators";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";const BULK_DELETE_CHANNEL = "/bulk-user-delete";diff --git a/frontend/discourse/admin/components/changes-banner.gjs b/frontend/discourse/admin/components/changes-banner.gjsindex 5e96efdc2c8..d799c1f00b6 100644--- a/frontend/discourse/admin/components/changes-banner.gjs+++ b/frontend/discourse/admin/components/changes-banner.gjs@@ -3,8 +3,8 @@ import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";import { trustHTML } from "@ember/template";import { modifier } from "ember-modifier";-import DButton from "discourse/components/d-button";import bodyClass from "discourse/helpers/body-class";+import DButton from "discourse/ui-kit/d-button";export default class ChangesBanner extends Component {@tracked isSaving = false;diff --git a/frontend/discourse/admin/components/color-input.gjs b/frontend/discourse/admin/components/color-input.gjsindex def27bac6ae..1b017ba0150 100644--- a/frontend/discourse/admin/components/color-input.gjs+++ b/frontend/discourse/admin/components/color-input.gjs@@ -4,8 +4,8 @@ import { on } from "@ember/modifier";import { action, computed } from "@ember/object";import { classNames } from "@ember-decorators/component";import { observes } from "@ember-decorators/object";-import TextField from "discourse/components/text-field";import { isValidHex } from "discourse/lib/color-transformations";+import DTextField from "discourse/ui-kit/d-text-field";/**An input field for a color.@@ -98,7 +98,7 @@ export default class ColorInput extends Component {}<template>- {{#if this.onlyHex}}<span class="add-on">#</span>{{/if}}<TextField+ {{#if this.onlyHex}}<span class="add-on">#</span>{{/if}}<DTextField@value={{this.hexValue}}@maxlength={{this.maxlength}}@input={{this.onHexInput}}diff --git a/frontend/discourse/admin/components/color-palette-editor.gjs b/frontend/discourse/admin/components/color-palette-editor.gjsindex f6c262b2256..acb16508edc 100644--- a/frontend/discourse/admin/components/color-palette-editor.gjs+++ b/frontend/discourse/admin/components/color-palette-editor.gjs@@ -5,11 +5,11 @@ import { on } from "@ember/modifier";import { action } from "@ember/object";import didInsert from "@ember/render-modifiers/modifiers/did-insert";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import { isValidHex, normalizeHex } from "discourse/lib/color-transformations";import { or } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";function isColorOverriden(color) {@@ -153,7 +153,7 @@ const Picker = class extends Component {<template><div- class={{concatClass+ class={{dConcatClass"color-palette-editor__picker""form-kit__control-input"(if this.invalid "--invalid")@@ -170,7 +170,7 @@ const Picker = class extends Component {{{on "change" this.onChange}}/><div class="color-palette-editor__input-wrapper">- {{icon "hashtag" class="color-palette-editor__icon"}}+ {{dIcon "hashtag" class="color-palette-editor__icon"}}<inputclass="color-palette-editor__text-input"data-position={{@position}}@@ -237,7 +237,7 @@ export default class ColorPaletteEditor extends Component {/>{{#unless @disabled}}<DButton- class={{concatClass+ class={{dConcatClass"btn-flat""color-palette-editor__revert"(unless (isColorOverriden color) "--hidden")diff --git a/frontend/discourse/admin/components/color-palette-list-item.gjs b/frontend/discourse/admin/components/color-palette-list-item.gjsindex 1285b743259..248a3e34ecc 100644--- a/frontend/discourse/admin/components/color-palette-list-item.gjs+++ b/frontend/discourse/admin/components/color-palette-list-item.gjs@@ -4,14 +4,14 @@ import { array, fn } from "@ember/helper";import { action } from "@ember/object";import { LinkTo } from "@ember/routing";import ColorPalettePreview from "discourse/components/color-palette-preview";-import DButton from "discourse/components/d-button";-import DropdownMenu from "discourse/components/dropdown-menu";import DButtonTooltip from "discourse/float-kit/components/d-button-tooltip";import DMenu from "discourse/float-kit/components/d-menu";import DTooltip from "discourse/float-kit/components/d-tooltip";-import icon from "discourse/helpers/d-icon";import { bind } from "discourse/lib/decorators";import { not } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class ColorPaletteListItem extends Component {@@ -114,7 +114,7 @@ export default class ColorPaletteListItem extends Component {@route="adminCustomizeThemes.show"@models={{array "themes" @scheme.theme_id}}>- {{icon "link"}}+ {{dIcon "link"}}{{@scheme.theme_name}}</LinkTo>{{/if}}@@ -128,7 +128,7 @@ export default class ColorPaletteListItem extends Component {}}class="theme-card__badge --default">- {{icon "sun"}}+ {{dIcon "sun"}}{{i18n "admin.customize.colors.default_light_badge.text"}}</span>{{/if}}@@ -138,7 +138,7 @@ export default class ColorPaletteListItem extends Component {title={{i18n "admin.customize.colors.default_dark_badge.title"}}class="theme-card__badge --default">- {{icon "moon"}}+ {{dIcon "moon"}}{{i18n "admin.customize.colors.default_dark_badge.text"}}</span>{{/if}}@@ -148,7 +148,7 @@ export default class ColorPaletteListItem extends Component {title={{i18n "admin.customize.theme.user_selectable"}}class="theme-card__badge --selectable">- {{icon "user-check"}}+ {{dIcon "user-check"}}{{i18n "admin.customize.theme.user_selectable_badge_label"}}</span>{{/if}}@@ -185,7 +185,7 @@ export default class ColorPaletteListItem extends Component {@isLoading={{this.isLoading}}><:content>- <DropdownMenu as |dropdown|>+ <DDropdownMenu as |dropdown|>{{#unless this.isBuiltInDefault}}<dropdown.item><DButton@@ -252,7 +252,7 @@ export default class ColorPaletteListItem extends Component {/></dropdown.item>{{/if}}- </DropdownMenu>+ </DDropdownMenu></:content></DMenu>{{/if}}diff --git a/frontend/discourse/admin/components/dashboard-new-feature-item.gjs b/frontend/discourse/admin/components/dashboard-new-feature-item.gjsindex bd019fbc413..896a721db6d 100644--- a/frontend/discourse/admin/components/dashboard-new-feature-item.gjs+++ b/frontend/discourse/admin/components/dashboard-new-feature-item.gjs@@ -1,7 +1,7 @@import Component from "@glimmer/component";import { dasherize } from "@ember/string";-import CookText from "discourse/components/cook-text";import { and, not } from "discourse/truth-helpers";+import DCookText from "discourse/ui-kit/d-cook-text";import { i18n } from "discourse-i18n";export default class DiscourseNewFeatureItem extends Component {@@ -39,7 +39,7 @@ export default class DiscourseNewFeatureItem extends Component {<div class="admin-new-feature-item__body"><div class="admin-new-feature-item__feature-description">- <CookText @rawText={{@item.description}} />+ <DCookText @rawText={{@item.description}} />{{#if @item.link}}<adiff --git a/frontend/discourse/admin/components/dashboard-new-features.gjs b/frontend/discourse/admin/components/dashboard-new-features.gjsindex 5b50274c0fe..5b0b9d06987 100644--- a/frontend/discourse/admin/components/dashboard-new-features.gjs+++ b/frontend/discourse/admin/components/dashboard-new-features.gjs@@ -5,10 +5,10 @@ import { service } from "@ember/service";import AdminConfigAreaCard from "discourse/admin/components/admin-config-area-card";import AdminConfigAreaEmptyList from "discourse/admin/components/admin-config-area-empty-list";import DashboardNewFeatureItem from "discourse/admin/components/dashboard-new-feature-item";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import { bind } from "discourse/lib/decorators";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";import { i18n } from "discourse-i18n";export default class DashboardNewFeatures extends Component {@@ -95,7 +95,7 @@ export default class DashboardNewFeatures extends Component {class="admin-config-area__primary-content"{{didInsert this.loadNewFeatures}}>- <ConditionalLoadingSpinner @condition={{this.isLoading}}>+ <DConditionalLoadingSpinner @condition={{this.isLoading}}>{{#each this.groupedNewFeatures as |groupedFeatures|}}<AdminConfigAreaCardclass="admin-new-features__group"@@ -113,7 +113,7 @@ export default class DashboardNewFeatures extends Component {{{else}}<AdminConfigAreaEmptyList @emptyLabelTranslated={{this.emptyLabel}} />{{/each}}- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner></div></template>}diff --git a/frontend/discourse/admin/components/dashboard-period-selector.gjs b/frontend/discourse/admin/components/dashboard-period-selector.gjsindex 22df84bc3e2..42c98afb051 100644--- a/frontend/discourse/admin/components/dashboard-period-selector.gjs+++ b/frontend/discourse/admin/components/dashboard-period-selector.gjs@@ -1,8 +1,8 @@import Component from "@glimmer/component";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import PeriodChooser from "discourse/select-kit/components/period-chooser";+import DButton from "discourse/ui-kit/d-button";import CustomDateRangeModal from "../components/modal/custom-date-range";export default class DashboardPeriodSelector extends Component {diff --git a/frontend/discourse/admin/components/dashboard-problems.gjs b/frontend/discourse/admin/components/dashboard-problems.gjsindex ff9ed502992..0c81f078a43 100644--- a/frontend/discourse/admin/components/dashboard-problems.gjs+++ b/frontend/discourse/admin/components/dashboard-problems.gjs@@ -3,14 +3,14 @@ import { concat } from "@ember/helper";import { action } from "@ember/object";import { compare } from "@ember/utils";import AdminNotice from "discourse/admin/components/admin-notice";-import ConditionalLoadingSection from "discourse/components/conditional-loading-section";-import DButton from "discourse/components/d-button";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import { removeValueFromArray } from "discourse/lib/array-tools";import { eq } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSection from "discourse/ui-kit/d-conditional-loading-section";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class DashboardProblems extends Component {@@ -35,18 +35,18 @@ export default class DashboardProblems extends Component {<div class="section dashboard-problems"><div class="section-title"><h2>- {{icon "heart"}}+ {{dIcon "heart"}}{{i18n "admin.dashboard.problems_found"}}</h2></div><div class="section-body">- <ConditionalLoadingSection @isLoading={{@loadingProblems}}>+ <DConditionalLoadingSection @isLoading={{@loadingProblems}}><div class="problem-messages"><ul>{{#each this.problems as |problem|}}<li- class={{concatClass+ class={{dConcatClass"dashboard-problem"(concat "priority-" problem.priority)}}@@ -72,7 +72,7 @@ export default class DashboardProblems extends Component {class="btn-default"/></p>- </ConditionalLoadingSection>+ </DConditionalLoadingSection></div></div>{{/if}}diff --git a/frontend/discourse/admin/components/dashboard/highlights.gjs b/frontend/discourse/admin/components/dashboard/highlights.gjsindex e86f3f0f220..cf481d167dd 100644--- a/frontend/discourse/admin/components/dashboard/highlights.gjs+++ b/frontend/discourse/admin/components/dashboard/highlights.gjs@@ -1,5 +1,5 @@import DashboardSection from "discourse/admin/components/dashboard/section";-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";<template>@@ -14,7 +14,7 @@ import { i18n } from "discourse-i18n";<div class="db-kpi__value">1,100</div><div class="db-kpi__label">New sign-ups</div><div class="db-delta --pos">+12%</div>- <span class="db-link-arrow">{{icon "arrow-right"}}</span>+ <span class="db-link-arrow">{{dIcon "arrow-right"}}</span></a><a class="db-kpi db-section__row-block"><div class="db-kpi__value-row">@@ -27,10 +27,10 @@ import { i18n } from "discourse-i18n";class="db-section__info"aria-label="Daily active users divided by monthly active users. Higher means members come back more often."title="Daily active users divided by monthly active users. Higher means members come back more often."- >{{icon "far-circle-question"}}</span>+ >{{dIcon "far-circle-question"}}</span></div><div class="db-delta --pos">+0.4pts</div>- <span class="db-link-arrow">{{icon "arrow-right"}}</span>+ <span class="db-link-arrow">{{dIcon "arrow-right"}}</span></a><a class="db-kpi db-section__row-block"><div class="db-kpi__value">374</div>@@ -40,10 +40,10 @@ import { i18n } from "discourse-i18n";class="db-section__info"aria-label="Members who posted, replied, or reacted for the first time this period."title="Members who posted, replied, or reacted for the first time this period."- >{{icon "far-circle-question"}}</span>+ >{{dIcon "far-circle-question"}}</span></div><div class="db-delta --pos">+6%</div>- <span class="db-link-arrow">{{icon "arrow-right"}}</span>+ <span class="db-link-arrow">{{dIcon "arrow-right"}}</span></a><a class="db-kpi db-section__row-block"><div class="db-kpi__value">73%</div>@@ -53,10 +53,10 @@ import { i18n } from "discourse-i18n";class="db-section__info"aria-label="Topics in support categories with a marked solution, divided by total topics."title="Topics in support categories with a marked solution, divided by total topics."- >{{icon "far-circle-question"}}</span>+ >{{dIcon "far-circle-question"}}</span></div><div class="db-delta --pos">+1%</div>- <span class="db-link-arrow">{{icon "arrow-right"}}</span>+ <span class="db-link-arrow">{{dIcon "arrow-right"}}</span></a></DashboardSection></template>diff --git a/frontend/discourse/admin/components/dashboard/reports.gjs b/frontend/discourse/admin/components/dashboard/reports.gjsindex 0248145e4e8..a0c2944df06 100644--- a/frontend/discourse/admin/components/dashboard/reports.gjs+++ b/frontend/discourse/admin/components/dashboard/reports.gjs@@ -1,8 +1,8 @@import Component from "@glimmer/component";import { action } from "@ember/object";import DashboardSection from "discourse/admin/components/dashboard/section";-import DButton from "discourse/components/d-button";-import icon from "discourse/helpers/d-icon";+import DButton from "discourse/ui-kit/d-button";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class DashboardReports extends Component {@@ -77,9 +77,8 @@ export default class DashboardReports extends Component {<div class="db-report__chart">PLACEHOLDER</div></div>- <button class="db-report__add-report" aria-label="Add report"><span>{{icon- "plus"- }}+ <button class="db-report__add-report" aria-label="Add report"><span+ >{{dIcon "plus"}}Add report</span></button></DashboardSection>diff --git a/frontend/discourse/admin/components/dashboard/section.gjs b/frontend/discourse/admin/components/dashboard/section.gjsindex 53395c70202..3053af0536c 100644--- a/frontend/discourse/admin/components/dashboard/section.gjs+++ b/frontend/discourse/admin/components/dashboard/section.gjs@@ -1,6 +1,6 @@import Component from "@glimmer/component";import { concat, hash } from "@ember/helper";-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";const LAYOUTS = ["column", "row", "grid"];diff --git a/frontend/discourse/admin/components/dashboard/traffic.gjs b/frontend/discourse/admin/components/dashboard/traffic.gjsindex 2af1a7a4718..76de4e66843 100644--- a/frontend/discourse/admin/components/dashboard/traffic.gjs+++ b/frontend/discourse/admin/components/dashboard/traffic.gjs@@ -1,5 +1,5 @@import DashboardSection from "discourse/admin/components/dashboard/section";-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";<template>@@ -20,7 +20,9 @@ import { i18n } from "discourse-i18n";<div class="db-section__metric-number">38%</div><div class="db-section__metric-label">Logged-in share- <span class="db-section__info">{{icon "far-circle-question"}}</span>+ <span class="db-section__info">{{dIcon+ "far-circle-question"+ }}</span></div></div><div class="db-section__metric">@@ -31,7 +33,9 @@ import { i18n } from "discourse-i18n";<div class="db-section__metric"><div class="db-section__metric-number">52%</div><div class="db-section__metric-label">Bounce rate- <span class="db-section__info">{{icon "far-circle-question"}}</span>+ <span class="db-section__info">{{dIcon+ "far-circle-question"+ }}</span></div></div></div>@@ -49,7 +53,7 @@ import { i18n } from "discourse-i18n";<div class="db-section__row-block-header"><a class="db-section__row-block-title">Top referrers<spanclass="db-link-arrow"- >{{icon "arrow-right"}}</span></a>+ >{{dIcon "arrow-right"}}</span></a></div><ul class="db-traffic__list"><li class="db-traffic__list-row">diff --git a/frontend/discourse/admin/components/edit-category-general.gjs b/frontend/discourse/admin/components/edit-category-general.gjsindex da04ad0220c..68d367b9b71 100644--- a/frontend/discourse/admin/components/edit-category-general.gjs+++ b/frontend/discourse/admin/components/edit-category-general.gjs@@ -4,10 +4,7 @@ import { hash } from "@ember/helper";import { action } from "@ember/object";import { service } from "@ember/service";import { trustHTML } from "@ember/template";-import DecoratedHtml from "discourse/components/decorated-html";import PluginOutlet from "discourse/components/plugin-outlet";-import categoryBadge from "discourse/helpers/category-badge";-import { categoryBadgeHTML } from "discourse/helpers/category-link";import lazyHash from "discourse/helpers/lazy-hash";import { uniqueItemsFromArray } from "discourse/lib/array-tools";import {@@ -18,6 +15,9 @@ import getURL from "discourse/lib/get-url";import Category from "discourse/models/category";import CategoryChooser from "discourse/select-kit/components/category-chooser";import { eq } from "discourse/truth-helpers";+import DDecoratedHtml from "discourse/ui-kit/d-decorated-html";+import dCategoryBadge from "discourse/ui-kit/helpers/d-category-badge";+import { categoryBadgeHTML } from "discourse/ui-kit/helpers/d-category-link";import { i18n } from "discourse-i18n";export default class EditCategoryGeneral extends Component {@@ -286,14 +286,14 @@ export default class EditCategoryGeneral extends Component {{{#if this.subCategories}}<@form.Container @title={{i18n "categories.subcategories"}}>{{#each this.subCategories as |s|}}- {{categoryBadge s hideParent="true"}}+ {{dCategoryBadge s hideParent="true"}}{{/each}}</@form.Container>{{/if}}{{#if this.showDescription}}<@form.Section @title={{i18n "category.description"}}>- <DecoratedHtml+ <DDecoratedHtml@html={{this.categoryDescription}}@className="readonly-field"/>diff --git a/frontend/discourse/admin/components/edit-category-settings.gjs b/frontend/discourse/admin/components/edit-category-settings.gjsindex 76a0ae706c5..9a943e0f8a6 100644--- a/frontend/discourse/admin/components/edit-category-settings.gjs+++ b/frontend/discourse/admin/components/edit-category-settings.gjs@@ -6,9 +6,6 @@ import { trustHTML } from "@ember/template";import { isEmpty } from "@ember/utils";import { buildCategoryPanel } from "discourse/admin/components/edit-category-panel";import PluginOutlet from "discourse/components/plugin-outlet";-import RelativeTimePicker from "discourse/components/relative-time-picker";-import TextField from "discourse/components/text-field";-import icon from "discourse/helpers/d-icon";import lazyHash from "discourse/helpers/lazy-hash";import withEventValue from "discourse/helpers/with-event-value";import {@@ -19,6 +16,9 @@ import getUrl from "discourse/lib/get-url";import { applyMutableValueTransformer } from "discourse/lib/transformer";import ComboBox from "discourse/select-kit/components/combo-box";import GroupChooser from "discourse/select-kit/components/group-chooser";+import DRelativeTimePicker from "discourse/ui-kit/d-relative-time-picker";+import DTextField from "discourse/ui-kit/d-text-field";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class EditCategorySettings extends buildCategoryPanel(@@ -439,7 +439,7 @@ export default class EditCategorySettings extends buildCategoryPanel({{i18n "category.default_slow_mode"}}</label><div class="category-default-slow-mode-seconds">- <RelativeTimePicker+ <DRelativeTimePicker@id="category-default-slow-mode"@durationMinutes={{this.category.defaultSlowModeMinutes}}@onChange={{this.onDefaultSlowModeDurationChange}}@@ -454,7 +454,7 @@ export default class EditCategorySettings extends buildCategoryPanel({{i18n "topic.auto_close.label"}}</label><div class="category-topic-auto-close-hours">- <RelativeTimePicker+ <DRelativeTimePicker@id="topic-auto-close"@durationHours={{this.category.auto_close_hours}}@hiddenIntervals={{this.hiddenRelativeIntervals}}@@ -613,7 +613,7 @@ export default class EditCategorySettings extends buildCategoryPanel(<label for="read-only-message">{{i18n"category.read_only_banner"}}</label>- <TextField+ <DTextField@valueProperty="value"@id="read-only-message"@value={{this.category.read_only_banner}}@@ -628,7 +628,7 @@ export default class EditCategorySettings extends buildCategoryPanel({{#if this.emailInEnabled}}<section class="field category-email-in"><label for="category-email-in">- {{icon "envelope"}}+ {{dIcon "envelope"}}{{i18n "category.email_in"}}</label><inputdiff --git a/frontend/discourse/admin/components/edit-category-tab.gjs b/frontend/discourse/admin/components/edit-category-tab.gjsindex 62e1c2571cc..0840bc8cde8 100644--- a/frontend/discourse/admin/components/edit-category-tab.gjs+++ b/frontend/discourse/admin/components/edit-category-tab.gjs@@ -6,11 +6,11 @@ import { scheduleOnce } from "@ember/runloop";import { underscore } from "@ember/string";import { isEmpty } from "@ember/utils";import { tagName } from "@ember-decorators/component";-import concatClass from "discourse/helpers/concat-class";import { addUniqueValueToArray } from "discourse/lib/array-tools";import getURL from "discourse/lib/get-url";import { deepEqual } from "discourse/lib/object";import DiscourseURL from "discourse/lib/url";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";@tagName("")@@ -70,7 +70,7 @@ export default class EditCategoryTab extends Component {<template><li- class={{concatClass (if this.active "active") this.tabClassName}}+ class={{dConcatClass (if this.active "active") this.tabClassName}}...attributes><a href {{on "click" this.select}} class={{if this.active "active"}}>diff --git a/frontend/discourse/admin/components/edit-category-tags.gjs b/frontend/discourse/admin/components/edit-category-tags.gjsindex f54b26474af..c36f23f285f 100644--- a/frontend/discourse/admin/components/edit-category-tags.gjs+++ b/frontend/discourse/admin/components/edit-category-tags.gjs@@ -4,11 +4,11 @@ import { action, computed, set } from "@ember/object";import { LinkTo } from "@ember/routing";import { isEmpty } from "@ember/utils";import { buildCategoryPanel } from "discourse/admin/components/edit-category-panel";-import DButton from "discourse/components/d-button";-import TextField from "discourse/components/text-field";import { removeValueFromArray } from "discourse/lib/array-tools";import TagChooser from "discourse/select-kit/components/tag-chooser";import TagGroupChooser from "discourse/select-kit/components/tag-group-chooser";+import DButton from "discourse/ui-kit/d-button";+import DTextField from "discourse/ui-kit/d-text-field";import { i18n } from "discourse-i18n";export default class EditCategoryTags extends buildCategoryPanel("tags") {@@ -57,7 +57,7 @@ export default class EditCategoryTags extends buildCategoryPanel("tags") {<label for="category-minimum-tags">{{i18n "category.minimum_required_tags"}}</label>- <TextField+ <DTextField@value={{this.category.minimum_required_tags}}@id="category-minimum-tags"@type="number"@@ -128,7 +128,7 @@ export default class EditCategoryTags extends buildCategoryPanel("tags") {<section class="field-item required-tag-groups">{{#each this.category.required_tag_groups as |rtg|}}<div class="required-tag-group-row">- <TextField @value={{rtg.min_count}} @type="number" @min="1" />+ <DTextField @value={{rtg.min_count}} @type="number" @min="1" /><TagGroupChooser@tagGroups={{if rtg.name (array rtg.name) (array)}}@onChange={{fn this.onTagGroupChange rtg}}diff --git a/frontend/discourse/admin/components/email-logs-list.gjs b/frontend/discourse/admin/components/email-logs-list.gjsindex ba642f94b17..58a75248c7e 100644--- a/frontend/discourse/admin/components/email-logs-list.gjs+++ b/frontend/discourse/admin/components/email-logs-list.gjs@@ -5,14 +5,14 @@ import { on } from "@ember/modifier";import { action } from "@ember/object";import didInsert from "@ember/render-modifiers/modifiers/did-insert";import EmailLog from "discourse/admin/models/email-log";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";import HorizontalScrollSyncWrapper from "discourse/components/horizontal-scroll-sync-wrapper";-import LoadMore from "discourse/components/load-more";-import TextField from "discourse/components/text-field";import { addUniqueValuesToArray } from "discourse/lib/array-tools";import discourseDebounce from "discourse/lib/debounce";import { INPUT_DELAY } from "discourse/lib/environment";import { autoTrackedArray } from "discourse/lib/tracked-tools";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DLoadMore from "discourse/ui-kit/d-load-more";+import DTextField from "discourse/ui-kit/d-text-field";import { i18n } from "discourse-i18n";export default class EmailLogsList extends Component {@@ -151,7 +151,7 @@ export default class EmailLogsList extends Component {}<template>- <LoadMore+ <DLoadMore@action={{this.loadMore}}@enabled={{this.canLoadMore}}@rootMargin="0px 0px 250px 0px"@@ -174,7 +174,7 @@ export default class EmailLogsList extends Component {</td>{{#each @filters as |filter|}}<td>- <TextField+ <DTextField@value={{get this.filterValues filter.property}}@placeholderKey={{filter.placeholder}}{{on "input" (fn this.updateFilter filter.name)}}@@ -203,8 +203,8 @@ export default class EmailLogsList extends Component {</tbody></table></HorizontalScrollSyncWrapper>- </LoadMore>+ </DLoadMore>- <ConditionalLoadingSpinner @condition={{this.loading}} />+ <DConditionalLoadingSpinner @condition={{this.loading}} /></template>}diff --git a/frontend/discourse/admin/components/email-styles-editor.gjs b/frontend/discourse/admin/components/email-styles-editor.gjsindex 65de7d219e8..37fa63d062b 100644--- a/frontend/discourse/admin/components/email-styles-editor.gjs+++ b/frontend/discourse/admin/components/email-styles-editor.gjs@@ -6,7 +6,7 @@ import { action, computed } from "@ember/object";import { service } from "@ember/service";import { tagName } from "@ember-decorators/component";import AceEditor from "discourse/components/ace-editor";-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";@tagName("")diff --git a/frontend/discourse/admin/components/embeddable-host.gjs b/frontend/discourse/admin/components/embeddable-host.gjsindex f5383639648..321a4ce6da7 100644--- a/frontend/discourse/admin/components/embeddable-host.gjs+++ b/frontend/discourse/admin/components/embeddable-host.gjs@@ -2,11 +2,11 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import DropdownMenu from "discourse/components/dropdown-menu";import DMenu from "discourse/float-kit/components/d-menu";-import categoryBadge from "discourse/helpers/category-badge";import Category from "discourse/models/category";+import DButton from "discourse/ui-kit/d-button";+import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";+import dCategoryBadge from "discourse/ui-kit/helpers/d-category-badge";import { i18n } from "discourse-i18n";export default class EmbeddableHost extends Component {@@ -56,7 +56,7 @@ export default class EmbeddableHost extends Component {<div class="d-table__mobile-label">{{i18n "admin.embedding.category"}}</div>- {{categoryBadge this.category allowUncategorized=true}}+ {{dCategoryBadge this.category allowUncategorized=true}}</td><td class="d-table__cell --detail"><div class="d-table__mobile-label">@@ -93,7 +93,7 @@ export default class EmbeddableHost extends Component {@onRegisterApi={{this.onRegisterApi}}><:content>- <DropdownMenu as |dropdown|>+ <DDropdownMenu as |dropdown|><dropdown.item><DButton@action={{this.delete}}@@ -102,7 +102,7 @@ export default class EmbeddableHost extends Component {class="btn-transparent --danger admin-embeddable-host-item__delete"/></dropdown.item>- </DropdownMenu>+ </DDropdownMenu></:content></DMenu></div>diff --git a/frontend/discourse/admin/components/emoji-uploader.gjs b/frontend/discourse/admin/components/emoji-uploader.gjsindex 2b4666170cc..eaad3c0488c 100644--- a/frontend/discourse/admin/components/emoji-uploader.gjs+++ b/frontend/discourse/admin/components/emoji-uploader.gjs@@ -7,11 +7,11 @@ import { getOwner } from "@ember/owner";import didInsert from "@ember/render-modifiers/modifiers/did-insert";import { isEmpty } from "@ember/utils";import { tagName } from "@ember-decorators/component";-import DButton from "discourse/components/d-button";import withEventValue from "discourse/helpers/with-event-value";import { uniqueItemsFromArray } from "discourse/lib/array-tools";import UppyUpload from "discourse/lib/uppy/uppy-upload";import ComboBox from "discourse/select-kit/components/combo-box";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";const DEFAULT_GROUP = "default";diff --git a/frontend/discourse/admin/components/emoji-value-list.gjs b/frontend/discourse/admin/components/emoji-value-list.gjsindex 4b4224823a8..1a9b474147c 100644--- a/frontend/discourse/admin/components/emoji-value-list.gjs+++ b/frontend/discourse/admin/components/emoji-value-list.gjs@@ -4,12 +4,12 @@ import { fn } from "@ember/helper";import { on } from "@ember/modifier";import { action, set, setProperties } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import EmojiPicker from "discourse/components/emoji-picker";import EmojiPickerDetached from "discourse/components/emoji-picker/detached";import { addUniqueValueToArray } from "discourse/lib/array-tools";import { emojiUrlFor } from "discourse/lib/text";import { not } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";export default class EmojiValueList extends Component {diff --git a/frontend/discourse/admin/components/flag-user.gjs b/frontend/discourse/admin/components/flag-user.gjsindex f63e3d3a616..e314133ce64 100644--- a/frontend/discourse/admin/components/flag-user.gjs+++ b/frontend/discourse/admin/components/flag-user.gjs@@ -3,8 +3,8 @@ import Component from "@ember/component";import { array } from "@ember/helper";import { LinkTo } from "@ember/routing";import { tagName } from "@ember-decorators/component";-import ageWithTooltip from "discourse/helpers/age-with-tooltip";-import avatar from "discourse/helpers/avatar";+import dAgeWithTooltip from "discourse/ui-kit/helpers/d-age-with-tooltip";+import dAvatar from "discourse/ui-kit/helpers/d-avatar";@tagName("")export default class FlagUser extends Component {@@ -16,7 +16,7 @@ export default class FlagUser extends Component {@models={{array this.user.id this.user.username}}class="flag-user-avatar">- {{avatar this.user imageSize="small"}}+ {{dAvatar this.user imageSize="small"}}</LinkTo><div class="flag-user-details"><div class="flag-user-who">@@ -28,7 +28,7 @@ export default class FlagUser extends Component {{{this.user.username}}</LinkTo><div class="flag-user-date">- {{ageWithTooltip this.date}}+ {{dAgeWithTooltip this.date}}</div></div><div class="flag-user-extra">diff --git a/frontend/discourse/admin/components/form-template/form.gjs b/frontend/discourse/admin/components/form-template/form.gjsindex 6c9dd8112c8..c83ae97214a 100644--- a/frontend/discourse/admin/components/form-template/form.gjs+++ b/frontend/discourse/admin/components/form-template/form.gjs@@ -7,10 +7,10 @@ import FormTemplateValidationOptionsModal from "discourse/admin/components/modalimport { templateFormFields } from "discourse/admin/lib/template-form-fields";import FormTemplate from "discourse/admin/models/form-template";import AceEditor from "discourse/components/ace-editor";-import DButton from "discourse/components/d-button";import FormTemplateFormPreview from "discourse/components/modal/form-template-form-preview";-import TextField from "discourse/components/text-field";import { popupAjaxError } from "discourse/lib/ajax-error";+import DButton from "discourse/ui-kit/d-button";+import DTextField from "discourse/ui-kit/d-text-field";import { i18n } from "discourse-i18n";export default class FormTemplateForm extends Component {@@ -157,7 +157,7 @@ export default class FormTemplateForm extends Component {<label for="template-name">{{i18n "admin.form_templates.new_template_form.name.label"}}</label>- <TextField+ <DTextField@value={{this.templateName}}@name="template-name"@placeholderKey="admin.form_templates.new_template_form.name.placeholder"diff --git a/frontend/discourse/admin/components/form-template/row-item.gjs b/frontend/discourse/admin/components/form-template/row-item.gjsindex 0f55f864978..b60a0a11015 100644--- a/frontend/discourse/admin/components/form-template/row-item.gjs+++ b/frontend/discourse/admin/components/form-template/row-item.gjs@@ -2,11 +2,11 @@ import Component from "@glimmer/component";import { fn } from "@ember/helper";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import CustomizeFormTemplateView from "discourse/components/modal/customize-form-template-view";-import categoryLink from "discourse/helpers/category-link";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";+import DButton from "discourse/ui-kit/d-button";+import dCategoryLink from "discourse/ui-kit/helpers/d-category-link";import { i18n } from "discourse-i18n";export default class FormTemplateRowItem extends Component {@@ -51,7 +51,7 @@ export default class FormTemplateRowItem extends Component {<td class="col first">{{@template.name}}</td><td class="col categories">{{#each this.activeCategories as |category|}}- {{categoryLink category}}+ {{dCategoryLink category}}{{/each}}</td><td class="col action">diff --git a/frontend/discourse/admin/components/images-uploader.gjs b/frontend/discourse/admin/components/images-uploader.gjsindex e2c9f54be68..aeecfbeeb13 100644--- a/frontend/discourse/admin/components/images-uploader.gjs+++ b/frontend/discourse/admin/components/images-uploader.gjs@@ -3,8 +3,8 @@ import Component from "@ember/component";import { getOwner } from "@ember/owner";import didInsert from "@ember/render-modifiers/modifiers/did-insert";import { tagName } from "@ember-decorators/component";-import icon from "discourse/helpers/d-icon";import UppyUpload from "discourse/lib/uppy/uppy-upload";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";@tagName("")@@ -35,7 +35,7 @@ export default class ImagesUploader extends Component {disabled={{this.uploadingOrProcessing}}title={{i18n "admin.site_settings.uploaded_image_list.upload.title"}}>- {{icon "far-image"}} {{this.uploadButtonText}}+ {{dIcon "far-image"}} {{this.uploadButtonText}}<input{{didInsert this.uppyUpload.setup}}class="hidden-upload-field"diff --git a/frontend/discourse/admin/components/inline-edit-checkbox.gjs b/frontend/discourse/admin/components/inline-edit-checkbox.gjsindex 96c7c893c6c..da50d7540a0 100644--- a/frontend/discourse/admin/components/inline-edit-checkbox.gjs+++ b/frontend/discourse/admin/components/inline-edit-checkbox.gjs@@ -3,9 +3,9 @@ import { fn } from "@ember/helper";import { on } from "@ember/modifier";import { action } from "@ember/object";import didUpdate from "@ember/render-modifiers/modifiers/did-update";-import DButton from "discourse/components/d-button";import withEventValue from "discourse/helpers/with-event-value";import { resettableTracked } from "discourse/lib/tracked-tools";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";// args: action, labelKey, checked, modelIddiff --git a/frontend/discourse/admin/components/install-theme-item.gjs b/frontend/discourse/admin/components/install-theme-item.gjsindex 4c272a5a119..a46e2385e67 100644--- a/frontend/discourse/admin/components/install-theme-item.gjs+++ b/frontend/discourse/admin/components/install-theme-item.gjs@@ -1,6 +1,6 @@import Component from "@glimmer/component";-import RadioButton from "discourse/components/radio-button";-import icon from "discourse/helpers/d-icon";+import DRadioButton from "discourse/ui-kit/d-radio-button";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class InstallThemeItem extends Component {@@ -10,7 +10,7 @@ export default class InstallThemeItem extends Component {<template><div class={{this.classes}}>- <RadioButton+ <DRadioButton@name="install-items"@id={{@value}}@value={{@value}}@@ -18,11 +18,11 @@ export default class InstallThemeItem extends Component {/><label class="radio" for={{@value}}>{{#if @showIcon}}- {{icon "plus"}}+ {{dIcon "plus"}}{{/if}}{{i18n @label}}</label>- {{icon "angle-right"}}+ {{dIcon "angle-right"}}</div></template>}diff --git a/frontend/discourse/admin/components/ip-lookup-accounts-table.gjs b/frontend/discourse/admin/components/ip-lookup-accounts-table.gjsindex 2e9e2fb5186..e645ae1fcad 100644--- a/frontend/discourse/admin/components/ip-lookup-accounts-table.gjs+++ b/frontend/discourse/admin/components/ip-lookup-accounts-table.gjs@@ -1,5 +1,5 @@import { LinkTo } from "@ember/routing";-import avatar from "discourse/helpers/avatar";+import dAvatar from "discourse/ui-kit/helpers/d-avatar";import { i18n } from "discourse-i18n";const IpLookupAccountsTable = <template>@@ -18,7 +18,7 @@ const IpLookupAccountsTable = <template><tr><td class="user"><LinkTo @route="adminUser" @model={{account}}>- {{avatar account imageSize="tiny"}}+ {{dAvatar account imageSize="tiny"}}<span>{{account.username}}</span></LinkTo></td>diff --git a/frontend/discourse/admin/components/ip-lookup.gjs b/frontend/discourse/admin/components/ip-lookup.gjsindex 7682ff65081..c8521f97604 100644--- a/frontend/discourse/admin/components/ip-lookup.gjs+++ b/frontend/discourse/admin/components/ip-lookup.gjs@@ -6,14 +6,14 @@ import { service } from "@ember/service";import { trustHTML } from "@ember/template";import IpLookupAccountsTable from "discourse/admin/components/ip-lookup-accounts-table";import AdminUser from "discourse/admin/models/admin-user";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DButton from "discourse/components/d-button";import DMenu from "discourse/float-kit/components/d-menu";-import loadingSpinner from "discourse/helpers/loading-spinner";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import { clipboardCopy } from "discourse/lib/utilities";import { gt } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import dLoadingSpinner from "discourse/ui-kit/helpers/d-loading-spinner";import { i18n } from "discourse-i18n";const MAX_ACCOUNTS_TO_DELETE = 50;@@ -210,7 +210,7 @@ export default class IpLookup extends Component {<dd>{{this.location.organization}}</dd>{{/if}}{{else}}- {{loadingSpinner size="small"}}+ {{dLoadingSpinner size="small"}}{{/if}}<dt class="other-accounts">@@ -234,7 +234,7 @@ export default class IpLookup extends Component {{{/if}}</dt>- <ConditionalLoadingSpinner+ <DConditionalLoadingSpinner@size="small"@condition={{this.otherAccountsLoading}}>@@ -243,7 +243,7 @@ export default class IpLookup extends Component {<IpLookupAccountsTable @accounts={{this.otherAccounts}} /></dd>{{/if}}- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner></dl><div class="powered-by">{{trustHTML(i18n "ip_lookup.powered_by")diff --git a/frontend/discourse/admin/components/modal/admin-search.gjs b/frontend/discourse/admin/components/modal/admin-search.gjsindex 7c13a1b95a7..d186570e560 100644--- a/frontend/discourse/admin/components/modal/admin-search.gjs+++ b/frontend/discourse/admin/components/modal/admin-search.gjs@@ -1,7 +1,7 @@import Component from "@glimmer/component";import { service } from "@ember/service";import AdminSearch from "discourse/admin/components/admin-search";-import DModal from "discourse/components/d-modal";+import DModal from "discourse/ui-kit/d-modal";export default class AdminSearchModal extends Component {@service router;diff --git a/frontend/discourse/admin/components/modal/api-key-urls.gjs b/frontend/discourse/admin/components/modal/api-key-urls.gjsindex bb74e6db14d..6c827084f42 100644--- a/frontend/discourse/admin/components/modal/api-key-urls.gjs+++ b/frontend/discourse/admin/components/modal/api-key-urls.gjs@@ -1,4 +1,4 @@-import DModal from "discourse/components/d-modal";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";const ApiKeyUrls = <template>diff --git a/frontend/discourse/admin/components/modal/badge-preview.gjs b/frontend/discourse/admin/components/modal/badge-preview.gjsindex 553857e1d57..0cc9cf4167a 100644--- a/frontend/discourse/admin/components/modal/badge-preview.gjs+++ b/frontend/discourse/admin/components/modal/badge-preview.gjs@@ -1,8 +1,8 @@import Component from "@glimmer/component";import { trustHTML } from "@ember/template";-import DModal from "discourse/components/d-modal";-import icon from "discourse/helpers/d-icon";import { escapeExpression } from "discourse/lib/utilities";+import DModal from "discourse/ui-kit/d-modal";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class BadgePreview extends Component {@@ -83,7 +83,7 @@ export default class BadgePreview extends Component {{{#if this.countWarning}}<div class="count-warning"><p class="heading">- {{icon "triangle-exclamation"}}+ {{dIcon "triangle-exclamation"}}{{i18n "admin.badges.preview.bad_count_warning.header"}}</p><p class="body">diff --git a/frontend/discourse/admin/components/modal/change-theme-source.gjs b/frontend/discourse/admin/components/modal/change-theme-source.gjsindex 723d8c2b876..4ba29bd371f 100644--- a/frontend/discourse/admin/components/modal/change-theme-source.gjs+++ b/frontend/discourse/admin/components/modal/change-theme-source.gjs@@ -2,13 +2,13 @@ import Component from "@glimmer/component";import { cached, tracked } from "@glimmer/tracking";import { action } from "@ember/object";import didInsert from "@ember/render-modifiers/modifiers/did-insert";-import ConditionalLoadingSection from "discourse/components/conditional-loading-section";-import CopyButton from "discourse/components/copy-button";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";import Form from "discourse/components/form";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSection from "discourse/ui-kit/d-conditional-loading-section";+import DCopyButton from "discourse/ui-kit/d-copy-button";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";export default class ChangeThemeSourceModal extends Component {@@ -107,7 +107,7 @@ export default class ChangeThemeSourceModal extends Component {@closeModal={{@closeModal}}><:body>- <ConditionalLoadingSection+ <DConditionalLoadingSection@isLoading={{this.loading}}@title={{i18n "admin.customize.theme.change_source.updating"}}>@@ -174,14 +174,14 @@ export default class ChangeThemeSourceModal extends Component {readonly="true"{{didInsert this.generatePublicKey}}>{{this.publicKey}}</textarea>- <CopyButton @selector="textarea.public-key-value" />+ <DCopyButton @selector="textarea.public-key-value" /></div></div>{{/if}}</div>{{/if}}</Form>- </ConditionalLoadingSection>+ </DConditionalLoadingSection></:body><:footer><DButtondiff --git a/frontend/discourse/admin/components/modal/color-scheme-select-base.gjs b/frontend/discourse/admin/components/modal/color-scheme-select-base.gjsindex be0da65b439..903a8f6f8c6 100644--- a/frontend/discourse/admin/components/modal/color-scheme-select-base.gjs+++ b/frontend/discourse/admin/components/modal/color-scheme-select-base.gjs@@ -2,9 +2,9 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { fn } from "@ember/helper";import { action } from "@ember/object";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";import ColorPalettePicker from "discourse/select-kit/components/color-palette-picker";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";export default class ColorSchemeSelectBase extends Component {diff --git a/frontend/discourse/admin/components/modal/custom-date-range.gjs b/frontend/discourse/admin/components/modal/custom-date-range.gjsindex e7f952c1aa2..4b8ff962226 100644--- a/frontend/discourse/admin/components/modal/custom-date-range.gjs+++ b/frontend/discourse/admin/components/modal/custom-date-range.gjs@@ -2,9 +2,9 @@import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";-import DateTimeInputRange from "discourse/components/date-time-input-range";+import DButton from "discourse/ui-kit/d-button";+import DDateTimeInputRange from "discourse/ui-kit/d-date-time-input-range";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";export default class CustomDateRange extends Component {@@ -30,7 +30,7 @@ export default class CustomDateRange extends Component {@closeModal={{@closeModal}}><:body>- <DateTimeInputRange+ <DDateTimeInputRange@from={{this.startDate}}@to={{this.endDate}}@onChange={{this.onChangeDateRange}}diff --git a/frontend/discourse/admin/components/modal/delete-posts-confirmation.gjs b/frontend/discourse/admin/components/modal/delete-posts-confirmation.gjsindex 6bedc226b76..f5478e5f76d 100644--- a/frontend/discourse/admin/components/modal/delete-posts-confirmation.gjs+++ b/frontend/discourse/admin/components/modal/delete-posts-confirmation.gjs@@ -2,8 +2,8 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { Input } from "@ember/component";import { trustHTML } from "@ember/template";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";export default class DeletePostsConfirmation extends Component {diff --git a/frontend/discourse/admin/components/modal/delete-user-posts-progress.gjs b/frontend/discourse/admin/components/modal/delete-user-posts-progress.gjsindex 967de9fce11..998cdacf865 100644--- a/frontend/discourse/admin/components/modal/delete-user-posts-progress.gjs+++ b/frontend/discourse/admin/components/modal/delete-user-posts-progress.gjs@@ -4,8 +4,8 @@ import { concat } from "@ember/helper";import { action } from "@ember/object";import { trustHTML } from "@ember/template";import AdminUser from "discourse/admin/models/admin-user";-import DModal from "discourse/components/d-modal";import { extractError } from "discourse/lib/ajax-error";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";export default class DeleteUserPostsProgress extends Component {diff --git a/frontend/discourse/admin/components/modal/edit-badge-groupings.gjs b/frontend/discourse/admin/components/modal/edit-badge-groupings.gjsindex 39d85cc978b..7cda4b70dc6 100644--- a/frontend/discourse/admin/components/modal/edit-badge-groupings.gjs+++ b/frontend/discourse/admin/components/modal/edit-badge-groupings.gjs@@ -3,11 +3,11 @@ import { Input } from "@ember/component";import { fn } from "@ember/helper";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";import { ajax } from "discourse/lib/ajax";import { removeValueFromArray } from "discourse/lib/array-tools";import { autoTrackedArray } from "discourse/lib/tracked-tools";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";export default class EditBadgeGroupings extends Component {diff --git a/frontend/discourse/admin/components/modal/form-template-validation-options.gjs b/frontend/discourse/admin/components/modal/form-template-validation-options.gjsindex d5ddffa514f..a6c1edac1dd 100644--- a/frontend/discourse/admin/components/modal/form-template-validation-options.gjs+++ b/frontend/discourse/admin/components/modal/form-template-validation-options.gjs@@ -1,5 +1,5 @@import Component from "@glimmer/component";-import DModal from "discourse/components/d-modal";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";const TABLE_HEADER_KEYS = ["key", "type", "description"];diff --git a/frontend/discourse/admin/components/modal/incoming-email.gjs b/frontend/discourse/admin/components/modal/incoming-email.gjsindex 336996c56c2..25fc4b02b88 100644--- a/frontend/discourse/admin/components/modal/incoming-email.gjs+++ b/frontend/discourse/admin/components/modal/incoming-email.gjs@@ -1,5 +1,5 @@import { Textarea } from "@ember/component";-import DModal from "discourse/components/d-modal";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";const IncomingEmail = <template>diff --git a/frontend/discourse/admin/components/modal/install-theme.gjs b/frontend/discourse/admin/components/modal/install-theme.gjsindex bb76ce2af93..d6baaf16cc3 100644--- a/frontend/discourse/admin/components/modal/install-theme.gjs+++ b/frontend/discourse/admin/components/modal/install-theme.gjs@@ -9,17 +9,17 @@ import { service } from "@ember/service";import { trustHTML } from "@ember/template";import InstallThemeItem from "discourse/admin/components/install-theme-item";import { COMPONENTS, THEMES } from "discourse/admin/models/theme";-import ConditionalLoadingSection from "discourse/components/conditional-loading-section";-import CopyButton from "discourse/components/copy-button";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";-import icon from "discourse/helpers/d-icon";import withEventValue from "discourse/helpers/with-event-value";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import discourseLater from "discourse/lib/later";import { POPULAR_THEMES } from "discourse/lib/popular-themes";import ComboBox from "discourse/select-kit/components/combo-box";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSection from "discourse/ui-kit/d-conditional-loading-section";+import DCopyButton from "discourse/ui-kit/d-copy-button";+import DModal from "discourse/ui-kit/d-modal";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";const MIN_NAME_LENGTH = 4;@@ -315,7 +315,7 @@ export default class InstallThemeModal extends Component {</div>{{/unless}}<div class="install-theme-content">- <ConditionalLoadingSection+ <DConditionalLoadingSection@isLoading={{this.loading}}@title={{this.installingMessage}}>@@ -343,7 +343,7 @@ export default class InstallThemeModal extends Component {target="_blank">{{#if theme.component}}- {{icon+ {{dIcon"puzzle-piece"title="admin.customize.theme.component"}}@@ -373,7 +373,7 @@ export default class InstallThemeModal extends Component {rel="noopener noreferrer"target="_blank">- {{icon "desktop"}}+ {{dIcon "desktop"}}{{i18n "admin.customize.theme.preview"}}</a>{{/if}}@@ -444,7 +444,7 @@ export default class InstallThemeModal extends Component {value={{this.publicKey}}{{didInsert this.generatePublicKey}}/>- <CopyButton @selector="textarea.public-key-value" />+ <DCopyButton @selector="textarea.public-key-value" /></div></div>{{/if}}@@ -486,7 +486,7 @@ export default class InstallThemeModal extends Component {<pre><code>{{this.uploadUrl}}</code></pre></div>{{/if}}- </ConditionalLoadingSection>+ </DConditionalLoadingSection></div></:body><:footer>diff --git a/frontend/discourse/admin/components/modal/merge-users-confirmation.gjs b/frontend/discourse/admin/components/modal/merge-users-confirmation.gjsindex 4b5e2b0f8a9..3e9ed1aa899 100644--- a/frontend/discourse/admin/components/modal/merge-users-confirmation.gjs+++ b/frontend/discourse/admin/components/modal/merge-users-confirmation.gjs@@ -3,8 +3,8 @@ import { tracked } from "@glimmer/tracking";import { Input } from "@ember/component";import { fn } from "@ember/helper";import { trustHTML } from "@ember/template";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";export default class MergeUsersConfirmation extends Component {diff --git a/frontend/discourse/admin/components/modal/merge-users-progress.gjs b/frontend/discourse/admin/components/modal/merge-users-progress.gjsindex 121efe11a6e..434cff74374 100644--- a/frontend/discourse/admin/components/modal/merge-users-progress.gjs+++ b/frontend/discourse/admin/components/modal/merge-users-progress.gjs@@ -1,9 +1,9 @@import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { service } from "@ember/service";-import DModal from "discourse/components/d-modal";import { bind } from "discourse/lib/decorators";import DiscourseURL from "discourse/lib/url";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";export default class MergeUsersProgress extends Component {diff --git a/frontend/discourse/admin/components/modal/merge-users-prompt.gjs b/frontend/discourse/admin/components/modal/merge-users-prompt.gjsindex 389e4154e6f..122e70601ef 100644--- a/frontend/discourse/admin/components/modal/merge-users-prompt.gjs+++ b/frontend/discourse/admin/components/modal/merge-users-prompt.gjs@@ -2,9 +2,9 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { fn, get, hash } from "@ember/helper";import { trustHTML } from "@ember/template";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";import EmailGroupUserChooser from "discourse/select-kit/components/email-group-user-chooser";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";export default class MergeUsersPrompt extends Component {diff --git a/frontend/discourse/admin/components/modal/penalize-user.gjs b/frontend/discourse/admin/components/modal/penalize-user.gjsindex db5dc9d5e84..a29a09ebe7b 100644--- a/frontend/discourse/admin/components/modal/penalize-user.gjs+++ b/frontend/discourse/admin/components/modal/penalize-user.gjs@@ -9,11 +9,11 @@ import { isEmpty } from "@ember/utils";import AdminPenaltyPostAction from "discourse/admin/components/admin-penalty-post-action";import AdminPenaltyReason from "discourse/admin/components/admin-penalty-reason";import AdminPenaltySimilarUsers from "discourse/admin/components/admin-penalty-similar-users";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";-import FutureDateInput from "discourse/components/future-date-input";import { extractError } from "discourse/lib/ajax-error";import { eq } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DFutureDateInput from "discourse/ui-kit/d-future-date-input";+import DModal from "discourse/ui-kit/d-modal";import I18n, { i18n } from "discourse-i18n";export default class PenalizeUser extends Component {@@ -165,7 +165,7 @@ export default class PenalizeUser extends Component {{{#if this.canPenalize}}<div class="penalty-duration-controls">{{#if (eq @model.penaltyType "suspend")}}- <FutureDateInput+ <DFutureDateInput@label="admin.user.suspend_duration"@clearable={{false}}@input={{this.penalizeUntil}}@@ -173,7 +173,7 @@ export default class PenalizeUser extends Component {class="suspend-until"/>{{else if (eq @model.penaltyType "silence")}}- <FutureDateInput+ <DFutureDateInput@label="admin.user.silence_duration"@clearable={{false}}@input={{this.penalizeUntil}}diff --git a/frontend/discourse/admin/components/modal/reseed.gjs b/frontend/discourse/admin/components/modal/reseed.gjsindex 4f902cf2e70..94b29f982e7 100644--- a/frontend/discourse/admin/components/modal/reseed.gjs+++ b/frontend/discourse/admin/components/modal/reseed.gjs@@ -2,11 +2,11 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { Input } from "@ember/component";import { action } from "@ember/object";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";-import DModalCancel from "discourse/components/d-modal-cancel";import { ajax } from "discourse/lib/ajax";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DModal from "discourse/ui-kit/d-modal";+import DModalCancel from "discourse/ui-kit/d-modal-cancel";import { i18n } from "discourse-i18n";export default class Reseed extends Component {@@ -66,7 +66,7 @@ export default class Reseed extends Component {@flash={{this.flash}}><:body>- <ConditionalLoadingSpinner @condition={{this.loading}}>+ <DConditionalLoadingSpinner @condition={{this.loading}}>{{#if this.categories}}<fieldset><legend class="options-group-title">@@ -102,7 +102,7 @@ export default class Reseed extends Component {{{/each}}</fieldset>{{/if}}- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner></:body><:footer><DButtondiff --git a/frontend/discourse/admin/components/modal/scrub-rejected-user.gjs b/frontend/discourse/admin/components/modal/scrub-rejected-user.gjsindex a1967f7cc97..7327014229b 100644--- a/frontend/discourse/admin/components/modal/scrub-rejected-user.gjs+++ b/frontend/discourse/admin/components/modal/scrub-rejected-user.gjs@@ -4,10 +4,10 @@ import { fn } from "@ember/helper";import { on } from "@ember/modifier";import { action } from "@ember/object";import { isEmpty } from "@ember/utils";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";-import TextField from "discourse/components/text-field";import withEventValue from "discourse/helpers/with-event-value";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";+import DTextField from "discourse/ui-kit/d-text-field";import { i18n } from "discourse-i18n";export default class ScrubRejectedUserModal extends Component {@@ -38,7 +38,7 @@ export default class ScrubRejectedUserModal extends Component {"review.user.scrub_record.reason_title"}}</label>- <TextField+ <DTextFieldclass="scrub-reason"id="scrub-reason"@placeholderKey="review.user.scrub_record.reason_placeholder"diff --git a/frontend/discourse/admin/components/modal/site-setting-default-categories.gjs b/frontend/discourse/admin/components/modal/site-setting-default-categories.gjsindex 162aa6d568c..e5bc641b810 100644--- a/frontend/discourse/admin/components/modal/site-setting-default-categories.gjs+++ b/frontend/discourse/admin/components/modal/site-setting-default-categories.gjs@@ -1,8 +1,8 @@import Component from "@glimmer/component";import { action } from "@ember/object";import { trustHTML } from "@ember/template";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";export default class SiteSettingDefaultCategories extends Component {diff --git a/frontend/discourse/admin/components/modal/staff-action-log-change.gjs b/frontend/discourse/admin/components/modal/staff-action-log-change.gjsindex 99b5139bcdb..a2a135f86dd 100644--- a/frontend/discourse/admin/components/modal/staff-action-log-change.gjs+++ b/frontend/discourse/admin/components/modal/staff-action-log-change.gjs@@ -2,9 +2,9 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";import { trustHTML } from "@ember/template";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";import { ajax } from "discourse/lib/ajax";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";export default class AdminStaffActionLogComponent extends Component {diff --git a/frontend/discourse/admin/components/modal/staff-action-log-details.gjs b/frontend/discourse/admin/components/modal/staff-action-log-details.gjsindex f95442465f3..471e6aca124 100644--- a/frontend/discourse/admin/components/modal/staff-action-log-details.gjs+++ b/frontend/discourse/admin/components/modal/staff-action-log-details.gjs@@ -1,5 +1,5 @@-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";const StaffActionLogDetails = <template>diff --git a/frontend/discourse/admin/components/modal/start-backup.gjs b/frontend/discourse/admin/components/modal/start-backup.gjsindex 7bc2137d723..918548bd767 100644--- a/frontend/discourse/admin/components/modal/start-backup.gjs+++ b/frontend/discourse/admin/components/modal/start-backup.gjs@@ -4,8 +4,8 @@ import { Input } from "@ember/component";import { action } from "@ember/object";import { service } from "@ember/service";import { trustHTML } from "@ember/template";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";export default class StartBackup extends Component {diff --git a/frontend/discourse/admin/components/modal/tag-upload.gjs b/frontend/discourse/admin/components/modal/tag-upload.gjsindex 3fb2407a522..087c030fc1f 100644--- a/frontend/discourse/admin/components/modal/tag-upload.gjs+++ b/frontend/discourse/admin/components/modal/tag-upload.gjs@@ -1,6 +1,6 @@import TagsUploader from "discourse/admin/components/tags-uploader";-import DModal from "discourse/components/d-modal";import routeAction from "discourse/helpers/route-action";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";const TagUpload = <template>diff --git a/frontend/discourse/admin/components/modal/uploaded-image-list.gjs b/frontend/discourse/admin/components/modal/uploaded-image-list.gjsindex 889e9198f96..880d3f0e270 100644--- a/frontend/discourse/admin/components/modal/uploaded-image-list.gjs+++ b/frontend/discourse/admin/components/modal/uploaded-image-list.gjs@@ -3,15 +3,15 @@ import { fn } from "@ember/helper";import { on } from "@ember/modifier";import { action } from "@ember/object";import ImagesUploader from "discourse/admin/components/images-uploader";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";-import boundAvatarTemplate from "discourse/helpers/bound-avatar-template";-import icon from "discourse/helpers/d-icon";import {addUniqueValueToArray,removeValueFromArray,} from "discourse/lib/array-tools";import { autoTrackedArray } from "discourse/lib/tracked-tools";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";+import dBoundAvatarTemplate from "discourse/ui-kit/helpers/d-bound-avatar-template";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class UploadedImageList extends Component {@@ -51,8 +51,8 @@ export default class UploadedImageList extends Component {class="selectable-avatar"{{on "click" (fn this.remove image)}}>- {{boundAvatarTemplate image "huge"}}- <span class="selectable-avatar__remove">{{icon+ {{dBoundAvatarTemplate image "huge"}}+ <span class="selectable-avatar__remove">{{dIcon"circle-xmark"}}</span></a>diff --git a/frontend/discourse/admin/components/modal/watched-word-testing.gjs b/frontend/discourse/admin/components/modal/watched-word-testing.gjsindex 13777adee47..b2fb214dbb6 100644--- a/frontend/discourse/admin/components/modal/watched-word-testing.gjs+++ b/frontend/discourse/admin/components/modal/watched-word-testing.gjs@@ -1,8 +1,8 @@import Component from "@glimmer/component";import { cached, tracked } from "@glimmer/tracking";import { Textarea } from "@ember/component";-import DModal from "discourse/components/d-modal";import { or } from "discourse/truth-helpers";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";export default class WatchedWordTesting extends Component {diff --git a/frontend/discourse/admin/components/permalink-form.gjs b/frontend/discourse/admin/components/permalink-form.gjsindex fe999a7ebc2..9df34f6886a 100644--- a/frontend/discourse/admin/components/permalink-form.gjs+++ b/frontend/discourse/admin/components/permalink-form.gjs@@ -6,10 +6,10 @@ import { schedule } from "@ember/runloop";import { service } from "@ember/service";import { tagName } from "@ember-decorators/component";import Permalink from "discourse/admin/models/permalink";-import DButton from "discourse/components/d-button";-import TextField from "discourse/components/text-field";import { bind } from "discourse/lib/decorators";import ComboBox from "discourse/select-kit/components/combo-box";+import DButton from "discourse/ui-kit/d-button";+import DTextField from "discourse/ui-kit/d-text-field";import { i18n } from "discourse-i18n";@tagName("")@@ -103,7 +103,7 @@ export default class PermalinkForm extends Component {<div class="inline-form"><label>{{i18n "admin.permalink.form.label"}}</label>- <TextField+ <DTextField@value={{this.url}}@disabled={{this.formSubmitted}}@placeholderKey="admin.permalink.url"@@ -119,7 +119,7 @@ export default class PermalinkForm extends Component {class="permalink-type"/>- <TextField+ <DTextField@value={{this.permalinkTypeValue}}@disabled={{this.formSubmitted}}@placeholderKey={{this.permalinkTypePlaceholder}}diff --git a/frontend/discourse/admin/components/problem-check-item.gjs b/frontend/discourse/admin/components/problem-check-item.gjsindex 5953c5da63e..bf7501c3558 100644--- a/frontend/discourse/admin/components/problem-check-item.gjs+++ b/frontend/discourse/admin/components/problem-check-item.gjs@@ -2,11 +2,11 @@ import Component from "@glimmer/component";import { fn, get } from "@ember/helper";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import formatDate from "discourse/helpers/format-date";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import { notEq } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import dFormatDate from "discourse/ui-kit/helpers/d-format-date";import { i18n } from "discourse-i18n";const STATUS_CLASSES = {@@ -75,7 +75,7 @@ export default class ProblemCheckItem extends Component {"admin.config.problem_checks.last_run_at"}}</div>{{#if @tracker.last_run_at}}- {{formatDate @tracker.last_run_at leaveAgo="true"}}+ {{dFormatDate @tracker.last_run_at leaveAgo="true"}}{{/if}}</td><td class="d-table__cell --controls">diff --git a/frontend/discourse/admin/components/redesigned-admin-dashboard.gjs b/frontend/discourse/admin/components/redesigned-admin-dashboard.gjsindex f57c8e68450..2a5b519a7a6 100644--- a/frontend/discourse/admin/components/redesigned-admin-dashboard.gjs+++ b/frontend/discourse/admin/components/redesigned-admin-dashboard.gjs@@ -3,9 +3,9 @@ import DashboardEngagement from "discourse/admin/components/dashboard/engagementimport DashboardHighlights from "discourse/admin/components/dashboard/highlights";import DashboardReports from "discourse/admin/components/dashboard/reports";import DashboardTraffic from "discourse/admin/components/dashboard/traffic";-import DToggleSwitch from "discourse/components/d-toggle-switch";import DMenu from "discourse/float-kit/components/d-menu";-import icon from "discourse/helpers/d-icon";+import DToggleSwitch from "discourse/ui-kit/d-toggle-switch";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";const sections = [@@ -56,7 +56,7 @@ const RedesignedAdminDashboard = <template><ul class="db-customise__list">{{#each sections as |s|}}<li class="db-customise__row">- <span class="db-customise__drag-handle">{{icon+ <span class="db-customise__drag-handle">{{dIcon"grip-vertical"}}</span><span class="db-customise__section-name">{{i18ndiff --git a/frontend/discourse/admin/components/schema-setting/editor.gjs b/frontend/discourse/admin/components/schema-setting/editor.gjsindex 1053a91f9e6..1c705177ea4 100644--- a/frontend/discourse/admin/components/schema-setting/editor.gjs+++ b/frontend/discourse/admin/components/schema-setting/editor.gjs@@ -7,12 +7,12 @@ import { trackedArray } from "@ember/reactive/collections";import { service } from "@ember/service";import Tree from "discourse/admin/components/schema-setting/editor/tree";import FieldInput from "discourse/admin/components/schema-setting/field";-import DButton from "discourse/components/d-button";import { popupAjaxError } from "discourse/lib/ajax-error";import { cloneJSON } from "discourse/lib/object";import { autoTrackedArray } from "discourse/lib/tracked-tools";import Category from "discourse/models/category";import { gt, not } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";export default class SchemaSettingNewEditor extends Component {diff --git a/frontend/discourse/admin/components/schema-setting/editor/child-tree-node.gjs b/frontend/discourse/admin/components/schema-setting/editor/child-tree-node.gjsindex 5654d3d0424..add20bf7454 100644--- a/frontend/discourse/admin/components/schema-setting/editor/child-tree-node.gjs+++ b/frontend/discourse/admin/components/schema-setting/editor/child-tree-node.gjs@@ -1,5 +1,5 @@import { on } from "@ember/modifier";-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";<template><li@@ -10,7 +10,7 @@ import icon from "discourse/helpers/d-icon";><div class="schema-setting-editor__tree-node-text"><span>{{@generateSchemaTitle @object @schema @index}}</span>- {{icon "chevron-right"}}+ {{dIcon "chevron-right"}}</div></li></template>diff --git a/frontend/discourse/admin/components/schema-setting/editor/child-tree.gjs b/frontend/discourse/admin/components/schema-setting/editor/child-tree.gjsindex 4aeab5bbcbb..bf32bfae0d8 100644--- a/frontend/discourse/admin/components/schema-setting/editor/child-tree.gjs+++ b/frontend/discourse/admin/components/schema-setting/editor/child-tree.gjs@@ -4,8 +4,8 @@ import { fn } from "@ember/helper";import { on } from "@ember/modifier";import { action } from "@ember/object";import ChildTreeNode from "discourse/admin/components/schema-setting/editor/child-tree-node";-import DButton from "discourse/components/d-button";-import icon from "discourse/helpers/d-icon";+import DButton from "discourse/ui-kit/d-button";+import dIcon from "discourse/ui-kit/helpers/d-icon";export default class SchemaSettingNewEditorChildTree extends Component {@tracked expanded = true;@@ -32,7 +32,7 @@ export default class SchemaSettingNewEditorChildTree extends Component {{{on "click" this.toggleVisibility}}>{{@name}}- {{icon (if this.expanded "chevron-down" "chevron-right")}}+ {{dIcon (if this.expanded "chevron-down" "chevron-right")}}</div>{{#if this.expanded}}diff --git a/frontend/discourse/admin/components/schema-setting/editor/tree-node.gjs b/frontend/discourse/admin/components/schema-setting/editor/tree-node.gjsindex 46f3425c30f..8b440454993 100644--- a/frontend/discourse/admin/components/schema-setting/editor/tree-node.gjs+++ b/frontend/discourse/admin/components/schema-setting/editor/tree-node.gjs@@ -3,10 +3,10 @@ import { tracked } from "@glimmer/tracking";import { get } from "@ember/helper";import { on } from "@ember/modifier";import ChildTree from "discourse/admin/components/schema-setting/editor/child-tree";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import { bind } from "discourse/lib/decorators";import { gt } from "discourse/truth-helpers";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";export default class SchemaSettingNewEditorTreeNode extends Component {@tracked text;@@ -51,7 +51,7 @@ export default class SchemaSettingNewEditorTreeNode extends Component {<li{{on "click" @onClick}}role="link"- class={{concatClass+ class={{dConcatClass"schema-setting-editor__tree-node --parent"(if @active "--active")}}@@ -60,9 +60,9 @@ export default class SchemaSettingNewEditorTreeNode extends Component {<span>{{this.text}}</span>{{#if (gt this.childObjectsProperties.length 0)}}- {{icon (if @active "chevron-down" "chevron-right")}}+ {{dIcon (if @active "chevron-down" "chevron-right")}}{{else}}- {{icon "chevron-right"}}+ {{dIcon "chevron-right"}}{{/if}}</div>diff --git a/frontend/discourse/admin/components/schema-setting/editor/tree.gjs b/frontend/discourse/admin/components/schema-setting/editor/tree.gjsindex 849fc698cdf..10591c57b7e 100644--- a/frontend/discourse/admin/components/schema-setting/editor/tree.gjs+++ b/frontend/discourse/admin/components/schema-setting/editor/tree.gjs@@ -1,9 +1,9 @@import { fn } from "@ember/helper";import { on } from "@ember/modifier";import TreeNode from "discourse/admin/components/schema-setting/editor/tree-node";-import DButton from "discourse/components/d-button";-import icon from "discourse/helpers/d-icon";import { eq } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import dIcon from "discourse/ui-kit/helpers/d-icon";<template><ul class="schema-setting-editor__tree">@@ -14,7 +14,7 @@ import { eq } from "discourse/truth-helpers";{{on "click" @clickBack}}><div class="schema-setting-editor__tree-node-text">- {{icon "arrow-left"}}+ {{dIcon "arrow-left"}}{{@backButtonText}}</div></li>diff --git a/frontend/discourse/admin/components/schema-setting/types/string.gjs b/frontend/discourse/admin/components/schema-setting/types/string.gjsindex 5781c1f1102..7d935d429ef 100644--- a/frontend/discourse/admin/components/schema-setting/types/string.gjs+++ b/frontend/discourse/admin/components/schema-setting/types/string.gjs@@ -4,8 +4,8 @@ import { Input } from "@ember/component";import { on } from "@ember/modifier";import { action } from "@ember/object";import FieldInputDescription from "discourse/admin/components/schema-setting/field-input-description";-import concatClass from "discourse/helpers/concat-class";import { and, not } from "discourse/truth-helpers";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";export default class SchemaSettingTypeString extends Component {@@ -68,7 +68,7 @@ export default class SchemaSettingTypeString extends Component {{{#if this.maxLength}}<div- class={{concatClass+ class={{dConcatClass"schema-field__input-count"(if this.validationErrorMessage " --error")}}diff --git a/frontend/discourse/admin/components/screened-ip-address-form.gjs b/frontend/discourse/admin/components/screened-ip-address-form.gjsindex 75524423ab3..cd132affd0a 100644--- a/frontend/discourse/admin/components/screened-ip-address-form.gjs+++ b/frontend/discourse/admin/components/screened-ip-address-form.gjs@@ -6,9 +6,9 @@ import { schedule } from "@ember/runloop";import { service } from "@ember/service";import { classNames, tagName } from "@ember-decorators/component";import ScreenedIpAddress from "discourse/admin/models/screened-ip-address";-import DButton from "discourse/components/d-button";-import TextField from "discourse/components/text-field";import ComboBox from "discourse/select-kit/components/combo-box";+import DButton from "discourse/ui-kit/d-button";+import DTextField from "discourse/ui-kit/d-text-field";import { i18n } from "discourse-i18n";/**@@ -94,7 +94,7 @@ export default class ScreenedIpAddressForm extends Component {<template><label>{{i18n "admin.logs.screened_ips.form.label"}}</label>- <TextField+ <DTextField@value={{this.ip_address}}@disabled={{this.formSubmitted}}@placeholderKey="admin.logs.screened_ips.form.ip_address"diff --git a/frontend/discourse/admin/components/secret-value-list.gjs b/frontend/discourse/admin/components/secret-value-list.gjsindex 9a08f5b8d4d..e0270097df2 100644--- a/frontend/discourse/admin/components/secret-value-list.gjs+++ b/frontend/discourse/admin/components/secret-value-list.gjs@@ -5,9 +5,9 @@ import { fn } from "@ember/helper";import { on } from "@ember/modifier";import { action, set } from "@ember/object";import { isEmpty } from "@ember/utils";-import DButton from "discourse/components/d-button";-import TextField from "discourse/components/text-field";import { addUniqueValueToArray } from "discourse/lib/array-tools";+import DButton from "discourse/ui-kit/d-button";+import DTextField from "discourse/ui-kit/d-text-field";import { i18n } from "discourse-i18n";const INPUT_DELIMITER = "\n";@@ -165,7 +165,7 @@ export default class SecretValueList extends Component {{{/if}}<div class="value">- <TextField+ <DTextField@value={{this.newKey}}@placeholder={{this.setting.placeholder.key}}class="new-value-input key"diff --git a/frontend/discourse/admin/components/setting-validation-message.gjs b/frontend/discourse/admin/components/setting-validation-message.gjsindex e1c33b1e34c..035f4d3b3e6 100644--- a/frontend/discourse/admin/components/setting-validation-message.gjs+++ b/frontend/discourse/admin/components/setting-validation-message.gjs@@ -1,14 +1,14 @@/* eslint-disable ember/no-classic-components */import Component from "@ember/component";import { tagName } from "@ember-decorators/component";-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";@tagName("")export default class SettingValidationMessage extends Component {<template><div ...attributes><div class="validation-error {{unless this.message 'hidden'}}">- {{icon "xmark"}}+ {{dIcon "xmark"}}{{this.message}}</div></div>diff --git a/frontend/discourse/admin/components/silence-details.gjs b/frontend/discourse/admin/components/silence-details.gjsindex 428c7321c61..7b21e1bb43e 100644--- a/frontend/discourse/admin/components/silence-details.gjs+++ b/frontend/discourse/admin/components/silence-details.gjs@@ -2,7 +2,7 @@import Component, { Textarea } from "@ember/component";import { trustHTML } from "@ember/template";import { tagName } from "@ember-decorators/component";-import TextField from "discourse/components/text-field";+import DTextField from "discourse/ui-kit/d-text-field";import { i18n } from "discourse-i18n";@tagName("")@@ -14,7 +14,7 @@ export default class SilenceDetails extends Component {{{trustHTML (i18n "admin.user.silence_reason_label")}}</div></label>- <TextField+ <DTextField@value={{this.reason}}@placeholderKey="admin.user.silence_reason_placeholder"class="silence-reason"diff --git a/frontend/discourse/admin/components/simple-list.gjs b/frontend/discourse/admin/components/simple-list.gjsindex 7b100d72f23..810715b7547 100644--- a/frontend/discourse/admin/components/simple-list.gjs+++ b/frontend/discourse/admin/components/simple-list.gjs@@ -4,10 +4,10 @@ import { fn, hash } from "@ember/helper";import { on } from "@ember/modifier";import { action } from "@ember/object";import { trackedArray } from "@ember/reactive/collections";-import DButton from "discourse/components/d-button";import withEventValue from "discourse/helpers/with-event-value";import ComboBox from "discourse/select-kit/components/combo-box";import { gt, not } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";// args: onChange, inputDelimiter, values, allowAny, choicesdiff --git a/frontend/discourse/admin/components/site-setting.gjs b/frontend/discourse/admin/components/site-setting.gjsindex 7fe5402bfb5..a66351cdc15 100644--- a/frontend/discourse/admin/components/site-setting.gjs+++ b/frontend/discourse/admin/components/site-setting.gjs@@ -16,11 +16,8 @@ import JobStatus from "discourse/admin/components/site-settings/job-status";import SiteSetting, {isSettingValueTrue,} from "discourse/admin/models/site-setting";-import DButton from "discourse/components/d-button";import JsonSchemaEditorModal from "discourse/components/modal/json-schema-editor";import PluginOutlet from "discourse/components/plugin-outlet";-import basePath from "discourse/helpers/base-path";-import icon from "discourse/helpers/d-icon";import lazyHash from "discourse/helpers/lazy-hash";import { uniqueItemsFromArray } from "discourse/lib/array-tools";import { bind } from "discourse/lib/decorators";@@ -28,6 +25,9 @@ import { deepEqual } from "discourse/lib/object";import { sanitize } from "discourse/lib/text";import { splitString } from "discourse/lib/utilities";import { and } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import dBasePath from "discourse/ui-kit/helpers/d-base-path";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";const CUSTOM_TYPES = [@@ -161,7 +161,7 @@ export default class SiteSettingComponent extends Component {}get dependsOnNoticeText() {- const path = basePath();+ const path = dBasePath();const links = this.setting.depends_on.map((name, index) => {const label = sanitize(@@ -183,7 +183,7 @@ export default class SiteSettingComponent extends Component {get themeSiteSettingWarningText() {return trustHTML(i18n("admin.theme_site_settings.site_setting_warning", {- basePath,+ basePath: dBasePath,defaultThemeName: sanitize(this.defaultTheme.name),defaultThemeId: this.defaultTheme.theme_id,})@@ -207,7 +207,7 @@ export default class SiteSettingComponent extends Component {) {return trustHTML(i18n("admin.upcoming_changes.default_warning", {- basePath,+ basePath: dBasePath,changeNamesFilter:this.setting.upcoming_change_default_override_metadata.change_setting_name,@@ -221,7 +221,7 @@ export default class SiteSettingComponent extends Component {return trustHTML(i18n("admin.upcoming_changes.default_warning_short", {- basePath,+ basePath: dBasePath,changeNamesFilter:this.setting.upcoming_change_default_override_metadata.change_setting_name,@@ -534,7 +534,7 @@ export default class SiteSettingComponent extends Component {title={{i18n "admin.settings.history"}}><span class="history-icon">- {{icon "clock-rotate-left"}}+ {{dIcon "clock-rotate-left"}}</span></LinkTo>{{/if}}@@ -591,7 +591,7 @@ export default class SiteSettingComponent extends Component {{{#if this.showThemeSiteSettingWarning}}<div class="setting-override-warning setting-theme-warning"><p class="setting-theme-warning__text">- {{icon "paintbrush"}}+ {{dIcon "paintbrush"}}{{this.themeSiteSettingWarningText}}</p></div>@@ -601,7 +601,7 @@ export default class SiteSettingComponent extends Component {class="setting-override-warning setting-upcoming-change-warning"><p class="setting-upcoming-change-warning__text">- {{icon "flask"}}+ {{dIcon "flask"}}{{this.upcomingChangeDefaultWarningText}}</p></div>@@ -609,7 +609,7 @@ export default class SiteSettingComponent extends Component {{{#if this.showDependsOnNotice}}<div class="setting-override-warning setting-depends-on-notice"><p class="setting-depends-on-notice__text">- {{icon "link"}}+ {{dIcon "link"}}{{this.dependsOnNoticeText}}</p></div>diff --git a/frontend/discourse/admin/components/site-settings/datetime.gjs b/frontend/discourse/admin/components/site-settings/datetime.gjsindex df9c3dbd667..38a3d076980 100644--- a/frontend/discourse/admin/components/site-settings/datetime.gjs+++ b/frontend/discourse/admin/components/site-settings/datetime.gjs@@ -2,7 +2,7 @@ import Component from "@glimmer/component";import { Input } from "@ember/component";import { on } from "@ember/modifier";import { action } from "@ember/object";-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";export default class Datetime extends Component {@actiondiff --git a/frontend/discourse/admin/components/site-settings/file-types-list.gjs b/frontend/discourse/admin/components/site-settings/file-types-list.gjsindex 970bdae9fae..0e3c2819a5f 100644--- a/frontend/discourse/admin/components/site-settings/file-types-list.gjs+++ b/frontend/discourse/admin/components/site-settings/file-types-list.gjs@@ -4,10 +4,10 @@ import { fn, hash } from "@ember/helper";import { action } from "@ember/object";import { service } from "@ember/service";import { isEmpty } from "@ember/utils";-import DButton from "discourse/components/d-button";import { uniqueItemsFromArray } from "discourse/lib/array-tools";import { makeArray } from "discourse/lib/helpers";import ListSetting from "discourse/select-kit/components/list-setting";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";const IMAGE_TYPES = [diff --git a/frontend/discourse/admin/components/site-settings/icon.gjs b/frontend/discourse/admin/components/site-settings/icon.gjsindex 9175bc2293c..14e32c59f81 100644--- a/frontend/discourse/admin/components/site-settings/icon.gjs+++ b/frontend/discourse/admin/components/site-settings/icon.gjs@@ -1,6 +1,6 @@import Component from "@glimmer/component";import { action } from "@ember/object";-import DIconGridPicker from "discourse/components/d-icon-grid-picker";+import DIconGridPicker from "discourse/ui-kit/d-icon-grid-picker";export default class Icon extends Component {@actiondiff --git a/frontend/discourse/admin/components/site-settings/string.gjs b/frontend/discourse/admin/components/site-settings/string.gjsindex 2f4be09d7a9..64da81ef3e8 100644--- a/frontend/discourse/admin/components/site-settings/string.gjs+++ b/frontend/discourse/admin/components/site-settings/string.gjs@@ -1,7 +1,7 @@/* eslint-disable ember/no-classic-components */import Component, { Input, Textarea } from "@ember/component";import { tagName } from "@ember-decorators/component";-import TextField from "discourse/components/text-field";+import DTextField from "discourse/ui-kit/d-text-field";@tagName("")export default class String extends Component {@@ -22,7 +22,7 @@ export default class String extends Component {@disabled={{@disabled}}/>{{else}}- <TextField+ <DTextField@value={{this.value}}@classNames="input-setting-string"@disabled={{@disabled}}diff --git a/frontend/discourse/admin/components/site-settings/upload.gjs b/frontend/discourse/admin/components/site-settings/upload.gjsindex 6d4071ce5a5..5a4c547b85e 100644--- a/frontend/discourse/admin/components/site-settings/upload.gjs+++ b/frontend/discourse/admin/components/site-settings/upload.gjs@@ -6,14 +6,14 @@ import { getOwner } from "@ember/owner";import { service } from "@ember/service";import { trustHTML } from "@ember/template";import { modifier } from "ember-modifier";-import DButton from "discourse/components/d-button";-import PickFilesButton from "discourse/components/pick-files-button";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import { getURLWithCDN } from "discourse/lib/get-url";import lightbox from "discourse/lib/lightbox";import { authorizesOneOrMoreExtensions, isImage } from "discourse/lib/uploads";import UppyUpload from "discourse/lib/uppy/uppy-upload";+import DButton from "discourse/ui-kit/d-button";+import DPickFilesButton from "discourse/ui-kit/d-pick-files-button";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";const BACKGROUND_SIZE_COVER_SETTINGS = ["welcome_banner_image"];@@ -49,7 +49,7 @@ const ImagePreview = <template>const FilePreview = <template><div class="file-info"><div class="file-icon">- {{icon "file"}}+ {{dIcon "file"}}</div><div class="file-details"><span class="file-name">{{@fileName}}</span>@@ -65,7 +65,7 @@ const FilePreview = <template>class="btn btn-default btn-small no-text download-btn"title={{i18n "admin.site_settings.download_file"}}>- {{icon "download"}}+ {{dIcon "download"}}</a></div></template>;@@ -268,14 +268,14 @@ export default class SiteSettingUpload extends Component {<template><divid={{this.settingId}}- class={{concatClass+ class={{dConcatClass"file-uploader"(if @value "has-file" "no-file")(if this.isImageFile "has-image")}}><div- class={{concatClass+ class={{dConcatClass"file-uploader__preview input-xxlarge"this.previewSizeClass}}@@ -310,8 +310,8 @@ export default class SiteSettingUpload extends Component {tabindex="0"{{on "keydown" this.onKeydown}}>- {{icon "upload"}}- <PickFilesButton+ {{dIcon "upload"}}+ <DPickFilesButton@registerFileInput={{this.uppyUpload.setup}}@fileInputDisabled={{this.disabled}}@acceptedFormatsOverride={{this.acceptedFormats}}@@ -353,8 +353,8 @@ export default class SiteSettingUpload extends Component {tabindex="0"{{on "keydown" this.onKeydown}}>- {{icon "upload"}}- <PickFilesButton+ {{dIcon "upload"}}+ <DPickFilesButton@registerFileInput={{this.uppyUpload.setup}}@fileInputDisabled={{this.disabled}}@acceptedFormatsOverride={{this.acceptedFormats}}diff --git a/frontend/discourse/admin/components/site-settings/uploaded-image-list.gjs b/frontend/discourse/admin/components/site-settings/uploaded-image-list.gjsindex da85da959d1..91dab935743 100644--- a/frontend/discourse/admin/components/site-settings/uploaded-image-list.gjs+++ b/frontend/discourse/admin/components/site-settings/uploaded-image-list.gjs@@ -5,7 +5,7 @@ import { action } from "@ember/object";import { service } from "@ember/service";import { tagName } from "@ember-decorators/component";import UploadedImageListModal from "discourse/admin/components/modal/uploaded-image-list";-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";@tagName("")export default class UploadedImageList extends Component {diff --git a/frontend/discourse/admin/components/site-text-summary.gjs b/frontend/discourse/admin/components/site-text-summary.gjsindex 2c0cc56079f..a06ff81409b 100644--- a/frontend/discourse/admin/components/site-text-summary.gjs+++ b/frontend/discourse/admin/components/site-text-summary.gjs@@ -2,10 +2,10 @@ import Component from "@glimmer/component";import { fn } from "@ember/helper";import { action } from "@ember/object";import didInsert from "@ember/render-modifiers/modifiers/did-insert";-import DButton from "discourse/components/d-button";-import concatClass from "discourse/helpers/concat-class";import { bind } from "discourse/lib/decorators";import highlightHTML from "discourse/lib/highlight-html";+import DButton from "discourse/ui-kit/d-button";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";export default class SiteTextSummary extends Component {@action@@ -45,7 +45,7 @@ export default class SiteTextSummary extends Component {<template><div- class={{concatClass "site-text" (if @siteText.overridden "overridden")}}+ class={{dConcatClass "site-text" (if @siteText.overridden "overridden")}}{{didInsert this.highlightSearchTerm}}data-site-text-id={{@siteText.id}}>diff --git a/frontend/discourse/admin/components/tags-uploader.gjs b/frontend/discourse/admin/components/tags-uploader.gjsindex 05b0707b45a..d97858ea3bf 100644--- a/frontend/discourse/admin/components/tags-uploader.gjs+++ b/frontend/discourse/admin/components/tags-uploader.gjs@@ -3,9 +3,9 @@ import { action } from "@ember/object";import { getOwner } from "@ember/owner";import didInsert from "@ember/render-modifiers/modifiers/did-insert";import { service } from "@ember/service";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import UppyUpload from "discourse/lib/uppy/uppy-upload";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class TagsUploader extends Component {@@ -34,9 +34,12 @@ export default class TagsUploader extends Component {<template><div id="tag-uploader"><label- class={{concatClass "btn btn-default" (if this.addDisabled "disabled")}}+ class={{dConcatClass+ "btn btn-default"+ (if this.addDisabled "disabled")+ }}>- {{icon "upload"}}+ {{dIcon "upload"}}{{i18n "admin.watched_words.form.upload"}}<input{{didInsert this.uppyUpload.setup}}diff --git a/frontend/discourse/admin/components/theme-settings-editor.gjs b/frontend/discourse/admin/components/theme-settings-editor.gjsindex bc0cc0ccb02..2f3cb751a56 100644--- a/frontend/discourse/admin/components/theme-settings-editor.gjs+++ b/frontend/discourse/admin/components/theme-settings-editor.gjs@@ -5,8 +5,8 @@ import { fn } from "@ember/helper";import { action } from "@ember/object";import { service } from "@ember/service";import AceEditor from "discourse/components/ace-editor";-import DButton from "discourse/components/d-button";-import icon from "discourse/helpers/d-icon";+import DButton from "discourse/ui-kit/d-button";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class ThemeSettingsEditor extends Component {@@ -221,7 +221,7 @@ export default class ThemeSettingsEditor extends Component {{{#each this.errors as |error|}}<div class="validation-error">- {{icon "xmark"}}+ {{dIcon "xmark"}}<b>{{error.setting}}</b>:{{error.errorMessage}}</div>diff --git a/frontend/discourse/admin/components/theme-site-settings.gjs b/frontend/discourse/admin/components/theme-site-settings.gjsindex 5b35cc114b0..d12d587b72c 100644--- a/frontend/discourse/admin/components/theme-site-settings.gjs+++ b/frontend/discourse/admin/components/theme-site-settings.gjs@@ -5,13 +5,13 @@ import { action } from "@ember/object";import { LinkTo } from "@ember/routing";import { service } from "@ember/service";import AdminFilterControls from "discourse/admin/components/admin-filter-controls";-import AsyncContent from "discourse/components/async-content";-import DPageSubheader from "discourse/components/d-page-subheader";import DTooltip from "discourse/float-kit/components/d-tooltip";-import basePath from "discourse/helpers/base-path";import { ajax } from "discourse/lib/ajax";import { currentThemeId, listThemes } from "discourse/lib/theme-selector";import { eq } from "discourse/truth-helpers";+import DAsyncContent from "discourse/ui-kit/d-async-content";+import DPageSubheader from "discourse/ui-kit/d-page-subheader";+import dBasePath from "discourse/ui-kit/helpers/d-base-path";import { i18n } from "discourse-i18n";export default class ThemeSiteSettings extends Component {@@ -85,12 +85,12 @@ export default class ThemeSiteSettings extends Component {@descriptionLabel={{i18n"admin.theme_site_settings.help"currentTheme=this.currentTheme.name- basePath=basePath+ basePath=dBasePathcurrentThemeId=this.currentThemeIdValue}}/>- <AsyncContent @asyncData={{this.loadThemeSiteSettings}}>+ <DAsyncContent @asyncData={{this.loadThemeSiteSettings}}><:content as |content|><AdminFilterControls@array={{this.filterableSettings content}}@@ -164,7 +164,7 @@ export default class ThemeSiteSettings extends Component {</:content></AdminFilterControls></:content>- </AsyncContent>+ </DAsyncContent></div></template>}diff --git a/frontend/discourse/admin/components/theme-upload-add.gjs b/frontend/discourse/admin/components/theme-upload-add.gjsindex 5905bd4b14d..7381d7c9f09 100644--- a/frontend/discourse/admin/components/theme-upload-add.gjs+++ b/frontend/discourse/admin/components/theme-upload-add.gjs@@ -4,10 +4,10 @@ import { Input } from "@ember/component";import { on } from "@ember/modifier";import { action } from "@ember/object";import { isEmpty } from "@ember/utils";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";import { ajax } from "discourse/lib/ajax";import { extractError } from "discourse/lib/ajax-error";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";const THEME_FIELD_VARIABLE_TYPE_IDS = [2, 3, 4];diff --git a/frontend/discourse/admin/components/themes-grid-card.gjs b/frontend/discourse/admin/components/themes-grid-card.gjsindex 2bf2bc62db1..ac37dc48c5b 100644--- a/frontend/discourse/admin/components/themes-grid-card.gjs+++ b/frontend/discourse/admin/components/themes-grid-card.gjs@@ -4,13 +4,13 @@ import { action } from "@ember/object";import { service } from "@ember/service";import { dasherize } from "@ember/string";import AdminConfigAreaCard from "discourse/admin/components/admin-config-area-card";-import DButton from "discourse/components/d-button";-import DropdownMenu from "discourse/components/dropdown-menu";import DMenu from "discourse/float-kit/components/d-menu";-import icon from "discourse/helpers/d-icon";import { popupAjaxError } from "discourse/lib/ajax-error";import { removeValueFromArray } from "discourse/lib/array-tools";import getURL from "discourse/lib/get-url";+import DButton from "discourse/ui-kit/d-button";+import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";import ThemesGridPlaceholder from "./themes-grid-placeholder";@@ -239,7 +239,7 @@ export default class ThemeCard extends Component {<spantitle={{i18n "admin.customize.theme.updates_available_tooltip"}}class="theme-card__badge"- >{{icon "arrows-rotate"}}+ >{{dIcon "arrows-rotate"}}{{i18n "admin.customize.theme.update_available"}}</span>{{/if}}@@ -247,7 +247,7 @@ export default class ThemeCard extends Component {<spanclass="theme-card__badge --default"title={{i18n "admin.customize.theme.default_theme"}}- >{{icon "paintbrush"}}+ >{{dIcon "paintbrush"}}{{i18n "admin.customize.theme.default"}}</span>{{/if}}@@ -255,7 +255,7 @@ export default class ThemeCard extends Component {<spantitle={{i18n "admin.customize.theme.user_selectable"}}class="theme-card__badge --selectable"- >{{icon "user-check"}}+ >{{dIcon "user-check"}}{{i18n"admin.customize.theme.user_selectable_badge_label"}}</span>@@ -280,7 +280,7 @@ export default class ThemeCard extends Component {@icon="ellipsis"><:content>- <DropdownMenu as |dropdown|>+ <DDropdownMenu as |dropdown|>{{! TODO: Jordan solutions for broken, disabled states }}<dropdown.item><DButton@@ -337,7 +337,7 @@ export default class ThemeCard extends Component {rel="noopener noreferrer"target="_blank"class="btn btn-transparent theme-card__button preview"- >{{icon "eye"}}+ >{{dIcon "eye"}}{{i18n "admin.customize.theme.preview"}}</a></dropdown.item><dropdown.item>@@ -349,7 +349,7 @@ export default class ThemeCard extends Component {class="theme-card__button btn-transparent --danger delete"/></dropdown.item>- </DropdownMenu>+ </DDropdownMenu></:content></DMenu></div>diff --git a/frontend/discourse/admin/components/themes-grid.gjs b/frontend/discourse/admin/components/themes-grid.gjsindex 3c98b09b3b1..bf61c44bd62 100644--- a/frontend/discourse/admin/components/themes-grid.gjs+++ b/frontend/discourse/admin/components/themes-grid.gjs@@ -2,10 +2,10 @@ import Component from "@glimmer/component";import { cached } from "@glimmer/tracking";import AdminConfigAreaCard from "discourse/admin/components/admin-config-area-card";import AdminFilterControls from "discourse/admin/components/admin-filter-controls";-import DButton from "discourse/components/d-button";import PluginOutlet from "discourse/components/plugin-outlet";-import icon from "discourse/helpers/d-icon";import lazyHash from "discourse/helpers/lazy-hash";+import DButton from "discourse/ui-kit/d-button";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";import ThemesGridCard from "./themes-grid-card";@@ -78,7 +78,7 @@ export default class ThemesGrid extends Component {<AdminConfigAreaCard class="theme-card --install-more"><:content><div class="theme-card__install-more-icon">- {{icon "plus"}}+ {{dIcon "plus"}}</div><div class="theme-card__content"><h3 class="theme-card__title">diff --git a/frontend/discourse/admin/components/themes-list-item.gjs b/frontend/discourse/admin/components/themes-list-item.gjsindex 7656760154b..14473b8be48 100644--- a/frontend/discourse/admin/components/themes-list-item.gjs+++ b/frontend/discourse/admin/components/themes-list-item.gjs@@ -5,11 +5,11 @@ import { on } from "@ember/modifier";import { action } from "@ember/object";import { trustHTML } from "@ember/template";import PluginOutlet from "discourse/components/plugin-outlet";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import lazyHash from "discourse/helpers/lazy-hash";import escape from "discourse/lib/escape";import { iconHTML } from "discourse/lib/icon-library";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";const MAX_COMPONENTS = 4;@@ -75,7 +75,7 @@ export default class ThemesListItem extends Component {<template>{{! template-lint-disable no-nested-interactive }}<div- class={{concatClass+ class={{dConcatClass"themes-list-container__item"(if @theme.selected "selected")}}@@ -106,31 +106,31 @@ export default class ThemesListItem extends Component {<span class="icons">{{#if @theme.selected}}- {{icon "angle-right"}}+ {{dIcon "angle-right"}}{{else}}{{#if @theme.default}}- {{icon+ {{dIcon"check"class="default-indicator"title="admin.customize.theme.default_theme_tooltip"}}{{/if}}{{#if @theme.isPendingUpdates}}- {{icon+ {{dIcon"arrows-rotate"title="admin.customize.theme.updates_available_tooltip"class="light-grey-icon"}}{{/if}}{{#if @theme.isBroken}}- {{icon+ {{dIcon"circle-exclamation"class="broken-indicator"title="admin.customize.theme.broken_theme_tooltip"}}{{/if}}{{#unless @theme.enabled}}- {{icon+ {{dIcon"ban"class="light-grey-icon"title="admin.customize.theme.disabled_component_tooltip"diff --git a/frontend/discourse/admin/components/upsert-category/appearance.gjs b/frontend/discourse/admin/components/upsert-category/appearance.gjsindex af75674abc9..0e339914037 100644--- a/frontend/discourse/admin/components/upsert-category/appearance.gjs+++ b/frontend/discourse/admin/components/upsert-category/appearance.gjs@@ -4,11 +4,11 @@ import { action } from "@ember/object";import { service } from "@ember/service";import PluginOutlet from "discourse/components/plugin-outlet";import UppyImageUploader from "discourse/components/uppy-image-uploader";-import concatClass from "discourse/helpers/concat-class";import lazyHash from "discourse/helpers/lazy-hash";import { CATEGORY_TEXT_COLORS } from "discourse/lib/constants";import { applyMutableValueTransformer } from "discourse/lib/transformer";import { eq } from "discourse/truth-helpers";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";export default class UpsertCategoryAppearance extends Component {@@ -144,7 +144,7 @@ export default class UpsertCategoryAppearance extends Component {<template><@form.Section- class={{concatClass+ class={{dConcatClass"edit-category-tab""edit-category-tab-images""--full"diff --git a/frontend/discourse/admin/components/upsert-category/general.gjs b/frontend/discourse/admin/components/upsert-category/general.gjsindex 3ffd0797548..ec0ce45eac2 100644--- a/frontend/discourse/admin/components/upsert-category/general.gjs+++ b/frontend/discourse/admin/components/upsert-category/general.gjs@@ -8,16 +8,9 @@ import didUpdate from "@ember/render-modifiers/modifiers/did-update";import willDestroy from "@ember/render-modifiers/modifiers/will-destroy";import { service } from "@ember/service";import { trustHTML } from "@ember/template";-import DIconGridPicker from "discourse/components/d-icon-grid-picker";-import DMultiSelect from "discourse/components/d-multi-select";-import DecoratedHtml from "discourse/components/decorated-html";import EmojiPicker from "discourse/components/emoji-picker";import PluginOutlet from "discourse/components/plugin-outlet";import DTooltip from "discourse/float-kit/components/d-tooltip";-import categoryBadge from "discourse/helpers/category-badge";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";-import emoji from "discourse/helpers/emoji";import lazyHash from "discourse/helpers/lazy-hash";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";@@ -32,6 +25,13 @@ import PermissionType from "discourse/models/permission-type";import CategoryChooser from "discourse/select-kit/components/category-chooser";import GroupChooser from "discourse/select-kit/components/group-chooser";import { eq, or } from "discourse/truth-helpers";+import DDecoratedHtml from "discourse/ui-kit/d-decorated-html";+import DIconGridPicker from "discourse/ui-kit/d-icon-grid-picker";+import DMultiSelect from "discourse/ui-kit/d-multi-select";+import dCategoryBadge from "discourse/ui-kit/helpers/d-category-badge";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dEmoji from "discourse/ui-kit/helpers/d-emoji";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";const DISCUSSION_TYPE_ID = "discussion";@@ -610,7 +610,7 @@ export default class UpsertCategoryGeneral extends Component {><:result as |type|><div- class={{concatClass+ class={{dConcatClass"category-type-selector__result"(unless type.available "--unavailable")(concat "--category-type-" type.id)@@ -618,7 +618,7 @@ export default class UpsertCategoryGeneral extends Component {><div class="category-type-selector__name"><span class="category-type-selector__icon">- {{emoji type.icon}}+ {{dEmoji type.icon}}</span>{{type.name}}@@ -646,7 +646,7 @@ export default class UpsertCategoryGeneral extends Component {{{/if}}<@form.Section- class={{concatClass+ class={{dConcatClass"edit-category-tab""edit-category-tab-general"(if (eq @selectedTab "general") "active")@@ -775,7 +775,7 @@ export default class UpsertCategoryGeneral extends Component {<Content @name="square">{{trustHTML- (categoryBadge+ (dCategoryBadge(this.buildTransientModel @transientData) styleType="square")}}@@ -795,7 +795,7 @@ export default class UpsertCategoryGeneral extends Component {class="edit-category-description-container --full"><div- class={{concatClass+ class={{dConcatClass"description-content"(unless this.descriptionExpanded "--collapsed")(if this.descriptionOverflows "--overflowing")@@ -806,7 +806,7 @@ export default class UpsertCategoryGeneral extends Component {this.categoryDescription}}>- <DecoratedHtml+ <DDecoratedHtml@html={{this.categoryDescription}}@className="readonly-field"/>@@ -889,19 +889,19 @@ export default class UpsertCategoryGeneral extends Component {><:trigger><Condition @name="public" @disabled={{true}}>- {{icon "ban"}}+ {{dIcon "ban"}}{{i18n this.publicVisibilityLabel}}</Condition></:trigger></DTooltip>{{else}}<Condition @name="public">- {{icon "check"}}+ {{dIcon "check"}}{{i18n this.publicVisibilityLabel}}</Condition>{{/if}}<Condition @name="group_restricted">- {{icon "check"}}+ {{dIcon "check"}}{{i18n "category.visibility.group_restricted"}}</Condition></cc.Conditions>diff --git a/frontend/discourse/admin/components/upsert-category/moderation.gjs b/frontend/discourse/admin/components/upsert-category/moderation.gjsindex 7efae0639a0..12b64841777 100644--- a/frontend/discourse/admin/components/upsert-category/moderation.gjs+++ b/frontend/discourse/admin/components/upsert-category/moderation.gjs@@ -3,13 +3,13 @@ import { hash } from "@ember/helper";import { on } from "@ember/modifier";import { action } from "@ember/object";import { service } from "@ember/service";-import RelativeTimePicker from "discourse/components/relative-time-picker";-import concatClass from "discourse/helpers/concat-class";import withEventValue from "discourse/helpers/with-event-value";import { POSTING_REVIEW_GROUP_BASED_MODES } from "discourse/lib/constants";import ComboBox from "discourse/select-kit/components/combo-box";import GroupChooser from "discourse/select-kit/components/group-chooser";import { eq } from "discourse/truth-helpers";+import DRelativeTimePicker from "discourse/ui-kit/d-relative-time-picker";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";export default class UpsertCategoryModeration extends Component {@@ -150,7 +150,7 @@ export default class UpsertCategoryModeration extends Component {<template><@form.Section- class={{concatClass+ class={{dConcatClass"edit-category-tab""edit-category-tab-moderation""--full"@@ -168,7 +168,7 @@ export default class UpsertCategoryModeration extends Component {{{/if}}<@form.Container @title={{i18n "category.default_slow_mode"}}>- <RelativeTimePicker+ <DRelativeTimePicker@id="category-default-slow-mode"@durationMinutes={{this.defaultSlowModeMinutes}}@onChange={{this.onDefaultSlowModeDurationChange}}@@ -176,7 +176,7 @@ export default class UpsertCategoryModeration extends Component {</@form.Container><@form.Container @title={{i18n "topic.auto_close.label"}}>- <RelativeTimePicker+ <DRelativeTimePicker@id="topic-auto-close"@durationHours={{this.autoCloseHours}}@hiddenIntervals={{this.hiddenRelativeIntervals}}diff --git a/frontend/discourse/admin/components/upsert-category/permission-row.gjs b/frontend/discourse/admin/components/upsert-category/permission-row.gjsindex 4ef20c833dc..30c8165f2f9 100644--- a/frontend/discourse/admin/components/upsert-category/permission-row.gjs+++ b/frontend/discourse/admin/components/upsert-category/permission-row.gjs@@ -1,12 +1,12 @@import Component from "@glimmer/component";import { action } from "@ember/object";-import DButton from "discourse/components/d-button";import PluginOutlet from "discourse/components/plugin-outlet";-import concatClass from "discourse/helpers/concat-class";import lazyHash from "discourse/helpers/lazy-hash";import { AUTO_GROUPS } from "discourse/lib/constants";import getURL from "discourse/lib/get-url";import PermissionType from "discourse/models/permission-type";+import DButton from "discourse/ui-kit/d-button";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";export default class UpsertCategoryPermissionRow extends Component {@@ -166,7 +166,7 @@ export default class UpsertCategoryPermissionRow extends Component {@action={{this.setPermissionReply}}@translatedTitle={{this.replyTooltip}}@disabled={{this.replyDisabled}}- class={{concatClass+ class={{dConcatClass"btn btn-flat reply-toggle"this.replyGrantedClass}}@@ -177,7 +177,7 @@ export default class UpsertCategoryPermissionRow extends Component {@action={{this.setPermissionFull}}@translatedTitle={{this.createTooltip}}@disabled={{this.createDisabled}}- class={{concatClass+ class={{dConcatClass"btn-flat create-toggle"this.createGrantedClass}}diff --git a/frontend/discourse/admin/components/upsert-category/security.gjs b/frontend/discourse/admin/components/upsert-category/security.gjsindex 7b043bda53d..9da113f3dfb 100644--- a/frontend/discourse/admin/components/upsert-category/security.gjs+++ b/frontend/discourse/admin/components/upsert-category/security.gjs@@ -4,12 +4,12 @@ import { service } from "@ember/service";import { isNone } from "@ember/utils";import UpsertCategoryPermissionRow from "discourse/admin/components/upsert-category/permission-row";import PluginOutlet from "discourse/components/plugin-outlet";-import concatClass from "discourse/helpers/concat-class";import lazyHash from "discourse/helpers/lazy-hash";import { AUTO_GROUPS } from "discourse/lib/constants";import Category from "discourse/models/category";import PermissionType from "discourse/models/permission-type";import { eq } from "discourse/truth-helpers";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";export default class UpsertCategorySecurity extends Component {@@ -163,7 +163,7 @@ export default class UpsertCategorySecurity extends Component {<template><@form.Section- class={{concatClass+ class={{dConcatClass"edit-category-tab""edit-category-tab-security"(if (eq @selectedTab "security") "active")diff --git a/frontend/discourse/admin/components/upsert-category/settings.gjs b/frontend/discourse/admin/components/upsert-category/settings.gjsindex 15ccf356161..07575e3a03e 100644--- a/frontend/discourse/admin/components/upsert-category/settings.gjs+++ b/frontend/discourse/admin/components/upsert-category/settings.gjs@@ -2,11 +2,11 @@ import Component from "@glimmer/component";import { service } from "@ember/service";import { trustHTML } from "@ember/template";import PluginOutlet from "discourse/components/plugin-outlet";-import concatClass from "discourse/helpers/concat-class";import lazyHash from "discourse/helpers/lazy-hash";import { SEARCH_PRIORITIES } from "discourse/lib/constants";import getUrl from "discourse/lib/get-url";import { eq } from "discourse/truth-helpers";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";export default class UpsertCategorySettings extends Component {@@ -37,7 +37,7 @@ export default class UpsertCategorySettings extends Component {<template><@form.Section- class={{concatClass+ class={{dConcatClass"edit-category-tab""edit-category-tab-settings"(if (eq @selectedTab "settings") "active")diff --git a/frontend/discourse/admin/components/upsert-category/tags.gjs b/frontend/discourse/admin/components/upsert-category/tags.gjsindex 49cb175a573..a92fd536484 100644--- a/frontend/discourse/admin/components/upsert-category/tags.gjs+++ b/frontend/discourse/admin/components/upsert-category/tags.gjs@@ -2,9 +2,9 @@ import Component from "@glimmer/component";import { array, fn, hash } from "@ember/helper";import { action } from "@ember/object";import { LinkTo } from "@ember/routing";-import concatClass from "discourse/helpers/concat-class";import TagGroupChooser from "discourse/select-kit/components/tag-group-chooser";import { eq } from "discourse/truth-helpers";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";export default class UpsertCategoryTags extends Component {@@ -35,7 +35,7 @@ export default class UpsertCategoryTags extends Component {<template><@form.Section- class={{concatClass+ class={{dConcatClass"edit-category-tab""edit-category-tab-tags"(if (eq @selectedTab "tags") "active")diff --git a/frontend/discourse/admin/components/value-list.gjs b/frontend/discourse/admin/components/value-list.gjsindex 0095fd02b30..f8eab224eae 100644--- a/frontend/discourse/admin/components/value-list.gjs+++ b/frontend/discourse/admin/components/value-list.gjs@@ -6,7 +6,6 @@ import { on } from "@ember/modifier";import { action, computed } from "@ember/object";import { isEmpty } from "@ember/utils";import { classNames } from "@ember-decorators/component";-import DButton from "discourse/components/d-button";import {addUniqueValueToArray,removeValueFromArray,@@ -15,6 +14,7 @@ import {import { makeArray } from "discourse/lib/helpers";import { autoTrackedArray } from "discourse/lib/tracked-tools";import ComboBox from "discourse/select-kit/components/combo-box";+import DButton from "discourse/ui-kit/d-button";@classNames("value-list")export default class ValueList extends Component {diff --git a/frontend/discourse/admin/components/version-checks.gjs b/frontend/discourse/admin/components/version-checks.gjsindex 86df24cec24..f8545bb3e0f 100644--- a/frontend/discourse/admin/components/version-checks.gjs+++ b/frontend/discourse/admin/components/version-checks.gjs@@ -1,8 +1,8 @@-import CustomHtml from "discourse/components/custom-html";import PluginOutlet from "discourse/components/plugin-outlet";-import icon from "discourse/helpers/d-icon";import dashIfEmpty from "discourse/helpers/dash-if-empty";import lazyHash from "discourse/helpers/lazy-hash";+import DCustomHtml from "discourse/ui-kit/d-custom-html";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";const VersionChecks = <template>@@ -49,7 +49,7 @@ const VersionChecks = <template><div class="version-status"><div class="face"><span class="icon critical-updates-available">- {{icon "far-face-frown"}}+ {{dIcon "far-face-frown"}}</span></div><div class="version-notes">@@ -73,11 +73,11 @@ const VersionChecks = <template><div class="face">{{#if @versionCheck.version_check_pending}}<span class="icon up-to-date">- {{icon "far-face-smile"}}+ {{dIcon "far-face-smile"}}</span>{{else}}<span class="icon critical-updates-available">- {{icon "far-face-frown"}}+ {{dIcon "far-face-frown"}}</span>{{/if}}</div>@@ -104,7 +104,7 @@ const VersionChecks = <template><div class="face">{{#if @versionCheck.upToDate}}<span class="icon up-to-date">- {{icon "far-face-smile"}}+ {{dIcon "far-face-smile"}}</span>{{else}}<span@@ -116,9 +116,9 @@ const VersionChecks = <template>}}">{{#if @versionCheck.behindByOneVersion}}- {{icon "far-face-meh"}}+ {{dIcon "far-face-meh"}}{{else}}- {{icon "far-face-frown"}}+ {{dIcon "far-face-frown"}}{{/if}}</span>{{/if}}@@ -139,7 +139,7 @@ const VersionChecks = <template></div>{{/if}}- <CustomHtml @name="update-header" class="update-header" />+ <DCustomHtml @name="update-header" class="update-header" /><PluginOutlet@name="admin-upgrade-header"diff --git a/frontend/discourse/admin/components/watched-word-form.gjs b/frontend/discourse/admin/components/watched-word-form.gjsindex d67f3d20254..bb07cae1fe2 100644--- a/frontend/discourse/admin/components/watched-word-form.gjs+++ b/frontend/discourse/admin/components/watched-word-form.gjs@@ -6,11 +6,11 @@ import { isEmpty } from "@ember/utils";import { tagName } from "@ember-decorators/component";import { observes } from "@ember-decorators/object";import WatchedWord from "discourse/admin/models/watched-word";-import DButton from "discourse/components/d-button";-import TextField from "discourse/components/text-field";import { popupAjaxError } from "discourse/lib/ajax-error";import TagChooser from "discourse/select-kit/components/tag-chooser";import WatchedWords from "discourse/select-kit/components/watched-words";+import DButton from "discourse/ui-kit/d-button";+import DTextField from "discourse/ui-kit/d-text-field";import { i18n } from "discourse-i18n";@tagName("")@@ -166,7 +166,7 @@ export default class WatchedWordForm extends Component {<label for="watched-replacement">{{i18n"admin.watched_words.form.replace_label"}}</label>- <TextField+ <DTextField@id="watched-replacement"@value={{this.replacement}}@disabled={{this.formSubmitted}}@@ -199,7 +199,7 @@ export default class WatchedWordForm extends Component {<label for="watched-link">{{i18n"admin.watched_words.form.link_label"}}</label>- <TextField+ <DTextField@id="watched-link"@value={{this.replacement}}@disabled={{this.formSubmitted}}diff --git a/frontend/discourse/admin/components/watched-word-uploader.gjs b/frontend/discourse/admin/components/watched-word-uploader.gjsindex 1e63c5cd451..0cd6aecf1ca 100644--- a/frontend/discourse/admin/components/watched-word-uploader.gjs+++ b/frontend/discourse/admin/components/watched-word-uploader.gjs@@ -5,8 +5,8 @@ import { getOwner } from "@ember/owner";import didInsert from "@ember/render-modifiers/modifiers/did-insert";import { service } from "@ember/service";import { tagName } from "@ember-decorators/component";-import icon from "discourse/helpers/d-icon";import UppyUpload from "discourse/lib/uppy/uppy-upload";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";@tagName("")@@ -31,7 +31,7 @@ export default class WatchedWordUploader extends Component {<template><div class="watched-words-uploader" ...attributes><label class="btn btn-default {{if this.addDisabled 'disabled'}}">- {{icon "upload"}}+ {{dIcon "upload"}}{{i18n "admin.watched_words.form.upload"}}<input{{didInsert this.uppyUpload.setup}}diff --git a/frontend/discourse/admin/components/webhook-event.gjs b/frontend/discourse/admin/components/webhook-event.gjsindex 3b22cddb0e6..3779e8e81d6 100644--- a/frontend/discourse/admin/components/webhook-event.gjs+++ b/frontend/discourse/admin/components/webhook-event.gjs@@ -2,11 +2,11 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import icon from "discourse/helpers/d-icon";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import { ensureJSON, plainJSON, prettyJSON } from "discourse/lib/formatter";+import DButton from "discourse/ui-kit/d-button";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class WebhookEvent extends Component {@@ -106,7 +106,7 @@ export default class WebhookEvent extends Component {<li><div class="col first status">{{#if @event.redelivering}}- {{icon "arrows-rotate"}}+ {{dIcon "arrows-rotate"}}{{else}}<span class={{this.statusColorClasses}}>{{@event.status}}</span>{{/if}}diff --git a/frontend/discourse/admin/components/webhook-events.gjs b/frontend/discourse/admin/components/webhook-events.gjsindex cd5eba4a358..428c7c423fb 100644--- a/frontend/discourse/admin/components/webhook-events.gjs+++ b/frontend/discourse/admin/components/webhook-events.gjs@@ -8,16 +8,16 @@ import didUpdate from "@ember/render-modifiers/modifiers/did-update";import willDestroy from "@ember/render-modifiers/modifiers/will-destroy";import { service } from "@ember/service";import WebhookEvent from "discourse/admin/components/webhook-event";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import CountI18n from "discourse/components/count-i18n";-import DButton from "discourse/components/d-button";-import LoadMore from "discourse/components/load-more";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import { bind } from "discourse/lib/decorators";import { autoTrackedArray } from "discourse/lib/tracked-tools";import ComboBox from "discourse/select-kit/components/combo-box";import { not } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DCountI18n from "discourse/ui-kit/d-count-i18n";+import DLoadMore from "discourse/ui-kit/d-load-more";import { i18n } from "discourse-i18n";export default class WebhookEvents extends Component {@@ -243,7 +243,7 @@ export default class WebhookEvents extends Component {</div>{{#if this.events.content}}- <LoadMore @action={{this.loadMore}}>+ <DLoadMore @action={{this.loadMore}}><div class="web-hook-events content-list"><div class="heading-container"><div class="col heading first status">@@ -270,7 +270,7 @@ export default class WebhookEvents extends Component {{{on "click" this.showInserted}}class="alert alert-info clickable">- <CountI18n+ <DCountI18n@key="admin.web_hooks.events.incoming"@count={{this.incomingCount}}/>@@ -284,8 +284,8 @@ export default class WebhookEvents extends Component {</ul></div>- <ConditionalLoadingSpinner @condition={{this.events.loadingMore}} />- </LoadMore>+ <DConditionalLoadingSpinner @condition={{this.events.loadingMore}} />+ </DLoadMore>{{else}}<p>{{i18n "admin.web_hooks.events.none"}}</p>{{/if}}diff --git a/frontend/discourse/admin/components/webhook-item.gjs b/frontend/discourse/admin/components/webhook-item.gjsindex bc0ac0f906a..36c84a64609 100644--- a/frontend/discourse/admin/components/webhook-item.gjs+++ b/frontend/discourse/admin/components/webhook-item.gjs@@ -4,9 +4,9 @@ import { action } from "@ember/object";import { LinkTo } from "@ember/routing";import { service } from "@ember/service";import WebhookStatus from "discourse/admin/components/webhook-status";-import DButton from "discourse/components/d-button";-import DropdownMenu from "discourse/components/dropdown-menu";import DMenu from "discourse/float-kit/components/d-menu";+import DButton from "discourse/ui-kit/d-button";+import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";import { i18n } from "discourse-i18n";export default class WebhookItem extends Component {@@ -60,7 +60,7 @@ export default class WebhookItem extends Component {@onRegisterApi={{this.onRegisterApi}}><:content>- <DropdownMenu as |dropdown|>+ <DDropdownMenu as |dropdown|><dropdown.item><DButton@action={{this.events}}@@ -79,7 +79,7 @@ export default class WebhookItem extends Component {class="btn-danger admin-web-hook__delete"/></dropdown.item>- </DropdownMenu>+ </DDropdownMenu></:content></DMenu></div>diff --git a/frontend/discourse/admin/models/report.js b/frontend/discourse/admin/models/report.jsindex bb5ad4a2667..09d3d38db0f 100644--- a/frontend/discourse/admin/models/report.js+++ b/frontend/discourse/admin/models/report.js@@ -1,7 +1,6 @@import EmberObject, { computed } from "@ember/object";import { isEmpty } from "@ember/utils";import { REPORT_MODES } from "discourse/admin/lib/constants";-import { renderAvatar } from "discourse/helpers/user-avatar";import { ajax } from "discourse/lib/ajax";import { durationTiny, number } from "discourse/lib/formatter";import getURL from "discourse/lib/get-url";@@ -13,6 +12,7 @@ import {formatUsername,toNumber,} from "discourse/lib/utilities";+import { renderAvatar } from "discourse/ui-kit/helpers/d-user-avatar";import I18n, { i18n } from "discourse-i18n";// Change this line each time report format changediff --git a/frontend/discourse/admin/templates/admin-analytics/settings.gjs b/frontend/discourse/admin/templates/admin-analytics/settings.gjsindex 3538988e513..affa9f2a254 100644--- a/frontend/discourse/admin/templates/admin-analytics/settings.gjs+++ b/frontend/discourse/admin/templates/admin-analytics/settings.gjs@@ -1,6 +1,6 @@import AdminAreaSettings from "discourse/admin/components/admin-area-settings";-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DPageHeader from "discourse/components/d-page-header";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DPageHeader from "discourse/ui-kit/d-page-header";import { i18n } from "discourse-i18n";export default <template>diff --git a/frontend/discourse/admin/templates/admin-api-keys.gjs b/frontend/discourse/admin/templates/admin-api-keys.gjsindex 3556ad4b3e1..005833eba81 100644--- a/frontend/discourse/admin/templates/admin-api-keys.gjs+++ b/frontend/discourse/admin/templates/admin-api-keys.gjs@@ -1,7 +1,7 @@-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DPageHeader from "discourse/components/d-page-header";-import NavItem from "discourse/components/nav-item";import PluginOutlet from "discourse/components/plugin-outlet";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DNavItem from "discourse/ui-kit/d-nav-item";+import DPageHeader from "discourse/ui-kit/d-page-header";import { i18n } from "discourse-i18n";export default <template>@@ -21,12 +21,12 @@ export default <template><actions.Primary @route="adminApiKeys.new" @label="admin.api_keys.add" /></:actions><:tabs>- <NavItem+ <DNavItem@route="adminApiKeys.settings"@label="settings"class="admin-api-keys-tabs__settings"/>- <NavItem+ <DNavItem@route="adminApiKeys.index"@label="admin.config.api_keys.title"class="admin-api-keys-tabs__index"diff --git a/frontend/discourse/admin/templates/admin-config/about.gjs b/frontend/discourse/admin/templates/admin-config/about.gjsindex 9962a56603a..27d5c52962d 100644--- a/frontend/discourse/admin/templates/admin-config/about.gjs+++ b/frontend/discourse/admin/templates/admin-config/about.gjs@@ -1,8 +1,8 @@import { hash } from "@ember/helper";import About from "discourse/admin/components/admin-config-areas/about";-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DPageHeader from "discourse/components/d-page-header";-import basePath from "discourse/helpers/base-path";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DPageHeader from "discourse/ui-kit/d-page-header";+import dBasePath from "discourse/ui-kit/helpers/d-base-path";import { i18n } from "discourse-i18n";export default <template>@@ -10,7 +10,7 @@ export default <template>@titleLabel={{i18n "admin.config.about.title"}}@descriptionLabel={{i18n"admin.config.about.header_description"- (hash basePath=(basePath))+ (hash basePath=(dBasePath))}}@hideTabs={{true}}@learnMoreUrl="https://meta.discourse.org/t/understanding-and-customizing-the-about-page/332161"diff --git a/frontend/discourse/admin/templates/admin-config/admin-welcome-banner.gjs b/frontend/discourse/admin/templates/admin-config/admin-welcome-banner.gjsindex 3a14055cbbd..fb4bc4bdaf9 100644--- a/frontend/discourse/admin/templates/admin-config/admin-welcome-banner.gjs+++ b/frontend/discourse/admin/templates/admin-config/admin-welcome-banner.gjs@@ -1,6 +1,6 @@import AdminWelcomeBannerForm from "discourse/admin/components/admin-welcome-banner-form";-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DPageHeader from "discourse/components/d-page-header";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DPageHeader from "discourse/ui-kit/d-page-header";import { i18n } from "discourse-i18n";export default <template>diff --git a/frontend/discourse/admin/templates/admin-config/color-palettes/index.gjs b/frontend/discourse/admin/templates/admin-config/color-palettes/index.gjsindex 3d1bd599efa..e764aefcb64 100644--- a/frontend/discourse/admin/templates/admin-config/color-palettes/index.gjs+++ b/frontend/discourse/admin/templates/admin-config/color-palettes/index.gjs@@ -1,12 +1,12 @@import { trustHTML } from "@ember/template";import AdminFilterControls from "discourse/admin/components/admin-filter-controls";import ColorPaletteListItem from "discourse/admin/components/color-palette-list-item";-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DPageHeader from "discourse/components/d-page-header";-import DPageSubheader from "discourse/components/d-page-subheader";import PluginOutlet from "discourse/components/plugin-outlet";import lazyHash from "discourse/helpers/lazy-hash";import getUrl from "discourse/lib/get-url";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DPageHeader from "discourse/ui-kit/d-page-header";+import DPageSubheader from "discourse/ui-kit/d-page-subheader";import { i18n } from "discourse-i18n";const FILTER_MINIMUM = 8;diff --git a/frontend/discourse/admin/templates/admin-config/content.gjs b/frontend/discourse/admin/templates/admin-config/content.gjsindex 1f0b488a624..afa375e854d 100644--- a/frontend/discourse/admin/templates/admin-config/content.gjs+++ b/frontend/discourse/admin/templates/admin-config/content.gjs@@ -1,6 +1,6 @@-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DPageHeader from "discourse/components/d-page-header";-import NavItem from "discourse/components/nav-item";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DNavItem from "discourse/ui-kit/d-nav-item";+import DPageHeader from "discourse/ui-kit/d-page-header";import { i18n } from "discourse-i18n";export default <template>@@ -16,19 +16,19 @@ export default <template>/></:breadcrumbs><:tabs>- <NavItem+ <DNavItem@route="adminConfig.content.categoriesAndTags"@label="admin.config.content.sub_pages.categories_and_tags.title"/>- <NavItem+ <DNavItem@route="adminConfig.content.sharing"@label="admin.config.content.sub_pages.sharing.title"/>- <NavItem+ <DNavItem@route="adminConfig.content.postsAndTopics"@label="admin.config.content.sub_pages.posts_and_topics.title"/>- <NavItem+ <DNavItem@route="adminConfig.content.statsAndThresholds"@label="admin.config.content.sub_pages.stats_and_thresholds.title"/>diff --git a/frontend/discourse/admin/templates/admin-config/customize.gjs b/frontend/discourse/admin/templates/admin-config/customize.gjsindex 4f4456eade6..ccb8a05f735 100644--- a/frontend/discourse/admin/templates/admin-config/customize.gjs+++ b/frontend/discourse/admin/templates/admin-config/customize.gjs@@ -1,7 +1,7 @@-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DPageHeader from "discourse/components/d-page-header";-import NavItem from "discourse/components/nav-item";import PluginOutlet from "discourse/components/plugin-outlet";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DNavItem from "discourse/ui-kit/d-nav-item";+import DPageHeader from "discourse/ui-kit/d-page-header";import { i18n } from "discourse-i18n";export default <template>@@ -17,15 +17,15 @@ export default <template></:breadcrumbs><:tabs>- <NavItem+ <DNavItem@route="adminConfig.customize.themes"@label="admin.config.themes.title"/>- <NavItem+ <DNavItem@route="adminConfig.customize.components"@label="admin.config.components.title"/>- <NavItem+ <DNavItem@route="adminConfig.customize.themeSiteSettings"@label="admin.config.theme_site_settings.title"/>diff --git a/frontend/discourse/admin/templates/admin-config/customize/components.gjs b/frontend/discourse/admin/templates/admin-config/customize/components.gjsindex 0ef855b9c7b..514f5eeea67 100644--- a/frontend/discourse/admin/templates/admin-config/customize/components.gjs+++ b/frontend/discourse/admin/templates/admin-config/customize/components.gjs@@ -1,5 +1,5 @@import Components from "discourse/admin/components/admin-config-areas/components";-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";import { i18n } from "discourse-i18n";export default <template>diff --git a/frontend/discourse/admin/templates/admin-config/customize/theme-site-settings.gjs b/frontend/discourse/admin/templates/admin-config/customize/theme-site-settings.gjsindex 927adba4ea1..b1fbcd377a0 100644--- a/frontend/discourse/admin/templates/admin-config/customize/theme-site-settings.gjs+++ b/frontend/discourse/admin/templates/admin-config/customize/theme-site-settings.gjs@@ -1,6 +1,6 @@import ThemeSiteSettings from "discourse/admin/components/theme-site-settings";-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DPageSubheader from "discourse/components/d-page-subheader";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DPageSubheader from "discourse/ui-kit/d-page-subheader";import { i18n } from "discourse-i18n";export default <template>diff --git a/frontend/discourse/admin/templates/admin-config/customize/themes.gjs b/frontend/discourse/admin/templates/admin-config/customize/themes.gjsindex 8d135f5dd15..54f7c1e508a 100644--- a/frontend/discourse/admin/templates/admin-config/customize/themes.gjs+++ b/frontend/discourse/admin/templates/admin-config/customize/themes.gjs@@ -1,5 +1,5 @@import Themes from "discourse/admin/components/admin-config-areas/themes";-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";import { i18n } from "discourse-i18n";export default <template>diff --git a/frontend/discourse/admin/templates/admin-config/developer/settings.gjs b/frontend/discourse/admin/templates/admin-config/developer/settings.gjsindex eaa464359de..dd13cc8c165 100644--- a/frontend/discourse/admin/templates/admin-config/developer/settings.gjs+++ b/frontend/discourse/admin/templates/admin-config/developer/settings.gjs@@ -1,6 +1,6 @@import AdminAreaSettings from "discourse/admin/components/admin-area-settings";-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DPageHeader from "discourse/components/d-page-header";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DPageHeader from "discourse/ui-kit/d-page-header";import { i18n } from "discourse-i18n";export default <template>diff --git a/frontend/discourse/admin/templates/admin-config/experimental/settings.gjs b/frontend/discourse/admin/templates/admin-config/experimental/settings.gjsindex 67a64ebbacc..d4132b59b88 100644--- a/frontend/discourse/admin/templates/admin-config/experimental/settings.gjs+++ b/frontend/discourse/admin/templates/admin-config/experimental/settings.gjs@@ -1,6 +1,6 @@import AdminAreaSettings from "discourse/admin/components/admin-area-settings";-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DPageHeader from "discourse/components/d-page-header";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DPageHeader from "discourse/ui-kit/d-page-header";import { i18n } from "discourse-i18n";export default <template>diff --git a/frontend/discourse/admin/templates/admin-config/files/settings.gjs b/frontend/discourse/admin/templates/admin-config/files/settings.gjsindex a9d92db6a7f..cde6ef002fa 100644--- a/frontend/discourse/admin/templates/admin-config/files/settings.gjs+++ b/frontend/discourse/admin/templates/admin-config/files/settings.gjs@@ -1,6 +1,6 @@import AdminAreaSettings from "discourse/admin/components/admin-area-settings";-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DPageHeader from "discourse/components/d-page-header";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DPageHeader from "discourse/ui-kit/d-page-header";import { i18n } from "discourse-i18n";export default <template>diff --git a/frontend/discourse/admin/templates/admin-config/flags.gjs b/frontend/discourse/admin/templates/admin-config/flags.gjsindex 2ba08589d4e..e0c14c71939 100644--- a/frontend/discourse/admin/templates/admin-config/flags.gjs+++ b/frontend/discourse/admin/templates/admin-config/flags.gjs@@ -1,9 +1,9 @@import Component from "@glimmer/component";import { service } from "@ember/service";import { SYSTEM_FLAG_IDS } from "discourse/admin/lib/constants";-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DPageHeader from "discourse/components/d-page-header";-import NavItem from "discourse/components/nav-item";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DNavItem from "discourse/ui-kit/d-nav-item";+import DPageHeader from "discourse/ui-kit/d-page-header";import { i18n } from "discourse-i18n";class FlagsTemplate extends Component {@@ -41,12 +41,12 @@ class FlagsTemplate extends Component {/></:actions><:tabs>- <NavItem+ <DNavItem@route="adminConfig.flags.settings"@label="settings"class="admin-flags-tabs__settings"/>- <NavItem+ <DNavItem@route="adminConfig.flags.index"@label="admin.config_areas.flags.flags_tab"class="admin-flags-tabs__flags"diff --git a/frontend/discourse/admin/templates/admin-config/fonts.gjs b/frontend/discourse/admin/templates/admin-config/fonts.gjsindex 1fef4d7a5de..cd58b1063fe 100644--- a/frontend/discourse/admin/templates/admin-config/fonts.gjs+++ b/frontend/discourse/admin/templates/admin-config/fonts.gjs@@ -1,6 +1,6 @@import AdminFontsForm from "discourse/admin/components/admin-fonts-form";-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DPageHeader from "discourse/components/d-page-header";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DPageHeader from "discourse/ui-kit/d-page-header";import { i18n } from "discourse-i18n";export default <template>diff --git a/frontend/discourse/admin/templates/admin-config/group-permissions/settings.gjs b/frontend/discourse/admin/templates/admin-config/group-permissions/settings.gjsindex f23313c629e..54c502060ad 100644--- a/frontend/discourse/admin/templates/admin-config/group-permissions/settings.gjs+++ b/frontend/discourse/admin/templates/admin-config/group-permissions/settings.gjs@@ -1,6 +1,6 @@import AdminAreaSettings from "discourse/admin/components/admin-area-settings";-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DPageHeader from "discourse/components/d-page-header";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DPageHeader from "discourse/ui-kit/d-page-header";import { i18n } from "discourse-i18n";export default <template>diff --git a/frontend/discourse/admin/templates/admin-config/interface/settings.gjs b/frontend/discourse/admin/templates/admin-config/interface/settings.gjsindex ace012a4a54..dda6373057e 100644--- a/frontend/discourse/admin/templates/admin-config/interface/settings.gjs+++ b/frontend/discourse/admin/templates/admin-config/interface/settings.gjs@@ -1,6 +1,6 @@import AdminAreaSettings from "discourse/admin/components/admin-area-settings";-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DPageHeader from "discourse/components/d-page-header";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DPageHeader from "discourse/ui-kit/d-page-header";import { i18n } from "discourse-i18n";export default <template>diff --git a/frontend/discourse/admin/templates/admin-config/legal/settings.gjs b/frontend/discourse/admin/templates/admin-config/legal/settings.gjsindex 9e3b94dbf08..4b0f107b07d 100644--- a/frontend/discourse/admin/templates/admin-config/legal/settings.gjs+++ b/frontend/discourse/admin/templates/admin-config/legal/settings.gjs@@ -1,6 +1,6 @@import AdminAreaSettings from "discourse/admin/components/admin-area-settings";-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DPageHeader from "discourse/components/d-page-header";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DPageHeader from "discourse/ui-kit/d-page-header";import { i18n } from "discourse-i18n";export default <template>diff --git a/frontend/discourse/admin/templates/admin-config/localization/settings.gjs b/frontend/discourse/admin/templates/admin-config/localization/settings.gjsindex 46657750556..b6089b408a2 100644--- a/frontend/discourse/admin/templates/admin-config/localization/settings.gjs+++ b/frontend/discourse/admin/templates/admin-config/localization/settings.gjs@@ -1,6 +1,6 @@import AdminAreaSettings from "discourse/admin/components/admin-area-settings";-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DPageHeader from "discourse/components/d-page-header";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DPageHeader from "discourse/ui-kit/d-page-header";import { i18n } from "discourse-i18n";export default <template>diff --git a/frontend/discourse/admin/templates/admin-config/login.gjs b/frontend/discourse/admin/templates/admin-config/login.gjsindex fa2da1d2b02..9c239bab832 100644--- a/frontend/discourse/admin/templates/admin-config/login.gjs+++ b/frontend/discourse/admin/templates/admin-config/login.gjs@@ -1,9 +1,9 @@import Component from "@glimmer/component";import { concat } from "@ember/helper";import { service } from "@ember/service";-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DPageHeader from "discourse/components/d-page-header";-import NavItem from "discourse/components/nav-item";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DNavItem from "discourse/ui-kit/d-nav-item";+import DPageHeader from "discourse/ui-kit/d-page-header";import { i18n } from "discourse-i18n";export default class extends Component {@@ -22,24 +22,24 @@ export default class extends Component {/></:breadcrumbs><:tabs>- <NavItem+ <DNavItem@route="adminConfig.login.settings"@label="admin.config.login.sub_pages.common_settings.title"/>- <NavItem+ <DNavItem@route="adminConfig.login.discourse-id"@label="admin.config.login.sub_pages.discourse_id.title"/>- <NavItem+ <DNavItem@route="adminConfig.login.authenticators"@label="admin.config.login.sub_pages.authenticators.title"/>- <NavItem+ <DNavItem@route="adminConfig.login.discourseconnect"@label="admin.config.login.sub_pages.discourseconnect.title"/>{{#each this.site.admin_config_login_routes as |login_route|}}- <NavItem+ <DNavItem@route="adminConfig.login.plugin-tab"@routeParam={{login_route}}@label={{concat "admin.config.login.sub_pages." login_route}}diff --git a/frontend/discourse/admin/templates/admin-config/login/discourse-id.gjs b/frontend/discourse/admin/templates/admin-config/login/discourse-id.gjsindex 862025a2246..9938a59d9db 100644--- a/frontend/discourse/admin/templates/admin-config/login/discourse-id.gjs+++ b/frontend/discourse/admin/templates/admin-config/login/discourse-id.gjs@@ -3,12 +3,12 @@ import { tracked } from "@glimmer/tracking";import { on } from "@ember/modifier";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import DToggleSwitch from "discourse/components/d-toggle-switch";import PluginOutlet from "discourse/components/plugin-outlet";import lazyHash from "discourse/helpers/lazy-hash";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";+import DButton from "discourse/ui-kit/d-button";+import DToggleSwitch from "discourse/ui-kit/d-toggle-switch";import { i18n } from "discourse-i18n";class DiscourseIdAdmin extends Component {diff --git a/frontend/discourse/admin/templates/admin-config/logo.gjs b/frontend/discourse/admin/templates/admin-config/logo.gjsindex 369eee9b2d7..029b0563d14 100644--- a/frontend/discourse/admin/templates/admin-config/logo.gjs+++ b/frontend/discourse/admin/templates/admin-config/logo.gjs@@ -1,6 +1,6 @@import AdminLogoForm from "discourse/admin/components/admin-logo-form";-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DPageHeader from "discourse/components/d-page-header";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DPageHeader from "discourse/ui-kit/d-page-header";import { i18n } from "discourse-i18n";export default <template>diff --git a/frontend/discourse/admin/templates/admin-config/navigation/settings.gjs b/frontend/discourse/admin/templates/admin-config/navigation/settings.gjsindex 1b8f8738d5e..5dc7aa8d5b6 100644--- a/frontend/discourse/admin/templates/admin-config/navigation/settings.gjs+++ b/frontend/discourse/admin/templates/admin-config/navigation/settings.gjs@@ -1,6 +1,6 @@import AdminAreaSettings from "discourse/admin/components/admin-area-settings";-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DPageHeader from "discourse/components/d-page-header";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DPageHeader from "discourse/ui-kit/d-page-header";import { i18n } from "discourse-i18n";export default <template>diff --git a/frontend/discourse/admin/templates/admin-config/notifications/settings.gjs b/frontend/discourse/admin/templates/admin-config/notifications/settings.gjsindex 2c8b2cb6cbb..2fa90bda4a4 100644--- a/frontend/discourse/admin/templates/admin-config/notifications/settings.gjs+++ b/frontend/discourse/admin/templates/admin-config/notifications/settings.gjs@@ -1,6 +1,6 @@import AdminAreaSettings from "discourse/admin/components/admin-area-settings";-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DPageHeader from "discourse/components/d-page-header";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DPageHeader from "discourse/ui-kit/d-page-header";import { i18n } from "discourse-i18n";export default <template>diff --git a/frontend/discourse/admin/templates/admin-config/onebox/settings.gjs b/frontend/discourse/admin/templates/admin-config/onebox/settings.gjsindex 78f8dc080f4..6f04a86960b 100644--- a/frontend/discourse/admin/templates/admin-config/onebox/settings.gjs+++ b/frontend/discourse/admin/templates/admin-config/onebox/settings.gjs@@ -1,6 +1,6 @@import AdminAreaSettings from "discourse/admin/components/admin-area-settings";-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DPageHeader from "discourse/components/d-page-header";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DPageHeader from "discourse/ui-kit/d-page-header";import { i18n } from "discourse-i18n";export default <template>diff --git a/frontend/discourse/admin/templates/admin-config/rate-limits/settings.gjs b/frontend/discourse/admin/templates/admin-config/rate-limits/settings.gjsindex 4f22eba3eef..5145aaf1463 100644--- a/frontend/discourse/admin/templates/admin-config/rate-limits/settings.gjs+++ b/frontend/discourse/admin/templates/admin-config/rate-limits/settings.gjs@@ -1,6 +1,6 @@import AdminAreaSettings from "discourse/admin/components/admin-area-settings";-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DPageHeader from "discourse/components/d-page-header";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DPageHeader from "discourse/ui-kit/d-page-header";import { i18n } from "discourse-i18n";export default <template>diff --git a/frontend/discourse/admin/templates/admin-config/search/settings.gjs b/frontend/discourse/admin/templates/admin-config/search/settings.gjsindex 4c87c91237f..5f0def0052e 100644--- a/frontend/discourse/admin/templates/admin-config/search/settings.gjs+++ b/frontend/discourse/admin/templates/admin-config/search/settings.gjs@@ -1,6 +1,6 @@import AdminAreaSettings from "discourse/admin/components/admin-area-settings";-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DPageHeader from "discourse/components/d-page-header";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DPageHeader from "discourse/ui-kit/d-page-header";import { i18n } from "discourse-i18n";export default <template>diff --git a/frontend/discourse/admin/templates/admin-config/security/settings.gjs b/frontend/discourse/admin/templates/admin-config/security/settings.gjsindex 71ee2c776df..fb1eb43ccd3 100644--- a/frontend/discourse/admin/templates/admin-config/security/settings.gjs+++ b/frontend/discourse/admin/templates/admin-config/security/settings.gjs@@ -1,6 +1,6 @@import AdminAreaSettings from "discourse/admin/components/admin-area-settings";-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DPageHeader from "discourse/components/d-page-header";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DPageHeader from "discourse/ui-kit/d-page-header";import { i18n } from "discourse-i18n";export default <template>diff --git a/frontend/discourse/admin/templates/admin-config/site-admin/settings.gjs b/frontend/discourse/admin/templates/admin-config/site-admin/settings.gjsindex 1fb21fee11b..a63b70d13c3 100644--- a/frontend/discourse/admin/templates/admin-config/site-admin/settings.gjs+++ b/frontend/discourse/admin/templates/admin-config/site-admin/settings.gjs@@ -1,6 +1,6 @@import AdminAreaSettings from "discourse/admin/components/admin-area-settings";-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DPageHeader from "discourse/components/d-page-header";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DPageHeader from "discourse/ui-kit/d-page-header";import { i18n } from "discourse-i18n";export default <template>diff --git a/frontend/discourse/admin/templates/admin-config/spam/settings.gjs b/frontend/discourse/admin/templates/admin-config/spam/settings.gjsindex 27ff1cee3bf..3286de10f14 100644--- a/frontend/discourse/admin/templates/admin-config/spam/settings.gjs+++ b/frontend/discourse/admin/templates/admin-config/spam/settings.gjs@@ -1,6 +1,6 @@import AdminAreaSettings from "discourse/admin/components/admin-area-settings";-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DPageHeader from "discourse/components/d-page-header";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DPageHeader from "discourse/ui-kit/d-page-header";import { i18n } from "discourse-i18n";export default <template>diff --git a/frontend/discourse/admin/templates/admin-config/trust-levels/settings.gjs b/frontend/discourse/admin/templates/admin-config/trust-levels/settings.gjsindex 7d842e036c0..bb38acb8bf3 100644--- a/frontend/discourse/admin/templates/admin-config/trust-levels/settings.gjs+++ b/frontend/discourse/admin/templates/admin-config/trust-levels/settings.gjs@@ -1,6 +1,6 @@import AdminAreaSettings from "discourse/admin/components/admin-area-settings";-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DPageHeader from "discourse/components/d-page-header";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DPageHeader from "discourse/ui-kit/d-page-header";import { i18n } from "discourse-i18n";export default <template>diff --git a/frontend/discourse/admin/templates/admin-config/upcoming-changes.gjs b/frontend/discourse/admin/templates/admin-config/upcoming-changes.gjsindex c10aef3e817..60aba121eb2 100644--- a/frontend/discourse/admin/templates/admin-config/upcoming-changes.gjs+++ b/frontend/discourse/admin/templates/admin-config/upcoming-changes.gjs@@ -1,6 +1,6 @@import AdminConfigAreasUpcomingChanges from "discourse/admin/components/admin-config-areas/upcoming-changes";-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DPageHeader from "discourse/components/d-page-header";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DPageHeader from "discourse/ui-kit/d-page-header";import { i18n } from "discourse-i18n";export default <template>diff --git a/frontend/discourse/admin/templates/admin-config/user-defaults/settings.gjs b/frontend/discourse/admin/templates/admin-config/user-defaults/settings.gjsindex 5042ff56f87..75a982c9272 100644--- a/frontend/discourse/admin/templates/admin-config/user-defaults/settings.gjs+++ b/frontend/discourse/admin/templates/admin-config/user-defaults/settings.gjs@@ -1,6 +1,6 @@import AdminAreaSettings from "discourse/admin/components/admin-area-settings";-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DPageHeader from "discourse/components/d-page-header";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DPageHeader from "discourse/ui-kit/d-page-header";import { i18n } from "discourse-i18n";export default <template>diff --git a/frontend/discourse/admin/templates/admin-customize-email-style.gjs b/frontend/discourse/admin/templates/admin-customize-email-style.gjsindex 60dcd070533..47b7c4099ff 100644--- a/frontend/discourse/admin/templates/admin-customize-email-style.gjs+++ b/frontend/discourse/admin/templates/admin-customize-email-style.gjs@@ -1,6 +1,6 @@-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DPageHeader from "discourse/components/d-page-header";-import NavItem from "discourse/components/nav-item";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DNavItem from "discourse/ui-kit/d-nav-item";+import DPageHeader from "discourse/ui-kit/d-page-header";import { i18n } from "discourse-i18n";export default <template>@@ -19,12 +19,12 @@ export default <template>/></:breadcrumbs><:tabs>- <NavItem+ <DNavItem@label="admin.customize.email_style.html"@route="adminCustomizeEmailStyle.edit"@routeParam="html"/>- <NavItem+ <DNavItem@label="admin.customize.email_style.css"@route="adminCustomizeEmailStyle.edit"@routeParam="css"diff --git a/frontend/discourse/admin/templates/admin-customize-email-style/edit.gjs b/frontend/discourse/admin/templates/admin-customize-email-style/edit.gjsindex 2f1a74b90cb..4d865d78233 100644--- a/frontend/discourse/admin/templates/admin-customize-email-style/edit.gjs+++ b/frontend/discourse/admin/templates/admin-customize-email-style/edit.gjs@@ -1,6 +1,6 @@import EmailStylesEditor from "discourse/admin/components/email-styles-editor";-import DButton from "discourse/components/d-button";import PluginOutlet from "discourse/components/plugin-outlet";+import DButton from "discourse/ui-kit/d-button";export default <template><PluginOutletdiff --git a/frontend/discourse/admin/templates/admin-customize-form-templates/index.gjs b/frontend/discourse/admin/templates/admin-customize-form-templates/index.gjsindex cd9a7714612..b55055e8ab8 100644--- a/frontend/discourse/admin/templates/admin-customize-form-templates/index.gjs+++ b/frontend/discourse/admin/templates/admin-customize-form-templates/index.gjs@@ -1,6 +1,6 @@import InfoHeader from "discourse/admin/components/form-template/info-header";import RowItem from "discourse/admin/components/form-template/row-item";-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";export default <template>diff --git a/frontend/discourse/admin/templates/admin-customize-robots-txt.gjs b/frontend/discourse/admin/templates/admin-customize-robots-txt.gjsindex cc1301b4bb7..fdbe265cc25 100644--- a/frontend/discourse/admin/templates/admin-customize-robots-txt.gjs+++ b/frontend/discourse/admin/templates/admin-customize-robots-txt.gjs@@ -1,6 +1,6 @@import { Textarea } from "@ember/component";-import DButton from "discourse/components/d-button";-import SaveControls from "discourse/components/save-controls";+import DButton from "discourse/ui-kit/d-button";+import DSaveControls from "discourse/ui-kit/d-save-controls";import { i18n } from "discourse-i18n";export default <template>@@ -16,7 +16,7 @@ export default <template>@value={{@controller.buffered.robots_txt}}class="robots-txt-input"/>- <SaveControls+ <DSaveControls@model={{@controller}}@action={{@controller.save}}@saved={{@controller.saved}}@@ -29,6 +29,6 @@ export default <template>@label="admin.settings.reset"class="btn-default"/>- </SaveControls>+ </DSaveControls></div></template>diff --git a/frontend/discourse/admin/templates/admin-customize-themes/edit.gjs b/frontend/discourse/admin/templates/admin-customize-themes/edit.gjsindex 607fd42251f..64795efafd5 100644--- a/frontend/discourse/admin/templates/admin-customize-themes/edit.gjs+++ b/frontend/discourse/admin/templates/admin-customize-themes/edit.gjs@@ -1,6 +1,6 @@import { LinkTo } from "@ember/routing";import AdminThemeEditor from "discourse/admin/components/admin-theme-editor";-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";export default <template>diff --git a/frontend/discourse/admin/templates/admin-customize-themes/show.gjs b/frontend/discourse/admin/templates/admin-customize-themes/show.gjsindex 10d7dcfb74a..38e3d505949 100644--- a/frontend/discourse/admin/templates/admin-customize-themes/show.gjs+++ b/frontend/discourse/admin/templates/admin-customize-themes/show.gjs@@ -1,13 +1,13 @@import { LinkTo } from "@ember/routing";import { trustHTML } from "@ember/template";-import DButton from "discourse/components/d-button";import PluginOutlet from "discourse/components/plugin-outlet";-import TextField from "discourse/components/text-field";-import UserLink from "discourse/components/user-link";-import avatar from "discourse/helpers/avatar";-import icon from "discourse/helpers/d-icon";-import formatDate from "discourse/helpers/format-date";import lazyHash from "discourse/helpers/lazy-hash";+import DButton from "discourse/ui-kit/d-button";+import DTextField from "discourse/ui-kit/d-text-field";+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 dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default <template>@@ -20,7 +20,7 @@ export default <template>"adminConfig.customize.themes"}}>- {{icon "angle-left"}}+ {{dIcon "angle-left"}}{{i18n(if@controller.model.component@@ -42,7 +42,7 @@ export default <template><div class="title admin-customize-themes-show__title">{{#if @controller.editingName}}<div class="container-edit-title">- <TextField @value={{@controller.model.name}} @autofocus="true" />+ <DTextField @value={{@controller.model.name}} @autofocus="true" /><DButton@action={{@controller.finishedEditingName}}@icon="check"@@ -64,7 +64,7 @@ export default <template>><span>{{@controller.model.name}}</span>{{#unless @controller.model.system}}- {{icon "pencil" class="inline-icon"}}+ {{dIcon "pencil" class="inline-icon"}}{{/unless}}</DButton>{{/if}}@@ -84,7 +84,7 @@ export default <template>{{#if @controller.sourceIsHttp}}<a class="remote-url" href={{@controller.remoteThemeLink}}>{{i18n"admin.customize.theme.source_url"- }}{{icon "link"}}</a>+ }}{{dIcon "link"}}</a>{{else}}<div class="remote-url"><code>{{@controller.model.remote_theme.remote_url}}</code>@@ -96,7 +96,7 @@ export default <template>{{#if @controller.showRemoteError}}<div class="error-message">- {{icon "triangle-exclamation"}}+ {{dIcon "triangle-exclamation"}}{{i18n "admin.customize.theme.repo_unreachable"}}</div><div class="raw-error">@@ -119,7 +119,7 @@ export default <template><span class="status-message">{{i18n "admin.customize.theme.last_attempt"}}- {{formatDate+ {{dFormatDate@controller.model.remote_theme.updated_atleaveAgo="true"}}@@ -148,11 +148,11 @@ export default <template><div class="alert alert-error">{{#if @controller.model.disabled_by}}{{i18n "admin.customize.theme.disabled_by"}}- <UserLink @user={{@controller.model.disabled_by}}>- {{avatar @controller.model.disabled_by imageSize="tiny"}}+ <DUserLink @user={{@controller.model.disabled_by}}>+ {{dAvatar @controller.model.disabled_by imageSize="tiny"}}{{@controller.model.disabled_by.username}}- </UserLink>- {{formatDate @controller.model.disabled_at leaveAgo="true"}}+ </DUserLink>+ {{dFormatDate @controller.model.disabled_at leaveAgo="true"}}{{else}}{{i18n "admin.customize.theme.disabled"}}{{/if}}@@ -171,7 +171,7 @@ export default <template>{{#if @controller.sourceIsHttp}}<a class="remote-url" href={{@controller.remoteThemeLink}}>{{i18n"admin.customize.theme.source_url"- }}{{icon "link"}}</a>+ }}{{dIcon "link"}}</a>{{else}}<div class="remote-url"><code>{{@controller.model.remote_theme.remote_url}}</code>@@ -186,14 +186,14 @@ export default <template><aclass="url about-url"href={{@controller.model.remote_theme.about_url}}- >{{i18n "admin.customize.theme.about_theme"}}{{icon "link"}}</a>+ >{{i18n "admin.customize.theme.about_theme"}}{{dIcon "link"}}</a>{{/if}}{{#if @controller.model.remote_theme.license_url}}<aclass="url license-url"href={{@controller.model.remote_theme.license_url}}- >{{i18n "admin.customize.theme.license"}}{{icon "link"}}</a>+ >{{i18n "admin.customize.theme.license"}}{{dIcon "link"}}</a>{{/if}}{{#if @controller.model.description}}@@ -228,7 +228,7 @@ export default <template>{{#if @controller.showRemoteError}}<div class="error-message">- {{icon "triangle-exclamation"}}+ {{dIcon "triangle-exclamation"}}{{i18n "admin.customize.theme.repo_unreachable"}}</div><div class="raw-error">diff --git a/frontend/discourse/admin/templates/admin-customize-themes/show/index.gjs b/frontend/discourse/admin/templates/admin-customize-themes/show/index.gjsindex b9ec3acc387..627ed972a5d 100644--- a/frontend/discourse/admin/templates/admin-customize-themes/show/index.gjs+++ b/frontend/discourse/admin/templates/admin-customize-themes/show/index.gjs@@ -6,18 +6,18 @@ import ThemeSettingEditor from "discourse/admin/components/theme-setting-editor"import ThemeSettingRelativesSelector from "discourse/admin/components/theme-setting-relatives-selector";import ThemeSiteSettingEditor from "discourse/admin/components/theme-site-setting-editor";import ThemeTranslation from "discourse/admin/components/theme-translation";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DButton from "discourse/components/d-button";import PluginOutlet from "discourse/components/plugin-outlet";-import UserLink from "discourse/components/user-link";-import icon from "discourse/helpers/d-icon";-import formatDate from "discourse/helpers/format-date";import formatUsername from "discourse/helpers/format-username";import lazyHash from "discourse/helpers/lazy-hash";import getURL from "discourse/lib/get-url";import ColorPalettePicker from "discourse/select-kit/components/color-palette-picker";import ComboBox from "discourse/select-kit/components/combo-box";import { and, not, or } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DUserLink from "discourse/ui-kit/d-user-link";+import dFormatDate from "discourse/ui-kit/helpers/d-format-date";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default <template>@@ -69,7 +69,7 @@ export default <template>{{else}}{{#unless @controller.showRemoteError}}{{i18n "admin.customize.theme.up_to_date"}}- {{formatDate+ {{dFormatDate@controller.model.remote_theme.updated_atleaveAgo="true"}}@@ -79,7 +79,7 @@ export default <template></span>{{else}}<span class="status-message">- {{icon "circle-info"}}+ {{dIcon "circle-info"}}{{i18n "admin.customize.theme.imported_from_archive"}}</span>{{/if}}@@ -89,9 +89,9 @@ export default <template>"admin.customize.theme.creator"}}</span><span>- <UserLink @user={{@controller.model.user}}>+ <DUserLink @user={{@controller.model.user}}>{{formatUsername @controller.model.user.username}}- </UserLink>+ </DUserLink></span>{{/if}}</div>@@ -427,7 +427,7 @@ export default <template>/></div></div>- <ConditionalLoadingSpinner+ <DConditionalLoadingSpinner@condition={{@controller.model.loadingTranslations}}><section@@ -442,7 +442,7 @@ export default <template>/>{{/each}}</section>- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner></div>{{/if}}@@ -457,14 +457,14 @@ export default <template>rel="noopener noreferrer"target="_blank"class="btn btn-default"- >{{icon "desktop"}}{{i18n "admin.customize.theme.preview"}}</a>+ >{{dIcon "desktop"}}{{i18n "admin.customize.theme.preview"}}</a>{{#unless @controller.model.system}}<aclass="btn btn-default export"rel="noopener noreferrer"target="_blank"href={{@controller.downloadUrl}}- >{{icon "download"}} {{i18n "admin.export_json.button_text"}}</a>+ >{{dIcon "download"}} {{i18n "admin.export_json.button_text"}}</a>{{/unless}}{{#if @controller.showConvert}}diff --git a/frontend/discourse/admin/templates/admin-customize-themes/show/schema.gjs b/frontend/discourse/admin/templates/admin-customize-themes/show/schema.gjsindex a3f5fe1d7fd..0c5767e0cca 100644--- a/frontend/discourse/admin/templates/admin-customize-themes/show/schema.gjs+++ b/frontend/discourse/admin/templates/admin-customize-themes/show/schema.gjs@@ -1,7 +1,7 @@import { hash } from "@ember/helper";import { LinkTo } from "@ember/routing";import Editor from "discourse/admin/components/schema-setting/editor";-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default <template>@@ -11,7 +11,7 @@ export default <template>@model={{@model.theme.id}}class="btn-transparent customize-show-schema__back">- {{icon "arrow-left"}}{{@model.theme.name}}+ {{dIcon "arrow-left"}}{{@model.theme.name}}</LinkTo><h2>{{i18n "admin.customize.schema.title" (hash [email protected])}}diff --git a/frontend/discourse/admin/templates/admin-email-logs.gjs b/frontend/discourse/admin/templates/admin-email-logs.gjsindex 05a8e190365..16882386cd1 100644--- a/frontend/discourse/admin/templates/admin-email-logs.gjs+++ b/frontend/discourse/admin/templates/admin-email-logs.gjs@@ -1,6 +1,6 @@-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DPageHeader from "discourse/components/d-page-header";-import NavItem from "discourse/components/nav-item";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DNavItem from "discourse/ui-kit/d-nav-item";+import DPageHeader from "discourse/ui-kit/d-page-header";import { i18n } from "discourse-i18n";export default <template>@@ -17,23 +17,23 @@ export default <template>/></:breadcrumbs><:tabs>- <NavItem+ <DNavItem@route="adminEmailLogs.sent"@label="admin.config.email_logs.sub_pages.sent.title"/>- <NavItem+ <DNavItem@route="adminEmailLogs.skipped"@label="admin.config.email_logs.sub_pages.skipped.title"/>- <NavItem+ <DNavItem@route="adminEmailLogs.bounced"@label="admin.config.email_logs.sub_pages.bounced.title"/>- <NavItem+ <DNavItem@route="adminEmailLogs.received"@label="admin.config.email_logs.sub_pages.received.title"/>- <NavItem+ <DNavItem@route="adminEmailLogs.rejected"@label="admin.config.email_logs.sub_pages.rejected.title"/>diff --git a/frontend/discourse/admin/templates/admin-email-logs/bounced.gjs b/frontend/discourse/admin/templates/admin-email-logs/bounced.gjsindex ba301c7e685..a8435dd191a 100644--- a/frontend/discourse/admin/templates/admin-email-logs/bounced.gjs+++ b/frontend/discourse/admin/templates/admin-email-logs/bounced.gjs@@ -7,11 +7,11 @@ import { service } from "@ember/service";import EmailLogsList from "discourse/admin/components/email-logs-list";import IncomingEmailModal from "discourse/admin/components/modal/incoming-email";import IncomingEmail from "discourse/admin/models/incoming-email";-import avatar from "discourse/helpers/avatar";-import icon from "discourse/helpers/d-icon";-import formatDate from "discourse/helpers/format-date";import { popupAjaxError } from "discourse/lib/ajax-error";import { bind } from "discourse/lib/decorators";+import dAvatar from "discourse/ui-kit/helpers/d-avatar";+import dFormatDate from "discourse/ui-kit/helpers/d-format-date";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";const BOUNCED_HEADERS = [@@ -68,12 +68,12 @@ export default class AdminEmailLogsBounced extends Component {as |emailLog ccThreshold sortWithAddressFilter handleShowIncomingEmail|><tr data-test-email-log-row-id={{emailLog.id}}>- <td>{{formatDate emailLog.created_at}}</td>+ <td>{{dFormatDate emailLog.created_at}}</td><td>{{#if emailLog.user}}<span class="email-logs-user"><LinkTo @route="adminUser" @model={{emailLog.user}}>- {{avatar emailLog.user imageSize="tiny"}}+ {{dAvatar emailLog.user imageSize="tiny"}}{{emailLog.user.username}}</LinkTo></span>@@ -92,7 +92,7 @@ export default class AdminEmailLogsBounced extends Component {{{on "click" (fn handleShowIncomingEmail emailLog.id)}}title={{i18n "admin.email.details_title"}}>- {{icon "circle-info"}}+ {{dIcon "circle-info"}}</a>{{/if}}</td>diff --git a/frontend/discourse/admin/templates/admin-email-logs/received.gjs b/frontend/discourse/admin/templates/admin-email-logs/received.gjsindex 28324f8fbdf..09d87224da5 100644--- a/frontend/discourse/admin/templates/admin-email-logs/received.gjs+++ b/frontend/discourse/admin/templates/admin-email-logs/received.gjs@@ -1,7 +1,7 @@import EmailLogsList from "discourse/admin/components/email-logs-list";import IncomingEmail from "discourse/admin/models/incoming-email";-import formatDate from "discourse/helpers/format-date";import routeAction from "discourse/helpers/route-action";+import dFormatDate from "discourse/ui-kit/helpers/d-format-date";const RECEIVED_HEADERS = [{ key: "admin.email.incoming_emails.from_address" },@@ -38,7 +38,7 @@ export default <template>><:default as |emailLog|><tr data-test-email-log-row-id={{emailLog.id}}>- <td>{{formatDate emailLog.created_at}}</td>+ <td>{{dFormatDate emailLog.created_at}}</td><td>{{emailLog.from_address}}</td><td>{{emailLog.to_addresses}}</td><td>diff --git a/frontend/discourse/admin/templates/admin-email-logs/rejected.gjs b/frontend/discourse/admin/templates/admin-email-logs/rejected.gjsindex d6fc12fb7a4..0e460174015 100644--- a/frontend/discourse/admin/templates/admin-email-logs/rejected.gjs+++ b/frontend/discourse/admin/templates/admin-email-logs/rejected.gjs@@ -2,8 +2,8 @@ import { fn } from "@ember/helper";import { on } from "@ember/modifier";import EmailLogsList from "discourse/admin/components/email-logs-list";import IncomingEmail from "discourse/admin/models/incoming-email";-import formatDate from "discourse/helpers/format-date";import routeAction from "discourse/helpers/route-action";+import dFormatDate from "discourse/ui-kit/helpers/d-format-date";const REJECTED_HEADERS = [{ key: "admin.email.incoming_emails.from_address" },@@ -48,7 +48,7 @@ export default <template>as |emailLog ccThreshold sortWithAddressFilter handleShowIncomingEmail|><tr data-test-email-log-row-id={{emailLog.id}}>- <td>{{formatDate emailLog.created_at}}</td>+ <td>{{dFormatDate emailLog.created_at}}</td><td>{{emailLog.from_address}}</td><td>{{emailLog.to_addresses}}</td><td>diff --git a/frontend/discourse/admin/templates/admin-email-logs/sent.gjs b/frontend/discourse/admin/templates/admin-email-logs/sent.gjsindex 85b32093037..4c3cb3b7e43 100644--- a/frontend/discourse/admin/templates/admin-email-logs/sent.gjs+++ b/frontend/discourse/admin/templates/admin-email-logs/sent.gjs@@ -2,11 +2,11 @@ import { array, fn, hash } from "@ember/helper";import { LinkTo } from "@ember/routing";import EmailLogsList from "discourse/admin/components/email-logs-list";import DTooltip from "discourse/float-kit/components/d-tooltip";-import avatar from "discourse/helpers/avatar";-import icon from "discourse/helpers/d-icon";-import formatDate from "discourse/helpers/format-date";import slice from "discourse/helpers/slice";import { gt } from "discourse/truth-helpers";+import dAvatar from "discourse/ui-kit/helpers/d-avatar";+import dFormatDate from "discourse/ui-kit/helpers/d-format-date";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";const CC_ADDRESS_DISPLAY_THRESHOLD = 2;@@ -54,12 +54,12 @@ export default <template>><:default as |emailLog ccThreshold sortWithAddressFilter|><tr class="sent-email-item" data-test-email-log-row-id={{emailLog.id}}>- <td class="sent-email-date">{{formatDate emailLog.created_at}}</td>+ <td class="sent-email-date">{{dFormatDate emailLog.created_at}}</td><td class="sent-email-username">{{#if emailLog.user}}<span class="email-logs-user"><LinkTo @route="adminUser" @model={{emailLog.user}}>- {{avatar emailLog.user imageSize="tiny"}}+ {{dAvatar emailLog.user imageSize="tiny"}}{{emailLog.user.username}}</LinkTo></span>@@ -69,7 +69,7 @@ export default <template></td><td class="sent-email-address">{{#if emailLog.bounced}}- {{icon "arrow-rotate-right" title="admin.email.bounced"}}+ {{dIcon "arrow-rotate-right" title="admin.email.bounced"}}{{/if}}<a href="mailto:{{emailLog.to_address}}" title="TO">{{emailLog.to_address}}diff --git a/frontend/discourse/admin/templates/admin-email-logs/skipped.gjs b/frontend/discourse/admin/templates/admin-email-logs/skipped.gjsindex 4daec152e27..38c8d79ae5f 100644--- a/frontend/discourse/admin/templates/admin-email-logs/skipped.gjs+++ b/frontend/discourse/admin/templates/admin-email-logs/skipped.gjs@@ -1,7 +1,7 @@import { LinkTo } from "@ember/routing";import EmailLogsList from "discourse/admin/components/email-logs-list";-import avatar from "discourse/helpers/avatar";-import formatDate from "discourse/helpers/format-date";+import dAvatar from "discourse/ui-kit/helpers/d-avatar";+import dFormatDate from "discourse/ui-kit/helpers/d-format-date";const SKIPPED_HEADERS = [{ key: "admin.email.user" },@@ -37,12 +37,12 @@ export default <template>><:default as |emailLog|><tr data-test-email-log-row-id={{emailLog.id}}>- <td>{{formatDate emailLog.created_at}}</td>+ <td>{{dFormatDate emailLog.created_at}}</td><td>{{#if emailLog.user}}<span class="email-logs-user"><LinkTo @route="adminUser" @model={{emailLog.user}}>- {{avatar emailLog.user imageSize="tiny"}}+ {{dAvatar emailLog.user imageSize="tiny"}}{{emailLog.user.username}}</LinkTo></span>diff --git a/frontend/discourse/admin/templates/admin-email-templates/edit.gjs b/frontend/discourse/admin/templates/admin-email-templates/edit.gjsindex 132960489a9..78bf429d34b 100644--- a/frontend/discourse/admin/templates/admin-email-templates/edit.gjs+++ b/frontend/discourse/admin/templates/admin-email-templates/edit.gjs@@ -4,12 +4,12 @@ import { on } from "@ember/modifier";import didInsert from "@ember/render-modifiers/modifiers/did-insert";import { LinkTo } from "@ember/routing";import AdminInterpolationKeys from "discourse/admin/components/admin-interpolation-keys";-import DButton from "discourse/components/d-button";-import DEditor from "discourse/components/d-editor";import PluginOutlet from "discourse/components/plugin-outlet";-import SaveControls from "discourse/components/save-controls";-import icon from "discourse/helpers/d-icon";import { USER_OPTION_COMPOSITION_MODES } from "discourse/lib/constants";+import DButton from "discourse/ui-kit/d-button";+import DEditor from "discourse/ui-kit/d-editor";+import DSaveControls from "discourse/ui-kit/d-save-controls";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default <template>@@ -17,7 +17,7 @@ export default <template><div class="email-template"><div class="back-to-email-templates"><LinkTo @route="adminEmailTemplates">- {{icon "angle-left"}}+ {{dIcon "angle-left"}}{{i18n "admin.customize.email_templates.back"}}</LinkTo></div>@@ -66,7 +66,7 @@ export default <template>@onInsertKey={{@controller.insertInterpolationKey}}/>- <SaveControls+ <DSaveControls@model={{@controller.emailTemplate}}@action={{@controller.saveChanges}}@saved={{@controller.saved}}@@ -78,7 +78,7 @@ export default <template>@label="admin.customize.email_templates.revert"/>{{/if}}- </SaveControls>+ </DSaveControls></div></PluginOutlet></template>diff --git a/frontend/discourse/admin/templates/admin-email-templates/index.gjs b/frontend/discourse/admin/templates/admin-email-templates/index.gjsindex 4d57d768425..f8b647d3ca1 100644--- a/frontend/discourse/admin/templates/admin-email-templates/index.gjs+++ b/frontend/discourse/admin/templates/admin-email-templates/index.gjs@@ -2,9 +2,9 @@ import { array } from "@ember/helper";import { on } from "@ember/modifier";import { LinkTo } from "@ember/routing";import AdminFilterControls from "discourse/admin/components/admin-filter-controls";-import DButton from "discourse/components/d-button";import PluginOutlet from "discourse/components/plugin-outlet";-import concatClass from "discourse/helpers/concat-class";+import DButton from "discourse/ui-kit/d-button";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";export default <template>@@ -44,7 +44,7 @@ export default <template><tbody class="d-table__body">{{#each filteredTemplates as |template|}}<tr- class={{concatClass+ class={{dConcatClass"d-table__row""email-templates-list__row"(if template.can_revert "overridden")diff --git a/frontend/discourse/admin/templates/admin-email.gjs b/frontend/discourse/admin/templates/admin-email.gjsindex 727167878b8..ecf2db583d1 100644--- a/frontend/discourse/admin/templates/admin-email.gjs+++ b/frontend/discourse/admin/templates/admin-email.gjs@@ -1,6 +1,6 @@-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DPageHeader from "discourse/components/d-page-header";-import NavItem from "discourse/components/nav-item";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DNavItem from "discourse/ui-kit/d-nav-item";+import DPageHeader from "discourse/ui-kit/d-page-header";import { i18n } from "discourse-i18n";export default <template>@@ -17,20 +17,20 @@ export default <template>/></:breadcrumbs><:tabs>- <NavItem @route="adminEmail.settings" @label="settings" />- <NavItem+ <DNavItem @route="adminEmail.settings" @label="settings" />+ <DNavItem@route="adminEmail.serverSettings"@label="admin.config.email.sub_pages.server_settings.title"/>- <NavItem+ <DNavItem@route="adminEmail.previewDigest"@label="admin.config.email.sub_pages.preview_summary.title"/>- <NavItem+ <DNavItem@route="adminEmail.advancedTest"@label="admin.config.email.sub_pages.advanced_test.title"/>- <NavItem+ <DNavItem@route="adminEmailTemplates"@label="admin.config.email.sub_pages.templates.title"/>diff --git a/frontend/discourse/admin/templates/admin-email/advanced-test.gjs b/frontend/discourse/admin/templates/admin-email/advanced-test.gjsindex 9253283c399..972291eda6e 100644--- a/frontend/discourse/admin/templates/admin-email/advanced-test.gjs+++ b/frontend/discourse/admin/templates/admin-email/advanced-test.gjs@@ -1,8 +1,8 @@import { Textarea } from "@ember/component";import { trustHTML } from "@ember/template";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DButton from "discourse/components/d-button";-import DPageSubheader from "discourse/components/d-page-subheader";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DPageSubheader from "discourse/ui-kit/d-page-subheader";import { i18n } from "discourse-i18n";export default <template>@@ -22,7 +22,7 @@ export default <template>/></div>- <ConditionalLoadingSpinner @condition={{@controller.loading}}>+ <DConditionalLoadingSpinner @condition={{@controller.loading}}>{{#if @controller.format}}<hr /><div class="text">@@ -35,5 +35,5 @@ export default <template><pre class="full-reason">{{trustHTML @controller.elided}}</pre></div>{{/if}}- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner></template>diff --git a/frontend/discourse/admin/templates/admin-email/preview-digest.gjs b/frontend/discourse/admin/templates/admin-email/preview-digest.gjsindex 87c8c84e41b..739b350fcf2 100644--- a/frontend/discourse/admin/templates/admin-email/preview-digest.gjs+++ b/frontend/discourse/admin/templates/admin-email/preview-digest.gjs@@ -1,12 +1,12 @@import { hash } from "@ember/helper";import { on } from "@ember/modifier";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DButton from "discourse/components/d-button";-import DPageSubheader from "discourse/components/d-page-subheader";import DatePickerPast from "discourse/components/date-picker-past";import PluginOutlet from "discourse/components/plugin-outlet";-import TextField from "discourse/components/text-field";import EmailGroupUserChooser from "discourse/select-kit/components/email-group-user-chooser";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DPageSubheader from "discourse/ui-kit/d-page-subheader";+import DTextField from "discourse/ui-kit/d-text-field";import { i18n } from "discourse-i18n";export default <template>@@ -63,7 +63,7 @@ export default <template></div></div>- <ConditionalLoadingSpinner @condition={{@controller.loading}}>+ <DConditionalLoadingSpinner @condition={{@controller.loading}}><div class="email-preview-digest">{{#if @controller.showSendEmailForm}}@@ -73,7 +73,7 @@ export default <template>{{i18n "admin.email.sending_test"}}{{else}}<label>{{i18n "admin.email.send_digest_label"}}</label>- <TextField+ <DTextField@value={{@controller.email}}@placeholderKey="admin.email.test_email_address"/>@@ -109,6 +109,6 @@ export default <template></div></div>- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner></PluginOutlet></template>diff --git a/frontend/discourse/admin/templates/admin-email/server-settings.gjs b/frontend/discourse/admin/templates/admin-email/server-settings.gjsindex 3f33c448487..464fb4b74dd 100644--- a/frontend/discourse/admin/templates/admin-email/server-settings.gjs+++ b/frontend/discourse/admin/templates/admin-email/server-settings.gjs@@ -1,5 +1,5 @@-import DButton from "discourse/components/d-button";-import TextField from "discourse/components/text-field";+import DButton from "discourse/ui-kit/d-button";+import DTextField from "discourse/ui-kit/d-text-field";import { i18n } from "discourse-i18n";export default <template>@@ -26,7 +26,7 @@ export default <template>{{#if @controller.sendingEmail}}{{i18n "admin.email.sending_test"}}{{else}}- <TextField+ <DTextField@value={{@controller.testEmailAddress}}@placeholderKey="admin.email.test_email_address"/>diff --git a/frontend/discourse/admin/templates/admin-embedding.gjs b/frontend/discourse/admin/templates/admin-embedding.gjsindex b73a982a2bb..087e7890535 100644--- a/frontend/discourse/admin/templates/admin-embedding.gjs+++ b/frontend/discourse/admin/templates/admin-embedding.gjs@@ -1,6 +1,6 @@-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DPageHeader from "discourse/components/d-page-header";-import NavItem from "discourse/components/nav-item";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DNavItem from "discourse/ui-kit/d-nav-item";+import DPageHeader from "discourse/ui-kit/d-page-header";import { i18n } from "discourse-i18n";export default <template>@@ -26,22 +26,22 @@ export default <template>/></:actions><:tabs>- <NavItem+ <DNavItem@route="adminEmbedding.settings"@label="admin.embedding.nav.settings"class="admin-embedding-tabs__settings"/>- <NavItem+ <DNavItem@route="adminEmbedding.index"@label="admin.embedding.nav.hosts"class="admin-embedding-tabs__hosts"/>- <NavItem+ <DNavItem@route="adminEmbedding.postsAndTopics"@label="admin.embedding.nav.posts_and_topics"class="admin-embedding-tabs__posts-and-topics"/>- <NavItem+ <DNavItem@route="adminEmbedding.crawlers"@label="admin.embedding.nav.crawlers"class="admin-embedding-tabs__crawlers"diff --git a/frontend/discourse/admin/templates/admin-embedding/crawlers.gjs b/frontend/discourse/admin/templates/admin-embedding/crawlers.gjsindex f5232b1f808..348bba6d27f 100644--- a/frontend/discourse/admin/templates/admin-embedding/crawlers.gjs+++ b/frontend/discourse/admin/templates/admin-embedding/crawlers.gjs@@ -1,5 +1,5 @@-import DPageSubheader from "discourse/components/d-page-subheader";import Form from "discourse/components/form";+import DPageSubheader from "discourse/ui-kit/d-page-subheader";import { i18n } from "discourse-i18n";export default <template>diff --git a/frontend/discourse/admin/templates/admin-embedding/index.gjs b/frontend/discourse/admin/templates/admin-embedding/index.gjsindex 118aa4efe2b..bca3e18b878 100644--- a/frontend/discourse/admin/templates/admin-embedding/index.gjs+++ b/frontend/discourse/admin/templates/admin-embedding/index.gjs@@ -3,10 +3,10 @@ import { trustHTML } from "@ember/template";import AdminConfigAreaCard from "discourse/admin/components/admin-config-area-card";import AdminConfigAreaEmptyList from "discourse/admin/components/admin-config-area-empty-list";import EmbeddableHost from "discourse/admin/components/embeddable-host";-import DToggleSwitch from "discourse/components/d-toggle-switch";-import HighlightedCode from "discourse/components/highlighted-code";import PluginOutlet from "discourse/components/plugin-outlet";import lazyHash from "discourse/helpers/lazy-hash";+import DHighlightedCode from "discourse/ui-kit/d-highlighted-code";+import DToggleSwitch from "discourse/ui-kit/d-toggle-switch";import { i18n } from "discourse-i18n";export default <template>@@ -36,7 +36,7 @@ export default <template>><:content>{{trustHTML (i18n "admin.embedding.sample")}}- <HighlightedCode @code={{@controller.embeddingCode}} @lang="html" />+ <DHighlightedCode @code={{@controller.embeddingCode}} @lang="html" /></:content></AdminConfigAreaCard>{{/if}}diff --git a/frontend/discourse/admin/templates/admin-embedding/posts-and-topics.gjs b/frontend/discourse/admin/templates/admin-embedding/posts-and-topics.gjsindex 76964031163..0d256835cc6 100644--- a/frontend/discourse/admin/templates/admin-embedding/posts-and-topics.gjs+++ b/frontend/discourse/admin/templates/admin-embedding/posts-and-topics.gjs@@ -1,7 +1,7 @@import { hash } from "@ember/helper";-import DPageSubheader from "discourse/components/d-page-subheader";import Form from "discourse/components/form";import UserChooser from "discourse/select-kit/components/user-chooser";+import DPageSubheader from "discourse/ui-kit/d-page-subheader";import { i18n } from "discourse-i18n";export default <template>diff --git a/frontend/discourse/admin/templates/admin-emojis.gjs b/frontend/discourse/admin/templates/admin-emojis.gjsindex 8b26f0e4abc..ee43d313d79 100644--- a/frontend/discourse/admin/templates/admin-emojis.gjs+++ b/frontend/discourse/admin/templates/admin-emojis.gjs@@ -1,6 +1,6 @@-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DPageHeader from "discourse/components/d-page-header";-import NavItem from "discourse/components/nav-item";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DNavItem from "discourse/ui-kit/d-nav-item";+import DPageHeader from "discourse/ui-kit/d-page-header";import { i18n } from "discourse-i18n";export default <template>@@ -21,12 +21,12 @@ export default <template><actions.Primary @route="adminEmojis.new" @label="admin.emoji.add" /></:actions><:tabs>- <NavItem+ <DNavItem@route="adminEmojis.settings"@label="settings"class="admin-emoji-tabs__settings"/>- <NavItem+ <DNavItem@route="adminEmojis.index"@label="admin.emoji.title"class="admin-emoji-tabs__emoji"diff --git a/frontend/discourse/admin/templates/admin-groups.gjs b/frontend/discourse/admin/templates/admin-groups.gjsindex f02cb5994e7..af371fcd954 100644--- a/frontend/discourse/admin/templates/admin-groups.gjs+++ b/frontend/discourse/admin/templates/admin-groups.gjs@@ -1,6 +1,6 @@-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DPageHeader from "discourse/components/d-page-header";-import NavItem from "discourse/components/nav-item";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DNavItem from "discourse/ui-kit/d-nav-item";+import DPageHeader from "discourse/ui-kit/d-page-header";import { i18n } from "discourse-i18n";export default <template>@@ -17,12 +17,12 @@ export default <template>/></:breadcrumbs><:tabs>- <NavItem+ <DNavItem@route="adminGroups.settings"@label="settings"class="admin-groups-tabs__settings"/>- <NavItem+ <DNavItem@route="adminGroups.index"@label="admin.config.groups.title"class="admin-groups-tabs__index"diff --git a/frontend/discourse/admin/templates/admin-logs.gjs b/frontend/discourse/admin/templates/admin-logs.gjsindex cedb48581fe..c9b580c7284 100644--- a/frontend/discourse/admin/templates/admin-logs.gjs+++ b/frontend/discourse/admin/templates/admin-logs.gjs@@ -1,6 +1,6 @@-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DPageHeader from "discourse/components/d-page-header";-import NavItem from "discourse/components/nav-item";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DNavItem from "discourse/ui-kit/d-nav-item";+import DPageHeader from "discourse/ui-kit/d-page-header";import { i18n } from "discourse-i18n";export default <template>@@ -19,32 +19,32 @@ export default <template>/></:breadcrumbs><:tabs>- <NavItem+ <DNavItem@route="adminLogs.staffActionLogs"@label="admin.config.staff_action_logs.title"/>{{#if @controller.currentUser.can_see_emails}}- <NavItem+ <DNavItem@route="adminLogs.screenedEmails"@label="admin.config.staff_action_logs.sub_pages.screened_emails.title"/>{{/if}}{{#if @controller.currentUser.can_see_ip}}- <NavItem+ <DNavItem@route="adminLogs.screenedIpAddresses"@label="admin.config.staff_action_logs.sub_pages.screened_ips.title"/>{{/if}}- <NavItem+ <DNavItem@route="adminLogs.screenedUrls"@label="admin.config.staff_action_logs.sub_pages.screened_urls.title"/>- <NavItem+ <DNavItem@route="adminSearchLogs"@label="admin.config.staff_action_logs.sub_pages.search_logs.title"/>{{#if @controller.currentUser.admin}}- <NavItem @path="/logs" @label="admin.logs.logster.title" />+ <DNavItem @path="/logs" @label="admin.logs.logster.title" />{{/if}}</:tabs></DPageHeader>diff --git a/frontend/discourse/admin/templates/admin-logs/screened-emails.gjs b/frontend/discourse/admin/templates/admin-logs/screened-emails.gjsindex 91f523cf1bf..5b1e100fc04 100644--- a/frontend/discourse/admin/templates/admin-logs/screened-emails.gjs+++ b/frontend/discourse/admin/templates/admin-logs/screened-emails.gjs@@ -1,8 +1,8 @@import { fn } from "@ember/helper";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DButton from "discourse/components/d-button";-import DPageSubheader from "discourse/components/d-page-subheader";-import ageWithTooltip from "discourse/helpers/age-with-tooltip";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DPageSubheader from "discourse/ui-kit/d-page-subheader";+import dAgeWithTooltip from "discourse/ui-kit/helpers/d-age-with-tooltip";import { i18n } from "discourse-i18n";export default <template>@@ -22,7 +22,7 @@ export default <template><br />- <ConditionalLoadingSpinner @condition={{@controller.loading}}>+ <DConditionalLoadingSpinner @condition={{@controller.loading}}>{{#if @controller.model.length}}<table class="screened-emails grid">@@ -52,10 +52,10 @@ export default <template>}}</div>{{item.match_count}}</td><td class="last_match_at"><div class="label">{{i18n"admin.logs.last_match_at"- }}</div>{{ageWithTooltip item.last_match_at}}</td>+ }}</div>{{dAgeWithTooltip item.last_match_at}}</td><td class="created_at"><div class="label">{{i18n"admin.logs.created_at"- }}</div>{{ageWithTooltip item.created_at}}</td>+ }}</div>{{dAgeWithTooltip item.created_at}}</td><td class="ip_address">{{item.ip_address}}</td><td class="action"><DButton@@ -72,5 +72,5 @@ export default <template>{{else}}{{i18n "search.no_results"}}{{/if}}- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner></template>diff --git a/frontend/discourse/admin/templates/admin-logs/screened-ip-addresses.gjs b/frontend/discourse/admin/templates/admin-logs/screened-ip-addresses.gjsindex 7d331aa8a7a..f22ddb0a0f7 100644--- a/frontend/discourse/admin/templates/admin-logs/screened-ip-addresses.gjs+++ b/frontend/discourse/admin/templates/admin-logs/screened-ip-addresses.gjs@@ -1,12 +1,12 @@import { fn } from "@ember/helper";import { on } from "@ember/modifier";import ScreenedIpAddressForm from "discourse/admin/components/screened-ip-address-form";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DButton from "discourse/components/d-button";-import DPageSubheader from "discourse/components/d-page-subheader";-import TextField from "discourse/components/text-field";-import ageWithTooltip from "discourse/helpers/age-with-tooltip";-import icon from "discourse/helpers/d-icon";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DPageSubheader from "discourse/ui-kit/d-page-subheader";+import DTextField from "discourse/ui-kit/d-text-field";+import dAgeWithTooltip from "discourse/ui-kit/helpers/d-age-with-tooltip";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default <template>@@ -18,7 +18,7 @@ export default <template><div class="screened-ip-controls"><div class="filter-screened-ip-address inline-form">- <TextField+ <DTextField@value={{@controller.filter}}@placeholderKey="admin.logs.screened_ips.form.filter"@autocorrect="off"@@ -37,7 +37,7 @@ export default <template><ScreenedIpAddressForm @action={{@controller.recordAdded}} /></div>- <ConditionalLoadingSpinner @condition={{@controller.loading}}>+ <DConditionalLoadingSpinner @condition={{@controller.loading}}>{{#if @controller.model.length}}<table class="admin-logs-table screened-ip-addresses grid"><thead class="heading-container">@@ -61,7 +61,7 @@ export default <template><tr class="admin-list-item"><td class="col first ip_address">{{#if item.editing}}- <TextField+ <DTextField@value={{item.ip_address}}@autofocus="autofocus"/>@@ -81,9 +81,9 @@ export default <template></td><td class="col action">{{#if item.isBlocked}}- {{icon "ban"}}+ {{dIcon "ban"}}{{else}}- {{icon "check"}}+ {{dIcon "check"}}{{/if}}{{item.actionName}}</td>@@ -93,12 +93,12 @@ export default <template></td><td class="col created_at"><div class="label">{{i18n "admin.logs.created_at"}}</div>- {{ageWithTooltip item.created_at}}+ {{dAgeWithTooltip item.created_at}}</td><td class="col last_match_at">{{#if item.last_match_at}}<div class="label">{{i18n "admin.logs.last_match_at"}}</div>- {{ageWithTooltip item.last_match_at}}+ {{dAgeWithTooltip item.last_match_at}}{{/if}}</td><td class="col actions">@@ -148,5 +148,5 @@ export default <template>{{else}}{{i18n "search.no_results"}}{{/if}}- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner></template>diff --git a/frontend/discourse/admin/templates/admin-logs/screened-urls.gjs b/frontend/discourse/admin/templates/admin-logs/screened-urls.gjsindex c34f670cede..c4de4ba09bc 100644--- a/frontend/discourse/admin/templates/admin-logs/screened-urls.gjs+++ b/frontend/discourse/admin/templates/admin-logs/screened-urls.gjs@@ -1,7 +1,7 @@-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DButton from "discourse/components/d-button";-import DPageSubheader from "discourse/components/d-page-subheader";-import ageWithTooltip from "discourse/helpers/age-with-tooltip";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DPageSubheader from "discourse/ui-kit/d-page-subheader";+import dAgeWithTooltip from "discourse/ui-kit/helpers/d-age-with-tooltip";import { i18n } from "discourse-i18n";export default <template>@@ -20,7 +20,7 @@ export default <template>/><br />- <ConditionalLoadingSpinner @condition={{@controller.loading}}>+ <DConditionalLoadingSpinner @condition={{@controller.loading}}>{{#if @controller.model.length}}<table class="screened-urls grid"><thead>@@ -47,10 +47,10 @@ export default <template>}}</div>{{url.match_count}}</td><td class="col last_match_at"><div class="label">{{i18n"admin.logs.last_match_at"- }}</div>{{ageWithTooltip url.last_match_at}}</td>+ }}</div>{{dAgeWithTooltip url.last_match_at}}</td><td class="col created_at"><div class="label">{{i18n"admin.logs.created_at"- }}</div>{{ageWithTooltip url.created_at}}</td>+ }}</div>{{dAgeWithTooltip url.created_at}}</td></tr>{{/each}}</tbody>@@ -58,5 +58,5 @@ export default <template>{{else}}{{i18n "search.no_results"}}{{/if}}- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner></template>diff --git a/frontend/discourse/admin/templates/admin-logs/staff-action-logs.gjs b/frontend/discourse/admin/templates/admin-logs/staff-action-logs.gjsindex 5dd4740fa60..15c85664ca8 100644--- a/frontend/discourse/admin/templates/admin-logs/staff-action-logs.gjs+++ b/frontend/discourse/admin/templates/admin-logs/staff-action-logs.gjs@@ -3,14 +3,14 @@ import { on } from "@ember/modifier";import { LinkTo } from "@ember/routing";import { trustHTML } from "@ember/template";import StaffActions from "discourse/admin/components/staff-actions";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DButton from "discourse/components/d-button";-import DateTimeInputRange from "discourse/components/date-time-input-range";-import LoadMore from "discourse/components/load-more";-import ageWithTooltip from "discourse/helpers/age-with-tooltip";-import avatar from "discourse/helpers/avatar";-import icon from "discourse/helpers/d-icon";import ComboBox from "discourse/select-kit/components/combo-box";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DDateTimeInputRange from "discourse/ui-kit/d-date-time-input-range";+import DLoadMore from "discourse/ui-kit/d-load-more";+import dAgeWithTooltip from "discourse/ui-kit/helpers/d-age-with-tooltip";+import dAvatar from "discourse/ui-kit/helpers/d-avatar";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default <template>@@ -84,7 +84,7 @@ export default <template>{{/if}}<div class="date-filter-container">- <DateTimeInputRange+ <DDateTimeInputRange@from={{@controller.startDate}}@to={{@controller.endDate}}@onChange={{@controller.onChangeDateRange}}@@ -107,7 +107,7 @@ export default <template><div class="clearfix"></div><StaffActions>- <LoadMore @action={{@controller.loadMore}}>+ <DLoadMore @action={{@controller.loadMore}}>{{#if @controller.model.content}}<table class="table staff-logs grid"><thead>@@ -125,7 +125,7 @@ export default <template><div class="staff-user">{{#if item.acting_user}}<LinkTo @route="adminUser" @model={{item.acting_user}}>- {{avatar item.acting_user imageSize="tiny"}}+ {{dAvatar item.acting_user imageSize="tiny"}}{{item.acting_user.username}}</LinkTo>{{else}}@@ -133,7 +133,7 @@ export default <template>class="deleted-user"title={{i18n "admin.user.deleted"}}>- {{icon "trash-can"}}+ {{dIcon "trash-can"}}</span>{{/if}}</div>@@ -150,7 +150,7 @@ export default <template><LinkTo@route="adminUser"@model={{item.target_user}}- >{{avatar item.target_user imageSize="tiny"}}</LinkTo>+ >{{dAvatar item.target_user imageSize="tiny"}}</LinkTo><ahref{{on@@ -171,7 +171,7 @@ export default <template>{{/if}}</div></td>- <td class="col value created-at">{{ageWithTooltip+ <td class="col value created-at">{{dAgeWithTooltipitem.created_at}}</td><td class="col value details">@@ -184,14 +184,14 @@ export default <template>"click"(fn @controller.showCustomDetailsModal item)}}- >{{icon "circle-info"}}+ >{{dIcon "circle-info"}}{{i18n "admin.logs.staff_actions.show"}}</a>{{/if}}{{#if item.useModalForDetails}}<ahref{{on "click" (fn @controller.showDetailsModal item)}}- >{{icon "circle-info"}}+ >{{dIcon "circle-info"}}{{i18n "admin.logs.staff_actions.show"}}</a>{{/if}}</div>@@ -208,12 +208,12 @@ export default <template></tbody></table>{{else if @controller.model.loadingMore}}- <ConditionalLoadingSpinner+ <DConditionalLoadingSpinner@condition={{@controller.model.loadingMore}}/>{{else}}{{i18n "search.no_results"}}{{/if}}- </LoadMore>+ </DLoadMore></StaffActions></template>diff --git a/frontend/discourse/admin/templates/admin-permalinks.gjs b/frontend/discourse/admin/templates/admin-permalinks.gjsindex ae7289adc83..875dd827252 100644--- a/frontend/discourse/admin/templates/admin-permalinks.gjs+++ b/frontend/discourse/admin/templates/admin-permalinks.gjs@@ -1,6 +1,6 @@-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DPageHeader from "discourse/components/d-page-header";-import NavItem from "discourse/components/nav-item";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DNavItem from "discourse/ui-kit/d-nav-item";+import DPageHeader from "discourse/ui-kit/d-page-header";import { i18n } from "discourse-i18n";export default <template>@@ -26,12 +26,12 @@ export default <template>/></:actions><:tabs>- <NavItem+ <DNavItem@route="adminPermalinks.settings"@label="admin.permalink.nav.settings"class="admin-permalinks-tabs__settings"/>- <NavItem+ <DNavItem@route="adminPermalinks.index"@label="admin.permalink.nav.permalinks"class="admin-permalins-permalinks"diff --git a/frontend/discourse/admin/templates/admin-permalinks/index.gjs b/frontend/discourse/admin/templates/admin-permalinks/index.gjsindex 71c0af3f36d..1fdade48ffe 100644--- a/frontend/discourse/admin/templates/admin-permalinks/index.gjs+++ b/frontend/discourse/admin/templates/admin-permalinks/index.gjs@@ -1,20 +1,20 @@import { fn } from "@ember/helper";import AdminConfigAreaEmptyList from "discourse/admin/components/admin-config-area-empty-list";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DButton from "discourse/components/d-button";-import DropdownMenu from "discourse/components/dropdown-menu";-import TextField from "discourse/components/text-field";import DMenu from "discourse/float-kit/components/d-menu";-import categoryLink from "discourse/helpers/category-link";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";+import DTextField from "discourse/ui-kit/d-text-field";+import dCategoryLink from "discourse/ui-kit/helpers/d-category-link";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default <template>{{#if @controller.hasPermalinks}}<div class="d-admin-filter"><div class="admin-filter__input-container permalink-search">- <TextField+ <DTextField@value={{@controller.filter}}@placeholderKey="admin.permalink.form.filter"@autocorrect="off"@@ -25,7 +25,7 @@ export default <template></div>{{/if}}- <ConditionalLoadingSpinner @condition={{@controller.loading}}>+ <DConditionalLoadingSpinner @condition={{@controller.loading}}><div class="permalink-results">{{#if @controller.model.length}}<table class="d-table permalinks">@@ -42,7 +42,10 @@ export default <template><tbody class="d-table__body">{{#each @controller.model as |pl|}}<tr- class={{concatClass "d-table__row admin-permalink-item" pl.key}}+ class={{dConcatClass+ "d-table__row admin-permalink-item"+ pl.key+ }}><td class="d-table__cell --overview"><DButton@@ -66,14 +69,14 @@ export default <template>#{{pl.post_number}}</a>{{/if}}{{#if pl.category_id}}- {{categoryLink pl.category}}+ {{dCategoryLink pl.category}}{{/if}}{{#if pl.tag_id}}<a href={{pl.tag_url}}>{{pl.tag_name}}</a>{{/if}}{{#if pl.external_url}}{{#if pl.linkIsExternal}}- {{icon "up-right-from-square"}}+ {{dIcon "up-right-from-square"}}{{/if}}<a href={{pl.external_url}}>{{pl.external_url}}</a>{{/if}}@@ -98,7 +101,7 @@ export default <template>@triggerClass="btn-default"><:content>- <DropdownMenu as |dropdown|>+ <DDropdownMenu as |dropdown|><dropdown.item><DButton@action={{fn @controller.destroyRecord pl}}@@ -107,7 +110,7 @@ export default <template>@label="admin.config_areas.permalinks.delete"/></dropdown.item>- </DropdownMenu>+ </DDropdownMenu></:content></DMenu></div>@@ -131,5 +134,5 @@ export default <template>{{/if}}{{/if}}</div>- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner></template>diff --git a/frontend/discourse/admin/templates/admin-plugins.gjs b/frontend/discourse/admin/templates/admin-plugins.gjsindex 17f74619143..917c6e81d38 100644--- a/frontend/discourse/admin/templates/admin-plugins.gjs+++ b/frontend/discourse/admin/templates/admin-plugins.gjs@@ -1,7 +1,7 @@-import DBreadcrumbsContainer from "discourse/components/d-breadcrumbs-container";-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import HorizontalOverflowNav from "discourse/components/horizontal-overflow-nav";-import NavItem from "discourse/components/nav-item";+import DBreadcrumbsContainer from "discourse/ui-kit/d-breadcrumbs-container";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DHorizontalOverflowNav from "discourse/ui-kit/d-horizontal-overflow-nav";+import DNavItem from "discourse/ui-kit/d-nav-item";import { i18n } from "discourse-i18n";export default <template>@@ -19,11 +19,11 @@ export default <template>@label={{i18n "admin.config.plugins.title"}}/><div class="d-nav-submenu">- <HorizontalOverflowNav class="main-nav nav plugin-nav">- <NavItem @route="adminPlugins.index" @label="admin.plugins.title" />+ <DHorizontalOverflowNav class="main-nav nav plugin-nav">+ <DNavItem @route="adminPlugins.index" @label="admin.plugins.title" />{{#each @controller.adminRoutes as |route|}}{{#if route.use_new_show_route}}- <NavItem+ <DNavItem@route={{route.full_location}}@label={{route.label}}@routeParam={{route.location}}@@ -31,7 +31,7 @@ export default <template>data-plugin-nav-tab-id={{route.plugin_id}}/>{{else}}- <NavItem+ <DNavItem@route={{route.full_location}}@label={{route.label}}@class="admin-plugin-tab-nav-item"@@ -39,7 +39,7 @@ export default <template>/>{{/if}}{{/each}}- </HorizontalOverflowNav>+ </DHorizontalOverflowNav></div></div>{{/if}}diff --git a/frontend/discourse/admin/templates/admin-plugins/index.gjs b/frontend/discourse/admin/templates/admin-plugins/index.gjsindex e0c25323504..3c19d152e16 100644--- a/frontend/discourse/admin/templates/admin-plugins/index.gjs+++ b/frontend/discourse/admin/templates/admin-plugins/index.gjs@@ -2,11 +2,11 @@ import { concat } from "@ember/helper";import { trustHTML } from "@ember/template";import AdminFilterControls from "discourse/admin/components/admin-filter-controls";import AdminPluginsList from "discourse/admin/components/admin-plugins-list";-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DPageHeader from "discourse/components/d-page-header";-import NavItem from "discourse/components/nav-item";import PluginOutlet from "discourse/components/plugin-outlet";import lazyHash from "discourse/helpers/lazy-hash";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DNavItem from "discourse/ui-kit/d-nav-item";+import DPageHeader from "discourse/ui-kit/d-page-header";import { i18n } from "discourse-i18n";export default <template>@@ -31,10 +31,10 @@ export default <template>/></:breadcrumbs><:tabs>- <NavItem @route="adminPlugins.index" @label="admin.plugins.title" />+ <DNavItem @route="adminPlugins.index" @label="admin.plugins.title" />{{#each @controller.adminRoutes as |route|}}{{#if route.use_new_show_route}}- <NavItem+ <DNavItem@route={{route.full_location}}@label={{route.label}}@routeParam={{route.location}}@@ -42,7 +42,7 @@ export default <template>data-plugin-nav-tab-id={{route.plugin_id}}/>{{else}}- <NavItem+ <DNavItem@route={{route.full_location}}@label={{route.label}}@class="admin-plugin-tab-nav-item"diff --git a/frontend/discourse/admin/templates/admin-problem-checks.gjs b/frontend/discourse/admin/templates/admin-problem-checks.gjsindex 0717aa7811a..82191c2d4f9 100644--- a/frontend/discourse/admin/templates/admin-problem-checks.gjs+++ b/frontend/discourse/admin/templates/admin-problem-checks.gjs@@ -1,5 +1,5 @@-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DPageHeader from "discourse/components/d-page-header";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DPageHeader from "discourse/ui-kit/d-page-header";import { i18n } from "discourse-i18n";export default <template>diff --git a/frontend/discourse/admin/templates/admin-reports.gjs b/frontend/discourse/admin/templates/admin-reports.gjsindex 35b188fae64..4d0d3307f91 100644--- a/frontend/discourse/admin/templates/admin-reports.gjs+++ b/frontend/discourse/admin/templates/admin-reports.gjs@@ -1,6 +1,6 @@-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DPageHeader from "discourse/components/d-page-header";-import NavItem from "discourse/components/nav-item";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DNavItem from "discourse/ui-kit/d-nav-item";+import DPageHeader from "discourse/ui-kit/d-page-header";import { i18n } from "discourse-i18n";export default <template>@@ -36,11 +36,11 @@ export default <template>/></:breadcrumbs><:tabs>- <NavItem+ <DNavItem@route="adminReports.dashboardSettings"@label="admin.config.reports.sub_pages.settings.title"/>- <NavItem+ <DNavItem@route="adminReports.index"@label="admin.config.reports.title"/>diff --git a/frontend/discourse/admin/templates/admin-search-logs/index.gjs b/frontend/discourse/admin/templates/admin-search-logs/index.gjsindex 82e14f44ff8..6f44ec82183 100644--- a/frontend/discourse/admin/templates/admin-search-logs/index.gjs+++ b/frontend/discourse/admin/templates/admin-search-logs/index.gjs@@ -1,8 +1,8 @@import { fn, hash } from "@ember/helper";import { LinkTo } from "@ember/routing";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";import ComboBox from "discourse/select-kit/components/combo-box";import PeriodChooser from "discourse/select-kit/components/period-chooser";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";import { i18n } from "discourse-i18n";export default <template>@@ -19,7 +19,7 @@ export default <template>/></div>- <ConditionalLoadingSpinner @condition={{@controller.loading}}>+ <DConditionalLoadingSpinner @condition={{@controller.loading}}>{{#if @controller.model.length}}<table class="search-logs-list grid">@@ -60,5 +60,5 @@ export default <template>{{else}}{{i18n "search.no_results"}}{{/if}}- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner></template>diff --git a/frontend/discourse/admin/templates/admin-search-logs/term.gjs b/frontend/discourse/admin/templates/admin-search-logs/term.gjsindex c5173a8e390..4cf79beadbd 100644--- a/frontend/discourse/admin/templates/admin-search-logs/term.gjs+++ b/frontend/discourse/admin/templates/admin-search-logs/term.gjs@@ -2,15 +2,15 @@ import { fn, hash } from "@ember/helper";import { LinkTo } from "@ember/routing";import { trustHTML } from "@ember/template";import Chart from "discourse/admin/components/chart";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";import HighlightSearch from "discourse/components/highlight-search";import TopicStatus from "discourse/components/topic-status";-import ageWithTooltip from "discourse/helpers/age-with-tooltip";-import avatar from "discourse/helpers/avatar";-import categoryLink from "discourse/helpers/category-link";-import discourseTag from "discourse/helpers/discourse-tag";import ComboBox from "discourse/select-kit/components/combo-box";import PeriodChooser from "discourse/select-kit/components/period-chooser";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import dAgeWithTooltip from "discourse/ui-kit/helpers/d-age-with-tooltip";+import dAvatar from "discourse/ui-kit/helpers/d-avatar";+import dCategoryLink from "discourse/ui-kit/helpers/d-category-link";+import dDiscourseTag from "discourse/ui-kit/helpers/d-discourse-tag";import { i18n } from "discourse-i18n";export default <template>@@ -34,7 +34,7 @@ export default <template>>{{@controller.term}}</LinkTo></h2>- <ConditionalLoadingSpinner @condition={{@controller.refreshing}}>+ <DConditionalLoadingSpinner @condition={{@controller.refreshing}}><Chart @chartConfig={{@controller.chartConfig}} /><br /><br />@@ -46,7 +46,7 @@ export default <template><div class="fps-result"><div class="author"><a href={{result.userPath}} data-user-card={{result.username}}>- {{avatar result imageSize="large"}}+ {{dAvatar result imageSize="large"}}</a></div>@@ -67,18 +67,18 @@ export default <template><div class="search-category">{{#if result.topic.category.parentCategory}}- {{categoryLink result.topic.category.parentCategory}}+ {{dCategoryLink result.topic.category.parentCategory}}{{/if}}- {{categoryLink result.topic.category hideParent=true}}+ {{dCategoryLink result.topic.category hideParent=true}}{{#each result.topic.tags as |tag|}}- {{discourseTag tag}}+ {{dDiscourseTag tag}}{{/each}}</div></div><div class="blurb container"><span class="date">- {{ageWithTooltip result.created_at}}+ {{dAgeWithTooltip result.created_at}}{{#if result.blurb}}-{{/if}}@@ -98,5 +98,5 @@ export default <template></div>{{/each}}</div>- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner></template>diff --git a/frontend/discourse/admin/templates/admin-search/index.gjs b/frontend/discourse/admin/templates/admin-search/index.gjsindex 088f3fd9a3c..6f064ea831e 100644--- a/frontend/discourse/admin/templates/admin-search/index.gjs+++ b/frontend/discourse/admin/templates/admin-search/index.gjs@@ -1,6 +1,6 @@import AdminSearch from "discourse/admin/components/admin-search";-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DPageHeader from "discourse/components/d-page-header";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DPageHeader from "discourse/ui-kit/d-page-header";import { i18n } from "discourse-i18n";export default <template>diff --git a/frontend/discourse/admin/templates/admin-section/account.gjs b/frontend/discourse/admin/templates/admin-section/account.gjsindex 677d96c4f5d..100d8d25bc8 100644--- a/frontend/discourse/admin/templates/admin-section/account.gjs+++ b/frontend/discourse/admin/templates/admin-section/account.gjs@@ -1,7 +1,7 @@import AdminSectionLandingItem from "discourse/admin/components/admin-section-landing-item";import AdminSectionLandingWrapper from "discourse/admin/components/admin-section-landing-wrapper";-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DPageHeader from "discourse/components/d-page-header";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DPageHeader from "discourse/ui-kit/d-page-header";import { i18n } from "discourse-i18n";export default <template>diff --git a/frontend/discourse/admin/templates/admin-site-settings.gjs b/frontend/discourse/admin/templates/admin-site-settings.gjsindex 88033ba5778..73eb4c9ffcd 100644--- a/frontend/discourse/admin/templates/admin-site-settings.gjs+++ b/frontend/discourse/admin/templates/admin-site-settings.gjs@@ -1,8 +1,8 @@import AdminSiteSettingsCategoryNav from "discourse/admin/components/admin-site-settings-category-nav";import AdminSiteSettingsChangesBanner from "discourse/admin/components/admin-site-settings-changes-banner";import AdminSiteSettingsFilterControls from "discourse/admin/components/admin-site-settings-filter-controls";-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DPageHeader from "discourse/components/d-page-header";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DPageHeader from "discourse/ui-kit/d-page-header";import { i18n } from "discourse-i18n";export default <template>diff --git a/frontend/discourse/admin/templates/admin-site-text.gjs b/frontend/discourse/admin/templates/admin-site-text.gjsindex 7fc8758a2fb..e14cd23f490 100644--- a/frontend/discourse/admin/templates/admin-site-text.gjs+++ b/frontend/discourse/admin/templates/admin-site-text.gjs@@ -1,5 +1,5 @@-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DPageHeader from "discourse/components/d-page-header";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DPageHeader from "discourse/ui-kit/d-page-header";import { i18n } from "discourse-i18n";export default <template>diff --git a/frontend/discourse/admin/templates/admin-site-text/edit.gjs b/frontend/discourse/admin/templates/admin-site-text/edit.gjsindex 890611df0ac..7d692b2b022 100644--- a/frontend/discourse/admin/templates/admin-site-text/edit.gjs+++ b/frontend/discourse/admin/templates/admin-site-text/edit.gjs@@ -3,11 +3,11 @@ import { on } from "@ember/modifier";import didInsert from "@ember/render-modifiers/modifiers/did-insert";import { LinkTo } from "@ember/routing";import AdminInterpolationKeys from "discourse/admin/components/admin-interpolation-keys";-import DButton from "discourse/components/d-button";-import ExpandingTextArea from "discourse/components/expanding-text-area";-import SaveControls from "discourse/components/save-controls";-import icon from "discourse/helpers/d-icon";import withEventValue from "discourse/helpers/with-event-value";+import DButton from "discourse/ui-kit/d-button";+import DExpandingTextArea from "discourse/ui-kit/d-expanding-text-area";+import DSaveControls from "discourse/ui-kit/d-save-controls";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default <template>@@ -37,7 +37,7 @@ export default <template></div>{{/if}}- <ExpandingTextArea+ <DExpandingTextArea{{didInsert @controller.registerTextarea}}{{on "input" (withEventValue (fn (mut @controller.buffered.value)))}}{{on "focusin" @controller.trackTextarea}}@@ -52,7 +52,7 @@ export default <template>@onInsertKey={{@controller.insertInterpolationKey}}/>- <SaveControls+ <DSaveControls@model={{@controller.siteText}}@action={{@controller.saveChanges}}@saved={{@controller.saved}}@@ -65,14 +65,14 @@ export default <template>class="revert-site-text"/>{{/if}}- </SaveControls>+ </DSaveControls><LinkTo@route="adminSiteText.index"@query={{hash [email protected]}}class="go-back">- {{icon "arrow-left"}}+ {{dIcon "arrow-left"}}{{i18n "admin.site_text.go_back"}}</LinkTo></div>diff --git a/frontend/discourse/admin/templates/admin-site-text/index.gjs b/frontend/discourse/admin/templates/admin-site-text/index.gjsindex 82e1bf48a08..b480ce7d418 100644--- a/frontend/discourse/admin/templates/admin-site-text/index.gjs+++ b/frontend/discourse/admin/templates/admin-site-text/index.gjs@@ -1,16 +1,16 @@import { hash } from "@ember/helper";import { on } from "@ember/modifier";import SiteTextSummary from "discourse/admin/components/site-text-summary";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DButton from "discourse/components/d-button";-import LoadMore from "discourse/components/load-more";-import TextField from "discourse/components/text-field";import ComboBox from "discourse/select-kit/components/combo-box";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DLoadMore from "discourse/ui-kit/d-load-more";+import DTextField from "discourse/ui-kit/d-text-field";import { i18n } from "discourse-i18n";export default <template><div class="search-area">- <TextField+ <DTextField@value={{@controller.q}}@placeholderKey="admin.site_text.search"@autofocus="true"@@ -89,7 +89,7 @@ export default <template><p><b>{{i18n "admin.site_text.recommended"}}</b></p>{{/if}}- <LoadMore+ <DLoadMore@action={{@controller.loadMore}}@enabled={{@controller.canLoadMore}}@isLoading={{@controller.searching}}@@ -107,6 +107,6 @@ export default <template>{{i18n "admin.site_text.no_results"}}{{/unless}}{{/each}}- <ConditionalLoadingSpinner @condition={{@controller.searching}} />- </LoadMore>+ <DConditionalLoadingSpinner @condition={{@controller.searching}} />+ </DLoadMore></template>diff --git a/frontend/discourse/admin/templates/admin-user-fields.gjs b/frontend/discourse/admin/templates/admin-user-fields.gjsindex 3ad772130dd..977e8662785 100644--- a/frontend/discourse/admin/templates/admin-user-fields.gjs+++ b/frontend/discourse/admin/templates/admin-user-fields.gjs@@ -1,5 +1,5 @@-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DPageHeader from "discourse/components/d-page-header";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DPageHeader from "discourse/ui-kit/d-page-header";import { i18n } from "discourse-i18n";export default <template>diff --git a/frontend/discourse/admin/templates/admin-user/badges.gjs b/frontend/discourse/admin/templates/admin-user/badges.gjsindex 4103d7ed7ec..fca303b4b6b 100644--- a/frontend/discourse/admin/templates/admin-user/badges.gjs+++ b/frontend/discourse/admin/templates/admin-user/badges.gjs@@ -1,22 +1,22 @@import { Input } from "@ember/component";import { fn, hash } from "@ember/helper";import { LinkTo } from "@ember/routing";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DButton from "discourse/components/d-button";import PluginOutlet from "discourse/components/plugin-outlet";import UserBadge from "discourse/components/user-badge";-import ageWithTooltip from "discourse/helpers/age-with-tooltip";-import avatar from "discourse/helpers/avatar";-import icon from "discourse/helpers/d-icon";import lazyHash from "discourse/helpers/lazy-hash";import ComboBox from "discourse/select-kit/components/combo-box";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import dAgeWithTooltip from "discourse/ui-kit/helpers/d-age-with-tooltip";+import dAvatar from "discourse/ui-kit/helpers/d-avatar";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default <template><div class="admin-controls"><nav><ul class="nav nav-pills">- <li><LinkTo @route="adminUser" @model={{@controller.user}}>{{icon+ <li><LinkTo @route="adminUser" @model={{@controller.user}}>{{dIcon"angle-left"}} {{@controller.user.username}}</LinkTo></li>@@ -24,7 +24,7 @@ export default <template></nav></div>- <ConditionalLoadingSpinner @condition={{@controller.loading}}>+ <DConditionalLoadingSpinner @condition={{@controller.loading}}><div class="admin-container user-badges"><h2>{{i18n "admin.badges.grant_badge"}}</h2><br />@@ -89,7 +89,7 @@ export default <template>/></td><td><LinkTo @route="adminUser" @model={{userBadge.granted_by}}>- {{avatar userBadge.granted_by imageSize="tiny"}}+ {{dAvatar userBadge.granted_by imageSize="tiny"}}{{userBadge.granted_by.username}}</LinkTo></td>@@ -98,7 +98,7 @@ export default <template><a href={{userBadge.postUrl}}>{{userBadge.topic_title}}</a>{{/if}}</td>- <td>{{ageWithTooltip userBadge.granted_at}}</td>+ <td>{{dAgeWithTooltip userBadge.granted_at}}</td><td>{{#if userBadge.grouped}}<DButton@@ -128,5 +128,5 @@ export default <template></table></PluginOutlet></div>- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner></template>diff --git a/frontend/discourse/admin/templates/admin-user/index.gjs b/frontend/discourse/admin/templates/admin-user/index.gjsindex d0c69e98ea6..de74fad7e82 100644--- a/frontend/discourse/admin/templates/admin-user/index.gjs+++ b/frontend/discourse/admin/templates/admin-user/index.gjs@@ -5,14 +5,7 @@ import AdminEditableField from "discourse/admin/components/admin-editable-field"import AdminUserExportsTable from "discourse/admin/components/admin-user-exports-table";import AdminUserUpcomingChanges from "discourse/admin/components/admin-user-upcoming-changes";import IpLookup from "discourse/admin/components/ip-lookup";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DButton from "discourse/components/d-button";import PluginOutlet from "discourse/components/plugin-outlet";-import avatar from "discourse/helpers/avatar";-import basePath from "discourse/helpers/base-path";-import icon from "discourse/helpers/d-icon";-import formatDate from "discourse/helpers/format-date";-import formatDuration from "discourse/helpers/format-duration";import i18nYesNo from "discourse/helpers/i18n-yes-no";import lazyHash from "discourse/helpers/lazy-hash";import routeAction from "discourse/helpers/route-action";@@ -20,6 +13,13 @@ import ComboBox from "discourse/select-kit/components/combo-box";import DropdownSelectBox from "discourse/select-kit/components/dropdown-select-box";import GroupChooser from "discourse/select-kit/components/group-chooser";import { and, gt, not } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import dAvatar from "discourse/ui-kit/helpers/d-avatar";+import dBasePath from "discourse/ui-kit/helpers/d-base-path";+import dFormatDate from "discourse/ui-kit/helpers/d-format-date";+import dFormatDuration from "discourse/ui-kit/helpers/d-format-duration";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default <template>@@ -31,7 +31,7 @@ export default <template>@model={{@controller.model}}class="btn btn-default">- {{icon "user"}}+ {{dIcon "user"}}{{i18n "admin.user.show_public_profile"}}</LinkTo>{{/if}}@@ -208,7 +208,7 @@ export default <template><div class="display-row"><div class="field">{{i18n "user.avatar.title"}}</div>- <div class="value">{{avatar @controller.model imageSize="large"}}</div>+ <div class="value">{{dAvatar @controller.model imageSize="large"}}</div><div class="controls">{{trustHTML(i18n "admin.user.visit_profile" [email protected])@@ -271,7 +271,7 @@ export default <template>@model={{@controller.model}}class="btn btn-default">- {{icon "certificate"}}+ {{dIcon "certificate"}}{{i18n "admin.badges.edit_badges"}}</LinkTo></div>@@ -335,7 +335,7 @@ export default <template>{{#if @controller.model.approved}}{{i18n "admin.user.approved_by"}}<LinkTo @route="adminUser" @model={{@controller.model.approvedBy}}>- {{avatar @controller.model.approvedBy imageSize="small"}}+ {{dAvatar @controller.model.approvedBy imageSize="small"}}</LinkTo><LinkTo @route="adminUser" @model={{@controller.model.approvedBy}}>{{@controller.model.approvedBy.username}}@@ -496,14 +496,14 @@ export default <template>{{#if @controller.model.can_change_trust_level}}{{#if @controller.model.canLockTrustLevel}}{{#if @controller.hasLockedTrustLevel}}- {{icon "lock" title="admin.user.trust_level_locked_tip"}}+ {{dIcon "lock" title="admin.user.trust_level_locked_tip"}}<DButton@action={{fn @controller.lockTrustLevel false}}@label="admin.user.unlock_trust_level"class="btn-default"/>{{else}}- {{icon "unlock" title="admin.user.trust_level_unlocked_tip"}}+ {{dIcon "unlock" title="admin.user.trust_level_unlocked_tip"}}<DButton@action={{fn @controller.lockTrustLevel true}}@label="admin.user.lock_trust_level"@@ -568,7 +568,7 @@ export default <template><div class="field">{{i18n "admin.user.suspended_by"}}</div><div class="value"><LinkTo @route="adminUser" @model={{@controller.model.suspendedBy}}>- {{avatar @controller.model.suspendedBy imageSize="tiny"}}+ {{dAvatar @controller.model.suspendedBy imageSize="tiny"}}</LinkTo><LinkTo @route="adminUser" @model={{@controller.model.suspendedBy}}>{{@controller.model.suspendedBy.username}}@@ -599,7 +599,7 @@ export default <template>{{/if}}</div><div class="controls">- <ConditionalLoadingSpinner+ <DConditionalLoadingSpinner@size="small"@condition={{@controller.model.silencingUser}}>@@ -622,7 +622,7 @@ export default <template>{{i18n "admin.user.silence_explanation"}}{{/if}}{{/if}}- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner></div></div>@@ -631,7 +631,7 @@ export default <template><div class="field">{{i18n "admin.user.silenced_by"}}</div><div class="value"><LinkTo @route="adminUser" @model={{@controller.model.silencedBy}}>- {{avatar @controller.model.silencedBy imageSize="tiny"}}+ {{dAvatar @controller.model.silencedBy imageSize="tiny"}}</LinkTo><LinkTo @route="adminUser" @model={{@controller.model.silencedBy}}>{{@controller.model.silencedBy.username}}@@ -735,18 +735,18 @@ export default <template><div class="display-row"><div class="field">{{i18n "created"}}</div>- <div class="value">{{formatDate+ <div class="value">{{dFormatDate@controller.model.created_atleaveAgo="true"}}</div></div><div class="display-row"><div class="field">{{i18n "admin.users.last_emailed"}}</div>- <div class="value">{{formatDate @controller.model.last_emailed_at}}</div>+ <div class="value">{{dFormatDate @controller.model.last_emailed_at}}</div></div><div class="display-row"><div class="field">{{i18n "last_seen"}}</div>- <div class="value">{{formatDate+ <div class="value">{{dFormatDate@controller.model.last_seen_atleaveAgo="true"}}</div>@@ -820,7 +820,7 @@ export default <template></div><div class="display-row"><div class="field">{{i18n "admin.user.time_read"}}</div>- <div class="value">{{formatDuration @controller.model.time_read}}</div>+ <div class="value">{{dFormatDuration @controller.model.time_read}}</div></div><div class="display-row"><div class="field">{{i18n "user.invited.days_visited"}}</div>@@ -843,7 +843,7 @@ export default <template>@query={{hash [email protected]}}class="btn btn-icon btn-default">- {{icon "far-eye"}}+ {{dIcon "far-eye"}}{{i18n "admin.user.view_edits"}}</LinkTo>{{/if}}@@ -940,7 +940,7 @@ export default <template><section class="details"><h1>{{i18n "admin.user.upcoming_changes.title"}}</h1><p>{{trustHTML- (i18n "admin.user.upcoming_changes.description" basePath=basePath)+ (i18n "admin.user.upcoming_changes.description" basePath=dBasePath)}}</p><AdminUserUpcomingChanges @user={{@controller.model}} /></section>@@ -1011,7 +1011,7 @@ export default <template>{{#if @controller.deleteExplanation}}<div class="pull-right">- {{icon "triangle-exclamation"}}+ {{dIcon "triangle-exclamation"}}<span class="delete-explanation">{{@controller.deleteExplanation}}</span>diff --git a/frontend/discourse/admin/templates/admin-user/tl3-requirements.gjs b/frontend/discourse/admin/templates/admin-user/tl3-requirements.gjsindex 2d504827ee8..a47a7b0daea 100644--- a/frontend/discourse/admin/templates/admin-user/tl3-requirements.gjs+++ b/frontend/discourse/admin/templates/admin-user/tl3-requirements.gjs@@ -1,13 +1,13 @@import { LinkTo } from "@ember/routing";import checkIcon from "discourse/admin/helpers/check-icon";-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default <template><div class="admin-controls"><nav><ul class="nav nav-pills">- <li><LinkTo @route="adminUser" @model={{@controller.model}}>{{icon+ <li><LinkTo @route="adminUser" @model={{@controller.model}}>{{dIcon"angle-left"}} {{@controller.model.username}}</LinkTo></li>@@ -174,22 +174,22 @@ export default <template>{{#if @controller.model.tl3Requirements.requirements_lost}}{{! tl implicitly not locked }}{{#if @controller.model.tl3Requirements.on_grace_period}}- {{icon "xmark"}}+ {{dIcon "xmark"}}{{i18n "admin.user.tl3_requirements.on_grace_period"}}{{else}}{{! not on grace period }}- {{icon "xmark"}}+ {{dIcon "xmark"}}{{i18n "admin.user.tl3_requirements.does_not_qualify"}}{{i18n "admin.user.tl3_requirements.will_be_demoted"}}{{/if}}{{else}}{{! requirements not lost - remains tl3 }}{{#if @controller.model.tl3Requirements.trust_level_locked}}- {{icon "lock"}}+ {{dIcon "lock"}}{{i18n "admin.user.tl3_requirements.locked_will_not_be_demoted"}}{{else}}{{! tl not locked }}- {{icon "check"}}+ {{dIcon "check"}}{{i18n "admin.user.tl3_requirements.qualifies"}}{{#if @controller.model.tl3Requirements.on_grace_period}}{{i18n "admin.user.tl3_requirements.on_grace_period"}}@@ -200,16 +200,16 @@ export default <template>{{! is not tl3 }}{{#if @controller.model.tl3Requirements.requirements_met}}{{! met & not tl3 - will be promoted}}- {{icon "check"}}+ {{dIcon "check"}}{{i18n "admin.user.tl3_requirements.qualifies"}}{{i18n "admin.user.tl3_requirements.will_be_promoted"}}{{else}}{{! requirements not met - remains regular }}{{#if @controller.model.tl3Requirements.trust_level_locked}}- {{icon "lock"}}+ {{dIcon "lock"}}{{i18n "admin.user.tl3_requirements.locked_will_not_be_promoted"}}{{else}}- {{icon "xmark"}}+ {{dIcon "xmark"}}{{i18n "admin.user.tl3_requirements.does_not_qualify"}}{{/if}}{{/if}}diff --git a/frontend/discourse/admin/templates/admin-users-list/show.gjs b/frontend/discourse/admin/templates/admin-users-list/show.gjsindex fd994b9d373..de541f987fb 100644--- a/frontend/discourse/admin/templates/admin-users-list/show.gjs+++ b/frontend/discourse/admin/templates/admin-users-list/show.gjs@@ -2,25 +2,25 @@ import { concat, fn, get } from "@ember/helper";import { on } from "@ember/modifier";import { LinkTo } from "@ember/routing";import { trustHTML } from "@ember/template";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DButton from "discourse/components/d-button";-import DPageSubheader from "discourse/components/d-page-subheader";-import DropdownMenu from "discourse/components/dropdown-menu";-import LoadMore from "discourse/components/load-more";import PluginOutlet from "discourse/components/plugin-outlet";-import ResponsiveTable from "discourse/components/responsive-table";-import TableHeaderToggle from "discourse/components/table-header-toggle";import DMenu from "discourse/float-kit/components/d-menu";import DTooltip from "discourse/float-kit/components/d-tooltip";-import avatar from "discourse/helpers/avatar";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";-import formatDuration from "discourse/helpers/format-duration";import i18nYesNo from "discourse/helpers/i18n-yes-no";import lazyHash from "discourse/helpers/lazy-hash";-import number from "discourse/helpers/number";import rawDate from "discourse/helpers/raw-date";import { eq, not, or } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";+import DLoadMore from "discourse/ui-kit/d-load-more";+import DPageSubheader from "discourse/ui-kit/d-page-subheader";+import DResponsiveTable from "discourse/ui-kit/d-responsive-table";+import DTableHeaderToggle from "discourse/ui-kit/d-table-header-toggle";+import dAvatar from "discourse/ui-kit/helpers/d-avatar";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dFormatDuration from "discourse/ui-kit/helpers/d-format-duration";+import dIcon from "discourse/ui-kit/helpers/d-icon";+import dNumber from "discourse/ui-kit/helpers/d-number";import { i18n } from "discourse-i18n";export default <template>@@ -67,11 +67,11 @@ export default <template><span class="d-button-label">{{i18n "admin.users.bulk_actions.title"}}</span>- {{icon "angle-down"}}+ {{dIcon "angle-down"}}</:trigger><:content>- <DropdownMenu as |dropdown|>+ <DDropdownMenu as |dropdown|><dropdown.item><DButton@translatedLabel={{i18n@@ -82,16 +82,16 @@ export default <template>class="bulk-delete btn-danger"/></dropdown.item>- </DropdownMenu>+ </DDropdownMenu></:content></DMenu></div>{{/if}}</div>- <LoadMore @action={{@controller.loadMore}} class="users-list-container">+ <DLoadMore @action={{@controller.loadMore}} class="users-list-container">{{#if @controller.users}}- <ResponsiveTable- @className={{concatClass "users-list" @controller.query}}+ <DResponsiveTable+ @className={{dConcatClass "users-list" @controller.query}}@ariaLabel={{@controller.title}}@style={{trustHTML(concat@@ -108,7 +108,7 @@ export default <template>@icon="list-check"@action={{@controller.toggleBulkSelect}}/>- <TableHeaderToggle+ <DTableHeaderToggle@onToggle={{@controller.updateOrder}}@field="username"@labelKey="username"@@ -118,7 +118,7 @@ export default <template>class="directory-table__column-header--username"/></div>- <TableHeaderToggle+ <DTableHeaderToggle@onToggle={{@controller.updateOrder}}@field="email"@labelKey="email"@@ -131,7 +131,7 @@ export default <template>"hidden"}}/>- <TableHeaderToggle+ <DTableHeaderToggle@onToggle={{@controller.updateOrder}}@field="last_emailed"@labelKey="admin.users.last_emailed"@@ -139,7 +139,7 @@ export default <template>@asc={{@controller.asc}}@automatic={{true}}/>- <TableHeaderToggle+ <DTableHeaderToggle@onToggle={{@controller.updateOrder}}@field="seen"@labelKey="last_seen"@@ -148,7 +148,7 @@ export default <template>@automatic={{true}}/>{{#unless @controller.showSilenceReason}}- <TableHeaderToggle+ <DTableHeaderToggle@onToggle={{@controller.updateOrder}}@field="topics_viewed"@labelKey="admin.user.topics_entered"@@ -157,7 +157,7 @@ export default <template>@automatic={{true}}/>{{/unless}}- <TableHeaderToggle+ <DTableHeaderToggle@onToggle={{@controller.updateOrder}}@field="posts_read"@labelKey="admin.user.posts_read_count"@@ -165,7 +165,7 @@ export default <template>@asc={{@controller.asc}}@automatic={{true}}/>- <TableHeaderToggle+ <DTableHeaderToggle@onToggle={{@controller.updateOrder}}@field="read_time"@labelKey="admin.user.time_read"@@ -173,7 +173,7 @@ export default <template>@asc={{@controller.asc}}@automatic={{true}}/>- <TableHeaderToggle+ <DTableHeaderToggle@onToggle={{@controller.updateOrder}}@field="created"@labelKey="created"@@ -182,7 +182,7 @@ export default <template>@automatic={{true}}/>{{#if @controller.showSilenceReason}}- <TableHeaderToggle+ <DTableHeaderToggle@onToggle={{@controller.updateOrder}}@field="silence_reason"@labelKey="admin.users.silence_reason"@@ -262,13 +262,13 @@ export default <template>href={{user.path}}data-user-card={{user.username}}>- {{avatar user imageSize="small"}}+ {{dAvatar user imageSize="small"}}</a><LinkTo @route="adminUser" @model={{user}}>{{user.username}}</LinkTo>{{#if user.staged}}- {{icon "far-envelope" title="user.staged"}}+ {{dIcon "far-envelope" title="user.staged"}}{{/if}}</div><div@@ -289,7 +289,7 @@ export default <template><span>{{i18n "admin.users.last_emailed"}}</span></span><span class="directory-table__value">- {{formatDuration user.last_emailed_age}}+ {{dFormatDuration user.last_emailed_age}}</span></div>{{else}}@@ -298,7 +298,7 @@ export default <template><span>{{i18n "admin.users.last_emailed"}}</span></span><span class="directory-table__value">- {{formatDuration user.last_emailed_age}}+ {{dFormatDuration user.last_emailed_age}}</span></div>{{/if}}@@ -311,7 +311,7 @@ export default <template><span>{{i18n "last_seen"}}</span></span><span class="directory-table__value">- {{formatDuration user.last_seen_age}}+ {{dFormatDuration user.last_seen_age}}</span></div>@@ -321,7 +321,7 @@ export default <template><span>{{i18n "admin.user.topics_entered"}}</span></span><span class="directory-table__value">- {{number user.topics_entered}}+ {{dNumber user.topics_entered}}</span></div>{{/unless}}@@ -330,7 +330,7 @@ export default <template><span>{{i18n "admin.user.posts_read_count"}}</span></span><span class="directory-table__value">- {{number user.posts_read_count}}+ {{dNumber user.posts_read_count}}</span></div><div class="directory-table__cell time-read">@@ -338,7 +338,7 @@ export default <template><span>{{i18n "admin.user.time_read"}}</span></span><span class="directory-table__value">- {{formatDuration user.time_read}}+ {{dFormatDuration user.time_read}}</span></div><div@@ -349,7 +349,7 @@ export default <template><span>{{i18n "created"}}</span></span><span class="directory-table__value">- {{formatDuration user.created_at_age}}+ {{dFormatDuration user.created_at_age}}</span></div>@@ -384,7 +384,7 @@ export default <template>{{/if}}<div- class={{concatClass+ class={{dConcatClass"directory-table__cell""user-role"(if@@ -400,13 +400,13 @@ export default <template></span><span class="directory-table__value">{{#if user.admin}}- {{icon "shield-halved" title="admin.title"}}+ {{dIcon "shield-halved" title="admin.title"}}{{/if}}{{#if user.moderator}}- {{icon "shield-halved" title="admin.moderator"}}+ {{dIcon "shield-halved" title="admin.moderator"}}{{/if}}{{#if user.second_factor_enabled}}- {{icon "lock" title="admin.user.second_factor_enabled"}}+ {{dIcon "lock" title="admin.user.second_factor_enabled"}}{{/if}}</span><PluginOutlet@@ -418,10 +418,10 @@ export default <template></div>{{/each}}</:body>- </ResponsiveTable>+ </DResponsiveTable>{{else if (not @controller.refreshing)}}<p>{{i18n "search.no_results"}}</p>{{/if}}- <ConditionalLoadingSpinner @condition={{@controller.refreshing}} />- </LoadMore>+ <DConditionalLoadingSpinner @condition={{@controller.refreshing}} />+ </DLoadMore></template>diff --git a/frontend/discourse/admin/templates/admin-users.gjs b/frontend/discourse/admin/templates/admin-users.gjsindex 01221eafef9..aa884d7c5f3 100644--- a/frontend/discourse/admin/templates/admin-users.gjs+++ b/frontend/discourse/admin/templates/admin-users.gjs@@ -1,7 +1,7 @@-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DPageHeader from "discourse/components/d-page-header";-import NavItem from "discourse/components/nav-item";import routeAction from "discourse/helpers/route-action";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DNavItem from "discourse/ui-kit/d-nav-item";+import DPageHeader from "discourse/ui-kit/d-page-header";import { i18n } from "discourse-i18n";export default <template>@@ -38,48 +38,48 @@ export default <template>{{/if}}</:actions><:tabs>- <NavItem+ <DNavItem@route="adminUsers.settings"@label="settings"class="admin-users-tabs__settings"/>- <NavItem+ <DNavItem@route="adminUsersList.show"@routeParam="active"@label="admin.users.nav.active"class="admin-users-tabs__active"/>- <NavItem+ <DNavItem@route="adminUsersList.show"@routeParam="new"@label="admin.users.nav.new"class="admin-users-tabs__new"/>- <NavItem+ <DNavItem@route="adminUsersList.show"@routeParam="staff"@label="admin.users.nav.staff"class="admin-users-tabs__staff"/>- <NavItem+ <DNavItem@route="adminUsersList.show"@routeParam="suspended"@label="admin.users.nav.suspended"class="admin-users-tabs__suspended"/>- <NavItem+ <DNavItem@route="adminUsersList.show"@routeParam="silenced"@label="admin.users.nav.silenced"class="admin-users-tabs__silenced"/>- <NavItem+ <DNavItem@route="adminUsersList.show"@routeParam="staged"@label="admin.users.nav.staged"class="admin-users-tabs__staged"/>- <NavItem+ <DNavItem@route="adminGroups.index"@label="groups.index.title"class="admin-users-tabs__groups"diff --git a/frontend/discourse/admin/templates/admin-watched-words.gjs b/frontend/discourse/admin/templates/admin-watched-words.gjsindex b9d878c8214..f8178490d54 100644--- a/frontend/discourse/admin/templates/admin-watched-words.gjs+++ b/frontend/discourse/admin/templates/admin-watched-words.gjs@@ -1,10 +1,10 @@import didInsert from "@ember/render-modifiers/modifiers/did-insert";import willDestroy from "@ember/render-modifiers/modifiers/will-destroy";import AdminWatchedWordsActionNav from "discourse/admin/components/admin-watched-words-action-nav";-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DButton from "discourse/components/d-button";-import DPageHeader from "discourse/components/d-page-header";-import TextField from "discourse/components/text-field";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DButton from "discourse/ui-kit/d-button";+import DPageHeader from "discourse/ui-kit/d-page-header";+import DTextField from "discourse/ui-kit/d-text-field";import { i18n } from "discourse-i18n";export default <template>@@ -35,7 +35,7 @@ export default <template>{{didInsert @controller.registerMenuTrigger}}/>{{/if}}- <TextField+ <DTextField@value={{@controller.filter}}@placeholderKey="admin.watched_words.search"class="no-blur"diff --git a/frontend/discourse/admin/templates/admin-watched-words/action.gjs b/frontend/discourse/admin/templates/admin-watched-words/action.gjsindex 0cb5af21c9e..729a1726e8c 100644--- a/frontend/discourse/admin/templates/admin-watched-words/action.gjs+++ b/frontend/discourse/admin/templates/admin-watched-words/action.gjs@@ -3,8 +3,8 @@ import { trustHTML } from "@ember/template";import AdminWatchedWord from "discourse/admin/components/admin-watched-word";import WatchedWordForm from "discourse/admin/components/watched-word-form";import WatchedWordUploader from "discourse/admin/components/watched-word-uploader";-import DButton from "discourse/components/d-button";-import basePath from "discourse/helpers/base-path";+import DButton from "discourse/ui-kit/d-button";+import dBasePath from "discourse/ui-kit/helpers/d-base-path";import { i18n } from "discourse-i18n";export default <template>@@ -56,7 +56,7 @@ export default <template>{{#if @controller.siteSettings.watched_words_regular_expressions}}<p>{{trustHTML- (i18n "admin.watched_words.regex_warning" basePath=(basePath))+ (i18n "admin.watched_words.regex_warning" basePath=(dBasePath))}}</p>{{/if}}diff --git a/frontend/discourse/admin/templates/admin-web-hooks.gjs b/frontend/discourse/admin/templates/admin-web-hooks.gjsindex 7a6c9674d2d..dce32a5a384 100644--- a/frontend/discourse/admin/templates/admin-web-hooks.gjs+++ b/frontend/discourse/admin/templates/admin-web-hooks.gjs@@ -1,6 +1,6 @@-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DPageHeader from "discourse/components/d-page-header";import PluginOutlet from "discourse/components/plugin-outlet";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DPageHeader from "discourse/ui-kit/d-page-header";import { i18n } from "discourse-i18n";export default <template>diff --git a/frontend/discourse/admin/templates/admin-web-hooks/show.gjs b/frontend/discourse/admin/templates/admin-web-hooks/show.gjsindex 255e8925ecc..1775d159261 100644--- a/frontend/discourse/admin/templates/admin-web-hooks/show.gjs+++ b/frontend/discourse/admin/templates/admin-web-hooks/show.gjs@@ -1,12 +1,12 @@import { LinkTo } from "@ember/routing";import WebhookEvents from "discourse/admin/components/webhook-events";-import DButton from "discourse/components/d-button";-import icon from "discourse/helpers/d-icon";+import DButton from "discourse/ui-kit/d-button";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default <template><LinkTo @route="adminWebHooks" class="go-back">- {{icon "arrow-left"}}+ {{dIcon "arrow-left"}}{{i18n "admin.web_hooks.back"}}</LinkTo>diff --git a/frontend/discourse/admin/templates/admin/backups.gjs b/frontend/discourse/admin/templates/admin/backups.gjsindex 2b7ece7b98f..1675394971d 100644--- a/frontend/discourse/admin/templates/admin/backups.gjs+++ b/frontend/discourse/admin/templates/admin/backups.gjs@@ -1,8 +1,8 @@import AdminBackupsActions from "discourse/admin/components/admin-backups-actions";-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DPageHeader from "discourse/components/d-page-header";-import NavItem from "discourse/components/nav-item";import PluginOutlet from "discourse/components/plugin-outlet";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DNavItem from "discourse/ui-kit/d-nav-item";+import DPageHeader from "discourse/ui-kit/d-page-header";import { i18n } from "discourse-i18n";export default <template>@@ -25,17 +25,17 @@ export default <template>{{/if}}</:actions><:tabs>- <NavItem+ <DNavItem@route="admin.backups.settings"@label="settings"class="admin-backups-tabs__settings"/>- <NavItem+ <DNavItem@route="admin.backups.index"@label="admin.backups.menu.backup_files"class="admin-backups-tabs__files"/>- <NavItem+ <DNavItem@route="admin.backups.logs"@label="admin.backups.menu.logs"class="admin-backups-tabs__logs"diff --git a/frontend/discourse/admin/templates/admin/backups/index.gjs b/frontend/discourse/admin/templates/admin/backups/index.gjsindex 5aa037e7c0c..89db0988187 100644--- a/frontend/discourse/admin/templates/admin/backups/index.gjs+++ b/frontend/discourse/admin/templates/admin/backups/index.gjs@@ -2,12 +2,12 @@ import { fn } from "@ember/helper";import { trustHTML } from "@ember/template";import UppyBackupUploader from "discourse/admin/components/uppy-backup-uploader";import humanSize from "discourse/admin/helpers/human-size";-import DButton from "discourse/components/d-button";-import DPageSubheader from "discourse/components/d-page-subheader";-import DropdownMenu from "discourse/components/dropdown-menu";import DMenu from "discourse/float-kit/components/d-menu";-import icon from "discourse/helpers/d-icon";import routeAction from "discourse/helpers/route-action";+import DButton from "discourse/ui-kit/d-button";+import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";+import DPageSubheader from "discourse/ui-kit/d-page-subheader";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default <template>@@ -34,7 +34,7 @@ export default <template>{{#if @controller.status.restoreDisabled}}<div class="backup-message alert alert-info">- {{icon "circle-info"}}+ {{dIcon "circle-info"}}{{trustHTML(i18n"admin.backups.operations.restore.is_disabled"@@ -88,7 +88,7 @@ export default <template>class="btn-default btn-small"><:content>- <DropdownMenu as |dropdown|>+ <DDropdownMenu as |dropdown|><dropdown.item><DButton@icon="play"@@ -109,7 +109,7 @@ export default <template>class="btn-transparent --danger backup-item-row__delete"/></dropdown.item>- </DropdownMenu>+ </DDropdownMenu></:content></DMenu>{{/if}}diff --git a/frontend/discourse/admin/templates/admin/backups/logs.gjs b/frontend/discourse/admin/templates/admin/backups/logs.gjsindex 58d35354d15..ded4d5ae816 100644--- a/frontend/discourse/admin/templates/admin/backups/logs.gjs+++ b/frontend/discourse/admin/templates/admin/backups/logs.gjs@@ -1,5 +1,5 @@import AdminBackupsLogs from "discourse/admin/components/admin-backups-logs";-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";import { i18n } from "discourse-i18n";export default <template>diff --git a/frontend/discourse/admin/templates/admin/dashboard.gjs b/frontend/discourse/admin/templates/admin/dashboard.gjsindex 64c33ee401a..2e02aafb1c4 100644--- a/frontend/discourse/admin/templates/admin/dashboard.gjs+++ b/frontend/discourse/admin/templates/admin/dashboard.gjs@@ -2,9 +2,9 @@ import { LinkTo } from "@ember/routing";import DashboardProblems from "discourse/admin/components/dashboard-problems";import RedesignedAdminDashboard from "discourse/admin/components/redesigned-admin-dashboard";import VersionChecks from "discourse/admin/components/version-checks";-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DPageHeader from "discourse/components/d-page-header";import PluginOutlet from "discourse/components/plugin-outlet";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DPageHeader from "discourse/ui-kit/d-page-header";import { i18n } from "discourse-i18n";export default <template>diff --git a/frontend/discourse/admin/templates/admin/dashboard/general.gjs b/frontend/discourse/admin/templates/admin/dashboard/general.gjsindex db0f4449dd9..d4d5a76e0ad 100644--- a/frontend/discourse/admin/templates/admin/dashboard/general.gjs+++ b/frontend/discourse/admin/templates/admin/dashboard/general.gjs@@ -2,17 +2,17 @@ import { LinkTo } from "@ember/routing";import { trustHTML } from "@ember/template";import AdminReport from "discourse/admin/components/admin-report";import DashboardPeriodSelector from "discourse/admin/components/dashboard-period-selector";-import ConditionalLoadingSection from "discourse/components/conditional-loading-section";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";import PluginOutlet from "discourse/components/plugin-outlet";-import basePath from "discourse/helpers/base-path";-import formatDate from "discourse/helpers/format-date";import lazyHash from "discourse/helpers/lazy-hash";import getUrl from "discourse/lib/get-url";+import DConditionalLoadingSection from "discourse/ui-kit/d-conditional-loading-section";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import dBasePath from "discourse/ui-kit/helpers/d-base-path";+import dFormatDate from "discourse/ui-kit/helpers/d-format-date";import { i18n } from "discourse-i18n";export default <template>- <ConditionalLoadingSpinner @condition={{@controller.isLoading}}>+ <DConditionalLoadingSpinner @condition={{@controller.isLoading}}><PluginOutlet @name="admin-dashboard-general-top" @connectorTagName="div" />{{#if @controller.isCommunityHealthVisible}}@@ -145,7 +145,7 @@ export default <template>{{/if}}<div class="user-metrics">- <ConditionalLoadingSection @isLoading={{@controller.isLoading}}>+ <DConditionalLoadingSection @isLoading={{@controller.isLoading}}><AdminReport@forcedModes={{@controller.reportModes.inline_table}}@dataSourceName="users_by_type"@@ -155,7 +155,7 @@ export default <template>@forcedModes={{@controller.reportModes.inline_table}}@dataSourceName="users_by_trust_level"/>- </ConditionalLoadingSection>+ </DConditionalLoadingSection></div><div class="misc">@@ -168,7 +168,7 @@ export default <template><div class="last-dashboard-update"><div><h4>{{i18n "admin.dashboard.last_updated"}} </h4>- <p>{{formatDate+ <p>{{dFormatDate@controller.model.attributes.updated_atleaveAgo="true"}}</p>@@ -176,7 +176,7 @@ export default <template>{{#if @controller.model.attributes.discourse_updated_at}}<div><h4>{{i18n "admin.dashboard.discourse_last_updated"}} </h4>- <p>{{formatDate+ <p>{{dFormatDate@controller.model.attributes.discourse_updated_atleaveAgo="true"}}</p>@@ -206,7 +206,8 @@ export default <template>/>{{trustHTML(i18n- "admin.dashboard.reports.trending_search.more" basePath=(basePath)+ "admin.dashboard.reports.trending_search.more"+ basePath=(dBasePath))}}</div>@@ -218,5 +219,5 @@ export default <template>@connectorTagName="div"@outletArgs={{lazyHash [email protected]}}/>- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner></template>diff --git a/frontend/discourse/admin/templates/admin/schema.gjs b/frontend/discourse/admin/templates/admin/schema.gjsindex ccbe8428fc0..5b1b817cff5 100644--- a/frontend/discourse/admin/templates/admin/schema.gjs+++ b/frontend/discourse/admin/templates/admin/schema.gjs@@ -1,12 +1,12 @@import { hash } from "@ember/helper";import Editor from "discourse/admin/components/schema-setting/editor";-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default <template><div class="customize-show-schema__header row"><a href={{@model.goBackUrl}}>- {{icon "arrow-left"}}+ {{dIcon "arrow-left"}}</a><h2>{{i18n "admin.customize.schema.title" (hash [email protected])}}diff --git a/frontend/discourse/admin/templates/admin/whats-new.gjs b/frontend/discourse/admin/templates/admin/whats-new.gjsindex 757a6a42614..013dc1b17cd 100644--- a/frontend/discourse/admin/templates/admin/whats-new.gjs+++ b/frontend/discourse/admin/templates/admin/whats-new.gjs@@ -1,6 +1,6 @@import DashboardNewFeatures from "discourse/admin/components/dashboard-new-features";-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DPageHeader from "discourse/components/d-page-header";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DPageHeader from "discourse/ui-kit/d-page-header";import { i18n } from "discourse-i18n";export default <template>diff --git a/frontend/discourse/admin/templates/config-user-api-settings.gjs b/frontend/discourse/admin/templates/config-user-api-settings.gjsindex 32e9fbcc1c5..4fa081329e8 100644--- a/frontend/discourse/admin/templates/config-user-api-settings.gjs+++ b/frontend/discourse/admin/templates/config-user-api-settings.gjs@@ -1,6 +1,6 @@import AdminAreaSettings from "discourse/admin/components/admin-area-settings";-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DPageHeader from "discourse/components/d-page-header";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DPageHeader from "discourse/ui-kit/d-page-header";import { i18n } from "discourse-i18n";export default <template>diff --git a/frontend/discourse/admin/templates/dashboard-new-features.gjs b/frontend/discourse/admin/templates/dashboard-new-features.gjsindex df82718a86c..23cb41b0166 100644--- a/frontend/discourse/admin/templates/dashboard-new-features.gjs+++ b/frontend/discourse/admin/templates/dashboard-new-features.gjs@@ -1,14 +1,14 @@import { trustHTML } from "@ember/template";import DashboardNewFeatures from "discourse/admin/components/dashboard-new-features";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";import { i18n } from "discourse-i18n";export default <template>- <ConditionalLoadingSpinner @condition={{@controller.isLoading}}>+ <DConditionalLoadingSpinner @condition={{@controller.isLoading}}><div class="admin-config-area"><h2>{{i18n "admin.dashboard.new_features.title"}}</h2><p>{{trustHTML (i18n "admin.dashboard.new_features.subtitle")}}</p><DashboardNewFeatures /></div>- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner></template>diff --git a/frontend/discourse/admin/templates/edit-category/tabs-horizontal.gjs b/frontend/discourse/admin/templates/edit-category/tabs-horizontal.gjsindex 46f850529c6..184851a0822 100644--- a/frontend/discourse/admin/templates/edit-category/tabs-horizontal.gjs+++ b/frontend/discourse/admin/templates/edit-category/tabs-horizontal.gjs@@ -4,10 +4,10 @@ import { on } from "@ember/modifier";import EditCategoryTab from "discourse/admin/components/edit-category-tab";import BackButton from "discourse/components/back-button";import BreadCrumbs from "discourse/components/bread-crumbs";-import DPageHeader from "discourse/components/d-page-header";-import DToggleSwitch from "discourse/components/d-toggle-switch";import { registeredEditCategoryTabs } from "discourse/lib/edit-category-tabs";import { and } from "discourse/truth-helpers";+import DPageHeader from "discourse/ui-kit/d-page-header";+import DToggleSwitch from "discourse/ui-kit/d-toggle-switch";export default class EditCategoryTabsHorizontalTemplate extends Component {evaluateTabCondition(tab, controller) {diff --git a/frontend/discourse/admin/templates/edit-category/tabs-vertical.gjs b/frontend/discourse/admin/templates/edit-category/tabs-vertical.gjsindex 885aa152116..ea350f1d026 100644--- a/frontend/discourse/admin/templates/edit-category/tabs-vertical.gjs+++ b/frontend/discourse/admin/templates/edit-category/tabs-vertical.gjs@@ -1,7 +1,7 @@import EditCategoryTab from "discourse/admin/components/edit-category-tab";import BreadCrumbs from "discourse/components/bread-crumbs";-import DButton from "discourse/components/d-button";import { and } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";const EditCategoryTabsVerticalTemplate = <template><div class="edit-category-title-bar">diff --git a/frontend/discourse/admin/templates/new-category/setup.gjs b/frontend/discourse/admin/templates/new-category/setup.gjsindex a09da86edf3..0551139085b 100644--- a/frontend/discourse/admin/templates/new-category/setup.gjs+++ b/frontend/discourse/admin/templates/new-category/setup.gjs@@ -1,5 +1,5 @@import CategoryTypeCards from "discourse/components/category-type-cards";-import DPageHeader from "discourse/components/d-page-header";+import DPageHeader from "discourse/ui-kit/d-page-header";import { i18n } from "discourse-i18n";export default <template>diff --git a/frontend/discourse/app/app.js b/frontend/discourse/app/app.jsindex 73c66f7e643..8e0f7361643 100644--- a/frontend/discourse/app/app.js+++ b/frontend/discourse/app/app.js@@ -2,6 +2,7 @@ import "./setup-deprecation-workflow";import "./array-shim";import "decorator-transforms/globals";import "./loader-shims";+import "./ui-kit-shims";import "./discourse-common-loader-shims";import "./global-compat";import dialogHolderCompatModules from "discourse/dialog-holder/dialog-holder-compat-modules";diff --git a/frontend/discourse/app/blocks/block-outlet.gjs b/frontend/discourse/app/blocks/block-outlet.gjsindex 6f7f2030354..233104a2d68 100644--- a/frontend/discourse/app/blocks/block-outlet.gjs+++ b/frontend/discourse/app/blocks/block-outlet.gjs@@ -14,8 +14,6 @@ import Component from "@glimmer/component";import { DEBUG } from "@glimmer/env";import { cached } from "@glimmer/tracking";import curryComponent from "ember-curry-component";-/** @type {import("discourse/components/async-content.gjs")} */-import AsyncContent from "discourse/components/async-content";/** @type {import("discourse/lib/blocks/-internals/components/block-layout-wrapper.gjs")} */import { wrapBlockLayout } from "discourse/lib/blocks/-internals/components/block-layout-wrapper";/** @type {import("discourse/lib/blocks/-internals/components/block-outlet-inline-error.gjs")} */@@ -43,6 +41,8 @@ import { validateLayout } from "discourse/lib/blocks/-internals/validation/layouimport { isRailsTesting, isTesting } from "discourse/lib/environment";import { buildArgsWithDeprecations } from "discourse/lib/outlet-args";import { BLOCK_OUTLETS } from "discourse/lib/registry/block-outlets";+/** @type {import("discourse/ui-kit/d-async-content.gjs")} */+import DAsyncContent from "discourse/ui-kit/d-async-content";/*** A block entry in a layout configuration.@@ -576,7 +576,7 @@ export default class BlockOutlet extends Component {)as |OutletInfo|}}- <AsyncContent @asyncData={{this.children}}>+ <DAsyncContent @asyncData={{this.children}}><:loading>{{! Resolving async blocks should not display a loading UI }}</:loading>@@ -626,7 +626,7 @@ export default class BlockOutlet extends Component {<OutletInfo />{{/if}}</:empty>- </AsyncContent>+ </DAsyncContent>{{/let}}{{! yield to :after block with hasLayout boolean for conditional renderingdiff --git a/frontend/discourse/app/components/about-page-extra-groups.gjs b/frontend/discourse/app/components/about-page-extra-groups.gjsindex ce1ae3b4c0c..067332c27a5 100644--- a/frontend/discourse/app/components/about-page-extra-groups.gjs+++ b/frontend/discourse/app/components/about-page-extra-groups.gjs@@ -4,8 +4,8 @@ import { action } from "@ember/object";import { service } from "@ember/service";import { trustHTML } from "@ember/template";import AboutPageUsers from "discourse/components/about-page-users";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";import { ajax } from "discourse/lib/ajax";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";export default class AboutPageExtraGroups extends Component {@service site;@@ -109,7 +109,7 @@ export default class AboutPageExtraGroups extends Component {}<template>- <ConditionalLoadingSpinner @condition={{this.loading}}>+ <DConditionalLoadingSpinner @condition={{this.loading}}>{{#each this.groups as |group|}}<sectionclass="about__{{group.name}}@@ -128,6 +128,6 @@ export default class AboutPageExtraGroups extends Component {/></section>{{/each}}- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner></template>}diff --git a/frontend/discourse/app/components/about-page-users.gjs b/frontend/discourse/app/components/about-page-users.gjsindex 83a42b8ce1f..abb56bf43bd 100644--- a/frontend/discourse/app/components/about-page-users.gjs+++ b/frontend/discourse/app/components/about-page-users.gjs@@ -1,8 +1,8 @@import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";-import DButton from "discourse/components/d-button";-import UserInfo from "discourse/components/user-info";+import DButton from "discourse/ui-kit/d-button";+import DUserInfo from "discourse/ui-kit/d-user-info";import { i18n } from "discourse-i18n";export default class AboutPageUsers extends Component {@@ -30,7 +30,7 @@ export default class AboutPageUsers extends Component {<template><div class="about-page-users-list">{{#each this.users as |user|}}- <UserInfo @user={{user}} />+ <DUserInfo @user={{user}} />{{/each}}</div>{{#if this.showViewMoreButton}}diff --git a/frontend/discourse/app/components/about-page.gjs b/frontend/discourse/app/components/about-page.gjsindex 83e4f337b13..072392c979e 100644--- a/frontend/discourse/app/components/about-page.gjs+++ b/frontend/discourse/app/components/about-page.gjs@@ -6,10 +6,10 @@ import { isBlank } from "@ember/utils";import AboutPageExtraGroups from "discourse/components/about-page-extra-groups";import AboutPageUsers from "discourse/components/about-page-users";import PluginOutlet from "discourse/components/plugin-outlet";-import icon from "discourse/helpers/d-icon";import lazyHash from "discourse/helpers/lazy-hash";import escape from "discourse/lib/escape";import { number } from "discourse/lib/formatter";+import dIcon from "discourse/ui-kit/helpers/d-icon";import I18n, { i18n } from "discourse-i18n";const pluginActivitiesFuncs = [];@@ -240,7 +240,7 @@ export default class AboutPage extends Component {{{#if this.currentUser.admin}}<p><LinkTo class="edit-about-page" @route="adminConfig.about">- {{icon "pencil"}}+ {{dIcon "pencil"}}<span>{{i18n "about.edit"}}</span></LinkTo></p>@@ -265,7 +265,7 @@ export default class AboutPage extends Component {{{#each this.stats as |stat|}}{{#if stat.display}}<span class="about__stats-item {{stat.class}}">- {{icon stat.icon}}+ {{dIcon stat.icon}}<span>{{stat.text}}</span></span>{{/if}}@@ -315,7 +315,7 @@ export default class AboutPage extends Component {<div class="about__activities">{{#each this.siteActivities as |activity|}}<div class="about__activities-item {{activity.class}}">- <span class="about__activities-item-icon">{{icon+ <span class="about__activities-item-icon">{{dIconactivity.icon}}</span><span class="about__activities-item-type">diff --git a/frontend/discourse/app/components/ace-editor.gjs b/frontend/discourse/app/components/ace-editor.gjsindex 9b51bfdb95a..33d53abdbfd 100644--- a/frontend/discourse/app/components/ace-editor.gjs+++ b/frontend/discourse/app/components/ace-editor.gjs@@ -6,12 +6,12 @@ import didUpdate from "@ember/render-modifiers/modifiers/did-update";import { service } from "@ember/service";import { buildWaiter } from "@ember/test-waiters";import { modifier } from "ember-modifier";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import concatClass from "discourse/helpers/concat-class";import { bind } from "discourse/lib/decorators";import { isTesting } from "discourse/lib/environment";import loadAce from "discourse/lib/load-ace-editor";import grippieDragResize from "discourse/modifiers/grippie-drag-resize";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";const WAITER = buildWaiter("ace-editor");@@ -273,7 +273,7 @@ export default class AceEditor extends Component {<template><div class="ace-wrapper">- <ConditionalLoadingSpinner @condition={{this.isLoading}} @size="small">+ <DConditionalLoadingSpinner @condition={{this.isLoading}} @size="small"><div{{didInsert this.setupAce}}{{this.setContent}}@@ -281,7 +281,7 @@ export default class AceEditor extends Component {{{didUpdate this.modeChanged @mode}}{{didUpdate this.placeholderChanged @placeholder}}{{didUpdate this.changeDisabledState @disabled}}- class={{concatClass this.cssClasses}}+ class={{dConcatClass this.cssClasses}}...attributes></div>@@ -295,7 +295,7 @@ export default class AceEditor extends Component {}}></div>{{/if}}- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner></div></template>}diff --git a/frontend/discourse/app/components/activation-controls.gjs b/frontend/discourse/app/components/activation-controls.gjsindex 9a2c29bed9d..69edf07c202 100644--- a/frontend/discourse/app/components/activation-controls.gjs+++ b/frontend/discourse/app/components/activation-controls.gjs@@ -1,6 +1,6 @@import Component from "@glimmer/component";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";export default class ActivationControls extends Component {@service siteSettings;diff --git a/frontend/discourse/app/components/admin-onboarding/banner.gjs b/frontend/discourse/app/components/admin-onboarding/banner.gjsindex 6fe306941e9..703c0d62a40 100644--- a/frontend/discourse/app/components/admin-onboarding/banner.gjs+++ b/frontend/discourse/app/components/admin-onboarding/banner.gjs@@ -9,11 +9,11 @@ import PredefinedTopicsOptionsModal from "discourse/components/admin-onboarding/import StartPostingOptions from "discourse/components/admin-onboarding/modal/start-posting-options";import PredefinedTopicOption from "discourse/components/admin-onboarding/predefined-topics-option";import OnboardingStep from "discourse/components/admin-onboarding/step";-import DButton from "discourse/components/d-button";import CreateInvite from "discourse/components/modal/create-invite";import { getAbsoluteURL } from "discourse/lib/get-url";import { applyValueTransformer } from "discourse/lib/transformer";import { clipboardCopy, defaultHomepage } from "discourse/lib/utilities";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";const STEPS = [diff --git a/frontend/discourse/app/components/admin-onboarding/modal/predefined-topics-options.gjs b/frontend/discourse/app/components/admin-onboarding/modal/predefined-topics-options.gjsindex fadf220ea01..ada97b33403 100644--- a/frontend/discourse/app/components/admin-onboarding/modal/predefined-topics-options.gjs+++ b/frontend/discourse/app/components/admin-onboarding/modal/predefined-topics-options.gjs@@ -3,7 +3,7 @@ import { concat, fn } from "@ember/helper";import { on } from "@ember/modifier";import { action } from "@ember/object";import { service } from "@ember/service";-import DModal from "discourse/components/d-modal";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";export default class PredefinedTopicOptions extends Component {diff --git a/frontend/discourse/app/components/admin-onboarding/modal/start-posting-options.gjs b/frontend/discourse/app/components/admin-onboarding/modal/start-posting-options.gjsindex f4c83a1bbad..f94ccf8358e 100644--- a/frontend/discourse/app/components/admin-onboarding/modal/start-posting-options.gjs+++ b/frontend/discourse/app/components/admin-onboarding/modal/start-posting-options.gjs@@ -1,4 +1,4 @@-import DModal from "discourse/components/d-modal";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";const StartPostingOptions = <template>diff --git a/frontend/discourse/app/components/admin-onboarding/start-posting-option.gjs b/frontend/discourse/app/components/admin-onboarding/start-posting-option.gjsindex 557b501a61c..28c9c7ac946 100644--- a/frontend/discourse/app/components/admin-onboarding/start-posting-option.gjs+++ b/frontend/discourse/app/components/admin-onboarding/start-posting-option.gjs@@ -1,7 +1,7 @@import Component from "@glimmer/component";import { on } from "@ember/modifier";import { action } from "@ember/object";-import concatClass from "discourse/helpers/concat-class";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";export default class StartPostingOption extends Component {@@ -25,7 +25,7 @@ export default class StartPostingOption extends Component {<template><buttontype="button"- class={{concatClass "start-posting-options-modal__card" this.name}}+ class={{dConcatClass "start-posting-options-modal__card" this.name}}disabled={{this.disableAction}}{{on "click" this.onSelect}}>diff --git a/frontend/discourse/app/components/admin-onboarding/step.gjs b/frontend/discourse/app/components/admin-onboarding/step.gjsindex efc0018f915..fc0b8c4d58e 100644--- a/frontend/discourse/app/components/admin-onboarding/step.gjs+++ b/frontend/discourse/app/components/admin-onboarding/step.gjs@@ -3,9 +3,9 @@ import { tracked } from "@glimmer/tracking";import { concat } from "@ember/helper";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import icon from "discourse/helpers/d-icon";import { currentThemeId, HORIZON_THEME_ID } from "discourse/lib/theme-selector";+import DButton from "discourse/ui-kit/d-button";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class OnboardingStep extends Component {@@ -52,7 +52,7 @@ export default class OnboardingStep extends Component {<template><div class="onboarding-step" id={{this.name}}><div class="onboarding-step__checkbox">- {{~icon+ {{~dIcon(if this.completed "square-check" "far-square")class=(if this.completed "checked")}}diff --git a/frontend/discourse/app/components/admin-post-menu.gjs b/frontend/discourse/app/components/admin-post-menu.gjsindex 8a7a06253c0..388a9721d31 100644--- a/frontend/discourse/app/components/admin-post-menu.gjs+++ b/frontend/discourse/app/components/admin-post-menu.gjs@@ -3,10 +3,10 @@ import { fn } from "@ember/helper";import { action } from "@ember/object";import { getOwner } from "@ember/owner";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import DropdownMenu from "discourse/components/dropdown-menu";-import concatClass from "discourse/helpers/concat-class";import { and, not, or } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";export default class AdminPostMenu extends Component {@service currentUser;@@ -80,7 +80,7 @@ export default class AdminPostMenu extends Component {}<template>- <DropdownMenu as |dropdown|>+ <DDropdownMenu as |dropdown|>{{#if this.currentUser.staff}}<dropdown.item><DButton@@ -106,7 +106,7 @@ export default class AdminPostMenu extends Component {"post.controls.convert_to_moderator_description"}}@icon="shield-halved"- class={{concatClass+ class={{dConcatClass"btn btn-transparent toggle-post-type"(if @data.post.isModeratorAction "btn-success")}}@@ -125,7 +125,7 @@ export default class AdminPostMenu extends Component {"post.controls.add_post_notice"}}@title="post.controls.add_post_notice_description"- class={{concatClass+ class={{dConcatClass"btn btn-transparent"(if @data.post.notice "change-notice" "add-notice")(if @data.post.notice "btn-success")@@ -175,7 +175,7 @@ export default class AdminPostMenu extends Component {@label="post.controls.unlock_post"@icon="unlock"@title="post.controls.unlock_post_description"- class={{concatClass+ class={{dConcatClass"btn btn-transparent unlock-post"(if @data.post.locked "btn-success")}}@@ -212,7 +212,7 @@ export default class AdminPostMenu extends Component {<DButton@label="post.controls.unwiki"@icon="far-pen-to-square"- class={{concatClass+ class={{dConcatClass"btn btn-transparent wiki wikied"(if @data.post.wiki "btn-success")}}@@ -273,11 +273,11 @@ export default class AdminPostMenu extends Component {@label={{button.label}}@translatedLabel={{button.translatedLabel}}@icon={{button.icon}}- class={{concatClass "btn btn-transparent" button.className}}+ class={{dConcatClass "btn btn-transparent" button.className}}@action={{fn this.extraAction button}}/></dropdown.item>{{/each}}- </DropdownMenu>+ </DDropdownMenu></template>}diff --git a/frontend/discourse/app/components/anonymous-topic-footer-buttons.gjs b/frontend/discourse/app/components/anonymous-topic-footer-buttons.gjsindex e8636fd8bad..07799871f6e 100644--- a/frontend/discourse/app/components/anonymous-topic-footer-buttons.gjs+++ b/frontend/discourse/app/components/anonymous-topic-footer-buttons.gjs@@ -3,10 +3,10 @@ import Component from "@ember/component";import { concat } from "@ember/helper";import { compare } from "@ember/utils";import { tagName } from "@ember-decorators/component";-import DButton from "discourse/components/d-button";-import concatClass from "discourse/helpers/concat-class";import routeAction from "discourse/helpers/route-action";import { getTopicFooterButtons } from "discourse/lib/register-topic-footer-button";+import DButton from "discourse/ui-kit/d-button";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";@tagName("")export default class AnonymousTopicFooterButtons extends Component {@@ -37,7 +37,7 @@ export default class AnonymousTopicFooterButtons extends Component {@translatedAriaLabel={{button.ariaLabel}}@disabled={{button.disabled}}id={{concat "topic-footer-button-" button.id}}- class={{concatClass+ class={{dConcatClass"btn-default""topic-footer-button"button.classNamesdiff --git a/frontend/discourse/app/components/avatar-uploader.gjs b/frontend/discourse/app/components/avatar-uploader.gjsindex 5874bbeae83..380648a9771 100644--- a/frontend/discourse/app/components/avatar-uploader.gjs+++ b/frontend/discourse/app/components/avatar-uploader.gjs@@ -5,8 +5,8 @@ import { getOwner } from "@ember/owner";import didInsert from "@ember/render-modifiers/modifiers/did-insert";import { isBlank } from "@ember/utils";import { tagName } from "@ember-decorators/component";-import DButton from "discourse/components/d-button";import UppyUpload from "discourse/lib/uppy/uppy-upload";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";@tagName("")diff --git a/frontend/discourse/app/components/back-button.gjs b/frontend/discourse/app/components/back-button.gjsindex 0036878a61c..5e26e493f75 100644--- a/frontend/discourse/app/components/back-button.gjs+++ b/frontend/discourse/app/components/back-button.gjs@@ -1,7 +1,7 @@import { array } from "@ember/helper";import { LinkTo } from "@ember/routing";-import icon from "discourse/helpers/d-icon";import { or } from "discourse/truth-helpers";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";<template>@@ -10,7 +10,7 @@ import { i18n } from "discourse-i18n";@route={{@route}}@models={{if @model (array @model) (array)}}>- {{icon "chevron-left"}}+ {{dIcon "chevron-left"}}{{i18n (or @label "back_button")}}</LinkTo></template>diff --git a/frontend/discourse/app/components/backup-codes.gjs b/frontend/discourse/app/components/backup-codes.gjsindex 21501a876d5..3a4f44754ef 100644--- a/frontend/discourse/app/components/backup-codes.gjs+++ b/frontend/discourse/app/components/backup-codes.gjs@@ -3,9 +3,9 @@ import { on } from "@ember/modifier";import { action } from "@ember/object";import didInsert from "@ember/render-modifiers/modifiers/did-insert";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import copyText from "discourse/lib/copy-text";import { slugify, toAsciiPrintable } from "discourse/lib/utilities";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";// https://developer.mozilla.org/en-US/docs/Web/API/WindowBase64/Base64_encoding_and_decodingdiff --git a/frontend/discourse/app/components/badge-title.gjs b/frontend/discourse/app/components/badge-title.gjsindex cc390381cf8..f564f466a17 100644--- a/frontend/discourse/app/components/badge-title.gjs+++ b/frontend/discourse/app/components/badge-title.gjs@@ -4,9 +4,9 @@ import { fn } from "@ember/helper";import { action } from "@ember/object";import { service } from "@ember/service";import { tagName } from "@ember-decorators/component";-import DButton from "discourse/components/d-button";import { ajax } from "discourse/lib/ajax";import ComboBox from "discourse/select-kit/components/combo-box";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";@tagName("")diff --git a/frontend/discourse/app/components/basic-topic-list.gjs b/frontend/discourse/app/components/basic-topic-list.gjsindex aed153e2432..98e92614238 100644--- a/frontend/discourse/app/components/basic-topic-list.gjs+++ b/frontend/discourse/app/components/basic-topic-list.gjs@@ -4,8 +4,8 @@ import { computed, set } from "@ember/object";import { service } from "@ember/service";import { observes } from "@ember-decorators/object";import $ from "jquery";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";import List from "discourse/components/topic-list/list";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";import { i18n } from "discourse-i18n";export default class BasicTopicList extends Component {@@ -100,7 +100,7 @@ export default class BasicTopicList extends Component {}<template>- <ConditionalLoadingSpinner @condition={{this.loading}}>+ <DConditionalLoadingSpinner @condition={{this.loading}}>{{#if this.topics}}<List@showPosters={{this.showPosters}}@@ -123,6 +123,6 @@ export default class BasicTopicList extends Component {</div>{{/unless}}{{/if}}- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner></template>}diff --git a/frontend/discourse/app/components/bookmark-icon.gjs b/frontend/discourse/app/components/bookmark-icon.gjsindex 43cfab050d7..ed09919b405 100644--- a/frontend/discourse/app/components/bookmark-icon.gjs+++ b/frontend/discourse/app/components/bookmark-icon.gjs@@ -1,10 +1,10 @@import Component from "@glimmer/component";-import icon from "discourse/helpers/d-icon";import {NO_REMINDER_ICON,NOT_BOOKMARKED,WITH_REMINDER_ICON,} from "discourse/models/bookmark";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class BookmarkIcon extends Component {@@ -33,6 +33,6 @@ export default class BookmarkIcon extends Component {}<template>- {{icon this.icon translatedTitle=this.title class=this.cssClasses}}+ {{dIcon this.icon translatedTitle=this.title class=this.cssClasses}}</template>}diff --git a/frontend/discourse/app/components/bookmark-list.gjs b/frontend/discourse/app/components/bookmark-list.gjsindex b4a503f03b8..de79b887593 100644--- a/frontend/discourse/app/components/bookmark-list.gjs+++ b/frontend/discourse/app/components/bookmark-list.gjs@@ -8,22 +8,11 @@ import { trustHTML } from "@ember/template";import { classNames } from "@ember-decorators/component";import { Promise } from "rsvp";import BookmarkActionsDropdown from "discourse/components/bookmark-actions-dropdown";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DButton from "discourse/components/d-button";-import LoadMore from "discourse/components/load-more";import BookmarkModal from "discourse/components/modal/bookmark";import PluginOutlet from "discourse/components/plugin-outlet";import ActivityCell from "discourse/components/topic-list/item/activity-cell";import TopicStatus from "discourse/components/topic-status";-import avatar from "discourse/helpers/avatar";-import categoryLink from "discourse/helpers/category-link";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";-import discourseTags from "discourse/helpers/discourse-tags";-import formatDate from "discourse/helpers/format-date";import lazyHash from "discourse/helpers/lazy-hash";-import replaceEmoji from "discourse/helpers/replace-emoji";-import topicLink from "discourse/helpers/topic-link";import { ajax } from "discourse/lib/ajax";import {addUniqueValueToArray,@@ -36,6 +25,17 @@ import {} from "discourse/lib/click-track";import BulkSelectBookmarksDropdown from "discourse/select-kit/components/bulk-select-bookmarks-dropdown";import { and } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DLoadMore from "discourse/ui-kit/d-load-more";+import dAvatar from "discourse/ui-kit/helpers/d-avatar";+import dCategoryLink from "discourse/ui-kit/helpers/d-category-link";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dDiscourseTags from "discourse/ui-kit/helpers/d-discourse-tags";+import dFormatDate from "discourse/ui-kit/helpers/d-format-date";+import dIcon from "discourse/ui-kit/helpers/d-icon";+import dReplaceEmoji from "discourse/ui-kit/helpers/d-replace-emoji";+import dTopicLink from "discourse/ui-kit/helpers/d-topic-link";import { i18n } from "discourse-i18n";@classNames("bookmark-list-wrapper")@@ -209,8 +209,8 @@ export default class BookmarkList extends Component {}<template>- <ConditionalLoadingSpinner @condition={{this.loading}}>- <LoadMore @action={{this.loadMore}}>+ <DConditionalLoadingSpinner @condition={{this.loading}}>+ <DLoadMore @action={{this.loadMore}}><table class="topic-list bookmark-list"><thead class="topic-list-header"><tr>@@ -280,7 +280,7 @@ export default class BookmarkList extends Component {<tbody class="topic-list-body">{{#each this.content as |bookmark|}}<tr- class={{concatClass+ class={{dConcatClass"topic-list-item bookmark-list-item"(if bookmark.excerpt "excerpt-expanded" "")(if bookmark.hasMetadata "has-metadata" "")@@ -315,12 +315,12 @@ export default class BookmarkList extends Component {'bookmark-expired-reminder'}}">- {{icon "far-clock"}}{{bookmark.formattedReminder}}+ {{dIcon "far-clock"}}{{bookmark.formattedReminder}}</span>{{/if}}{{#if bookmark.name}}<span class="bookmark-metadata-item">- {{icon "circle-info"}}<span>{{replaceEmoji+ {{dIcon "circle-info"}}<span>{{dReplaceEmojibookmark.name}}</span></span>@@ -329,11 +329,11 @@ export default class BookmarkList extends Component {{{/if}}<div class="bookmark-status-with-link">{{#if bookmark.pinned}}- {{icon "thumbtack" class="bookmark-pinned"}}+ {{dIcon "thumbtack" class="bookmark-pinned"}}{{/if}}{{#if bookmark.bookmarkableTopicAlike}}<TopicStatus @topic={{bookmark.topicStatus}} />- {{topicLink bookmark.topicForList}}+ {{dTopicLink bookmark.topicForList}}{{else}}<ahref={{bookmark.bookmarkable_url}}@@ -348,8 +348,8 @@ export default class BookmarkList extends Component {</span>{{#if bookmark.bookmarkableTopicAlike}}<div class="link-bottom-line">- {{categoryLink bookmark.category}}- {{discourseTags+ {{dCategoryLink bookmark.category}}+ {{dDiscourseTagsbookmarkmode="list"tagsForUser=this.tagsForUser@@ -368,7 +368,7 @@ export default class BookmarkList extends Component {data-user-card={{bookmark.user.username}}class="avatar">- {{avatar+ {{dAvatarbookmark.bookmarkableUseravatarTemplatePath="avatar_template"usernamePath="username"@@ -394,7 +394,7 @@ export default class BookmarkList extends Component {data-user-card={{bookmark.user.username}}class="avatar">- {{avatar+ {{dAvatarbookmark.useravatarTemplatePath="avatar_template"usernamePath="username"@@ -406,7 +406,7 @@ export default class BookmarkList extends Component {</td><tdclass="post-metadata topic-list-data updated-at"- >{{formatDate bookmark.updated_at format="tiny"}}</td>+ >{{dFormatDate bookmark.updated_at format="tiny"}}</td><ActivityCell class="post-metadata" @topic={{bookmark}} />{{/if}}<td class="topic-list-data">@@ -422,8 +422,8 @@ export default class BookmarkList extends Component {{{/each}}</tbody></table>- <ConditionalLoadingSpinner @condition={{this.loadingMore}} />- </LoadMore>- </ConditionalLoadingSpinner>+ <DConditionalLoadingSpinner @condition={{this.loadingMore}} />+ </DLoadMore>+ </DConditionalLoadingSpinner></template>}diff --git a/frontend/discourse/app/components/bookmark-menu.gjs b/frontend/discourse/app/components/bookmark-menu.gjsindex 1b7f52090d8..b04d39c9aef 100644--- a/frontend/discourse/app/components/bookmark-menu.gjs+++ b/frontend/discourse/app/components/bookmark-menu.gjs@@ -3,11 +3,8 @@ import { tracked } from "@glimmer/tracking";import { fn } from "@ember/helper";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import DropdownMenu from "discourse/components/dropdown-menu";import BookmarkModal from "discourse/components/modal/bookmark";import DMenu from "discourse/float-kit/components/d-menu";-import icon from "discourse/helpers/d-icon";import { popupAjaxError } from "discourse/lib/ajax-error";import {TIME_SHORTCUT_TYPES,@@ -18,6 +15,9 @@ import {NOT_BOOKMARKED,WITH_REMINDER_ICON,} from "discourse/models/bookmark";+import DButton from "discourse/ui-kit/d-button";+import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class BookmarkMenu extends Component {@@ -277,10 +277,10 @@ export default class BookmarkMenu extends Component {@arrow={{false}}><:content>- <DropdownMenu as |dropdown|>+ <DDropdownMenu as |dropdown|>{{#unless this.showEditDeleteMenu}}<dropdown.item class="bookmark-menu__title">- {{icon "circle-check"}}+ {{dIcon "circle-check"}}<span>{{i18n "bookmarks.bookmarked_success"}}</span></dropdown.item>{{/unless}}@@ -330,7 +330,7 @@ export default class BookmarkMenu extends Component {{{else}}<dropdown.item class="bookmark-menu__row-title">- {{icon "bell"}}+ {{dIcon "bell"}}{{i18n "bookmarks.also_set_reminder"}}</dropdown.item>@@ -351,7 +351,7 @@ export default class BookmarkMenu extends Component {</dropdown.item>{{/each}}{{/if}}- </DropdownMenu>+ </DDropdownMenu></:content></DMenu></template>diff --git a/frontend/discourse/app/components/bread-crumbs.gjs b/frontend/discourse/app/components/bread-crumbs.gjsindex cdf0b6f2fbd..4c72ce59d21 100644--- a/frontend/discourse/app/components/bread-crumbs.gjs+++ b/frontend/discourse/app/components/bread-crumbs.gjs@@ -5,11 +5,11 @@ import { computed } from "@ember/object";import { tagName } from "@ember-decorators/component";import PluginOutlet from "discourse/components/plugin-outlet";import categoryVariables from "discourse/helpers/category-variables";-import concatClass from "discourse/helpers/concat-class";import lazyHash from "discourse/helpers/lazy-hash";import CategoryDrop from "discourse/select-kit/components/category-drop";import TagDrop from "discourse/select-kit/components/tag-drop";import TagsIntersectionChooser from "discourse/select-kit/components/tags-intersection-chooser";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import deprecatedOutletArgument from "../helpers/deprecated-outlet-argument";@tagName("")@@ -56,7 +56,7 @@ export default class BreadCrumbs extends Component {<template><ol- class={{concatClass "category-breadcrumb" (if this.hidden "hidden")}}+ class={{dConcatClass "category-breadcrumb" (if this.hidden "hidden")}}...attributes><PluginOutletdiff --git a/frontend/discourse/app/components/bulk-actions/change-category.gjs b/frontend/discourse/app/components/bulk-actions/change-category.gjsindex 9b9d2886194..01ece08028e 100644--- a/frontend/discourse/app/components/bulk-actions/change-category.gjs+++ b/frontend/discourse/app/components/bulk-actions/change-category.gjs@@ -1,9 +1,9 @@import Component from "@glimmer/component";import { fn } from "@ember/helper";import { action } from "@ember/object";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DButton from "discourse/components/d-button";import CategoryChooser from "discourse/select-kit/components/category-chooser";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";import { i18n } from "discourse-i18n";export default class ChangeCategory extends Component {@@ -30,11 +30,11 @@ export default class ChangeCategory extends Component {/></p>- <ConditionalLoadingSpinner @condition={{@loading}}>+ <DConditionalLoadingSpinner @condition={{@loading}}><DButton@action={{this.changeCategory}}@label="topics.bulk.change_category"/>- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner></template>}diff --git a/frontend/discourse/app/components/bulk-actions/notification-level.gjs b/frontend/discourse/app/components/bulk-actions/notification-level.gjsindex 4d284f34e92..5d9870546bc 100644--- a/frontend/discourse/app/components/bulk-actions/notification-level.gjs+++ b/frontend/discourse/app/components/bulk-actions/notification-level.gjs@@ -2,9 +2,9 @@ import Component from "@glimmer/component";import { action, computed } from "@ember/object";import { trustHTML } from "@ember/template";import { isEmpty } from "@ember/utils";-import DButton from "discourse/components/d-button";-import RadioButton from "discourse/components/radio-button";import { topicLevels } from "discourse/lib/notification-levels";+import DButton from "discourse/ui-kit/d-button";+import DRadioButton from "discourse/ui-kit/d-radio-button";import { i18n } from "discourse-i18n";// Support for changing the notification level of various topics@@ -37,7 +37,7 @@ export default class NotificationLevel extends Component {{{#each this.notificationLevels as |level|}}<div class="controls"><label class="radio notification-level-radio checkbox-label">- <RadioButton+ <DRadioButton@value={{level.id}}@name="notification_level"@selection={{this.notificationLevelId}}diff --git a/frontend/discourse/app/components/bulk-select-toggle.gjs b/frontend/discourse/app/components/bulk-select-toggle.gjsindex 26639092172..ef9b5ae7d76 100644--- a/frontend/discourse/app/components/bulk-select-toggle.gjs+++ b/frontend/discourse/app/components/bulk-select-toggle.gjs@@ -1,4 +1,4 @@-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";const BulkSelectToggle = <template><DButtondiff --git a/frontend/discourse/app/components/bulk-select-topics-dropdown.gjs b/frontend/discourse/app/components/bulk-select-topics-dropdown.gjsindex 41369c3fe26..b87c319f3d5 100644--- a/frontend/discourse/app/components/bulk-select-topics-dropdown.gjs+++ b/frontend/discourse/app/components/bulk-select-topics-dropdown.gjs@@ -2,16 +2,16 @@ import Component from "@glimmer/component";import { fn } from "@ember/helper";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import DropdownMenu from "discourse/components/dropdown-menu";import BulkTopicActions, {addBulkDropdownAction,} from "discourse/components/modal/bulk-topic-actions";import DismissReadModal from "discourse/components/modal/dismiss-read";import DMenu from "discourse/float-kit/components/d-menu";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import Topic from "discourse/models/topic";+import DButton from "discourse/ui-kit/d-button";+import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";const _customButtons = [];@@ -409,22 +409,22 @@ export default class BulkSelectTopicsDropdown extends Component {<span class="d-button-label">{{i18n "select_kit.components.bulk_select_topics_dropdown.title"}}</span>- {{icon "angle-down"}}+ {{dIcon "angle-down"}}</:trigger><:content>- <DropdownMenu as |dropdown|>+ <DDropdownMenu as |dropdown|>{{#each this.buttons as |button|}}<dropdown.item><DButton@translatedLabel={{button.name}}@icon={{button.icon}}- class={{concatClass "btn-transparent" button.id button.class}}+ class={{dConcatClass "btn-transparent" button.id button.class}}@action={{fn this.onSelect button.id}}/></dropdown.item>{{/each}}- </DropdownMenu>+ </DDropdownMenu></:content></DMenu></template>diff --git a/frontend/discourse/app/components/calendar-subscription-url.gjs b/frontend/discourse/app/components/calendar-subscription-url.gjsindex 4f42fa0dbc8..28b9d915917 100644--- a/frontend/discourse/app/components/calendar-subscription-url.gjs+++ b/frontend/discourse/app/components/calendar-subscription-url.gjs@@ -2,8 +2,8 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { on } from "@ember/modifier";import { action } from "@ember/object";-import icon from "discourse/helpers/d-icon";import { clipboardCopy } from "discourse/lib/utilities";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class CalendarSubscriptionUrl extends Component {@@ -44,7 +44,7 @@ export default class CalendarSubscriptionUrl extends Component {{{on "click" this.copy}}class="btn btn-default btn-small">- {{icon (if this.copied "check" "copy")}}+ {{dIcon (if this.copied "check" "copy")}}{{ifthis.copied(i18n "user.calendar_subscriptions.copied")@@ -57,7 +57,7 @@ export default class CalendarSubscriptionUrl extends Component {rel="noopener noreferrer"class="btn btn-flat btn-small">- {{icon "fab-google"}}+ {{dIcon "fab-google"}}{{i18n "user.calendar_subscriptions.add_to_google"}}</a><a@@ -66,11 +66,11 @@ export default class CalendarSubscriptionUrl extends Component {rel="noopener noreferrer"class="btn btn-flat btn-small">- {{icon "fab-microsoft"}}+ {{dIcon "fab-microsoft"}}{{i18n "user.calendar_subscriptions.add_to_outlook"}}</a><a href={{this.webcalUrl}} class="btn btn-flat btn-small">- {{icon "fab-apple"}}+ {{dIcon "fab-apple"}}{{i18n "user.calendar_subscriptions.add_to_apple"}}</a></div>diff --git a/frontend/discourse/app/components/categories-boxes-topic.gjs b/frontend/discourse/app/components/categories-boxes-topic.gjsindex a57eca9d242..254caf6e692 100644--- a/frontend/discourse/app/components/categories-boxes-topic.gjs+++ b/frontend/discourse/app/components/categories-boxes-topic.gjs@@ -3,7 +3,7 @@ import Component from "@ember/component";import { computed } from "@ember/object";import { trustHTML } from "@ember/template";import { tagName } from "@ember-decorators/component";-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";@tagName("")export default class CategoriesBoxesTopic extends Component {@@ -20,7 +20,7 @@ export default class CategoriesBoxesTopic extends Component {<template><li data-topic-id={{this.topic.id}} ...attributes>- {{icon this.topicStatusIcon}}+ {{dIcon this.topicStatusIcon}}<a href={{this.topic.lastUnreadUrl}} class="title">{{trustHTML this.topic.fancyTitle}}diff --git a/frontend/discourse/app/components/categories-boxes-with-topics.gjs b/frontend/discourse/app/components/categories-boxes-with-topics.gjsindex fd6a3cf1846..0071d4d5b2d 100644--- a/frontend/discourse/app/components/categories-boxes-with-topics.gjs+++ b/frontend/discourse/app/components/categories-boxes-with-topics.gjs@@ -8,9 +8,9 @@ import CategoryLogo from "discourse/components/category-logo";import CategoryTitleBefore from "discourse/components/category-title-before";import PluginOutlet from "discourse/components/plugin-outlet";import categoryColorVariable from "discourse/helpers/category-color-variable";-import { categoryBadgeHTML } from "discourse/helpers/category-link";-import concatClass from "discourse/helpers/concat-class";import lazyHash from "discourse/helpers/lazy-hash";+import { categoryBadgeHTML } from "discourse/ui-kit/helpers/d-category-link";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";@tagName("")export default class CategoriesBoxesWithTopics extends Component {@@ -31,7 +31,7 @@ export default class CategoriesBoxesWithTopics extends Component {<template><section- class={{concatClass+ class={{dConcatClass"category-boxes-with-topics"(if this.anyLogos "with-logos" "no-logos")}}diff --git a/frontend/discourse/app/components/categories-boxes.gjs b/frontend/discourse/app/components/categories-boxes.gjsindex 8dd95349af4..66ddea0be2c 100644--- a/frontend/discourse/app/components/categories-boxes.gjs+++ b/frontend/discourse/app/components/categories-boxes.gjs@@ -6,16 +6,16 @@ import { tagName } from "@ember-decorators/component";import CategoryLogo from "discourse/components/category-logo";import CategoryTitleBefore from "discourse/components/category-title-before";import CategoryTitleLink from "discourse/components/category-title-link";-import DecoratedHtml from "discourse/components/decorated-html";import PluginOutlet from "discourse/components/plugin-outlet";import borderColor from "discourse/helpers/border-color";import categoryColorVariable from "discourse/helpers/category-color-variable";-import categoryLink, {- categoryBadgeHTML,-} from "discourse/helpers/category-link";-import concatClass from "discourse/helpers/concat-class";-import dirSpan from "discourse/helpers/dir-span";import lazyHash from "discourse/helpers/lazy-hash";+import DDecoratedHtml from "discourse/ui-kit/d-decorated-html";+import dCategoryLink, {+ categoryBadgeHTML,+} from "discourse/ui-kit/helpers/d-category-link";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dDirSpan from "discourse/ui-kit/helpers/d-dir-span";@tagName("")export default class CategoriesBoxes extends Component {@@ -38,7 +38,7 @@ export default class CategoriesBoxes extends Component {<template><section- class={{concatClass+ class={{dConcatClass"category-boxes"(if this.anyLogos "with-logos" "no-logos")(if this.hasSubcategories "with-subcategories")@@ -84,8 +84,8 @@ export default class CategoriesBoxes extends Component {{{#unless c.isMuted}}<div class="description">- <DecoratedHtml- @html={{dirSpan c.description_excerpt htmlSafe="true"}}+ <DDecoratedHtml+ @html={{dDirSpan c.description_excerpt htmlSafe="true"}}/></div>@@ -118,7 +118,7 @@ export default class CategoriesBoxes extends Component {<CategoryTitleBefore@category={{subsubcategory}}/>- {{categoryLink+ {{dCategoryLinksubsubcategoryhideParent="true"}}@@ -139,7 +139,7 @@ export default class CategoriesBoxes extends Component {<CategoryLogo @category={{sc}} /></span>{{/if}}- {{categoryLink sc hideParent="true"}}+ {{dCategoryLink sc hideParent="true"}}</a>{{/each}}</div>diff --git a/frontend/discourse/app/components/categories-only.gjs b/frontend/discourse/app/components/categories-only.gjsindex 172803d55ed..7e0997127ac 100644--- a/frontend/discourse/app/components/categories-only.gjs+++ b/frontend/discourse/app/components/categories-only.gjs@@ -5,8 +5,8 @@ import { action, computed } from "@ember/object";import { tagName } from "@ember-decorators/component";import ParentCategoryRow from "discourse/components/parent-category-row";import PluginOutlet from "discourse/components/plugin-outlet";-import icon from "discourse/helpers/d-icon";import lazyHash from "discourse/helpers/lazy-hash";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";@tagName("")@@ -119,7 +119,7 @@ export default class CategoriesOnly extends Component {"categories.muted"}}</h3>{{#if this.mutedToggleIcon}}- {{icon this.mutedToggleIcon}}+ {{dIcon this.mutedToggleIcon}}{{/if}}</a>{{#if this.site.mobileView}}diff --git a/frontend/discourse/app/components/category-logo.gjs b/frontend/discourse/app/components/category-logo.gjsindex fef6088fc8e..f8d8e3a52b1 100644--- a/frontend/discourse/app/components/category-logo.gjs+++ b/frontend/discourse/app/components/category-logo.gjs@@ -1,8 +1,8 @@-import LightDarkImg from "discourse/components/light-dark-img";+import DLightDarkImg from "discourse/ui-kit/d-light-dark-img";const CategoryLogo = <template><div class="category-logo aspect-image" ...attributes>- <LightDarkImg+ <DLightDarkImg@lightImg={{@category.uploaded_logo}}@darkImg={{@category.uploaded_logo_dark}}/>diff --git a/frontend/discourse/app/components/category-name-fields.gjs b/frontend/discourse/app/components/category-name-fields.gjsindex 4b0e4a2ea23..c4bd5673abd 100644--- a/frontend/discourse/app/components/category-name-fields.gjs+++ b/frontend/discourse/app/components/category-name-fields.gjs@@ -2,8 +2,8 @@import Component from "@ember/component";import { tagName } from "@ember-decorators/component";import PluginOutlet from "discourse/components/plugin-outlet";-import TextField from "discourse/components/text-field";import lazyHash from "discourse/helpers/lazy-hash";+import DTextField from "discourse/ui-kit/d-text-field";import { i18n } from "discourse-i18n";@tagName("")@@ -18,7 +18,7 @@ export default class CategoryNameFields extends Component {{{#unless this.category.isUncategorizedCategory}}<section class="field-item"><label>{{i18n "category.name"}}</label>- <TextField+ <DTextField@value={{this.category.name}}@placeholderKey="category.name_placeholder"@maxlength="50"@@ -28,7 +28,7 @@ export default class CategoryNameFields extends Component {{{/unless}}<section class="field-item"><label>{{i18n "category.slug"}}</label>- <TextField+ <DTextField@value={{this.category.slug}}@placeholderKey="category.slug_placeholder"@maxlength="255"diff --git a/frontend/discourse/app/components/category-permission-row.gjs b/frontend/discourse/app/components/category-permission-row.gjsindex d6b6f30b43e..45f7c283fb3 100644--- a/frontend/discourse/app/components/category-permission-row.gjs+++ b/frontend/discourse/app/components/category-permission-row.gjs@@ -1,12 +1,12 @@import Component from "@glimmer/component";import { action } from "@ember/object";-import DButton from "discourse/components/d-button";import PluginOutlet from "discourse/components/plugin-outlet";-import concatClass from "discourse/helpers/concat-class";import lazyHash from "discourse/helpers/lazy-hash";import { AUTO_GROUPS } from "discourse/lib/constants";import getURL from "discourse/lib/get-url";import PermissionType from "discourse/models/permission-type";+import DButton from "discourse/ui-kit/d-button";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";export default class CategoryPermissionRow extends Component {@@ -171,7 +171,7 @@ export default class CategoryPermissionRow extends Component {@action={{this.setPermissionReply}}@translatedTitle={{this.replyTooltip}}@disabled={{this.replyDisabled}}- class={{concatClass+ class={{dConcatClass"btn btn-flat reply-toggle"this.replyGrantedClass}}@@ -182,7 +182,7 @@ export default class CategoryPermissionRow extends Component {@action={{this.setPermissionFull}}@translatedTitle={{this.createTooltip}}@disabled={{this.createDisabled}}- class={{concatClass+ class={{dConcatClass"btn-flat create-toggle"this.createGrantedClass}}diff --git a/frontend/discourse/app/components/category-title-link.gjs b/frontend/discourse/app/components/category-title-link.gjsindex 97617fdfff0..9321de84656 100644--- a/frontend/discourse/app/components/category-title-link.gjs+++ b/frontend/discourse/app/components/category-title-link.gjs@@ -1,15 +1,15 @@import Component from "@glimmer/component";import CategoryLogo from "discourse/components/category-logo";import CategoryTitleBefore from "discourse/components/category-title-before";-import { categoryBadgeHTML } from "discourse/helpers/category-link";-import dirSpan from "discourse/helpers/dir-span";-import element from "discourse/helpers/element";import { or } from "discourse/truth-helpers";+import { categoryBadgeHTML } from "discourse/ui-kit/helpers/d-category-link";+import dDirSpan from "discourse/ui-kit/helpers/d-dir-span";+import dElement from "discourse/ui-kit/helpers/d-element";export default class CategoryTitleLink extends Component {get displayName() {if (this.args.unstyled === true) {- return dirSpan(this.args.category.displayName);+ return dDirSpan(this.args.category.displayName);}const categoryBadge = categoryBadgeHTML(this.args.category, {@@ -17,11 +17,11 @@ export default class CategoryTitleLink extends Component {link: false,});- return dirSpan(categoryBadge, { htmlSafe: "true" });+ return dDirSpan(categoryBadge, { htmlSafe: "true" });}<template>- {{#let (element (or @tagName "h3")) as |TagName|}}+ {{#let (dElement (or @tagName "h3")) as |TagName|}}<TagName><a class="category-title-link" href={{@category.url}}><div class="category-text-title">diff --git a/frontend/discourse/app/components/category-topic-template-editor.gjs b/frontend/discourse/app/components/category-topic-template-editor.gjsindex 0bc4c78b556..e2f0d90cec5 100644--- a/frontend/discourse/app/components/category-topic-template-editor.gjs+++ b/frontend/discourse/app/components/category-topic-template-editor.gjs@@ -4,10 +4,10 @@ import { on } from "@ember/modifier";import { action } from "@ember/object";import { LinkTo } from "@ember/routing";import { service } from "@ember/service";-import DEditor from "discourse/components/d-editor";-import DToggleSwitch from "discourse/components/d-toggle-switch";-import TextField from "discourse/components/text-field";import FormTemplateChooser from "discourse/select-kit/components/form-template-chooser";+import DEditor from "discourse/ui-kit/d-editor";+import DTextField from "discourse/ui-kit/d-text-field";+import DToggleSwitch from "discourse/ui-kit/d-toggle-switch";import { i18n } from "discourse-i18n";export default class CategoryTopicTemplateEditor extends Component {@@ -114,7 +114,7 @@ export default class CategoryTopicTemplateEditor extends Component {<label for="category-topic-title-placeholder">{{i18n "category.topic_title_placeholder"}}</label>- <TextField+ <DTextField@value={{this.topicTitlePlaceholder}}@id="category-topic-title-placeholder"@placeholderKey="category.topic_title_placeholder_placeholder"diff --git a/frontend/discourse/app/components/category-type-cards.gjs b/frontend/discourse/app/components/category-type-cards.gjsindex 2f9ff5a414c..b0476ff869b 100644--- a/frontend/discourse/app/components/category-type-cards.gjs+++ b/frontend/discourse/app/components/category-type-cards.gjs@@ -4,9 +4,9 @@ import { on } from "@ember/modifier";import { action } from "@ember/object";import { service } from "@ember/service";import PluginOutlet from "discourse/components/plugin-outlet";-import concatClass from "discourse/helpers/concat-class";-import emoji from "discourse/helpers/emoji";import lazyHash from "discourse/helpers/lazy-hash";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dEmoji from "discourse/ui-kit/helpers/d-emoji";import { i18n } from "discourse-i18n";export default class CategoryTypeCards extends Component {@@ -23,7 +23,7 @@ export default class CategoryTypeCards extends Component {<div class="category-type-cards">{{#each @types as |type|}}<div- class={{concatClass+ class={{dConcatClass"category-type-cards__card"(unless type.available "--unavailable")(concat "--category-type-" type.id)@@ -36,7 +36,7 @@ export default class CategoryTypeCards extends Component {{{on "click" (fn this.selectType type)}}><span class="category-type-cards__card-icon">- {{emoji type.icon alt="" skipTitle=true}}+ {{dEmoji type.icon alt="" skipTitle=true}}</span><span class="category-type-cards__card-name">{{type.name}}diff --git a/frontend/discourse/app/components/category-unread.gjs b/frontend/discourse/app/components/category-unread.gjsindex 40a00cc577a..a186bc98e3c 100644--- a/frontend/discourse/app/components/category-unread.gjs+++ b/frontend/discourse/app/components/category-unread.gjs@@ -1,14 +1,14 @@/* eslint-disable ember/no-classic-components */import Component from "@ember/component";import { tagName } from "@ember-decorators/component";-import element from "discourse/helpers/element";import { or } from "discourse/truth-helpers";+import dElement from "discourse/ui-kit/helpers/d-element";import { i18n } from "discourse-i18n";@tagName("")export default class CategoryUnread extends Component {<template>- {{#let (element (or @tagName "span")) as |TagName|}}+ {{#let (dElement (or @tagName "span")) as |TagName|}}<TagName class="category__badges" ...attributes>{{#if this.unreadTopicsCount}}<adiff --git a/frontend/discourse/app/components/choose-message.gjs b/frontend/discourse/app/components/choose-message.gjsindex 8e02797d6e1..e6f2631b9ae 100644--- a/frontend/discourse/app/components/choose-message.gjs+++ b/frontend/discourse/app/components/choose-message.gjs@@ -5,9 +5,9 @@ import { on } from "@ember/modifier";import { action } from "@ember/object";import { next } from "@ember/runloop";import { isEmpty } from "@ember/utils";-import AsyncContent from "discourse/components/async-content";import { searchForTerm } from "discourse/lib/search";import { eq } from "discourse/truth-helpers";+import DAsyncContent from "discourse/ui-kit/d-async-content";import { i18n } from "discourse-i18n";export default class ChooseMessage extends Component {@@ -57,7 +57,7 @@ export default class ChooseMessage extends Component {/><div class="choose-message__search-results">- <AsyncContent+ <DAsyncContent@asyncData={{this.search}}@context={{this.messageTitle}}@debounce={{true}}@@ -92,7 +92,7 @@ export default class ChooseMessage extends Component {</div>{{/each}}</:content>- </AsyncContent>+ </DAsyncContent></div></div></template>diff --git a/frontend/discourse/app/components/choose-topic.gjs b/frontend/discourse/app/components/choose-topic.gjsindex 4cb0617a49a..8e68a9c2b74 100644--- a/frontend/discourse/app/components/choose-topic.gjs+++ b/frontend/discourse/app/components/choose-topic.gjs@@ -5,12 +5,12 @@ import { on } from "@ember/modifier";import { action } from "@ember/object";import { next } from "@ember/runloop";import { isEmpty, isPresent } from "@ember/utils";-import AsyncContent from "discourse/components/async-content";import TopicStatus from "discourse/components/topic-status";-import boundCategoryLink from "discourse/helpers/bound-category-link";-import replaceEmoji from "discourse/helpers/replace-emoji";import { searchForTerm } from "discourse/lib/search";import { eq, or } from "discourse/truth-helpers";+import DAsyncContent from "discourse/ui-kit/d-async-content";+import dBoundCategoryLink from "discourse/ui-kit/helpers/d-bound-category-link";+import dReplaceEmoji from "discourse/ui-kit/helpers/d-replace-emoji";import { i18n } from "discourse-i18n";// args:@@ -126,7 +126,7 @@ export default class ChooseTopic extends Component {/><div class="choose-topic__search-results">- <AsyncContent+ <DAsyncContent@asyncData={{this.loadTopics}}@context={{this.topicTitle}}@debounce={{true}}@@ -158,10 +158,10 @@ export default class ChooseTopic extends Component {/><TopicStatus @topic={{t}} @disableActions={{true}} /><span class="topic-title">- {{replaceEmoji t.title}}+ {{dReplaceEmoji t.title}}</span><span class="topic-categories">- {{boundCategoryLink+ {{dBoundCategoryLinkt.categoryancestors=t.category.predecessorshideParent=true@@ -173,7 +173,7 @@ export default class ChooseTopic extends Component {{{/each}}</div></:content>- </AsyncContent>+ </DAsyncContent></div></div></template>diff --git a/frontend/discourse/app/components/composer-container.gjs b/frontend/discourse/app/components/composer-container.gjsindex 9d214bab8f4..bc65e69e36c 100644--- a/frontend/discourse/app/components/composer-container.gjs+++ b/frontend/discourse/app/components/composer-container.gjs@@ -15,17 +15,10 @@ import ComposerSaveButton from "discourse/components/composer-save-button";import ComposerTitle from "discourse/components/composer-title";import ComposerToggles from "discourse/components/composer-toggles";import ComposerUserSelector from "discourse/components/composer-user-selector";-import DButton from "discourse/components/d-button";import LinkToInput from "discourse/components/link-to-input";import PluginOutlet from "discourse/components/plugin-outlet";-import PopupInputTip from "discourse/components/popup-input-tip";-import TextField from "discourse/components/text-field";-import avatar from "discourse/helpers/avatar";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import htmlClass from "discourse/helpers/html-class";import lazyHash from "discourse/helpers/lazy-hash";-import loadingSpinner from "discourse/helpers/loading-spinner";import discourseDebounce from "discourse/lib/debounce";import { bind } from "discourse/lib/decorators";import PostLocalization from "discourse/models/post-localization";@@ -34,6 +27,13 @@ import CategoryChooser from "discourse/select-kit/components/category-chooser";import DropdownSelectBox from "discourse/select-kit/components/dropdown-select-box";import MiniTagChooser from "discourse/select-kit/components/mini-tag-chooser";import { and, or } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DPopupInputTip from "discourse/ui-kit/d-popup-input-tip";+import DTextField from "discourse/ui-kit/d-text-field";+import dAvatar from "discourse/ui-kit/helpers/d-avatar";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";+import dLoadingSpinner from "discourse/ui-kit/helpers/d-loading-spinner";import { i18n } from "discourse-i18n";export default class ComposerContainer extends Component {@@ -236,7 +236,7 @@ export default class ComposerContainer extends Component {{{/if}}{{#if this.composer.isWhispering}}{{#if this.composer.model.noBump}}- <span class="no-bump">{{icon "anchor"}}</span>+ <span class="no-bump">{{dIcon "anchor"}}</span>{{/if}}{{/if}}{{/if}}@@ -250,7 +250,7 @@ export default class ComposerContainer extends Component {{{if this.composer.showEditReason '--active'}}"title={{i18n "composer.edit_reason"}}>- <TextField+ <DTextField@value={{this.composer.editReason}}@id="edit-reason"@maxlength="255"@@ -292,7 +292,7 @@ export default class ComposerContainer extends Component {@recipients={{this.composer.model.targetRecipients}}@hasGroups={{this.composer.model.hasTargetGroups}}@focusTarget={{this.composer.focusTarget}}- class={{concatClass+ class={{dConcatClass"users-input"(if this.composer.showWarning "can-warn")}}@@ -337,7 +337,7 @@ export default class ComposerContainer extends Component {composer=this.composer.model}}/>- <PopupInputTip+ <DPopupInputTip@validation={{this.composer.categoryValidation}}/></div>@@ -360,7 +360,7 @@ export default class ComposerContainer extends Component {composer=this.composer.model}}/>- <PopupInputTip+ <DPopupInputTip@validation={{this.composer.tagValidation}}/></div>@@ -435,7 +435,7 @@ export default class ComposerContainer extends Component {/>{{#if this.composer.model.noBump}}- <span class="no-bump">{{icon "anchor"}}</span>+ <span class="no-bump">{{dIcon "anchor"}}</span>{{/if}}{{/if}}@@ -462,7 +462,7 @@ export default class ComposerContainer extends Component {{{if this.composer.isUploading 'hidden'}}"aria-label={{i18n "composer.upload_title"}}>- {{icon this.composer.uploadIcon}}+ {{dIcon this.composer.uploadIcon}}</a>{{/if}}@@ -474,7 +474,7 @@ export default class ComposerContainer extends Component {{{on "click" this.composer.togglePreview}}aria-label={{i18n "composer.show_preview"}}>- {{icon "desktop"}}+ {{dIcon "desktop"}}</a>{{/if}}@@ -494,11 +494,11 @@ export default class ComposerContainer extends Component {}}<div id="file-uploading">{{#if this.composer.isProcessingUpload}}- {{loadingSpinner size="small"}}<span>{{i18n+ {{dLoadingSpinner size="small"}}<span>{{i18n"upload_selector.processing"}}</span>{{else}}- {{loadingSpinner size="small"}}<span>{{i18n+ {{dLoadingSpinner size="small"}}<span>{{i18n"upload_selector.uploading"}}{{this.composer.uploadProgress}}%</span>@@ -509,7 +509,7 @@ export default class ComposerContainer extends Component {hrefid="cancel-file-upload"{{on "click" this.composer.cancelUpload}}- >{{icon "xmark"}}</a>+ >{{dIcon "xmark"}}</a>{{/if}}</div>{{/if}}@@ -524,13 +524,13 @@ export default class ComposerContainer extends Component {title={{this.composer.model.draftStatus}}>{{#if this.composer.model.draftConflictUser}}- {{avatar+ {{dAvatarthis.composer.model.draftConflictUserimageSize="small"}}- {{icon "user-pen"}}+ {{dIcon "user-pen"}}{{else}}- {{icon "triangle-exclamation"}}+ {{dIcon "triangle-exclamation"}}{{/if}}{{#if this.site.desktopView}}{{this.composer.model.draftStatus}}@@ -544,7 +544,7 @@ export default class ComposerContainer extends Component {@action={{this.composer.togglePreview}}@translatedTitle={{this.composer.toggleText}}@icon="angles-left"- class={{concatClass+ class={{dConcatClass"btn-transparent btn-mini-toggle toggle-preview"(unless this.composer.isPreviewVisible "active")}}@@ -563,13 +563,13 @@ export default class ComposerContainer extends Component {>{{i18n "composer.view_new_post"}}</a>{{else}}{{i18n "composer.saving"}}- {{loadingSpinner size="small"}}+ {{dLoadingSpinner size="small"}}{{/if}}</div><div class="draft-text">{{#if this.composer.model.topic}}- {{icon "share"}}+ {{dIcon "share"}}{{trustHTML this.composer.draftTitle}}{{else}}{{i18n "composer.saved_draft"}}diff --git a/frontend/discourse/app/components/composer-editor.gjs b/frontend/discourse/app/components/composer-editor.gjsindex 8a637b2a916..39f3e3db501 100644--- a/frontend/discourse/app/components/composer-editor.gjs+++ b/frontend/discourse/app/components/composer-editor.gjs@@ -13,11 +13,8 @@ import { observes, on } from "@ember-decorators/object";import { BasePlugin } from "@uppy/core";import $ from "jquery";import { resolveAllShortUrls } from "pretty-text/upload-short-url";-import DEditor from "discourse/components/d-editor";import DEditorPreview from "discourse/components/d-editor-preview";-import { applyHtmlDecorators } from "discourse/components/decorated-html";import Wrapper from "discourse/components/form-template-field/wrapper";-import PickFilesButton from "discourse/components/pick-files-button";import PostTranslationEditor from "discourse/components/post-translation-editor";import lazyHash from "discourse/helpers/lazy-hash";import { ajax } from "discourse/lib/ajax";@@ -47,6 +44,9 @@ import { formatUsername } from "discourse/lib/utilities";import Composer from "discourse/models/composer";import FormTemplateChooser from "discourse/select-kit/components/form-template-chooser";import { gt } from "discourse/truth-helpers";+import { applyHtmlDecorators } from "discourse/ui-kit/d-decorated-html";+import DEditor from "discourse/ui-kit/d-editor";+import DPickFilesButton from "discourse/ui-kit/d-pick-files-button";import { i18n } from "discourse-i18n";let uploadHandlers = [];@@ -1174,7 +1174,7 @@ export default class ComposerEditor extends Component {{{/if}}{{#if this.composer.allowUpload}}- <PickFilesButton+ <DPickFilesButton@fileInputId={{this.fileUploadElementId}}@allowMultiple={{true}}name="file-uploader"diff --git a/frontend/discourse/app/components/composer-message.gjs b/frontend/discourse/app/components/composer-message.gjsindex 1b87548653b..ab3baaaa60d 100644--- a/frontend/discourse/app/components/composer-message.gjs+++ b/frontend/discourse/app/components/composer-message.gjs@@ -1,5 +1,5 @@-import concatClass from "discourse/helpers/concat-class";import { applyMutableValueTransformer } from "discourse/lib/transformer";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import DominatingTopicComposerMessage from "./composer-messages/dominating-topic";import EducationComposerMessage from "./composer-messages/education";import GetARoomComposerMessage from "./composer-messages/get-a-room";@@ -31,7 +31,7 @@ function getComposerMessageComponent(templateName) {}const ComposerMessage = <template>- <div class={{concatClass "composer-popup" @message.extraClass}}>+ <div class={{dConcatClass "composer-popup" @message.extraClass}}>{{#let(getComposerMessageComponent @message.templateName)as |MessageComponent|diff --git a/frontend/discourse/app/components/composer-messages.gjs b/frontend/discourse/app/components/composer-messages.gjsindex 200bc438bb5..c2cf3b4e5f0 100644--- a/frontend/discourse/app/components/composer-messages.gjs+++ b/frontend/discourse/app/components/composer-messages.gjs@@ -7,7 +7,6 @@ import { schedule } from "@ember/runloop";import { tagName } from "@ember-decorators/component";import ComposerMessage from "discourse/components/composer-message";import ShareTopic from "discourse/components/modal/share-topic";-import concatClass from "discourse/helpers/concat-class";import { ajax } from "discourse/lib/ajax";import {addUniqueValueToArray,@@ -16,6 +15,7 @@ import {import { debounce } from "discourse/lib/decorators";import { INPUT_DELAY } from "discourse/lib/environment";import LinkLookup from "discourse/lib/link-lookup";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";import { autoTrackedArray } from "../lib/tracked-tools";@@ -357,7 +357,10 @@ export default class ComposerMessages extends Component {<template><div- class={{concatClass "composer-popup-container" (if this.hidden "hidden")}}+ class={{dConcatClass+ "composer-popup-container"+ (if this.hidden "hidden")+ }}...attributes>{{#each this.messages as |message|}}diff --git a/frontend/discourse/app/components/composer-messages/dominating-topic.gjs b/frontend/discourse/app/components/composer-messages/dominating-topic.gjsindex 37425dde060..1b2583613fd 100644--- a/frontend/discourse/app/components/composer-messages/dominating-topic.gjs+++ b/frontend/discourse/app/components/composer-messages/dominating-topic.gjs@@ -3,7 +3,7 @@ import { fn } from "@ember/helper";import { service } from "@ember/service";import { trustHTML } from "@ember/template";import ComposerTipCloseButton from "discourse/components/composer-tip-close-button";-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";export default class DominatingTopicComposerMessage extends Component {@service currentUser;diff --git a/frontend/discourse/app/components/composer-messages/get-a-room.gjs b/frontend/discourse/app/components/composer-messages/get-a-room.gjsindex dc25feabfab..034315ad974 100644--- a/frontend/discourse/app/components/composer-messages/get-a-room.gjs+++ b/frontend/discourse/app/components/composer-messages/get-a-room.gjs@@ -1,7 +1,7 @@import { fn } from "@ember/helper";import { trustHTML } from "@ember/template";import ComposerTipCloseButton from "discourse/components/composer-tip-close-button";-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";const GetARoomComposerMessage = <template><ComposerTipCloseButton @action={{fn @closeMessage @message}} />diff --git a/frontend/discourse/app/components/composer-save-button.gjs b/frontend/discourse/app/components/composer-save-button.gjsindex 72a22492c10..f918c55489f 100644--- a/frontend/discourse/app/components/composer-save-button.gjs+++ b/frontend/discourse/app/components/composer-save-button.gjs@@ -1,8 +1,8 @@import Component from "@glimmer/component";-import DButton from "discourse/components/d-button";-import concatClass from "discourse/helpers/concat-class";import { applyValueTransformer } from "discourse/lib/transformer";import { translateModKey } from "discourse/lib/utilities";+import DButton from "discourse/ui-kit/d-button";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";export default class ComposerSaveButton extends Component {@@ -21,7 +21,7 @@ export default class ComposerSaveButton extends Component {@icon={{@icon}}@translatedTitle={{this.translatedTitle}}@forwardEvent={{@forwardEvent}}- class={{concatClass "btn-primary create" (if @disableSubmit "disabled")}}+ class={{dConcatClass "btn-primary create" (if @disableSubmit "disabled")}}aria-keyshortcuts={{translateModKey "Meta+Enter" "+"}}...attributes/>diff --git a/frontend/discourse/app/components/composer-tip-close-button.gjs b/frontend/discourse/app/components/composer-tip-close-button.gjsindex a70a4bdf078..4418b0bdf28 100644--- a/frontend/discourse/app/components/composer-tip-close-button.gjs+++ b/frontend/discourse/app/components/composer-tip-close-button.gjs@@ -1,4 +1,4 @@-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";const ComposerTipCloseButton = <template><DButtondiff --git a/frontend/discourse/app/components/composer-title.gjs b/frontend/discourse/app/components/composer-title.gjsindex 3b1aaa8d5cc..53fcea97436 100644--- a/frontend/discourse/app/components/composer-title.gjs+++ b/frontend/discourse/app/components/composer-title.gjs@@ -7,13 +7,13 @@ import { observes } from "@ember-decorators/object";import { load } from "pretty-text/oneboxer";import { lookupCache } from "pretty-text/oneboxer-cache";import PluginOutlet from "discourse/components/plugin-outlet";-import PopupInputTip from "discourse/components/popup-input-tip";-import TextField from "discourse/components/text-field";import lazyHash from "discourse/helpers/lazy-hash";import { ajax } from "discourse/lib/ajax";import discourseDebounce from "discourse/lib/debounce";import { isTesting } from "discourse/lib/environment";import putCursorAtEnd from "discourse/lib/put-cursor-at-end";+import DPopupInputTip from "discourse/ui-kit/d-popup-input-tip";+import DTextField from "discourse/ui-kit/d-text-field";import { i18n } from "discourse-i18n";@classNames("title-input")@@ -254,7 +254,7 @@ export default class ComposerTitle extends Component {}<template>- <TextField+ <DTextField@value={{this.composer.title}}@id="reply-title"@maxLength={{this.titleMaxLength}}@@ -271,6 +271,6 @@ export default class ComposerTitle extends Component {@outletArgs={{lazyHash composer=this.composer}}/>- <PopupInputTip @validation={{this.validation}} />+ <DPopupInputTip @validation={{this.validation}} /></template>}diff --git a/frontend/discourse/app/components/composer-toggles.gjs b/frontend/discourse/app/components/composer-toggles.gjsindex 51af61c8337..59f2cd121c0 100644--- a/frontend/discourse/app/components/composer-toggles.gjs+++ b/frontend/discourse/app/components/composer-toggles.gjs@@ -1,9 +1,9 @@import Component from "@glimmer/component";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import PluginOutlet from "discourse/components/plugin-outlet";-import concatClass from "discourse/helpers/concat-class";import { applyValueTransformer } from "discourse/lib/transformer";+import DButton from "discourse/ui-kit/d-button";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";export default class ComposerToggles extends Component {@service site;@@ -48,7 +48,7 @@ export default class ComposerToggles extends Component {}<template>- <div class={{concatClass "composer-controls" this.additionalClasses}}>+ <div class={{dConcatClass "composer-controls" this.additionalClasses}}><span><PluginOutlet @name="before-composer-toggles" @connectorTagName="div" /></span>diff --git a/frontend/discourse/app/components/composer/textarea-editor.gjs b/frontend/discourse/app/components/composer/textarea-editor.gjsindex a537dd36e6e..84a2e00f8df 100644--- a/frontend/discourse/app/components/composer/textarea-editor.gjs+++ b/frontend/discourse/app/components/composer/textarea-editor.gjs@@ -3,12 +3,12 @@ import { getOwner } from "@ember/owner";import { service } from "@ember/service";import ItsATrap from "@discourse/itsatrap";import { modifier } from "ember-modifier";-import DTextarea from "discourse/components/d-textarea";-import concatClass from "discourse/helpers/concat-class";import { bind } from "discourse/lib/decorators";import TextareaTextManipulation from "discourse/lib/textarea-text-manipulation";import forceScrollingElementPosition from "discourse/modifiers/force-scrolling-element-position";import preventScrollOnFocus from "discourse/modifiers/prevent-scroll-on-focus";+import DTextarea from "discourse/ui-kit/d-textarea";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";export default class TextareaEditor extends Component {@service currentUser;@@ -113,7 +113,7 @@ export default class TextareaEditor extends Component {@input={{@change}}@focusIn={{@focusIn}}@focusOut={{@focusOut}}- class={{concatClass+ class={{dConcatClass@class(ifthis.currentUser.user_option.enable_markdown_monospace_fontdiff --git a/frontend/discourse/app/components/composer/toggle-switch.gjs b/frontend/discourse/app/components/composer/toggle-switch.gjsindex 162628c36ab..b2ec42d1634 100644--- a/frontend/discourse/app/components/composer/toggle-switch.gjs+++ b/frontend/discourse/app/components/composer/toggle-switch.gjs@@ -1,9 +1,9 @@import Component from "@glimmer/component";import { on } from "@ember/modifier";import { action } from "@ember/object";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import { translateModKey } from "discourse/lib/utilities";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class ComposerToggleSwitch extends Component {@@ -47,7 +47,7 @@ export default class ComposerToggleSwitch extends Component {<template>{{! template-lint-disable no-redundant-role }}<button- class={{concatClass+ class={{dConcatClass"composer-toggle-switch"(if @state "--rte" "--markdown")}}@@ -66,19 +66,19 @@ export default class ComposerToggleSwitch extends Component {><span class="composer-toggle-switch__slider"><span- class={{concatClass+ class={{dConcatClass"composer-toggle-switch__left-icon"(unless @state "--active")}}aria-hidden="true"- >{{icon "fab-markdown"}}</span>+ >{{dIcon "fab-markdown"}}</span><span- class={{concatClass+ class={{dConcatClass"composer-toggle-switch__right-icon"(if @state "--active")}}aria-hidden="true"- >{{icon "a"}}</span>+ >{{dIcon "a"}}</span></span></button></template>diff --git a/frontend/discourse/app/components/composer/toolbar-buttons.gjs b/frontend/discourse/app/components/composer/toolbar-buttons.gjsindex 181c7977203..fa25c3bc1f3 100644--- a/frontend/discourse/app/components/composer/toolbar-buttons.gjs+++ b/frontend/discourse/app/components/composer/toolbar-buttons.gjs@@ -1,9 +1,9 @@import Component from "@glimmer/component";import { action } from "@ember/object";-import DButton from "discourse/components/d-button";import ToolbarPopupMenuOptions from "discourse/components/toolbar-popup-menu-options";-import concatClass from "discourse/helpers/concat-class";import { eq } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";export default class ComposerToolbarButtons extends Component {@action@@ -53,7 +53,7 @@ export default class ComposerToolbarButtons extends Component {@onKeydown={{this.rovingButtonBar}}@icon={{button.icon}}@triggerLabel={{button.popupMenu.triggerLabel}}- @class={{concatClass+ @class={{dConcatClassbutton.className(if (this.isButtonActive button) "--active")}}@@ -71,7 +71,7 @@ export default class ComposerToolbarButtons extends Component {@onKeyDown={{this.rovingButtonBar}}aria-keyshortcuts={{button.ariaKeyshortcuts}}tabindex={{this.tabIndex button}}- class={{concatClass+ class={{dConcatClass"toolbar__button"button.className(if (this.isButtonActive button) "--active")diff --git a/frontend/discourse/app/components/composer/toolbar-scroll-container.gjs b/frontend/discourse/app/components/composer/toolbar-scroll-container.gjsindex 7cf33bf8849..6187ff54d86 100644--- a/frontend/discourse/app/components/composer/toolbar-scroll-container.gjs+++ b/frontend/discourse/app/components/composer/toolbar-scroll-container.gjs@@ -3,11 +3,11 @@ import { tracked } from "@glimmer/tracking";import { on } from "@ember/modifier";import { action } from "@ember/object";import didInsert from "@ember/render-modifiers/modifiers/did-insert";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import { bind } from "discourse/lib/decorators";import { isDocumentRTL } from "discourse/lib/text-direction";-import onResize from "discourse/modifiers/on-resize";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";+import dOnResize from "discourse/ui-kit/modifiers/d-on-resize";export default class ToolbarScrollContainer extends Component {@tracked hasLeftScroll = false;@@ -80,15 +80,15 @@ export default class ToolbarScrollContainer extends Component {{{on "mousedown" this.preventFocusGrab}}{{on "click" this.scrollLeft}}>- {{icon "chevron-left"}}+ {{dIcon "chevron-left"}}</button>{{/if}}<div- class={{concatClass "d-editor-button-bar" @class}}+ class={{dConcatClass "d-editor-button-bar" @class}}role="toolbar"{{didInsert this.setup}}- {{onResize this.onResize}}+ {{dOnResize this.onResize}}{{on "scroll" this.onScroll}}>{{yield}}@@ -103,7 +103,7 @@ export default class ToolbarScrollContainer extends Component {{{on "mousedown" this.preventFocusGrab}}{{on "click" this.scrollRight}}>- {{icon "chevron-right"}}+ {{dIcon "chevron-right"}}</button>{{/if}}</div>diff --git a/frontend/discourse/app/components/create-topic-button.gjs b/frontend/discourse/app/components/create-topic-button.gjsindex 5919a7a868d..5581b40bb4c 100644--- a/frontend/discourse/app/components/create-topic-button.gjs+++ b/frontend/discourse/app/components/create-topic-button.gjs@@ -1,8 +1,8 @@import Component from "@glimmer/component";import { service } from "@ember/service";import TopicDraftsDropdown from "discourse/components/topic-drafts-dropdown";-import concatClass from "discourse/helpers/concat-class";import { applyValueTransformer } from "discourse/lib/transformer";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";export default class CreateTopicButton extends Component {@service router;@@ -31,7 +31,7 @@ export default class CreateTopicButton extends Component {});- return concatClass(+ return dConcatClass(this.args.btnClass,this.btnTypeClass,...additionalClassesdiff --git a/frontend/discourse/app/components/d-editor-original-translation-preview.gjs b/frontend/discourse/app/components/d-editor-original-translation-preview.gjsindex 4a221831a84..aed7ff17406 100644--- a/frontend/discourse/app/components/d-editor-original-translation-preview.gjs+++ b/frontend/discourse/app/components/d-editor-original-translation-preview.gjs@@ -4,8 +4,8 @@ import { fn } from "@ember/helper";import { on } from "@ember/modifier";import { action } from "@ember/object";import { trustHTML } from "@ember/template";-import CookText from "discourse/components/cook-text";-import DToggleSwitch from "discourse/components/d-toggle-switch";+import DCookText from "discourse/ui-kit/d-cook-text";+import DToggleSwitch from "discourse/ui-kit/d-toggle-switch";import { i18n } from "discourse-i18n";export default class DEditorOriginalTranslationPreview extends Component {@@ -88,12 +88,12 @@ export default class DEditorOriginalTranslationPreview extends Component {{{#if @model.cookedPost}}{{trustHTML @model.cookedPost}}{{else if @model.rawPost}}- <CookText @rawText={{@model.rawPost}} />+ <DCookText @rawText={{@model.rawPost}} />{{/if}}{{/if}}{{else}}{{#if this.translationText}}- <CookText @rawText={{this.translationText}} />+ <DCookText @rawText={{this.translationText}} />{{else}}<div class="d-editor-translation-preview-empty">{{i18n "composer.translations.no_translation_yet"}}diff --git a/frontend/discourse/app/components/d-editor-preview.gjs b/frontend/discourse/app/components/d-editor-preview.gjsindex 80c89b265e5..a724e66e2a0 100644--- a/frontend/discourse/app/components/d-editor-preview.gjs+++ b/frontend/discourse/app/components/d-editor-preview.gjs@@ -2,9 +2,9 @@ import Component from "@glimmer/component";import { on } from "@ember/modifier";import { action } from "@ember/object";import { trustHTML } from "@ember/template";-import DecoratedHtml from "discourse/components/decorated-html";import PluginOutlet from "discourse/components/plugin-outlet";import { wantsNewWindow } from "discourse/lib/intercept-click";+import DDecoratedHtml from "discourse/ui-kit/d-decorated-html";export default class DEditorPreview extends Component {@action@@ -46,7 +46,7 @@ export default class DEditorPreview extends Component {{{on "click" this.handlePreviewClick}}...attributes>- <DecoratedHtml+ <DDecoratedHtml@className="d-editor-preview"@html={{trustHTML @preview}}@decorate={{@onPreviewUpdated}}diff --git a/frontend/discourse/app/components/d-navigation.gjs b/frontend/discourse/app/components/d-navigation.gjsindex 53b1d7f8636..fb1d74cf510 100644--- a/frontend/discourse/app/components/d-navigation.gjs+++ b/frontend/discourse/app/components/d-navigation.gjs@@ -9,7 +9,6 @@ import BreadCrumbs from "discourse/components/bread-crumbs";import BulkSelectToggle from "discourse/components/bulk-select-toggle";import CategoryNotificationsTracking from "discourse/components/category-notifications-tracking";import CreateTopicButton from "discourse/components/create-topic-button";-import DButton from "discourse/components/d-button";import NavigationBar from "discourse/components/navigation-bar";import PluginOutlet from "discourse/components/plugin-outlet";import TagInfoButton from "discourse/components/tag-info-button";@@ -23,6 +22,7 @@ import NavItem from "discourse/models/nav-item";import CategoriesAdminDropdown from "discourse/select-kit/components/categories-admin-dropdown";import TagCategoryAdminDropdown from "discourse/select-kit/components/tag-category-admin-dropdown";import { and, gt } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";@tagName("")export default class DNavigation extends Component {diff --git a/frontend/discourse/app/components/d-segmented-control.gjs b/frontend/discourse/app/components/d-segmented-control.gjsindex 1e598fb2994..5b2007927cd 100644--- a/frontend/discourse/app/components/d-segmented-control.gjs+++ b/frontend/discourse/app/components/d-segmented-control.gjs@@ -3,9 +3,9 @@ import { fn } from "@ember/helper";import { on } from "@ember/modifier";import { action } from "@ember/object";import { modifier as modifierFn } from "ember-modifier";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import { eq } from "discourse/truth-helpers";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class DSegmentedControl extends Component {@@ -66,7 +66,7 @@ export default class DSegmentedControl extends Component {{{#each @items as |item|}}<label- class={{concatClass+ class={{dConcatClass"d-segmented-control__label"item.class(if item.disabled "is-disabled")@@ -83,7 +83,7 @@ export default class DSegmentedControl extends Component {{{on "change" (fn this.handleChange item.value)}}/><span class="d-segmented-control__text">- {{#if item.icon}}{{icon item.icon}}{{/if}}+ {{#if item.icon}}{{dIcon item.icon}}{{/if}}{{item.label}}</span></label>diff --git a/frontend/discourse/app/components/d-textarea.js b/frontend/discourse/app/components/d-textarea.jsdeleted file mode 100644index 38fc0431be6..00000000000--- a/frontend/discourse/app/components/d-textarea.js+++ /dev/null@@ -1,5 +0,0 @@-import { attributeBindings } from "@ember-decorators/component";-import TextArea from "./textarea";--@attributeBindings("aria-label")-export default class DTextarea extends TextArea {}diff --git a/frontend/discourse/app/components/date-picker-future.js b/frontend/discourse/app/components/date-picker-future.jsindex 4f862b8314a..612694d5711 100644--- a/frontend/discourse/app/components/date-picker-future.js+++ b/frontend/discourse/app/components/date-picker-future.js@@ -1,6 +1,6 @@-import DatePicker from "discourse/components/date-picker";+import DDatePicker from "discourse/ui-kit/d-date-picker";-export default class DatePickerFuture extends DatePicker {+export default class DatePickerFuture extends DDatePicker {_opts() {return {defaultDate: this.defaultDate || moment().add(1, "day").toDate(),diff --git a/frontend/discourse/app/components/date-picker-past.js b/frontend/discourse/app/components/date-picker-past.jsindex ae6222bfaa1..9490bc367ca 100644--- a/frontend/discourse/app/components/date-picker-past.js+++ b/frontend/discourse/app/components/date-picker-past.js@@ -1,6 +1,6 @@-import DatePicker from "discourse/components/date-picker";+import DDatePicker from "discourse/ui-kit/d-date-picker";-export default class DatePickerPast extends DatePicker {+export default class DatePickerPast extends DDatePicker {_opts() {return {defaultDate:diff --git a/frontend/discourse/app/components/desktop-notification-config.gjs b/frontend/discourse/app/components/desktop-notification-config.gjsindex 33caf05c62b..83930a1fded 100644--- a/frontend/discourse/app/components/desktop-notification-config.gjs+++ b/frontend/discourse/app/components/desktop-notification-config.gjs@@ -1,6 +1,6 @@import Component from "@glimmer/component";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";export default class DesktopNotificationsConfig extends Component {diff --git a/frontend/discourse/app/components/dialog-messages/confirm-session.gjs b/frontend/discourse/app/components/dialog-messages/confirm-session.gjsindex 93124226fc8..8a34e8a667b 100644--- a/frontend/discourse/app/components/dialog-messages/confirm-session.gjs+++ b/frontend/discourse/app/components/dialog-messages/confirm-session.gjs@@ -3,14 +3,14 @@ import { tracked } from "@glimmer/tracking";import { Input } from "@ember/component";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import UserLink from "discourse/components/user-link";import { ajax } from "discourse/lib/ajax";import { extractError, popupAjaxError } from "discourse/lib/ajax-error";import {getPasskeyCredential,isWebauthnSupported,} from "discourse/lib/webauthn";+import DButton from "discourse/ui-kit/d-button";+import DUserLink from "discourse/ui-kit/d-user-link";import { i18n } from "discourse-i18n";export default class ConfirmSession extends Component {@@ -127,9 +127,9 @@ export default class ConfirmSession extends Component {<div class="confirm-session__instructions"><span>{{this.loggedInAs}}</span>- <UserLink @user={{this.currentUser}}>+ <DUserLink @user={{this.currentUser}}>{{this.currentUser.username}}- </UserLink>+ </DUserLink></div><form>diff --git a/frontend/discourse/app/components/dialog-messages/group-delete.gjs b/frontend/discourse/app/components/dialog-messages/group-delete.gjsindex 059ad6c5ca0..a1676983b42 100644--- a/frontend/discourse/app/components/dialog-messages/group-delete.gjs+++ b/frontend/discourse/app/components/dialog-messages/group-delete.gjs@@ -1,16 +1,16 @@-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";const GroupDelete = <template>{{#if @model.user_count}}<p>- {{icon "users"}}+ {{dIcon "users"}}{{i18n "admin.groups.delete_details" [email protected]_count}}</p>{{/if}}{{#if @model.message_count}}<p>- {{icon "envelope"}}+ {{dIcon "envelope"}}{{i18n"admin.groups.delete_with_messages_confirm"[email protected]_count@@ -19,7 +19,7 @@ const GroupDelete = <template>{{/if}}<p>- {{icon "triangle-exclamation"}}+ {{dIcon "triangle-exclamation"}}{{i18n "admin.groups.delete_warning"}}</p></template>;diff --git a/frontend/discourse/app/components/dialog-messages/second-factor-confirm-phrase.gjs b/frontend/discourse/app/components/dialog-messages/second-factor-confirm-phrase.gjsindex a24eb4295b3..c1e758c75f7 100644--- a/frontend/discourse/app/components/dialog-messages/second-factor-confirm-phrase.gjs+++ b/frontend/discourse/app/components/dialog-messages/second-factor-confirm-phrase.gjs@@ -3,7 +3,7 @@ import { on } from "@ember/modifier";import { action } from "@ember/object";import { service } from "@ember/service";import { trustHTML } from "@ember/template";-import TextField from "discourse/components/text-field";+import DTextField from "discourse/ui-kit/d-text-field";import { i18n } from "discourse-i18n";export default class SecondFactorConfirmPhrase extends Component {@@ -47,7 +47,7 @@ export default class SecondFactorConfirmPhrase extends Component {}}</p>- <TextField+ <DTextField{{on "input" this.onConfirmPhraseInput}}@id="confirm-phrase"@autocorrect="off"diff --git a/frontend/discourse/app/components/directory-item.gjs b/frontend/discourse/app/components/directory-item.gjsindex 967f769d58e..8e4fd0ac0b7 100644--- a/frontend/discourse/app/components/directory-item.gjs+++ b/frontend/discourse/app/components/directory-item.gjs@@ -3,14 +3,14 @@ import Component from "@ember/component";import { computed } from "@ember/object";import { tagName } from "@ember-decorators/component";import DirectoryItemUserFieldValue from "discourse/components/directory-item-user-field-value";-import UserInfo from "discourse/components/user-info";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import directoryColumnIsUserField from "discourse/helpers/directory-column-is-user-field";import directoryItemLabel from "discourse/helpers/directory-item-label";import directoryItemValue from "discourse/helpers/directory-item-value";-import formatDuration from "discourse/helpers/format-duration";import { deepEqual } from "discourse/lib/object";+import DUserInfo from "discourse/ui-kit/d-user-info";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dFormatDuration from "discourse/ui-kit/helpers/d-format-duration";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";@tagName("")@@ -20,11 +20,11 @@ export default class DirectoryItem extends Component {<template><divrole="row"- class={{concatClass "directory-table__row" (if this.me "me")}}+ class={{dConcatClass "directory-table__row" (if this.me "me")}}...attributes><div class="directory-table__cell" role="rowheader">- <UserInfo @user={{this.item.user}} @headingLevel={{3}} />+ <DUserInfo @user={{this.item.user}} @headingLevel={{3}} /></div>{{#each this.columns as |column|}}@@ -43,7 +43,7 @@ export default class DirectoryItem extends Component {<span class="directory-table__label"><span>{{#if column.icon}}- {{icon column.icon}}+ {{dIcon column.icon}}{{/if}}{{directoryItemLabel item=this.item column=column}}</span>@@ -60,7 +60,7 @@ export default class DirectoryItem extends Component {<span>{{i18n "directory.time_read"}}</span></span><span class="directory-table__value">- {{formatDuration this.item.time_read}}+ {{dFormatDuration this.item.time_read}}</span></div>{{/if}}diff --git a/frontend/discourse/app/components/directory-table.gjs b/frontend/discourse/app/components/directory-table.gjsindex f93c9993c84..c734d8667ab 100644--- a/frontend/discourse/app/components/directory-table.gjs+++ b/frontend/discourse/app/components/directory-table.gjs@@ -2,9 +2,9 @@ import Component from "@glimmer/component";import { action } from "@ember/object";import didInsert from "@ember/render-modifiers/modifiers/did-insert";import DirectoryItem from "discourse/components/directory-item";-import ResponsiveTable from "discourse/components/responsive-table";-import TableHeaderToggle from "discourse/components/table-header-toggle";import directoryColumnIsAutomatic from "discourse/helpers/directory-column-is-automatic";+import DResponsiveTable from "discourse/ui-kit/d-responsive-table";+import DTableHeaderToggle from "discourse/ui-kit/d-table-header-toggle";import { i18n } from "discourse-i18n";export default class DirectoryTable extends Component {@@ -26,11 +26,11 @@ export default class DirectoryTable extends Component {}<template>- <ResponsiveTable {{didInsert this.setupTable}}>+ <DResponsiveTable {{didInsert this.setupTable}}><:header>- <TableHeaderToggle @field="username" @order={{@order}} @asc={{@asc}} />+ <DTableHeaderToggle @field="username" @order={{@order}} @asc={{@asc}} />{{#each @columns as |column|}}- <TableHeaderToggle+ <DTableHeaderToggle@onToggle={{this.updateOrderAndAsc}}@field={{column.name}}@icon={{column.icon}}@@ -59,6 +59,6 @@ export default class DirectoryTable extends Component {/>{{/each}}</:body>- </ResponsiveTable>+ </DResponsiveTable></template>}diff --git a/frontend/discourse/app/components/discourse-banner.gjs b/frontend/discourse/app/components/discourse-banner.gjsindex b3e044196e7..1100a7eb27a 100644--- a/frontend/discourse/app/components/discourse-banner.gjs+++ b/frontend/discourse/app/components/discourse-banner.gjs@@ -3,10 +3,10 @@ import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";import { service } from "@ember/service";import { trustHTML } from "@ember/template";-import DButton from "discourse/components/d-button";-import icon from "discourse/helpers/d-icon";+import DButton from "discourse/ui-kit/d-button";+import DDecoratedHtml from "discourse/ui-kit/d-decorated-html";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";-import DecoratedHtml from "./decorated-html";export default class DiscourseBanner extends Component {@service currentUser;@@ -70,7 +70,7 @@ export default class DiscourseBanner extends Component {href={{this.banner.url}}class="btn btn-transparent edit-banner">- {{icon "pencil"}}+ {{dIcon "pencil"}}{{#if this.site.desktopView}}{{trustHTML (i18n "banner.edit")}}{{/if}}@@ -86,7 +86,7 @@ export default class DiscourseBanner extends Component {/></div>- <DecoratedHtml @html={{this.content}} @id="banner-content" />+ <DDecoratedHtml @html={{this.content}} @id="banner-content" /></div></div></div>diff --git a/frontend/discourse/app/components/discourse-tag-bound.gjs b/frontend/discourse/app/components/discourse-tag-bound.gjsindex c8bd9fb31f9..574415a01e4 100644--- a/frontend/discourse/app/components/discourse-tag-bound.gjs+++ b/frontend/discourse/app/components/discourse-tag-bound.gjs@@ -2,8 +2,8 @@import Component from "@ember/component";import { computed } from "@ember/object";import { tagName } from "@ember-decorators/component";-import concatClass from "discourse/helpers/concat-class";import getURL from "discourse/lib/get-url";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";@tagName("")export default class DiscourseTagBound extends Component {@@ -25,7 +25,7 @@ export default class DiscourseTagBound extends Component {<template><ahref={{this.href}}- class={{concatClass "discourse-tag" this.style this.tagClass}}+ class={{dConcatClass "discourse-tag" this.style this.tagClass}}...attributes>{{this.tagRecord.name}}</a></template>diff --git a/frontend/discourse/app/components/discovery/categories-display.gjs b/frontend/discourse/app/components/discovery/categories-display.gjsindex 9efbca7bb68..b5a5d8368de 100644--- a/frontend/discourse/app/components/discovery/categories-display.gjs+++ b/frontend/discourse/app/components/discovery/categories-display.gjs@@ -6,12 +6,12 @@ import CategoriesBoxes from "discourse/components/categories-boxes";import CategoriesBoxesWithTopics from "discourse/components/categories-boxes-with-topics";import CategoriesOnly from "discourse/components/categories-only";import CategoriesWithFeaturedTopics from "discourse/components/categories-with-featured-topics";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import LoadMore from "discourse/components/load-more";import PluginOutlet from "discourse/components/plugin-outlet";import SubcategoriesWithFeaturedTopics from "discourse/components/subcategories-with-featured-topics";import lazyHash from "discourse/helpers/lazy-hash";import { MAX_UNOPTIMIZED_CATEGORIES } from "discourse/lib/constants";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DLoadMore from "discourse/ui-kit/d-load-more";const subcategoryComponents = {boxes_with_featured_topics: CategoriesBoxesWithTopics,@@ -98,13 +98,13 @@ export default class CategoriesDisplay extends Component {@outletArgs={{lazyHash categories=@categories topics=@topics}}/>{{#if this.canLoadMore}}- <LoadMore @action={{@loadMore}}>+ <DLoadMore @action={{@loadMore}}><this.categoriesComponent@categories={{@categories}}@topics={{@topics}}/>- <ConditionalLoadingSpinner @condition={{@loadingMore}} />- </LoadMore>+ <DConditionalLoadingSpinner @condition={{@loadingMore}} />+ </DLoadMore>{{else}}<this.categoriesComponent@categories={{@categories}}diff --git a/frontend/discourse/app/components/discovery/filter-navigation-menu.gjs b/frontend/discourse/app/components/discovery/filter-navigation-menu.gjsindex a949ccdada3..dda1acf17b4 100644--- a/frontend/discourse/app/components/discovery/filter-navigation-menu.gjs+++ b/frontend/discourse/app/components/discovery/filter-navigation-menu.gjs@@ -8,31 +8,31 @@ import didInsert from "@ember/render-modifiers/modifiers/did-insert";import didUpdate from "@ember/render-modifiers/modifiers/did-update";import { cancel } from "@ember/runloop";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import DropdownMenu from "discourse/components/dropdown-menu";import { VISIBILITY_OPTIMIZERS } from "discourse/float-kit/lib/constants";-import categoryBadge from "discourse/helpers/category-badge";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import withEventValue from "discourse/helpers/with-event-value";import discourseDebounce from "discourse/lib/debounce";import FilterSuggestions from "discourse/lib/filter-suggestions";import { eq } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";+import dCategoryBadge from "discourse/ui-kit/helpers/d-category-badge";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";const FilterNavigationMenuList = <template>{{#if @data.suggestions.length}}- <DropdownMenu as |dropdown|>+ <DDropdownMenu as |dropdown|>{{#each @data.suggestions as |item index|}}<dropdown.item- class={{concatClass+ class={{dConcatClass"filter-navigation__tip-item"(if (eq index @data.selectedIndex) "--selected")}}{{on "click" (fn @data.selectItem item)}}>{{#if item.category}}- {{categoryBadge item.category allowUncategorized=true}}+ {{dCategoryBadge item.category allowUncategorized=true}}{{else}}<span class="filter-navigation__tip-name">{{item.name}}@@ -45,7 +45,7 @@ const FilterNavigationMenuList = <template>{{/if}}</dropdown.item>{{/each}}- </DropdownMenu>+ </DDropdownMenu>{{/if}}</template>;@@ -339,7 +339,7 @@ export default class FilterNavigationMenu extends Component {<template><div class="topic-query-filter__input">- {{icon "filter" class="topic-query-filter__icon btn-flat"}}+ {{dIcon "filter" class="topic-query-filter__icon btn-flat"}}<inputclass="topic-query-filter__filter-term"diff --git a/frontend/discourse/app/components/discovery/layout.gjs b/frontend/discourse/app/components/discovery/layout.gjsindex b170a0b7435..319ec414650 100644--- a/frontend/discourse/app/components/discovery/layout.gjs+++ b/frontend/discourse/app/components/discovery/layout.gjs@@ -4,8 +4,8 @@ import BlockOutlet from "discourse/blocks/block-outlet";import CategoryReadOnlyBanner from "discourse/components/category-read-only-banner";import DiscourseBanner from "discourse/components/discourse-banner";import PluginOutlet from "discourse/components/plugin-outlet";-import concatClass from "discourse/helpers/concat-class";import lazyHash from "discourse/helpers/lazy-hash";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";/* Renders its content inside a <div> with the given class when @when is true,or renders the content directly when false. */@@ -79,7 +79,7 @@ export default class Layout extends Component {@when={{this.hasSidebarLayout}}@class="discovery-layout__list">- <div class={{concatClass "container list-container" @listClass}}>+ <div class={{dConcatClass "container list-container" @listClass}}><div class="row full-width"><div id="header-list-area">{{yield to="header"}}diff --git a/frontend/discourse/app/components/discovery/navigation.gjs b/frontend/discourse/app/components/discovery/navigation.gjsindex 863e2c2a065..4a19b83c2da 100644--- a/frontend/discourse/app/components/discovery/navigation.gjs+++ b/frontend/discourse/app/components/discovery/navigation.gjs@@ -10,13 +10,13 @@ import AccessibleDiscoveryHeading from "discourse/components/discovery/accessiblimport ReorderCategories from "discourse/components/modal/reorder-categories";import PluginOutlet from "discourse/components/plugin-outlet";import bodyClass from "discourse/helpers/body-class";-import categoryBadge from "discourse/helpers/category-badge";-import concatClass from "discourse/helpers/concat-class";import lazyHash from "discourse/helpers/lazy-hash";import { calculateFilterMode } from "discourse/lib/filter-mode";import { TRACKED_QUERY_PARAM_VALUE } from "discourse/lib/topic-list-tracked-filter";import DiscourseURL from "discourse/lib/url";import Category from "discourse/models/category";+import dCategoryBadge from "discourse/ui-kit/helpers/d-category-badge";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";export default class DiscoveryNavigation extends Component {@service categoryTypeChooser;@@ -73,7 +73,7 @@ export default class DiscoveryNavigation extends Component {}get headingClasses() {- return concatClass(+ return dConcatClass("category-heading",this.args.category?.uploaded_logo?.url ? "--has-logo" : null);@@ -106,7 +106,7 @@ export default class DiscoveryNavigation extends Component {/>{{#if @category.description}}<div class="category-heading__content">- {{categoryBadge @category class="category-heading__badge"}}+ {{dCategoryBadge @category class="category-heading__badge"}}<p class="category-heading__description">{{trustHTML @category.description}}</p>@@ -126,7 +126,7 @@ export default class DiscoveryNavigation extends Component {{{bodyClass this.bodyClass}}<section- class={{concatClass+ class={{dConcatClass"navigation-container"(if @category "category-navigation")}}diff --git a/frontend/discourse/app/components/discovery/topics.gjs b/frontend/discourse/app/components/discovery/topics.gjsindex 1a28807a147..ffd6ed74f12 100644--- a/frontend/discourse/app/components/discovery/topics.gjs+++ b/frontend/discourse/app/components/discovery/topics.gjs@@ -3,23 +3,23 @@ import { hash } from "@ember/helper";import { on } from "@ember/modifier";import { action } from "@ember/object";import { service } from "@ember/service";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import CountI18n from "discourse/components/count-i18n";import DiscoveryTopicsList from "discourse/components/discovery-topics-list";import EmptyTopicFilter from "discourse/components/empty-topic-filter";-import LoadMore from "discourse/components/load-more";import NewListHeaderControlsWrapper from "discourse/components/new-list-header-controls-wrapper";import PluginOutlet from "discourse/components/plugin-outlet";import TopicDismissButtons from "discourse/components/topic-dismiss-buttons";import List from "discourse/components/topic-list/list";import hideApplicationFooter from "discourse/helpers/hide-application-footer";import lazyHash from "discourse/helpers/lazy-hash";-import loadingSpinner from "discourse/helpers/loading-spinner";import { popupAjaxError } from "discourse/lib/ajax-error";import { filterTypeForMode } from "discourse/lib/filter-mode";import { applyBehaviorTransformer } from "discourse/lib/transformer";import PeriodChooser from "discourse/select-kit/components/period-chooser";import { or } from "discourse/truth-helpers";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DCountI18n from "discourse/ui-kit/d-count-i18n";+import DLoadMore from "discourse/ui-kit/d-load-more";+import dLoadingSpinner from "discourse/ui-kit/helpers/d-loading-spinner";export default class DiscoveryTopics extends Component {@service documentTitle;@@ -228,7 +228,7 @@ export default class DiscoveryTopics extends Component {class="alert alert-info clickable{{if @model.loadingBefore 'loading'}}">- <CountI18n+ <DCountI18n@key="topic_count_"@suffix={{this.topicTrackingState.filter}}@count={{or@@ -237,7 +237,7 @@ export default class DiscoveryTopics extends Component {}}/>{{#if @model.loadingBefore}}- {{loadingSpinner size="small"}}+ {{dLoadingSpinner size="small"}}{{/if}}</a></div>@@ -274,7 +274,7 @@ export default class DiscoveryTopics extends Component {@listContext="discovery"/>- <LoadMore @action={{this.loadMore}} />+ <DLoadMore @action={{this.loadMore}} />{{/if}}<span class="after-topic-list-plugin-outlet-wrapper">@@ -293,7 +293,7 @@ export default class DiscoveryTopics extends Component {</DiscoveryTopicsList><footer class="topic-list-bottom">- <ConditionalLoadingSpinner @condition={{@model.loadingMore}} />+ <DConditionalLoadingSpinner @condition={{@model.loadingMore}} />{{#if this.allLoaded}}<PluginOutlet@name="topic-list-bottom"diff --git a/frontend/discourse/app/components/docked-composer.gjs b/frontend/discourse/app/components/docked-composer.gjsindex 2b8db6acbe3..22c09546e71 100644--- a/frontend/discourse/app/components/docked-composer.gjs+++ b/frontend/discourse/app/components/docked-composer.gjs@@ -11,14 +11,14 @@ import didUpdate from "@ember/render-modifiers/modifiers/did-update";import willDestroy from "@ember/render-modifiers/modifiers/will-destroy";import { schedule } from "@ember/runloop";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import DEditor from "discourse/components/d-editor";import bodyClass from "discourse/helpers/body-class";-import concatClass from "discourse/helpers/concat-class";import { popupAjaxError } from "discourse/lib/ajax-error";import UppyUpload from "discourse/lib/uppy/uppy-upload";import UppyMediaOptimization from "discourse/lib/uppy-media-optimization-plugin";import { clipboardHelpers } from "discourse/lib/utilities";+import DButton from "discourse/ui-kit/d-button";+import DEditor from "discourse/ui-kit/d-editor";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";// Reusable chat-style "docked" composer. There is deliberately no@@ -435,7 +435,7 @@ export default class DockedComposer extends Component {{{bodyClass @bodyClassName}}{{/if}}<div- class={{concatClass+ class={{dConcatClass"docked-composer"(if this.resizable "docked-composer--resizable")(if this.autoResize "docked-composer--auto-resize")diff --git a/frontend/discourse/app/components/edit-category-type-schema-fields.gjs b/frontend/discourse/app/components/edit-category-type-schema-fields.gjsindex 4ed282b1c35..c9d7297e938 100644--- a/frontend/discourse/app/components/edit-category-type-schema-fields.gjs+++ b/frontend/discourse/app/components/edit-category-type-schema-fields.gjs@@ -1,8 +1,8 @@import Component from "@glimmer/component";import { get } from "@ember/helper";-import RelativeTimePicker from "discourse/components/relative-time-picker";import { bind } from "discourse/lib/decorators";import { eq } from "discourse/truth-helpers";+import DRelativeTimePicker from "discourse/ui-kit/d-relative-time-picker";import { i18n } from "discourse-i18n";// NOTE: In future we may want to use FormKit versions of site setting components@@ -32,7 +32,7 @@ const SchemaFormField = <template>@type="custom"as |field|>- <RelativeTimePicker+ <DRelativeTimePicker@durationHours={{field.value}}@durationOutputUnit="hours"@onChange={{field.set}}diff --git a/frontend/discourse/app/components/edit-topic-timer-form.gjs b/frontend/discourse/app/components/edit-topic-timer-form.gjsindex 737d02c8c50..8e99286cba9 100644--- a/frontend/discourse/app/components/edit-topic-timer-form.gjs+++ b/frontend/discourse/app/components/edit-topic-timer-form.gjs@@ -5,7 +5,6 @@ import { action } from "@ember/object";import { service } from "@ember/service";import { isEmpty } from "@ember/utils";import ItsATrap from "@discourse/itsatrap";-import DSelect from "discourse/components/d-select";import {BUMP_TYPE,CLOSE_AFTER_LAST_POST_STATUS_TYPE,@@ -16,16 +15,17 @@ import {OPEN_STATUS_TYPE,PUBLISH_TO_CATEGORY_STATUS_TYPE,} from "discourse/components/modal/edit-topic-timer";-import RelativeTimePicker from "discourse/components/relative-time-picker";-import TimeShortcutPicker from "discourse/components/time-shortcut-picker";import TopicTimerInfo from "discourse/components/topic-timer-info";-import icon from "discourse/helpers/d-icon";import {TIME_SHORTCUT_TYPES,timeShortcuts,} from "discourse/lib/time-shortcut";import CategoryChooser from "discourse/select-kit/components/category-chooser";import { FORMAT } from "discourse/select-kit/components/future-date-input-selector";+import DRelativeTimePicker from "discourse/ui-kit/d-relative-time-picker";+import DSelect from "discourse/ui-kit/d-select";+import DTimeShortcutPicker from "discourse/ui-kit/d-time-shortcut-picker";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class EditTopicTimerForm extends Component {@@ -264,7 +264,7 @@ export default class EditTopicTimerForm extends Component {<label class="control-label">{{i18n "topic.topic_status_update.when"}}</label>- <TimeShortcutPicker+ <DTimeShortcutPicker@timeShortcuts={{this.timeOptions}}@prefilledDatetime={{@topicTimer.execute_at}}@onTimeSelected={{this.onTimeSelected}}@@ -278,7 +278,7 @@ export default class EditTopicTimerForm extends Component {<label class="control-label">{{i18n "topic.topic_status_update.duration"}}</label>- <RelativeTimePicker+ <DRelativeTimePicker@onChange={{this.changeDuration}}@durationMinutes={{@topicTimer.duration_minutes}}/>@@ -287,14 +287,14 @@ export default class EditTopicTimerForm extends Component {{{#if this.willCloseImmediately}}<div class="warning">- {{icon "triangle-exclamation"}}+ {{dIcon "triangle-exclamation"}}{{this.willCloseI18n}}</div>{{/if}}{{#if this.willDeleteImmediately}}<div class="warning">- {{icon "triangle-exclamation"}}+ {{dIcon "triangle-exclamation"}}{{this.willDeleteI18n}}</div>{{/if}}diff --git a/frontend/discourse/app/components/embed-mode-composer.gjs b/frontend/discourse/app/components/embed-mode-composer.gjsindex c0e8ecbde27..ab45b533da2 100644--- a/frontend/discourse/app/components/embed-mode-composer.gjs+++ b/frontend/discourse/app/components/embed-mode-composer.gjs@@ -4,11 +4,11 @@ import { action } from "@ember/object";import { schedule } from "@ember/runloop";import { service } from "@ember/service";import { modifier } from "ember-modifier";-import DButton from "discourse/components/d-button";import DockedComposer from "discourse/components/docked-composer";-import avatar from "discourse/helpers/avatar";import { ajax } from "discourse/lib/ajax";import EmbedMode from "discourse/lib/embed-mode";+import DButton from "discourse/ui-kit/d-button";+import dAvatar from "discourse/ui-kit/helpers/d-avatar";import { i18n } from "discourse-i18n";export default class EmbedModeComposer extends Component {@@ -264,7 +264,7 @@ export default class EmbedModeComposer extends Component {{{#if this.editingPost}}<div class="embed-mode-composer__editing"><span class="embed-mode-composer__editing-text">- {{avatar this.editingPost imageSize="tiny"}}+ {{dAvatar this.editingPost imageSize="tiny"}}{{i18n "embed_mode.editing_post"}}</span><DButton@@ -276,7 +276,7 @@ export default class EmbedModeComposer extends Component {{{else if this.replyingToPost}}<div class="embed-mode-composer__replying-to"><span class="embed-mode-composer__replying-to-text">- {{avatar this.replyingToPost imageSize="tiny"}}+ {{dAvatar this.replyingToPost imageSize="tiny"}}{{i18n"embed_mode.replying_to"username=this.replyingToPost.usernamediff --git a/frontend/discourse/app/components/embed-topic-footer.gjs b/frontend/discourse/app/components/embed-topic-footer.gjsindex 789cd8642ee..45cbf115202 100644--- a/frontend/discourse/app/components/embed-topic-footer.gjs+++ b/frontend/discourse/app/components/embed-topic-footer.gjs@@ -3,11 +3,11 @@ import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";import { service } from "@ember/service";import { modifier } from "ember-modifier";-import DButton from "discourse/components/d-button";import PoweredByDiscourse from "discourse/components/powered-by-discourse";-import icon from "discourse/helpers/d-icon";import EmbedMode from "discourse/lib/embed-mode";import getURL from "discourse/lib/get-url";+import DButton from "discourse/ui-kit/d-button";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class EmbedTopicFooter extends Component {@@ -91,7 +91,7 @@ export default class EmbedTopicFooter extends Component {<div class="embed-topic-footer" {{this.trackFooterVisibility}}>{{#if this.showFirstReplyMessage}}<div class="embed-topic-footer__first-reply">- {{icon "comment"}}+ {{dIcon "comment"}}<span>{{i18n "embed_mode.be_first_to_reply"}}</span><DButton@action={{this.handleReply}}diff --git a/frontend/discourse/app/components/emoji-picker/content.gjs b/frontend/discourse/app/components/emoji-picker/content.gjsindex 7f6c00b0dcf..e343cf2013c 100644--- a/frontend/discourse/app/components/emoji-picker/content.gjs+++ b/frontend/discourse/app/components/emoji-picker/content.gjs@@ -9,13 +9,9 @@ import { cancel, next, schedule } from "@ember/runloop";import { service } from "@ember/service";import { modifier as modifierFn } from "ember-modifier";import { emojiSearch, isSkinTonableEmoji } from "pretty-text/emoji";-import DButton from "discourse/components/d-button";-import FilterInput from "discourse/components/filter-input";import PluginOutlet from "discourse/components/plugin-outlet";-import concatClass from "discourse/helpers/concat-class";import lazyHash from "discourse/helpers/lazy-hash";import noop from "discourse/helpers/noop";-import replaceEmoji from "discourse/helpers/replace-emoji";import withEventValue from "discourse/helpers/with-event-value";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";@@ -27,9 +23,13 @@ import { INPUT_DELAY } from "discourse/lib/environment";import { makeArray } from "discourse/lib/helpers";import loadEmojiSearchAliases from "discourse/lib/load-emoji-search-aliases";import { emojiUrlFor } from "discourse/lib/text";-import autoFocus from "discourse/modifiers/auto-focus";import preventScrollOnFocus from "discourse/modifiers/prevent-scroll-on-focus";import { eq, gt, includes, notEq } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DFilterInput from "discourse/ui-kit/d-filter-input";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dReplaceEmoji from "discourse/ui-kit/helpers/d-replace-emoji";+import dAutoFocus from "discourse/ui-kit/modifiers/d-auto-focus";import { i18n } from "discourse-i18n";import DiversityMenu from "./diversity-menu";@@ -451,7 +451,7 @@ export default class EmojiPicker extends Component {{{! template-lint-disable no-nested-interactive }}{{! template-lint-disable no-pointer-down-event-binding }}<div- class={{concatClass "emoji-picker"}}+ class={{dConcatClass "emoji-picker"}}{{didInsert this.loadEmojis}}{{didInsert (if @didInsert @didInsert (noop))}}{{on "keydown" this.trapKeyDownEvents}}@@ -469,9 +469,9 @@ export default class EmojiPicker extends Component {close=@close}}>- <FilterInput+ <DFilterInput{{preventScrollOnFocus}}- {{autoFocus}}+ {{dAutoFocus}}{{didInsert this.registerFilterInput}}@value={{this.term}}@filterAction={{withEventValue this.didInputFilter}}@@ -497,7 +497,7 @@ export default class EmojiPicker extends Component {{{#each-in this.groups as |section emojis|}}{{#if emojis.length}}<DButton- class={{concatClass+ class={{dConcatClass"btn-flat""emoji-picker__section-btn"(if (eq this.lastVisibleSection section) "active")@@ -507,7 +507,7 @@ export default class EmojiPicker extends Component {data-section={{section}}>{{#if (eq section "favorites")}}- {{replaceEmoji ":star:"}}+ {{dReplaceEmoji ":star:"}}{{else}}<imgwidth="18"@@ -558,7 +558,7 @@ export default class EmojiPicker extends Component {{{else}}<p class="emoji-picker__no-results">{{i18n "chat.emoji_picker.no_results"}}- {{replaceEmoji ":crying_cat_face:"}}+ {{dReplaceEmoji ":crying_cat_face:"}}</p>{{/if}}{{/each}}@@ -567,7 +567,7 @@ export default class EmojiPicker extends Component {{{#each-in this.groups as |section emojis|}}{{#if emojis}}<div- class={{concatClass+ class={{dConcatClass"emoji-picker__section"(if (notEq this.filteredEmojis null) "hidden")}}diff --git a/frontend/discourse/app/components/emoji-picker/diversity-menu.gjs b/frontend/discourse/app/components/emoji-picker/diversity-menu.gjsindex d7d3d7c9189..c7f56adcf5c 100644--- a/frontend/discourse/app/components/emoji-picker/diversity-menu.gjs+++ b/frontend/discourse/app/components/emoji-picker/diversity-menu.gjs@@ -2,11 +2,11 @@ import Component from "@glimmer/component";import { concat, fn } from "@ember/helper";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import DropdownMenu from "discourse/components/dropdown-menu";import DMenu from "discourse/float-kit/components/d-menu";-import replaceEmoji from "discourse/helpers/replace-emoji";import { eq } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";+import dReplaceEmoji from "discourse/ui-kit/helpers/d-replace-emoji";export const FITZPATRICK_MODIFIERS = [{ scale: null, modifier: "" },@@ -41,14 +41,14 @@ export default class EmojiPicker extends Component {><:trigger>{{#if (eq this.emojiStore.diversity 1)}}- {{replaceEmoji ":clap:"}}+ {{dReplaceEmoji ":clap:"}}{{else}}- {{replaceEmoji (concat ":clap:t" this.emojiStore.diversity ":")}}+ {{dReplaceEmoji (concat ":clap:t" this.emojiStore.diversity ":")}}{{/if}}</:trigger><:content>- <DropdownMenu as |dropdown|>+ <DDropdownMenu as |dropdown|>{{#each this.fitzpatrickModifiers as |fitzpatrick|}}<dropdown.item><DButton@@ -57,14 +57,14 @@ export default class EmojiPicker extends Component {data-level={{fitzpatrick.scale}}>{{#if fitzpatrick.scale}}- {{replaceEmoji (concat ":clap:t" fitzpatrick.scale ":")}}+ {{dReplaceEmoji (concat ":clap:t" fitzpatrick.scale ":")}}{{else}}- {{replaceEmoji ":clap:"}}+ {{dReplaceEmoji ":clap:"}}{{/if}}</DButton></dropdown.item>{{/each}}- </DropdownMenu>+ </DDropdownMenu></:content></DMenu></template>diff --git a/frontend/discourse/app/components/emoji-picker/index.gjs b/frontend/discourse/app/components/emoji-picker/index.gjsindex e6825ef7d90..6a825f5bd8b 100644--- a/frontend/discourse/app/components/emoji-picker/index.gjs+++ b/frontend/discourse/app/components/emoji-picker/index.gjs@@ -3,9 +3,9 @@ import { concat } from "@ember/helper";import { action } from "@ember/object";import EmojiPickerContent from "discourse/components/emoji-picker/content";import DMenu from "discourse/float-kit/components/d-menu";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";-import replaceEmoji from "discourse/helpers/replace-emoji";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";+import dReplaceEmoji from "discourse/ui-kit/helpers/d-replace-emoji";export default class EmojiPicker extends Component {@action@@ -27,7 +27,7 @@ export default class EmojiPicker extends Component {<template><DMenu- @triggerClass={{concatClass @btnClass}}+ @triggerClass={{dConcatClass @btnClass}}@onRegisterApi={{this.onRegisterMenu}}@identifier="emoji-picker"@groupIdentifier="emoji-picker"@@ -40,9 +40,9 @@ export default class EmojiPicker extends Component {><:trigger>{{#if @emoji}}- {{replaceEmoji (concat ":" @emoji ":")}}+ {{dReplaceEmoji (concat ":" @emoji ":")}}{{else}}- {{icon this.icon}}+ {{dIcon this.icon}}{{/if}}{{#if @label}}diff --git a/frontend/discourse/app/components/empty-topic-filter.gjs b/frontend/discourse/app/components/empty-topic-filter.gjsindex b5bc01c4476..81c8f9523a8 100644--- a/frontend/discourse/app/components/empty-topic-filter.gjs+++ b/frontend/discourse/app/components/empty-topic-filter.gjs@@ -1,9 +1,9 @@import Component from "@glimmer/component";import { service } from "@ember/service";import { trustHTML } from "@ember/template";-import EmptyState from "discourse/components/empty-state";import SvgDocumentsCheckmark from "discourse/components/svg/documents-checkmark";-import basePath from "discourse/helpers/base-path";+import DEmptyState from "discourse/ui-kit/d-empty-state";+import dBasePath from "discourse/ui-kit/helpers/d-base-path";import { i18n } from "discourse-i18n";export default class EmptyTopicFilter extends Component {@@ -65,14 +65,14 @@ export default class EmptyTopicFilter extends Component {get tipText() {if (this.args.unreadFilter || this.args.newFilter) {return i18n("topics.none.education.topic_tracking_preferences", {- basePath: basePath(),+ basePath: dBasePath(),});}return "";}<template>- <EmptyState+ <DEmptyState@identifier="empty-topic-filter"@title={{this.educationText}}@ctaLabel={{this.ctaLabelWithAction.label}}diff --git a/frontend/discourse/app/components/expand-post.gjs b/frontend/discourse/app/components/expand-post.gjsindex 1dfbf7c5660..80a8bd8215e 100644--- a/frontend/discourse/app/components/expand-post.gjs+++ b/frontend/discourse/app/components/expand-post.gjs@@ -1,9 +1,9 @@import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";-import DButton from "discourse/components/d-button";-import concatClass from "discourse/helpers/concat-class";import { ajax } from "discourse/lib/ajax";+import DButton from "discourse/ui-kit/d-button";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";export default class ExpandPost extends Component {@tracked expanded = false;@@ -40,7 +40,7 @@ export default class ExpandPost extends Component {@action={{this.toggleItem}}@icon={{if this.expanded "chevron-up" "chevron-down"}}@title="post.expand_collapse"- class={{concatClass+ class={{dConcatClass"btn-transparent"(if this.expanded "collapse-item" "expand-item")}}diff --git a/frontend/discourse/app/components/fast-edit.gjs b/frontend/discourse/app/components/fast-edit.gjsindex c13290d51d8..007a3b148b5 100644--- a/frontend/discourse/app/components/fast-edit.gjs+++ b/frontend/discourse/app/components/fast-edit.gjs@@ -2,14 +2,14 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { on } from "@ember/modifier";import { action } from "@ember/object";-import DButton from "discourse/components/d-button";import PluginOutlet from "discourse/components/plugin-outlet";import lazyHash from "discourse/helpers/lazy-hash";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import { translateModKey } from "discourse/lib/utilities";-import autoFocus from "discourse/modifiers/auto-focus";import preventScrollOnFocus from "discourse/modifiers/prevent-scroll-on-focus";+import DButton from "discourse/ui-kit/d-button";+import dAutoFocus from "discourse/ui-kit/modifiers/d-auto-focus";import { i18n } from "discourse-i18n";export default class FastEdit extends Component {@@ -78,7 +78,7 @@ export default class FastEdit extends Component {{{on "input" this.updateValue}}id="fast-edit-input"{{preventScrollOnFocus}}- {{autoFocus}}+ {{dAutoFocus}}>{{this.value}}</textarea><div class="fast-edit-container__footer">diff --git a/frontend/discourse/app/components/featured-topic.gjs b/frontend/discourse/app/components/featured-topic.gjsindex 46b3f416ae4..0be081d3506 100644--- a/frontend/discourse/app/components/featured-topic.gjs+++ b/frontend/discourse/app/components/featured-topic.gjs@@ -7,7 +7,7 @@ import {} from "@ember-decorators/component";import $ from "jquery";import TopicPostBadges from "discourse/components/topic-post-badges";-import ageWithTooltip from "discourse/helpers/age-with-tooltip";+import dAgeWithTooltip from "discourse/ui-kit/helpers/d-age-with-tooltip";import TopicStatus from "./topic-status";@classNameBindings(":featured-topic")@@ -34,7 +34,7 @@ export default class FeaturedTopic extends Component {@url={{this.topic.lastUnreadUrl}}/>- <a href={{this.topic.lastPostUrl}} class="last-posted-at">{{ageWithTooltip+ <a href={{this.topic.lastPostUrl}} class="last-posted-at">{{dAgeWithTooltipthis.topic.last_posted_at}}</a></template>diff --git a/frontend/discourse/app/components/flag-action-type.gjs b/frontend/discourse/app/components/flag-action-type.gjsindex 9304f9f8a39..b3ff153ebae 100644--- a/frontend/discourse/app/components/flag-action-type.gjs+++ b/frontend/discourse/app/components/flag-action-type.gjs@@ -5,9 +5,9 @@ import { on } from "@ember/modifier";import { computed } from "@ember/object";import { trustHTML } from "@ember/template";import { tagName } from "@ember-decorators/component";-import concatClass from "discourse/helpers/concat-class";import { applyValueTransformer } from "discourse/lib/transformer";import { MAX_MESSAGE_LENGTH } from "discourse/models/post-action-type";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";@tagName("")@@ -128,7 +128,7 @@ export default class FlagActionType extends Component {@value={{this.message}}/><div- class={{concatClass+ class={{dConcatClass"custom-message-length"this.customMessageLengthClasses}}@@ -167,7 +167,7 @@ export default class FlagActionType extends Component {@value={{this.message}}/><div- class={{concatClass+ class={{dConcatClass"custom-message-length"this.customMessageLengthClasses}}diff --git a/frontend/discourse/app/components/footer-nav.gjs b/frontend/discourse/app/components/footer-nav.gjsindex bf9a0f4d8d1..17e2a0cb7c7 100644--- a/frontend/discourse/app/components/footer-nav.gjs+++ b/frontend/discourse/app/components/footer-nav.gjs@@ -1,12 +1,12 @@import Component from "@glimmer/component";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import concatClass from "discourse/helpers/concat-class";import htmlClass from "discourse/helpers/html-class";import { postRNWebviewMessage } from "discourse/lib/utilities";import { SCROLLED_UP, UNSCROLLED } from "discourse/services/scroll-direction";import { not } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";export default class FooterNav extends Component {@service capabilities;@@ -103,7 +103,7 @@ export default class FooterNav extends Component {{{htmlClass "footer-nav-visible"}}{{/if}}- <div class={{concatClass "footer-nav" (if this.isVisible "visible")}}>+ <div class={{dConcatClass "footer-nav" (if this.isVisible "visible")}}><div class="footer-nav-widget"><DButton@action={{this.goBack}}diff --git a/frontend/discourse/app/components/form-template-field/checkbox.gjs b/frontend/discourse/app/components/form-template-field/checkbox.gjsindex 633d6e7a29f..b61164376ca 100644--- a/frontend/discourse/app/components/form-template-field/checkbox.gjs+++ b/frontend/discourse/app/components/form-template-field/checkbox.gjs@@ -1,7 +1,7 @@import { Input } from "@ember/component";import { on } from "@ember/modifier";import { trustHTML } from "@ember/template";-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";const Checkbox = <template><div class="control-group form-template-field" data-field-type="checkbox">@@ -16,7 +16,7 @@ const Checkbox = <template>/>{{@attributes.label}}{{#if @validations.required}}- {{icon "asterisk" class="form-template-field__required-indicator"}}+ {{dIcon "asterisk" class="form-template-field__required-indicator"}}{{/if}}</label>diff --git a/frontend/discourse/app/components/form-template-field/composer.gjs b/frontend/discourse/app/components/form-template-field/composer.gjsindex 2fd2b122af4..fe9addea507 100644--- a/frontend/discourse/app/components/form-template-field/composer.gjs+++ b/frontend/discourse/app/components/form-template-field/composer.gjs@@ -3,8 +3,8 @@ import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";import { next } from "@ember/runloop";import { trustHTML } from "@ember/template";-import DEditor from "discourse/components/d-editor";-import icon from "discourse/helpers/d-icon";+import DEditor from "discourse/ui-kit/d-editor";+import dIcon from "discourse/ui-kit/helpers/d-icon";export default class FormTemplateFieldComposer extends Component {@tracked composerValue = this.args.value || "";@@ -23,7 +23,7 @@ export default class FormTemplateFieldComposer extends Component {<label class="form-template-field__label">{{@attributes.label}}{{#if @validations.required}}- {{icon "asterisk" class="form-template-field__required-indicator"}}+ {{dIcon "asterisk" class="form-template-field__required-indicator"}}{{/if}}</label>{{/if}}diff --git a/frontend/discourse/app/components/form-template-field/dropdown.gjs b/frontend/discourse/app/components/form-template-field/dropdown.gjsindex 9cf314295f0..19425bb0020 100644--- a/frontend/discourse/app/components/form-template-field/dropdown.gjs+++ b/frontend/discourse/app/components/form-template-field/dropdown.gjs@@ -1,7 +1,7 @@import { on } from "@ember/modifier";import { trustHTML } from "@ember/template";-import icon from "discourse/helpers/d-icon";import { eq } from "discourse/truth-helpers";+import dIcon from "discourse/ui-kit/helpers/d-icon";const Dropdown = <template><div class="control-group form-template-field" data-field-type="dropdown">@@ -9,7 +9,7 @@ const Dropdown = <template><label class="form-template-field__label">{{@attributes.label}}{{#if @validations.required}}- {{icon "asterisk" class="form-template-field__required-indicator"}}+ {{dIcon "asterisk" class="form-template-field__required-indicator"}}{{/if}}</label>{{/if}}diff --git a/frontend/discourse/app/components/form-template-field/input.gjs b/frontend/discourse/app/components/form-template-field/input.gjsindex f0430cfb80f..5efaeb96819 100644--- a/frontend/discourse/app/components/form-template-field/input.gjs+++ b/frontend/discourse/app/components/form-template-field/input.gjs@@ -1,7 +1,7 @@import { Input } from "@ember/component";import { on } from "@ember/modifier";import { trustHTML } from "@ember/template";-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";const FormTemplateFieldInput = <template><div class="control-group form-template-field" data-field-type="input">@@ -9,7 +9,7 @@ const FormTemplateFieldInput = <template><label class="form-template-field__label">{{@attributes.label}}{{#if @validations.required}}- {{icon "asterisk" class="form-template-field__required-indicator"}}+ {{dIcon "asterisk" class="form-template-field__required-indicator"}}{{/if}}</label>{{/if}}diff --git a/frontend/discourse/app/components/form-template-field/multi-select.gjs b/frontend/discourse/app/components/form-template-field/multi-select.gjsindex 4445ef2857d..700e6fab8d2 100644--- a/frontend/discourse/app/components/form-template-field/multi-select.gjs+++ b/frontend/discourse/app/components/form-template-field/multi-select.gjs@@ -2,7 +2,7 @@ import Component from "@glimmer/component";import { on } from "@ember/modifier";import { action } from "@ember/object";import { trustHTML } from "@ember/template";-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";export default class FormTemplateFieldMultiSelect extends Component {@action@@ -19,7 +19,7 @@ export default class FormTemplateFieldMultiSelect extends Component {<label class="form-template-field__label">{{@attributes.label}}{{#if @validations.required}}- {{icon "asterisk" class="form-template-field__required-indicator"}}+ {{dIcon "asterisk" class="form-template-field__required-indicator"}}{{/if}}</label>{{/if}}diff --git a/frontend/discourse/app/components/form-template-field/tag-chooser.gjs b/frontend/discourse/app/components/form-template-field/tag-chooser.gjsindex 4eb2e9ca4a4..4f10b3f9ffd 100644--- a/frontend/discourse/app/components/form-template-field/tag-chooser.gjs+++ b/frontend/discourse/app/components/form-template-field/tag-chooser.gjs@@ -6,9 +6,9 @@ import didUpdate from "@ember/render-modifiers/modifiers/did-update";import { next } from "@ember/runloop";import { service } from "@ember/service";import { trustHTML } from "@ember/template";-import icon from "discourse/helpers/d-icon";import { uniqueItemsFromArray } from "discourse/lib/array-tools";import { not } from "discourse/truth-helpers";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class TagChooserField extends Component {@@ -161,7 +161,7 @@ export default class TagChooserField extends Component {<label class="form-template-field__label">{{@attributes.label}}{{#if @validations.required}}- {{icon "asterisk" class="form-template-field__required-indicator"}}+ {{dIcon "asterisk" class="form-template-field__required-indicator"}}{{/if}}</label>{{/if}}diff --git a/frontend/discourse/app/components/form-template-field/textarea.gjs b/frontend/discourse/app/components/form-template-field/textarea.gjsindex 67e267a037d..2073c91b2bb 100644--- a/frontend/discourse/app/components/form-template-field/textarea.gjs+++ b/frontend/discourse/app/components/form-template-field/textarea.gjs@@ -5,8 +5,8 @@ import { action } from "@ember/object";import { schedule } from "@ember/runloop";import { service } from "@ember/service";import { trustHTML } from "@ember/template";-import icon from "discourse/helpers/d-icon";import { resettableTracked } from "discourse/lib/tracked-tools";+import dIcon from "discourse/ui-kit/helpers/d-icon";export default class FormTemplateFieldTextarea extends Component {@service appEvents;@@ -48,7 +48,7 @@ export default class FormTemplateFieldTextarea extends Component {<label class="form-template-field__label">{{@attributes.label}}{{#if @validations.required}}- {{icon "asterisk" class="form-template-field__required-indicator"}}+ {{dIcon "asterisk" class="form-template-field__required-indicator"}}{{/if}}</label>{{/if}}diff --git a/frontend/discourse/app/components/form-template-field/upload.gjs b/frontend/discourse/app/components/form-template-field/upload.gjsindex 8964f2b711b..3a2fadcff7b 100644--- a/frontend/discourse/app/components/form-template-field/upload.gjs+++ b/frontend/discourse/app/components/form-template-field/upload.gjs@@ -5,8 +5,6 @@ import { next, schedule } from "@ember/runloop";import { service } from "@ember/service";import { dasherize } from "@ember/string";import { trustHTML } from "@ember/template";-import PickFilesButton from "discourse/components/pick-files-button";-import icon from "discourse/helpers/d-icon";import { bind } from "discourse/lib/decorators";import {autoTrackedArray,@@ -14,6 +12,8 @@ import {} from "discourse/lib/tracked-tools";import { isAudio, isImage, isVideo } from "discourse/lib/uploads";import UppyUpload from "discourse/lib/uppy/uppy-upload";+import DPickFilesButton from "discourse/ui-kit/d-pick-files-button";+import dIcon from "discourse/ui-kit/helpers/d-icon";export default class FormTemplateFieldUpload extends Component {@service appEvents;@@ -138,7 +138,7 @@ export default class FormTemplateFieldUpload extends Component {<label class="form-template-field__label">{{@attributes.label}}{{#if @validations.required}}- {{icon "asterisk" class="form-template-field__required-indicator"}}+ {{dIcon "asterisk" class="form-template-field__required-indicator"}}{{/if}}</label>{{/if}}@@ -149,7 +149,7 @@ export default class FormTemplateFieldUpload extends Component {</span>{{/if}}- <PickFilesButton+ <DPickFilesButton@registerFileInput={{this.uppyUpload.setup}}@fileInputClass="form-template-field__upload"@fileInputId={{this.fileUploadElementId}}@@ -167,7 +167,7 @@ export default class FormTemplateFieldUpload extends Component {<ul class="form-template-field__uploaded-files">{{#each this.uploadedFiles as |file|}}<li>- {{icon "file"}}+ {{dIcon "file"}}<ahref={{file.url}}target="_blank"diff --git a/frontend/discourse/app/components/fullname-input.gjs b/frontend/discourse/app/components/fullname-input.gjsindex 6c41c9b1aa8..a52d745e998 100644--- a/frontend/discourse/app/components/fullname-input.gjs+++ b/frontend/discourse/app/components/fullname-input.gjs@@ -1,9 +1,9 @@import Component from "@glimmer/component";import { on } from "@ember/modifier";import { service } from "@ember/service";-import InputTip from "discourse/components/input-tip";-import TextField from "discourse/components/text-field";import valueEntered from "discourse/helpers/value-entered";+import DInputTip from "discourse/ui-kit/d-input-tip";+import DTextField from "discourse/ui-kit/d-text-field";import { i18n } from "discourse-i18n";export default class FullnameInput extends Component {@@ -18,7 +18,7 @@ export default class FullnameInput extends Component {<template><div ...attributes>- <TextField+ <DTextField{{on "focusin" @onFocusIn}}@disabled={{@nameDisabled}}@value={{@accountName}}@@ -37,7 +37,7 @@ export default class FullnameInput extends Component {{{i18n "user.name.instructions_required"}}</span>{{else}}- <InputTip @validation={{@nameValidation}} id="fullname-validation" />+ <DInputTip @validation={{@nameValidation}} id="fullname-validation" />{{/if}}</div></template>diff --git a/frontend/discourse/app/components/glimmer-site-header.gjs b/frontend/discourse/app/components/glimmer-site-header.gjsindex 4b69570d880..17c0bc805e0 100644--- a/frontend/discourse/app/components/glimmer-site-header.gjs+++ b/frontend/discourse/app/components/glimmer-site-header.gjs@@ -6,7 +6,6 @@ import { cancel, schedule } from "@ember/runloop";import { service } from "@ember/service";import { waitForPromise } from "@ember/test-waiters";import ItsATrap from "@discourse/itsatrap";-import concatClass from "discourse/helpers/concat-class";import discourseDebounce from "discourse/lib/debounce";import { bind } from "discourse/lib/decorators";import { isTesting } from "discourse/lib/environment";@@ -17,7 +16,8 @@ import {shouldCloseMenu,} from "discourse/lib/swipe-events";import { isDocumentRTL } from "discourse/lib/text-direction";-import swipe from "discourse/modifiers/swipe";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dSwipe from "discourse/ui-kit/modifiers/d-swipe";import Header from "./header";import ImpersonationNotice from "./impersonation-notice";@@ -432,12 +432,12 @@ export default class GlimmerSiteHeader extends Component {<template><div- class={{concatClass+ class={{dConcatClass(unless this.slideInMode "drop-down-mode")"d-header-wrap"}}{{didInsert this.setupHeader}}- {{swipe+ {{dSwipeonDidStartSwipe=this.onSwipeStartonDidEndSwipe=this.onSwipeEndonDidCancelSwipe=this.onSwipeCanceldiff --git a/frontend/discourse/app/components/global-notice.gjs b/frontend/discourse/app/components/global-notice.gjsindex f5f49b94661..e05de2f9aae 100644--- a/frontend/discourse/app/components/global-notice.gjs+++ b/frontend/discourse/app/components/global-notice.gjs@@ -5,12 +5,12 @@ import EmberObject, { action } from "@ember/object";import { service } from "@ember/service";import { trustHTML } from "@ember/template";import { tagName } from "@ember-decorators/component";-import DButton from "discourse/components/d-button";import cookie, { removeCookie } from "discourse/lib/cookie";import { bind } from "discourse/lib/decorators";import { isDevelopment } from "discourse/lib/environment";import { currentThemeId } from "discourse/lib/theme-selector";import { DeferredTrackedSet } from "discourse/lib/tracked-tools";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";const _pluginNotices = new DeferredTrackedSet();diff --git a/frontend/discourse/app/components/google-search.gjs b/frontend/discourse/app/components/google-search.gjsindex 2ca73f0c61a..92895e78a47 100644--- a/frontend/discourse/app/components/google-search.gjs+++ b/frontend/discourse/app/components/google-search.gjs@@ -3,9 +3,9 @@ import Component from "@ember/component";import { computed, set } from "@ember/object";import { tagName } from "@ember-decorators/component";import PluginOutlet from "discourse/components/plugin-outlet";-import concatClass from "discourse/helpers/concat-class";import lazyHash from "discourse/helpers/lazy-hash";import getURL from "discourse/lib/get-url";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";@tagName("")@@ -26,7 +26,7 @@ export default class GoogleSearch extends Component {<template><div- class={{concatClass "google-search-form" (if this.hidden "hidden")}}+ class={{dConcatClass "google-search-form" (if this.hidden "hidden")}}...attributes><PluginOutletdiff --git a/frontend/discourse/app/components/group-card-contents.gjs b/frontend/discourse/app/components/group-card-contents.gjsindex 989f0d35d2c..fada4f89703 100644--- a/frontend/discourse/app/components/group-card-contents.gjs+++ b/frontend/discourse/app/components/group-card-contents.gjs@@ -4,14 +4,14 @@ import { service } from "@ember/service";import { trustHTML } from "@ember/template";import { classNameBindings, classNames } from "@ember-decorators/component";import { on as onEvent } from "@ember-decorators/object";-import AvatarFlair from "discourse/components/avatar-flair";import CardContentsBase from "discourse/components/card-contents-base";-import DButton from "discourse/components/d-button";import GroupMembershipButton from "discourse/components/group-membership-button";-import boundAvatar from "discourse/helpers/bound-avatar";import routeAction from "discourse/helpers/route-action";import { wantsNewWindow } from "discourse/lib/intercept-click";import { groupPath } from "discourse/lib/url";+import DAvatarFlair from "discourse/ui-kit/d-avatar-flair";+import DButton from "discourse/ui-kit/d-button";+import dBoundAvatar from "discourse/ui-kit/helpers/d-bound-avatar";import { i18n } from "discourse-i18n";const maxMembersToDisplay = 10;@@ -170,7 +170,7 @@ export default class GroupCardContents extends CardContentsBase {href={{this.groupPath}}class="card-huge-avatar">- <AvatarFlair+ <DAvatarFlair@flairName={{this.group.name}}@flairUrl={{this.group.flair_url}}@flairBgColor={{this.group.flair_bg_color}}@@ -234,7 +234,7 @@ export default class GroupCardContents extends CardContentsBase {{{on "click" this.close}}href={{user.path}}class="card-tiny-avatar"- >{{boundAvatar user "tiny"}}</a>+ >{{dBoundAvatar user "tiny"}}</a>{{/each}}{{#if this.showMoreMembers}}<adiff --git a/frontend/discourse/app/components/group-card.gjs b/frontend/discourse/app/components/group-card.gjsindex 981deb82b0d..5d35a02ad64 100644--- a/frontend/discourse/app/components/group-card.gjs+++ b/frontend/discourse/app/components/group-card.gjs@@ -1,12 +1,12 @@import { LinkTo } from "@ember/routing";import { trustHTML } from "@ember/template";-import AvatarFlair from "discourse/components/avatar-flair";import GroupInfo from "discourse/components/group-info";import GroupMembershipButton from "discourse/components/group-membership-button";import PluginOutlet from "discourse/components/plugin-outlet";-import icon from "discourse/helpers/d-icon";import lazyHash from "discourse/helpers/lazy-hash";import routeAction from "discourse/helpers/route-action";+import DAvatarFlair from "discourse/ui-kit/d-avatar-flair";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";const GroupCard = <template>@@ -20,7 +20,7 @@ const GroupCard = <template><div class="group-info-wrapper">{{#if @group.flair_url}}<span class="group-avatar-flair">- <AvatarFlair+ <DAvatarFlair@flairName={{@group.name}}@flairUrl={{@group.flair_url}}@flairBgColor={{@group.flair_bg_color}}@@ -31,7 +31,7 @@ const GroupCard = <template><span class="group-info"><GroupInfo @group={{@group}} />- <div class="group-user-count">{{icon+ <div class="group-user-count">{{dIcon"user"}}{{@group.user_count}}</div></span>@@ -46,24 +46,24 @@ const GroupCard = <template>>{{#if @group.is_group_owner}}<span class="is-group-owner">- {{icon "shield-halved"}}+ {{dIcon "shield-halved"}}{{i18n "groups.index.is_group_owner"}}</span>{{else if @group.is_group_user}}<span class="is-group-member">- {{icon "check"}}+ {{dIcon "check"}}{{i18n "groups.index.is_group_user"}}</span>{{else if @group.public_admission}}{{i18n "groups.index.public"}}{{else if @group.isPrivate}}- {{icon "far-eye-slash"}}+ {{dIcon "far-eye-slash"}}{{i18n "groups.index.private"}}{{else}}{{#if @group.automatic}}{{i18n "groups.index.automatic"}}{{else}}- {{icon "ban"}}+ {{dIcon "ban"}}{{i18n "groups.index.closed"}}{{/if}}{{/if}}diff --git a/frontend/discourse/app/components/group-flair-inputs.gjs b/frontend/discourse/app/components/group-flair-inputs.gjsindex 555bb11f96c..72f09a53b8b 100644--- a/frontend/discourse/app/components/group-flair-inputs.gjs+++ b/frontend/discourse/app/components/group-flair-inputs.gjs@@ -5,16 +5,16 @@ import { action, computed } from "@ember/object";import { tagName } from "@ember-decorators/component";import { observes, on } from "@ember-decorators/object";import $ from "jquery";-import AvatarFlair from "discourse/components/avatar-flair";-import DIconGridPicker from "discourse/components/d-icon-grid-picker";-import RadioButton from "discourse/components/radio-button";-import TextField from "discourse/components/text-field";import UppyImageUploader from "discourse/components/uppy-image-uploader";import { ajax } from "discourse/lib/ajax";import discourseDebounce from "discourse/lib/debounce";import getURL from "discourse/lib/get-url";import { convertIconClass } from "discourse/lib/icon-library";import { or } from "discourse/truth-helpers";+import DAvatarFlair from "discourse/ui-kit/d-avatar-flair";+import DIconGridPicker from "discourse/ui-kit/d-icon-grid-picker";+import DRadioButton from "discourse/ui-kit/d-radio-button";+import DTextField from "discourse/ui-kit/d-text-field";import { i18n } from "discourse-i18n";@tagName("")@@ -114,7 +114,7 @@ export default class GroupFlairInputs extends Component {<div class="radios"><label class="radio-label" for="avatar-flair-icon">- <RadioButton+ <DRadioButton@name="avatar-flair-icon"@id="avatar-flair-icon"@value="icon"@@ -124,7 +124,7 @@ export default class GroupFlairInputs extends Component {</label><label class="radio-label" for="avatar-flair-image">- <RadioButton+ <DRadioButton@name="avatar-flair-image"@id="avatar-flair-image"@value="image"@@ -161,7 +161,7 @@ export default class GroupFlairInputs extends Component {"groups.flair_bg_color"}}</label>- <TextField+ <DTextField@name="flair_bg_color"@value={{this.model.flair_bg_color}}@placeholderKey="groups.flair_bg_color_placeholder"@@ -175,7 +175,7 @@ export default class GroupFlairInputs extends Component {"groups.flair_color"}}</label>- <TextField+ <DTextField@name="flair_color"@value={{this.model.flair_color}}@placeholderKey="groups.flair_color_placeholder"@@ -205,7 +205,7 @@ export default class GroupFlairInputs extends Component {this.model.flairBackgroundHexColor)}}- <AvatarFlair+ <DAvatarFlair@flairName={{this.model.name}}@flairUrl={{ifthis.flairPreviewIcondiff --git a/frontend/discourse/app/components/group-list.gjs b/frontend/discourse/app/components/group-list.gjsindex 058354e9292..e7dd16a5234 100644--- a/frontend/discourse/app/components/group-list.gjs+++ b/frontend/discourse/app/components/group-list.gjs@@ -3,16 +3,16 @@ import { hash } from "@ember/helper";import { on } from "@ember/modifier";import { action } from "@ember/object";import { service } from "@ember/service";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DButton from "discourse/components/d-button";import GroupCard from "discourse/components/group-card";-import LoadMore from "discourse/components/load-more";import PluginOutlet from "discourse/components/plugin-outlet";import bodyClass from "discourse/helpers/body-class";import hideApplicationFooter from "discourse/helpers/hide-application-footer";import withEventValue from "discourse/helpers/with-event-value";import ComboBox from "discourse/select-kit/components/combo-box";import { or } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DLoadMore from "discourse/ui-kit/d-load-more";import { i18n } from "discourse-i18n";export default class GroupList extends Component {@@ -86,7 +86,7 @@ export default class GroupList extends Component {</div>{{#if @groups.content}}- <LoadMore @action={{this.loadMore}}>+ <DLoadMore @action={{this.loadMore}}><div class="container"><div class="groups-boxes">{{#each @groups.content as |group|}}@@ -98,8 +98,8 @@ export default class GroupList extends Component {/></div></div>- </LoadMore>- <ConditionalLoadingSpinner @condition={{@groups.loadingMore}} />+ </DLoadMore>+ <DConditionalLoadingSpinner @condition={{@groups.loadingMore}} />{{else}}<p role="status">{{i18n "groups.index.empty"}}</p>{{/if}}diff --git a/frontend/discourse/app/components/group-manage-logs-filter.gjs b/frontend/discourse/app/components/group-manage-logs-filter.gjsindex a994b6dd733..b312313296c 100644--- a/frontend/discourse/app/components/group-manage-logs-filter.gjs+++ b/frontend/discourse/app/components/group-manage-logs-filter.gjs@@ -3,7 +3,7 @@ import Component from "@ember/component";import { concat, fn } from "@ember/helper";import { computed } from "@ember/object";import { tagName } from "@ember-decorators/component";-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";@tagName("")diff --git a/frontend/discourse/app/components/group-manage-logs-row.gjs b/frontend/discourse/app/components/group-manage-logs-row.gjsindex f759e9f70f5..1cb3efb2dd3 100644--- a/frontend/discourse/app/components/group-manage-logs-row.gjs+++ b/frontend/discourse/app/components/group-manage-logs-row.gjs@@ -3,9 +3,9 @@ import Component from "@ember/component";import { fn, hash } from "@ember/helper";import { action } from "@ember/object";import { tagName } from "@ember-decorators/component";-import DButton from "discourse/components/d-button";-import ageWithTooltip from "discourse/helpers/age-with-tooltip";-import avatar from "discourse/helpers/avatar";+import DButton from "discourse/ui-kit/d-button";+import dAgeWithTooltip from "discourse/ui-kit/helpers/d-age-with-tooltip";+import dAvatar from "discourse/ui-kit/helpers/d-avatar";import { i18n } from "discourse-i18n";@tagName("")@@ -33,7 +33,7 @@ export default class GroupManageLogsRow extends Component {</td><td>- <span>{{avatar this.log.acting_user imageSize="tiny"}}</span>+ <span>{{dAvatar this.log.acting_user imageSize="tiny"}}</span><DButton@action={{fnthis.filter@@ -46,7 +46,7 @@ export default class GroupManageLogsRow extends Component {<td>{{#if this.log.target_user}}- <span>{{avatar this.log.target_user imageSize="tiny"}}</span>+ <span>{{dAvatar this.log.target_user imageSize="tiny"}}</span><DButton@action={{fnthis.filter@@ -71,7 +71,7 @@ export default class GroupManageLogsRow extends Component {{{/if}}</td>- <td>{{ageWithTooltip this.log.created_at format="medium"}}</td>+ <td>{{dAgeWithTooltip this.log.created_at format="medium"}}</td><td class="group-manage-logs-expand-details">{{#if this.log.prev_value}}diff --git a/frontend/discourse/app/components/group-manage-save-button.gjs b/frontend/discourse/app/components/group-manage-save-button.gjsindex d116edd323e..2232f035211 100644--- a/frontend/discourse/app/components/group-manage-save-button.gjs+++ b/frontend/discourse/app/components/group-manage-save-button.gjs@@ -3,13 +3,13 @@ import Component from "@ember/component";import { action, computed } from "@ember/object";import { service } from "@ember/service";import { tagName } from "@ember-decorators/component";-import DButton from "discourse/components/d-button";import GroupFlairVisibilityWarning from "discourse/components/group-flair-visibility-warning";import GroupDefaultNotificationsModal from "discourse/components/modal/group-default-notifications";import { popupAjaxError } from "discourse/lib/ajax-error";import { GROUP_VISIBILITY_LEVELS } from "discourse/lib/constants";import { defaultHomepage } from "discourse/lib/utilities";import { or } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";@tagName("")diff --git a/frontend/discourse/app/components/group-member.gjs b/frontend/discourse/app/components/group-member.gjsindex ea4958cd543..bf1659ee7cb 100644--- a/frontend/discourse/app/components/group-member.gjs+++ b/frontend/discourse/app/components/group-member.gjs@@ -3,8 +3,8 @@ import Component from "@ember/component";import { on } from "@ember/modifier";import { action } from "@ember/object";import { tagName } from "@ember-decorators/component";-import avatar from "discourse/helpers/avatar";-import icon from "discourse/helpers/d-icon";+import dAvatar from "discourse/ui-kit/helpers/d-avatar";+import dIcon from "discourse/ui-kit/helpers/d-icon";@tagName("")export default class GroupMember extends Component {@@ -17,12 +17,12 @@ export default class GroupMember extends Component {<template><div class="item" ...attributes><a href={{this.member.adminPath}}>- {{avatar this.member imageSize="small"}}+ {{dAvatar this.member imageSize="small"}}</a><span>{{this.member.username}}</span>{{#unless this.automatic}}<a href {{on "click" this.remove}} class="remove">- {{icon "xmark"}}+ {{dIcon "xmark"}}</a>{{/unless}}</div>diff --git a/frontend/discourse/app/components/group-membership-button.gjs b/frontend/discourse/app/components/group-membership-button.gjsindex a5c0c91a652..12b29245bd1 100644--- a/frontend/discourse/app/components/group-membership-button.gjs+++ b/frontend/discourse/app/components/group-membership-button.gjs@@ -3,8 +3,8 @@ import Component from "@ember/component";import { action, computed } from "@ember/object";import { service } from "@ember/service";import { tagName } from "@ember-decorators/component";-import DButton from "discourse/components/d-button";import { popupAjaxError } from "discourse/lib/ajax-error";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";import RequestGroupMembershipForm from "./modal/request-group-membership-form";diff --git a/frontend/discourse/app/components/group-navigation.gjs b/frontend/discourse/app/components/group-navigation.gjsindex 3006b160fd1..7ae9b1767e2 100644--- a/frontend/discourse/app/components/group-navigation.gjs+++ b/frontend/discourse/app/components/group-navigation.gjs@@ -1,11 +1,11 @@import Component from "@glimmer/component";import { LinkTo } from "@ember/routing";import { service } from "@ember/service";-import HorizontalOverflowNav from "discourse/components/horizontal-overflow-nav";import PluginOutlet from "discourse/components/plugin-outlet";-import icon from "discourse/helpers/d-icon";import lazyHash from "discourse/helpers/lazy-hash";import GroupDropdown from "discourse/select-kit/components/group-dropdown";+import DHorizontalOverflowNav from "discourse/ui-kit/d-horizontal-overflow-nav";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class GroupNavigation extends Component {@@ -18,7 +18,7 @@ export default class GroupNavigation extends Component {@value={{@group.name}}/>{{/if}}- <HorizontalOverflowNav class="group-nav">+ <DHorizontalOverflowNav class="group-nav">{{#if this.site.mobileView}}<li><LinkTo @route="groups.index">@@ -35,7 +35,7 @@ export default class GroupNavigation extends Component {class={{tab.name}}>{{#if tab.icon}}- {{icon tab.icon}}+ {{dIcon tab.icon}}{{/if}}{{tab.message}}{{#if tab.count}}@@ -51,6 +51,6 @@ export default class GroupNavigation extends Component {@outletArgs={{lazyHash group=@group}}@connectorTagName="li"/>- </HorizontalOverflowNav>+ </DHorizontalOverflowNav></template>}diff --git a/frontend/discourse/app/components/group-selector.gjs b/frontend/discourse/app/components/group-selector.gjsindex cc6b2776a23..9ba3d680088 100644--- a/frontend/discourse/app/components/group-selector.gjs+++ b/frontend/discourse/app/components/group-selector.gjs@@ -3,7 +3,7 @@ import { tracked } from "@glimmer/tracking";import { array } from "@ember/helper";import { action } from "@ember/object";import { isEmpty } from "@ember/utils";-import DMultiSelect from "discourse/components/d-multi-select";+import DMultiSelect from "discourse/ui-kit/d-multi-select";import { i18n } from "discourse-i18n";export default class GroupSelector extends Component {diff --git a/frontend/discourse/app/components/group-smtp-email-settings.gjs b/frontend/discourse/app/components/group-smtp-email-settings.gjsindex eda5a129dee..536b645e3b3 100644--- a/frontend/discourse/app/components/group-smtp-email-settings.gjs+++ b/frontend/discourse/app/components/group-smtp-email-settings.gjs@@ -6,12 +6,12 @@ import { action, getProperties } from "@ember/object";import { LinkTo } from "@ember/routing";import { service } from "@ember/service";import Form from "discourse/components/form";-import formatDate from "discourse/helpers/format-date";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import { GROUP_SMTP_SSL_MODES } from "discourse/lib/constants";import emailProviderDefaultSettings from "discourse/lib/email-provider-default-settings";import { or } from "discourse/truth-helpers";+import dFormatDate from "discourse/ui-kit/helpers/d-format-date";import { i18n } from "discourse-i18n";export default class GroupSmtpEmailSettings extends Component {@@ -237,7 +237,7 @@ export default class GroupSmtpEmailSettings extends Component {<div class=".group-smtp-form__last-updated-details"><small>{{i18n "groups.manage.email.last_updated"}}- <strong>{{formatDate+ <strong>{{dFormatDate@group.smtp_updated_atleaveAgo="true"}}</strong>diff --git a/frontend/discourse/app/components/groups-form-interaction-fields.gjs b/frontend/discourse/app/components/groups-form-interaction-fields.gjsindex f43ab08f63d..76b284aa6f6 100644--- a/frontend/discourse/app/components/groups-form-interaction-fields.gjs+++ b/frontend/discourse/app/components/groups-form-interaction-fields.gjs@@ -4,12 +4,12 @@ import { fn, hash } from "@ember/helper";import { computed } from "@ember/object";import { tagName } from "@ember-decorators/component";import PluginOutlet from "discourse/components/plugin-outlet";-import TextField from "discourse/components/text-field";import DTooltip from "discourse/float-kit/components/d-tooltip";import lazyHash from "discourse/helpers/lazy-hash";import { NotificationLevels } from "discourse/lib/notification-levels";import ComboBox from "discourse/select-kit/components/combo-box";import NotificationsButton from "discourse/select-kit/components/notifications-button";+import DTextField from "discourse/ui-kit/d-text-field";import { i18n } from "discourse-i18n";@tagName("")@@ -224,7 +224,7 @@ export default class GroupsFormInteractionFields extends Component {{{i18n "admin.groups.manage.interaction.incoming_email"}}</label>- <TextField+ <DTextField@name="incoming_email"@value={{this.model.incoming_email}}@placeholderKey="admin.groups.manage.interaction.incoming_email_placeholder"diff --git a/frontend/discourse/app/components/groups-form-membership-fields.gjs b/frontend/discourse/app/components/groups-form-membership-fields.gjsindex 9c7b1ddf2c2..269f8a363a8 100644--- a/frontend/discourse/app/components/groups-form-membership-fields.gjs+++ b/frontend/discourse/app/components/groups-form-membership-fields.gjs@@ -4,7 +4,6 @@ import { fn, hash } from "@ember/helper";import { on } from "@ember/modifier";import { action, computed } from "@ember/object";import { tagName } from "@ember-decorators/component";-import ExpandingTextArea from "discourse/components/expanding-text-area";import GroupFlairInputs from "discourse/components/group-flair-inputs";import PluginOutlet from "discourse/components/plugin-outlet";import lazyHash from "discourse/helpers/lazy-hash";@@ -12,6 +11,7 @@ import withEventValue from "discourse/helpers/with-event-value";import AssociatedGroup from "discourse/models/associated-group";import ComboBox from "discourse/select-kit/components/combo-box";import ListSetting from "discourse/select-kit/components/list-setting";+import DExpandingTextArea from "discourse/ui-kit/d-expanding-text-area";import { i18n } from "discourse-i18n";@tagName("")@@ -151,7 +151,7 @@ export default class GroupsFormMembershipFields extends Component {{{i18n "groups.membership_request_template"}}</label>- <ExpandingTextArea+ <DExpandingTextArea{{on"input"(withEventValuediff --git a/frontend/discourse/app/components/groups-form-profile-fields.gjs b/frontend/discourse/app/components/groups-form-profile-fields.gjsindex c357ee36170..fd273e4166f 100644--- a/frontend/discourse/app/components/groups-form-profile-fields.gjs+++ b/frontend/discourse/app/components/groups-form-profile-fields.gjs@@ -4,15 +4,15 @@ import EmberObject, { computed } from "@ember/object";import { isEmpty } from "@ember/utils";import { tagName } from "@ember-decorators/component";import { observes } from "@ember-decorators/object";-import DEditor from "discourse/components/d-editor";import GroupFlairInputs from "discourse/components/group-flair-inputs";-import InputTip from "discourse/components/input-tip";import PluginOutlet from "discourse/components/plugin-outlet";-import TextField from "discourse/components/text-field";import lazyHash from "discourse/helpers/lazy-hash";import { popupAjaxError } from "discourse/lib/ajax-error";import discourseDebounce from "discourse/lib/debounce";import Group from "discourse/models/group";+import DEditor from "discourse/ui-kit/d-editor";+import DInputTip from "discourse/ui-kit/d-input-tip";+import DTextField from "discourse/ui-kit/d-text-field";import { i18n } from "discourse-i18n";@tagName("")@@ -133,14 +133,14 @@ export default class GroupsFormProfileFields extends Component {"groups.name"}}</label>- <TextField+ <DTextField@name="name"@value={{this.nameInput}}@placeholderKey="admin.groups.name_placeholder"class="input-xxlarge group-form-name"/>- <InputTip @validation={{this.nameValidation}} />+ <DInputTip @validation={{this.nameValidation}} /></div>{{/if}}@@ -149,7 +149,7 @@ export default class GroupsFormProfileFields extends Component {"groups.manage.full_name"}}</label>- <TextField+ <DTextField@name="full_name"@value={{this.model.full_name}}class="input-xxlarge group-form-full-name"diff --git a/frontend/discourse/app/components/hashtag-autocomplete-results.gjs b/frontend/discourse/app/components/hashtag-autocomplete-results.gjsindex a83d28343c2..1edeb6f6f02 100644--- a/frontend/discourse/app/components/hashtag-autocomplete-results.gjs+++ b/frontend/discourse/app/components/hashtag-autocomplete-results.gjs@@ -7,10 +7,10 @@ import { on } from "@ember/modifier";import { action } from "@ember/object";import didInsert from "@ember/render-modifiers/modifiers/did-insert";import didUpdate from "@ember/render-modifiers/modifiers/did-update";-import categoryLink from "discourse/helpers/category-link";-import icon from "discourse/helpers/d-icon";-import scrollIntoView from "discourse/modifiers/scroll-into-view";import { eq } from "discourse/truth-helpers";+import dCategoryLink from "discourse/ui-kit/helpers/d-category-link";+import dIcon from "discourse/ui-kit/helpers/d-icon";+import dScrollIntoView from "discourse/ui-kit/modifiers/d-scroll-into-view";/*** @typedef {import("discourse/lib/types/d-autocomplete").HashtagAutocompleteResult} HashtagAutocompleteResult@@ -56,7 +56,7 @@ export default class HashtagAutocompleteResults extends Component {@actiongetResultLabel(result) {if (result.model) {- return categoryLink(result.model, {+ return dCategoryLink(result.model, {allowUncategorized: true,link: false,});@@ -73,14 +73,14 @@ export default class HashtagAutocompleteResults extends Component {><ul>{{#each @results as |result index|}}- <li {{scrollIntoView (this.shouldScroll index)}}>+ <li {{dScrollIntoView (this.shouldScroll index)}}><ahrefclass={{if (eq index @selectedIndex) "selected"}}{{on "click" (fn this.handleResultClick result index)}}>{{#unless result.model}}- {{icon "tag"}}+ {{dIcon "tag"}}{{/unless}}<span class="text-content">{{this.getResultLabel result}}</span></a>diff --git a/frontend/discourse/app/components/header.gjs b/frontend/discourse/app/components/header.gjsindex 6cb5072c73a..eb2534354e9 100644--- a/frontend/discourse/app/components/header.gjs+++ b/frontend/discourse/app/components/header.gjs@@ -9,8 +9,8 @@ import DAG from "discourse/lib/dag";import scrollLock from "discourse/lib/scroll-lock";import { scrollTop } from "discourse/lib/scroll-top";import DiscourseURL from "discourse/lib/url";-import closeOnClickOutside from "discourse/modifiers/close-on-click-outside";import { and, eq, not, or } from "discourse/truth-helpers";+import dCloseOnClickOutside from "discourse/ui-kit/modifiers/d-close-on-click-outside";import AuthButtons from "./header/auth-buttons";import Contents from "./header/contents";import HamburgerDropdownWrapper from "./header/hamburger-dropdown-wrapper";@@ -270,7 +270,7 @@ export default class GlimmerHeader extends Component {{{#if this.search.visible}}<SearchMenuWrapper{{this.handleFocus}}- {{closeOnClickOutside+ {{dCloseOnClickOutsidethis.toggleSearchMenu(hashtargetSelector=".search-menu-panel"diff --git a/frontend/discourse/app/components/header/auth-buttons.gjs b/frontend/discourse/app/components/header/auth-buttons.gjsindex a3d0ed15386..7a9bd64686c 100644--- a/frontend/discourse/app/components/header/auth-buttons.gjs+++ b/frontend/discourse/app/components/header/auth-buttons.gjs@@ -1,6 +1,6 @@import Component from "@glimmer/component";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";export default class AuthButtons extends Component {@service header;diff --git a/frontend/discourse/app/components/header/dropdown.gjs b/frontend/discourse/app/components/header/dropdown.gjsindex 02c14830afa..50e356ba042 100644--- a/frontend/discourse/app/components/header/dropdown.gjs+++ b/frontend/discourse/app/components/header/dropdown.gjs@@ -1,9 +1,9 @@import Component from "@glimmer/component";import { on } from "@ember/modifier";import { action } from "@ember/object";-import DButton from "discourse/components/d-button";-import concatClass from "discourse/helpers/concat-class";import { wantsNewWindow } from "discourse/lib/intercept-click";+import DButton from "discourse/ui-kit/d-button";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";export default class Dropdown extends Component {@@ -28,7 +28,7 @@ export default class Dropdown extends Component {<template><li- class={{concatClass (if @active "active") "header-dropdown-toggle"}}+ class={{dConcatClass (if @active "active") "header-dropdown-toggle"}}...attributes><DButtondiff --git a/frontend/discourse/app/components/header/hamburger-dropdown-wrapper.gjs b/frontend/discourse/app/components/header/hamburger-dropdown-wrapper.gjsindex 591cbfc8cc5..925f4ee256a 100644--- a/frontend/discourse/app/components/header/hamburger-dropdown-wrapper.gjs+++ b/frontend/discourse/app/components/header/hamburger-dropdown-wrapper.gjs@@ -9,7 +9,7 @@ import discourseLater from "discourse/lib/later";import { isDocumentRTL } from "discourse/lib/text-direction";import { applyValueTransformer } from "discourse/lib/transformer";import { prefersReducedMotion } from "discourse/lib/utilities";-import closeOnClickOutside from "../../modifiers/close-on-click-outside";+import dCloseOnClickOutside from "discourse/ui-kit/modifiers/d-close-on-click-outside";import SidebarHamburgerDropdown from "../sidebar/hamburger-dropdown";const CLOSE_ON_CLICK_SELECTORS =@@ -96,7 +96,7 @@ export default class HamburgerDropdownWrapper extends Component {{{on "click" this.click}}{{! we don't want to close the hamburger dropdown when clicking on the hamburger dropdown itselfso we use the secondaryTargetSelector to prevent that }}- {{closeOnClickOutside+ {{dCloseOnClickOutsidethis.clickOutside(hashtargetSelector=".hamburger-panel"diff --git a/frontend/discourse/app/components/header/header-search.gjs b/frontend/discourse/app/components/header/header-search.gjsindex f0a7759a7d5..151d88def67 100644--- a/frontend/discourse/app/components/header/header-search.gjs+++ b/frontend/discourse/app/components/header/header-search.gjs@@ -1,10 +1,10 @@import Component from "@glimmer/component";import { service } from "@ember/service";import { modifier } from "ember-modifier";-import DButton from "discourse/components/d-button";import SearchMenu from "discourse/components/search-menu";import bodyClass from "discourse/helpers/body-class";-import concatClass from "discourse/helpers/concat-class";+import DButton from "discourse/ui-kit/d-button";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";export default class HeaderSearch extends Component {@service siteSettings;@@ -47,7 +47,7 @@ export default class HeaderSearch extends Component {@icon="magnifying-glass"@translatedLabel={{@buttonText}}@title="search.open_advanced"- class={{concatClass "btn search-icon" @buttonClass}}+ class={{dConcatClass "btn search-icon" @buttonClass}}@href={{this.advancedSearchButtonHref}}/>diff --git a/frontend/discourse/app/components/header/home-logo-contents.gjs b/frontend/discourse/app/components/header/home-logo-contents.gjsindex 6894d6d78f1..696729e98d3 100644--- a/frontend/discourse/app/components/header/home-logo-contents.gjs+++ b/frontend/discourse/app/components/header/home-logo-contents.gjs@@ -1,4 +1,4 @@-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";import Logo from "./logo";const HomeLogoContents = <template>@@ -11,7 +11,7 @@ const HomeLogoContents = <template>@darkUrl={{@logoSmallUrlDark}}/>{{else}}- {{icon "house"}}+ {{dIcon "house"}}{{/if}}{{else if @showMobileLogo}}<Logodiff --git a/frontend/discourse/app/components/header/home-logo.gjs b/frontend/discourse/app/components/header/home-logo.gjsindex 2cdc4912cc0..6e50a169eed 100644--- a/frontend/discourse/app/components/header/home-logo.gjs+++ b/frontend/discourse/app/components/header/home-logo.gjs@@ -3,12 +3,12 @@ import { on } from "@ember/modifier";import { action } from "@ember/object";import { service } from "@ember/service";import PluginOutlet from "discourse/components/plugin-outlet";-import concatClass from "discourse/helpers/concat-class";import lazyHash from "discourse/helpers/lazy-hash";import getURL from "discourse/lib/get-url";import { wantsNewWindow } from "discourse/lib/intercept-click";import { applyValueTransformer } from "discourse/lib/transformer";import DiscourseURL from "discourse/lib/url";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import HomeLogoContents from "./home-logo-contents";export default class HomeLogo extends Component {@@ -93,7 +93,7 @@ export default class HomeLogo extends Component {@name="home-logo"@outletArgs={{lazyHash minimized=@minimized}}>- <div class={{concatClass (if @minimized "title--minimized") "title"}}>+ <div class={{dConcatClass (if @minimized "title--minimized") "title"}}><a href={{this.href}} {{on "click" this.click}}><PluginOutlet@name="home-logo-contents"diff --git a/frontend/discourse/app/components/header/search-menu-wrapper.gjs b/frontend/discourse/app/components/header/search-menu-wrapper.gjsindex edfe5b31323..dc1a44283b4 100644--- a/frontend/discourse/app/components/header/search-menu-wrapper.gjs+++ b/frontend/discourse/app/components/header/search-menu-wrapper.gjs@@ -2,7 +2,7 @@ import Component from "@glimmer/component";import { service } from "@ember/service";import MenuPanel from "discourse/components/menu-panel";import SearchMenu from "discourse/components/search-menu";-import concatClass from "discourse/helpers/concat-class";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";export default class SearchMenuWrapper extends Component {@service site;@@ -19,7 +19,7 @@ export default class SearchMenuWrapper extends Component {aria-live="polite"...attributes>- <MenuPanel class={{concatClass this.animationClass "search-menu-panel"}}>+ <MenuPanel class={{dConcatClass this.animationClass "search-menu-panel"}}><SearchMenu@onClose={{@closeSearchMenu}}@inlineResults={{true}}diff --git a/frontend/discourse/app/components/header/sidebar-toggle.gjs b/frontend/discourse/app/components/header/sidebar-toggle.gjsindex 2ad4a667113..4e5302fbc3d 100644--- a/frontend/discourse/app/components/header/sidebar-toggle.gjs+++ b/frontend/discourse/app/components/header/sidebar-toggle.gjs@@ -2,8 +2,8 @@ import Component from "@glimmer/component";import { on } from "@ember/modifier";import { action } from "@ember/object";import { service } from "@ember/service";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class SidebarToggle extends Component {@@ -28,7 +28,7 @@ export default class SidebarToggle extends Component {<span class="header-sidebar-toggle"><buttontitle={{i18n "sidebar.title"}}- class={{concatClass+ class={{dConcatClass"btn btn-flat btn-sidebar-toggle no-text btn-icon"(if this.site.narrowDesktopView "narrow-desktop")}}@@ -36,7 +36,7 @@ export default class SidebarToggle extends Component {aria-controls="d-sidebar"{{on "click" this.toggleWithBlur}}>- {{icon @icon}}+ {{dIcon @icon}}</button></span></template>diff --git a/frontend/discourse/app/components/header/topic/featured-link.gjs b/frontend/discourse/app/components/header/topic/featured-link.gjsindex 9bef47be77c..d0e87c3c42b 100644--- a/frontend/discourse/app/components/header/topic/featured-link.gjs+++ b/frontend/discourse/app/components/header/topic/featured-link.gjs@@ -1,6 +1,6 @@import Component from "@glimmer/component";-import icon from "discourse/helpers/d-icon";import { extractLinkMeta } from "discourse/lib/render-topic-featured-link";+import dIcon from "discourse/ui-kit/helpers/d-icon";export default class FeaturedLink extends Component {get meta() {@@ -15,7 +15,7 @@ export default class FeaturedLink extends Component {target={{this.meta.target}}href={{this.meta.href}}>- {{icon "up-right-from-square"}}+ {{dIcon "up-right-from-square"}}{{this.meta.domain}}</a>{{/if}}diff --git a/frontend/discourse/app/components/header/topic/info.gjs b/frontend/discourse/app/components/header/topic/info.gjsindex e3024630871..fce66a8284c 100644--- a/frontend/discourse/app/components/header/topic/info.gjs+++ b/frontend/discourse/app/components/header/topic/info.gjs@@ -5,14 +5,14 @@ import { action } from "@ember/object";import { service } from "@ember/service";import { trustHTML } from "@ember/template";import TopicStatus from "discourse/components/topic-status";-import categoryLink from "discourse/helpers/category-link";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import lazyHash from "discourse/helpers/lazy-hash";import { wantsNewWindow } from "discourse/lib/intercept-click";import renderTags from "discourse/lib/render-tags";import DiscourseURL from "discourse/lib/url";import { and, gt, not, or } from "discourse/truth-helpers";+import dCategoryLink from "discourse/ui-kit/helpers/d-category-link";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";import PluginOutlet from "../../plugin-outlet";import FeaturedLink from "./featured-link";@@ -86,13 +86,13 @@ export default class Info extends Component {<template><div- class={{concatClass (if this.twoRows "two-rows") "extra-info-wrapper"}}+ class={{dConcatClass (if this.twoRows "two-rows") "extra-info-wrapper"}}><PluginOutlet@name="header-topic-info__before"@outletArgs={{lazyHash topic=@topicInfo}}/>- <div class={{concatClass (if this.twoRows "two-rows") "extra-info"}}>+ <div class={{dConcatClass (if this.twoRows "two-rows") "extra-info"}}><div class="title-wrapper"><h1 class="header-title">{{#if this.showPM}}@@ -101,7 +101,7 @@ export default class Info extends Component {href={{this.pmHref}}aria-label={{i18n "user.messages.inbox"}}>- {{icon "envelope" class="private-message-glyph"}}+ {{dIcon "envelope" class="private-message-glyph"}}</a>{{/if}}@@ -152,18 +152,18 @@ export default class Info extends Component {this.site.desktopView)}}- {{categoryLink+ {{dCategoryLink@topicInfo.category.parentCategory.parentCategory(hash hideParent="true")}}{{/if}}- {{categoryLink+ {{dCategoryLink@topicInfo.category.parentCategory(hash hideParent="true")}}{{/if}}- {{categoryLink @topicInfo.category (hash hideParent="true")}}+ {{dCategoryLink @topicInfo.category (hash hideParent="true")}}</PluginOutlet></div>{{/if}}diff --git a/frontend/discourse/app/components/header/topic/participant.gjs b/frontend/discourse/app/components/header/topic/participant.gjsindex 4a5d508f0db..8c23e748557 100644--- a/frontend/discourse/app/components/header/topic/participant.gjs+++ b/frontend/discourse/app/components/header/topic/participant.gjs@@ -3,10 +3,10 @@ import { concat, hash } from "@ember/helper";import { on } from "@ember/modifier";import { action } from "@ember/object";import { service } from "@ember/service";-import avatar from "discourse/helpers/bound-avatar-template";-import icon from "discourse/helpers/d-icon";import getURL from "discourse/lib/get-url";import { eq, or } from "discourse/truth-helpers";+import dBoundAvatarTemplate from "discourse/ui-kit/helpers/d-bound-avatar-template";+import dIcon from "discourse/ui-kit/helpers/d-icon";export default class Participant extends Component {@service appEvents;@@ -38,14 +38,14 @@ export default class Participant extends Component {title={{@username}}>{{#if (eq @type "user")}}- {{avatar+ {{dBoundAvatarTemplate@user.avatar_template(or @avatarSize "tiny")(hash title=@username)}}{{else}}<span>- {{icon "users"}}+ {{dIcon "users"}}{{@username}}</span>{{/if}}diff --git a/frontend/discourse/app/components/header/user-dropdown.gjs b/frontend/discourse/app/components/header/user-dropdown.gjsindex 0f9600cb823..5335aade2c3 100644--- a/frontend/discourse/app/components/header/user-dropdown.gjs+++ b/frontend/discourse/app/components/header/user-dropdown.gjs@@ -1,10 +1,10 @@import Component from "@glimmer/component";import { on } from "@ember/modifier";import { action } from "@ember/object";-import DButton from "discourse/components/d-button";import PluginOutlet from "discourse/components/plugin-outlet";-import concatClass from "discourse/helpers/concat-class";import { wantsNewWindow } from "discourse/lib/intercept-click";+import DButton from "discourse/ui-kit/d-button";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";import Notifications from "./user-dropdown/notifications";@@ -26,7 +26,7 @@ export default class UserDropdown extends Component {<template><liid="current-user"- class={{concatClass+ class={{dConcatClass(if @active "active")"header-dropdown-toggle current-user user-menu-panel"}}diff --git a/frontend/discourse/app/components/header/user-dropdown/notifications.gjs b/frontend/discourse/app/components/header/user-dropdown/notifications.gjsindex ff96852ffad..c1f3ae74b11 100644--- a/frontend/discourse/app/components/header/user-dropdown/notifications.gjs+++ b/frontend/discourse/app/components/header/user-dropdown/notifications.gjs@@ -3,12 +3,12 @@ import { hash } from "@ember/helper";import { service } from "@ember/service";import { trustHTML } from "@ember/template";import PluginOutlet from "discourse/components/plugin-outlet";-import icon from "discourse/helpers/d-icon";+import { applyValueTransformer } from "discourse/lib/transformer";+import dIcon from "discourse/ui-kit/helpers/d-icon";import {addExtraUserClasses,renderAvatar,-} from "discourse/helpers/user-avatar";-import { applyValueTransformer } from "discourse/lib/transformer";+} from "discourse/ui-kit/helpers/d-user-avatar";import { i18n } from "discourse-i18n";import UserTip from "../../user-tip";import UserStatusBubble from "./user-status-bubble";@@ -80,7 +80,7 @@ export default class Notifications extends Component {<divclass="do-not-disturb-background"title={{i18n "notifications.paused"}}- >{{icon "discourse-dnd"}}</div>+ >{{dIcon "discourse-dnd"}}</div>{{else}}{{#if this.currentUser.new_personal_messages_notifications_count}}<a@@ -99,7 +99,7 @@ export default class Notifications extends Component {)}}>- {{icon "envelope"}}+ {{dIcon "envelope"}}</a>{{else if this.currentUser.unseen_reviewable_count}}<a@@ -114,7 +114,7 @@ export default class Notifications extends Component {(hash count=this.currentUser.unseen_reviewable_count)}}>- {{icon "flag"}}+ {{dIcon "flag"}}</a>{{else if this.currentUser.all_unread_notifications_count}}<adiff --git a/frontend/discourse/app/components/header/user-dropdown/user-status-bubble.gjs b/frontend/discourse/app/components/header/user-dropdown/user-status-bubble.gjsindex 24c5ebe985a..48c7079c440 100644--- a/frontend/discourse/app/components/header/user-dropdown/user-status-bubble.gjs+++ b/frontend/discourse/app/components/header/user-dropdown/user-status-bubble.gjs@@ -1,6 +1,6 @@import { concat } from "@ember/helper";-import emoji from "discourse/helpers/emoji";import escape from "discourse/lib/escape";+import dEmoji from "discourse/ui-kit/helpers/d-emoji";import { i18n } from "discourse-i18n";const title = (description, endsAt, timezone) => {@@ -19,7 +19,7 @@ const title = (description, endsAt, timezone) => {const UserStatusBubble = <template><div class="user-status-background">- {{emoji+ {{dEmoji@status.emojititle=(title @status.description @status.ends_at @timezone)alt=(concat ":" @status.emoji ":")diff --git a/frontend/discourse/app/components/header/user-menu-wrapper.gjs b/frontend/discourse/app/components/header/user-menu-wrapper.gjsindex d85c39a81fd..62e30216d40 100644--- a/frontend/discourse/app/components/header/user-menu-wrapper.gjs+++ b/frontend/discourse/app/components/header/user-menu-wrapper.gjs@@ -5,7 +5,7 @@ import { isTesting } from "discourse/lib/environment";import discourseLater from "discourse/lib/later";import { isDocumentRTL } from "discourse/lib/text-direction";import { prefersReducedMotion } from "discourse/lib/utilities";-import closeOnClickOutside from "../../modifiers/close-on-click-outside";+import dCloseOnClickOutside from "discourse/ui-kit/modifiers/d-close-on-click-outside";import UserMenu from "../user-menu/menu";export default class UserMenuWrapper extends Component {@@ -44,7 +44,7 @@ export default class UserMenuWrapper extends Component {<template><divclass="user-menu-dropdown-wrapper"- {{closeOnClickOutside+ {{dCloseOnClickOutsidethis.clickOutside(hashtargetSelector=".user-menu-panel"diff --git a/frontend/discourse/app/components/honeypot-input.js b/frontend/discourse/app/components/honeypot-input.jsindex 8a6ef38a47c..8ee647c47f8 100644--- a/frontend/discourse/app/components/honeypot-input.js+++ b/frontend/discourse/app/components/honeypot-input.js@@ -1,7 +1,7 @@import { on } from "@ember-decorators/object";-import TextField from "discourse/components/text-field";+import DTextField from "discourse/ui-kit/d-text-field";-export default class HoneypotInput extends TextField {+export default class HoneypotInput extends DTextField {@on("init")_init() {// Chrome autocomplete is buggy per:diff --git a/frontend/discourse/app/components/horizontal-scroll-sync-wrapper.gjs b/frontend/discourse/app/components/horizontal-scroll-sync-wrapper.gjsindex 24621a84a65..e4b9d267acc 100644--- a/frontend/discourse/app/components/horizontal-scroll-sync-wrapper.gjs+++ b/frontend/discourse/app/components/horizontal-scroll-sync-wrapper.gjs@@ -2,7 +2,7 @@ import Component from "@glimmer/component";import { on } from "@ember/modifier";import { modifier } from "ember-modifier";import { bind } from "discourse/lib/decorators";-import onResize from "discourse/modifiers/on-resize";+import dOnResize from "discourse/ui-kit/modifiers/d-on-resize";export default class HorizontalScrollSyncWrapper extends Component {scrollableElement;@@ -127,7 +127,7 @@ export default class HorizontalScrollSyncWrapper extends Component {</div><div- {{onResize this.syncScrollWidth}}+ {{dOnResize this.syncScrollWidth}}class="horizontal-scroll-sync__content">{{yield}}diff --git a/frontend/discourse/app/components/ignored-user-list-item.gjs b/frontend/discourse/app/components/ignored-user-list-item.gjsindex c3732e2be08..1d91bd493de 100644--- a/frontend/discourse/app/components/ignored-user-list-item.gjs+++ b/frontend/discourse/app/components/ignored-user-list-item.gjs@@ -3,7 +3,7 @@ import Component from "@ember/component";import { fn } from "@ember/helper";import { action } from "@ember/object";import { tagName } from "@ember-decorators/component";-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";@tagName("")export default class IgnoredUserListItem extends Component {diff --git a/frontend/discourse/app/components/ignored-user-list.gjs b/frontend/discourse/app/components/ignored-user-list.gjsindex f38a9ba456e..de1dad86d4e 100644--- a/frontend/discourse/app/components/ignored-user-list.gjs+++ b/frontend/discourse/app/components/ignored-user-list.gjs@@ -1,13 +1,13 @@import Component from "@glimmer/component";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import { popupAjaxError } from "discourse/lib/ajax-error";import {addUniqueValueToArray,removeValueFromArray,} from "discourse/lib/array-tools";import User from "discourse/models/user";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";import IgnoredUserListItem from "./ignored-user-list-item";import IgnoreDurationModal from "./modal/ignore-duration-with-username";diff --git a/frontend/discourse/app/components/image-carousel.gjs b/frontend/discourse/app/components/image-carousel.gjsindex c4eab4c88e7..c087e21cc35 100644--- a/frontend/discourse/app/components/image-carousel.gjs+++ b/frontend/discourse/app/components/image-carousel.gjs@@ -7,10 +7,10 @@ import { action } from "@ember/object";import { throttle } from "@ember/runloop";import { trustHTML } from "@ember/template";import { modifier } from "ember-modifier";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import { isTesting } from "discourse/lib/environment";import { eq } from "discourse/truth-helpers";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";const plusOne = helper(([val]) => val + 1);@@ -165,7 +165,7 @@ export default class ImageCarousel extends Component {<template><div- class={{concatClass+ class={{dConcatClass"d-image-carousel"(if @data.mode (concat "d-image-carousel--" @data.mode))(if this.isSingle "d-image-carousel--single")@@ -179,7 +179,7 @@ export default class ImageCarousel extends Component {>{{#each this.items as |item index|}}<div- class={{concatClass+ class={{dConcatClass"d-image-carousel__slide"(if (eq this.currentIndex index) "is-active")}}@@ -201,7 +201,7 @@ export default class ImageCarousel extends Component {aria-label={{i18n "carousel.previous"}}{{on "click" (fn this.scrollToIndex this.prevIndex)}}>- {{icon "chevron-left"}}+ {{dIcon "chevron-left"}}</button>{{#if this.showDots}}@@ -209,7 +209,7 @@ export default class ImageCarousel extends Component {{{#each this.items as |_item index|}}<buttontype="button"- class={{concatClass+ class={{dConcatClass"d-image-carousel__dot"(if (eq this.currentIndex index) "active")}}@@ -233,7 +233,7 @@ export default class ImageCarousel extends Component {aria-label={{i18n "carousel.next"}}{{on "click" (fn this.scrollToIndex this.nextIndex)}}>- {{icon "chevron-right"}}+ {{dIcon "chevron-right"}}</button></div>{{/unless}}diff --git a/frontend/discourse/app/components/impersonation-notice.gjs b/frontend/discourse/app/components/impersonation-notice.gjsindex b910cd8a4c0..8555b301e6e 100644--- a/frontend/discourse/app/components/impersonation-notice.gjs+++ b/frontend/discourse/app/components/impersonation-notice.gjs@@ -2,10 +2,10 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import DiscourseURL from "discourse/lib/url";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";export default class ImpersonationNotice extends Component {diff --git a/frontend/discourse/app/components/interface-color-selector.gjs b/frontend/discourse/app/components/interface-color-selector.gjsindex 5962b672ab0..91914139603 100644--- a/frontend/discourse/app/components/interface-color-selector.gjs+++ b/frontend/discourse/app/components/interface-color-selector.gjs@@ -2,9 +2,9 @@ import Component from "@glimmer/component";import { fn } from "@ember/helper";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import DropdownMenu from "discourse/components/dropdown-menu";import DMenu from "discourse/float-kit/components/d-menu";+import DButton from "discourse/ui-kit/d-button";+import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";import { i18n } from "discourse-i18n";export default class InterfaceColorSelector extends Component {@@ -53,7 +53,7 @@ export default class InterfaceColorSelector extends Component {data-current-mode={{this.interfaceColor.colorMode}}><:content as |dMenu|>- <DropdownMenu as |dropdown|>+ <DDropdownMenu as |dropdown|><dropdown.item><DButtonclass="interface-color-selector__light-option"@@ -84,7 +84,7 @@ export default class InterfaceColorSelector extends Component {@action={{fn this.switchToAuto dMenu}}/></dropdown.item>- </DropdownMenu>+ </DDropdownMenu></:content></DMenu></template>diff --git a/frontend/discourse/app/components/invite-panel.gjs b/frontend/discourse/app/components/invite-panel.gjsindex 1ea5ce538de..09b8237baf0 100644--- a/frontend/discourse/app/components/invite-panel.gjs+++ b/frontend/discourse/app/components/invite-panel.gjs@@ -6,14 +6,14 @@ import { service } from "@ember/service";import { trustHTML } from "@ember/template";import { isEmpty } from "@ember/utils";import { tagName } from "@ember-decorators/component";-import DButton from "discourse/components/d-button";import DiscourseLinkedText from "discourse/components/discourse-linked-text";import GeneratedInviteLink from "discourse/components/generated-invite-link";-import TextField from "discourse/components/text-field";import { getNativeContact } from "discourse/lib/pwa-utils";import { emailValid } from "discourse/lib/utilities";import EmailGroupUserChooser from "discourse/select-kit/components/email-group-user-chooser";import GroupChooser from "discourse/select-kit/components/group-chooser";+import DButton from "discourse/ui-kit/d-button";+import DTextField from "discourse/ui-kit/d-text-field";import { i18n } from "discourse-i18n";@tagName("")@@ -518,7 +518,7 @@ export default class InvitePanel extends Component {class="invite-user-input"/>{{else}}- <TextField+ <DTextField@value={{this.invitee}}@placeholderKey="topic.invite_reply.email_placeholder"class="email-or-username-input"diff --git a/frontend/discourse/app/components/language-switcher.gjs b/frontend/discourse/app/components/language-switcher.gjsindex 83dc62f019f..8c02120e882 100644--- a/frontend/discourse/app/components/language-switcher.gjs+++ b/frontend/discourse/app/components/language-switcher.gjs@@ -2,12 +2,12 @@ import Component from "@glimmer/component";import { fn } from "@ember/helper";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import DropdownMenu from "discourse/components/dropdown-menu";import DMenu from "discourse/float-kit/components/d-menu";-import icon from "discourse/helpers/d-icon";import { ajax } from "discourse/lib/ajax";import cookie, { removeCookie } from "discourse/lib/cookie";+import DButton from "discourse/ui-kit/d-button";+import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";+import dIcon from "discourse/ui-kit/helpers/d-icon";import I18n, { i18n } from "discourse-i18n";const SHOW_ORIGINAL_COOKIE = "content-localization-show-original";@@ -121,10 +121,10 @@ export default class LanguageSwitcher extends Component {<span class="language-switcher__locale">{{this.currentLanguageCode}}</span>- {{icon "angle-down"}}+ {{dIcon "angle-down"}}</:trigger><:content>- <DropdownMenu as |dropdown|>+ <DDropdownMenu as |dropdown|>{{#each this.content as |option|}}<dropdown.itemclass="locale-options {{if option.isActive '--selected'}}"@@ -136,7 +136,7 @@ export default class LanguageSwitcher extends Component {/></dropdown.item>{{/each}}- </DropdownMenu>+ </DDropdownMenu></:content></DMenu></template>diff --git a/frontend/discourse/app/components/legacy-about-page-users.gjs b/frontend/discourse/app/components/legacy-about-page-users.gjsindex af6283f0c49..fd57277b847 100644--- a/frontend/discourse/app/components/legacy-about-page-users.gjs+++ b/frontend/discourse/app/components/legacy-about-page-users.gjs@@ -1,5 +1,5 @@import Component from "@glimmer/component";-import UserInfo from "discourse/components/user-info";+import DUserInfo from "discourse/ui-kit/d-user-info";export default class LegacyAboutPageUsers extends Component {get users() {@@ -8,7 +8,7 @@ export default class LegacyAboutPageUsers extends Component {<template>{{#each this.users as |user|}}- <UserInfo @user={{user}} />+ <DUserInfo @user={{user}} />{{/each}}</template>}diff --git a/frontend/discourse/app/components/link-to-input.gjs b/frontend/discourse/app/components/link-to-input.gjsindex 4ede559d06e..f1bf9a34499 100644--- a/frontend/discourse/app/components/link-to-input.gjs+++ b/frontend/discourse/app/components/link-to-input.gjs@@ -2,7 +2,7 @@import Component from "@ember/component";import { schedule } from "@ember/runloop";import $ from "jquery";-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class LinkToInput extends Component {@@ -27,7 +27,7 @@ export default class LinkToInput extends Component {{{i18n this.key}}{{/if}}{{#if this.icon}}- {{icon this.icon}}+ {{dIcon this.icon}}{{/if}}</a>{{/if}}diff --git a/frontend/discourse/app/components/loading-slider-fallback-spinner.gjs b/frontend/discourse/app/components/loading-slider-fallback-spinner.gjsindex c2b7ab54319..2bbe69bbbb0 100644--- a/frontend/discourse/app/components/loading-slider-fallback-spinner.gjs+++ b/frontend/discourse/app/components/loading-slider-fallback-spinner.gjs@@ -2,7 +2,7 @@ import Component from "@glimmer/component";import { service } from "@ember/service";import bodyClass from "discourse/helpers/body-class";import hideApplicationFooter from "discourse/helpers/hide-application-footer";-import loadingSpinner from "discourse/helpers/loading-spinner";+import dLoadingSpinner from "discourse/ui-kit/helpers/d-loading-spinner";export default class LoadingSliderFallbackSpinner extends Component {@service loadingSlider;@@ -16,7 +16,7 @@ export default class LoadingSliderFallbackSpinner extends Component {<template>{{#if this.shouldDisplay}}- <div class="route-loading-spinner">{{loadingSpinner}}</div>+ <div class="route-loading-spinner">{{dLoadingSpinner}}</div>{{bodyClass "has-route-loading-spinner"}}{{hideApplicationFooter}}{{/if}}diff --git a/frontend/discourse/app/components/local-login-form.gjs b/frontend/discourse/app/components/local-login-form.gjsindex 65884e5e9d1..b6b3fa49456 100644--- a/frontend/discourse/app/components/local-login-form.gjs+++ b/frontend/discourse/app/components/local-login-form.gjs@@ -9,17 +9,17 @@ import { service } from "@ember/service";import { trustHTML } from "@ember/template";import { isEmpty } from "@ember/utils";import ForgotPassword from "discourse/components/modal/forgot-password";-import PasswordField from "discourse/components/password-field";import SecondFactorForm from "discourse/components/second-factor-form";-import SecondFactorInput from "discourse/components/second-factor-input";import SecurityKeyForm from "discourse/components/security-key-form";-import TogglePasswordMask from "discourse/components/toggle-password-mask";-import icon from "discourse/helpers/d-icon";import valueEntered from "discourse/helpers/value-entered";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import { escapeExpression } from "discourse/lib/utilities";import { getWebauthnCredential } from "discourse/lib/webauthn";+import DPasswordField from "discourse/ui-kit/d-password-field";+import DSecondFactorInput from "discourse/ui-kit/d-second-factor-input";+import DTogglePasswordMask from "discourse/ui-kit/d-toggle-password-mask";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class LocalLoginForm extends Component {@@ -204,7 +204,7 @@ export default class LocalLoginForm extends Component {{{/if}}</div><div class="input-group">- <PasswordField+ <DPasswordField{{on "focusin" this.scrollInputIntoView}}{{on "keydown" this.loginOnEnter}}{{on "input" @loginPasswordChanged}}@@ -222,7 +222,7 @@ export default class LocalLoginForm extends Component {{{i18n "login.password"}}</label>{{#if @loginPassword}}- <TogglePasswordMask+ <DTogglePasswordMask@maskPassword={{this.maskPassword}}@togglePasswordMask={{this.togglePasswordMask}}tabindex="3"@@ -239,7 +239,7 @@ export default class LocalLoginForm extends Component {</a></div><div class="caps-lock-warning {{unless this.capsLockOn 'hidden'}}">- {{icon "triangle-exclamation"}}+ {{dIcon "triangle-exclamation"}}{{i18n "login.caps_lock_warning"}}</div></div></div>@@ -262,7 +262,7 @@ export default class LocalLoginForm extends Component {@action={{this.authenticateSecurityKey}}/>{{else}}- <SecondFactorInput+ <DSecondFactorInput{{on "keydown" this.loginOnEnter}}{{on "focusin" this.scrollInputIntoView}}@onChange={{fn (mut @secondFactorToken)}}diff --git a/frontend/discourse/app/components/login-buttons.gjs b/frontend/discourse/app/components/login-buttons.gjsindex a40d39887c0..2feb05fde1f 100644--- a/frontend/discourse/app/components/login-buttons.gjs+++ b/frontend/discourse/app/components/login-buttons.gjs@@ -7,10 +7,10 @@ import { tagName } from "@ember-decorators/component";import GoogleIcon from "discourse/components/google-icon";import PasskeyLoginButton from "discourse/components/passkey-login-button";import PluginOutlet from "discourse/components/plugin-outlet";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import { isWebauthnSupported } from "discourse/lib/webauthn";import { findAll } from "discourse/models/login-method";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";@tagName("")@@ -47,7 +47,7 @@ export default class LoginButtons extends Component {<template><divid="login-buttons"- class={{concatClass+ class={{dConcatClass(if this.hidden "hidden")(if this.multiple "multiple")}}@@ -62,16 +62,16 @@ export default class LoginButtons extends Component {{{on "click" (fn this.externalLogin b)}}aria-label={{b.screenReaderTitle}}>- {{icon b.icon}}+ {{dIcon b.icon}}<span class="btn-social-title">{{b.title}}</span></button><div class="btn-discourse-id__suffix"><span class="btn-discourse-id__description">{{i18n "login.works_with"}}</span>- {{icon "fab-google"}}- {{icon "fab-apple"}}- {{icon "fab-facebook"}}- {{icon "fab-github"}}+ {{dIcon "fab-google"}}+ {{dIcon "fab-apple"}}+ {{dIcon "fab-facebook"}}+ {{dIcon "fab-github"}}</div></div>{{else}}@@ -84,9 +84,9 @@ export default class LoginButtons extends Component {{{#if b.isGoogle}}<GoogleIcon />{{else if b.icon}}- {{icon b.icon}}+ {{dIcon b.icon}}{{else}}- {{icon "right-to-bracket"}}+ {{dIcon "right-to-bracket"}}{{/if}}<span class="btn-social-title">{{b.title}}</span></button>diff --git a/frontend/discourse/app/components/login-page-cta.gjs b/frontend/discourse/app/components/login-page-cta.gjsindex 09283d2df8d..c01414e59c1 100644--- a/frontend/discourse/app/components/login-page-cta.gjs+++ b/frontend/discourse/app/components/login-page-cta.gjs@@ -1,5 +1,5 @@-import DButton from "discourse/components/d-button";import PluginOutlet from "discourse/components/plugin-outlet";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";const LoginPageCta = <template>diff --git a/frontend/discourse/app/components/mobile-category-topic.gjs b/frontend/discourse/app/components/mobile-category-topic.gjsindex a111c5503bc..6066c7518ad 100644--- a/frontend/discourse/app/components/mobile-category-topic.gjs+++ b/frontend/discourse/app/components/mobile-category-topic.gjs@@ -4,9 +4,9 @@ import { classNameBindings, tagName } from "@ember-decorators/component";import $ from "jquery";import PostCountOrBadges from "discourse/components/topic-list/post-count-or-badges";import TopicStatus from "discourse/components/topic-status";-import ageWithTooltip from "discourse/helpers/age-with-tooltip";import coldAgeClass from "discourse/helpers/cold-age-class";-import topicLink from "discourse/helpers/topic-link";+import dAgeWithTooltip from "discourse/ui-kit/helpers/d-age-with-tooltip";+import dTopicLink from "discourse/ui-kit/helpers/d-topic-link";export function showEntrance(e) {let target = $(e.target);@@ -36,11 +36,11 @@ export default class MobileCategoryTopic extends Component {<td class="main-link"><div class="topic-inset"><TopicStatus @topic={{this.topic}} @disableActions={{true}} />- {{topicLink this.topic}}+ {{dTopicLink this.topic}}{{#if this.topic.unseen}}<span class="badge-notification new-topic"></span>{{/if}}- <span class={{coldAgeClass this.topic.last_posted_at}}>{{ageWithTooltip+ <span class={{coldAgeClass this.topic.last_posted_at}}>{{dAgeWithTooltipthis.topic.last_posted_at}}</span></div>diff --git a/frontend/discourse/app/components/mobile-nav.gjs b/frontend/discourse/app/components/mobile-nav.gjsindex 8e9955d3be3..b4f43b8c21b 100644--- a/frontend/discourse/app/components/mobile-nav.gjs+++ b/frontend/discourse/app/components/mobile-nav.gjs@@ -8,7 +8,7 @@ import { trustHTML } from "@ember/template";import { classNames, tagName } from "@ember-decorators/component";import { on as onEvent } from "@ember-decorators/object";import $ from "jquery";-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";@tagName("ul")@classNames("mobile-nav")@@ -86,7 +86,7 @@ export default class MobileNav extends Component {<li><a href {{on "click" this.toggleExpanded}} class="expander"><span class="selection">{{trustHTML this.selectedHtml}}</span>- {{icon "angle-down"}}+ {{dIcon "angle-down"}}</a></li>{{/if}}diff --git a/frontend/discourse/app/components/modal/activation-edit.gjs b/frontend/discourse/app/components/modal/activation-edit.gjsindex 7c96fb98eb1..77ea148fc7d 100644--- a/frontend/discourse/app/components/modal/activation-edit.gjs+++ b/frontend/discourse/app/components/modal/activation-edit.gjs@@ -4,10 +4,10 @@ import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";import { service } from "@ember/service";import ActivationEmailForm from "discourse/components/activation-email-form";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";import { extractError } from "discourse/lib/ajax-error";import { changeEmail } from "discourse/lib/user-activation";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";import ActivationResent from "./activation-resent";diff --git a/frontend/discourse/app/components/modal/activation-resent.gjs b/frontend/discourse/app/components/modal/activation-resent.gjsindex 515fc196720..4071a962aeb 100644--- a/frontend/discourse/app/components/modal/activation-resent.gjs+++ b/frontend/discourse/app/components/modal/activation-resent.gjs@@ -1,5 +1,5 @@import { trustHTML } from "@ember/template";-import DModal from "discourse/components/d-modal";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";const ActivationResent = <template>diff --git a/frontend/discourse/app/components/modal/add-pm-participants.gjs b/frontend/discourse/app/components/modal/add-pm-participants.gjsindex a78130693c7..6ccd265ef55 100644--- a/frontend/discourse/app/components/modal/add-pm-participants.gjs+++ b/frontend/discourse/app/components/modal/add-pm-participants.gjs@@ -1,5 +1,5 @@-import DModal from "discourse/components/d-modal";import InvitePanel from "discourse/components/invite-panel";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";const AddPmParticipants = <template>diff --git a/frontend/discourse/app/components/modal/anonymous-flag.gjs b/frontend/discourse/app/components/modal/anonymous-flag.gjsindex b003def543f..4cdf2291cf5 100644--- a/frontend/discourse/app/components/modal/anonymous-flag.gjs+++ b/frontend/discourse/app/components/modal/anonymous-flag.gjs@@ -2,8 +2,8 @@ import Component from "@glimmer/component";import { service } from "@ember/service";import { trustHTML } from "@ember/template";import { isEmpty } from "@ember/utils";-import DModal from "discourse/components/d-modal";import { getAbsoluteURL } from "discourse/lib/get-url";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";export default class AnonymousFlagModal extends Component {diff --git a/frontend/discourse/app/components/modal/associate-account-confirm.gjs b/frontend/discourse/app/components/modal/associate-account-confirm.gjsindex 14e6dae396e..82074a872da 100644--- a/frontend/discourse/app/components/modal/associate-account-confirm.gjs+++ b/frontend/discourse/app/components/modal/associate-account-confirm.gjs@@ -3,10 +3,10 @@ import { tracked } from "@glimmer/tracking";import { concat } from "@ember/helper";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";export default class AssociateAccountConfirm extends Component {diff --git a/frontend/discourse/app/components/modal/auth-token.gjs b/frontend/discourse/app/components/modal/auth-token.gjsindex 9033e2a0951..7099bd58836 100644--- a/frontend/discourse/app/components/modal/auth-token.gjs+++ b/frontend/discourse/app/components/modal/auth-token.gjs@@ -4,14 +4,14 @@ import { on } from "@ember/modifier";import { action } from "@ember/object";import { service } from "@ember/service";import { trustHTML } from "@ember/template";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";-import DModalCancel from "discourse/components/d-modal-cancel";-import icon from "discourse/helpers/d-icon";-import formatDate from "discourse/helpers/format-date";import { ajax } from "discourse/lib/ajax";import { userPath } from "discourse/lib/url";-import autoFocus from "discourse/modifiers/auto-focus";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";+import DModalCancel from "discourse/ui-kit/d-modal-cancel";+import dFormatDate from "discourse/ui-kit/helpers/d-format-date";+import dIcon from "discourse/ui-kit/helpers/d-icon";+import dAutoFocus from "discourse/ui-kit/modifiers/d-auto-focus";import { i18n } from "discourse-i18n";export default class AuthTokenComponent extends Component {@@ -54,9 +54,9 @@ export default class AuthTokenComponent extends Component {<div><h3>{{i18n "user.auth_tokens.details"}}</h3><ul>- <li>{{icon "far-clock"}} {{formatDate @model.seen_at}}</li>- <li>{{icon "location-dot"}} {{@model.location}}</li>- <li>{{icon @model.icon}}+ <li>{{dIcon "far-clock"}} {{dFormatDate @model.seen_at}}</li>+ <li>{{dIcon "location-dot"}} {{@model.location}}</li>+ <li>{{dIcon @model.icon}}{{i18n"user.auth_tokens.browser_and_device"@@ -71,8 +71,8 @@ export default class AuthTokenComponent extends Component {{{i18n "user.auth_tokens.latest_post"}}{{! when this.fetchActivity is called, the modal focus is reset }}{{! allowing you to tab behind the modal, so we need to refocus }}- <a href {{on "click" this.toggleExpanded}} {{autoFocus}}>- {{icon (if this.expanded "angle-up" "angle-down")}}+ <a href {{on "click" this.toggleExpanded}} {{dAutoFocus}}>+ {{dIcon (if this.expanded "angle-up" "angle-down")}}</a></h3>{{#if this.expanded}}diff --git a/frontend/discourse/app/components/modal/avatar-selector.gjs b/frontend/discourse/app/components/modal/avatar-selector.gjsindex 9bd5428401c..13267f9a713 100644--- a/frontend/discourse/app/components/modal/avatar-selector.gjs+++ b/frontend/discourse/app/components/modal/avatar-selector.gjs@@ -6,15 +6,15 @@ import { action } from "@ember/object";import { service } from "@ember/service";import { trustHTML } from "@ember/template";import AvatarUploader from "discourse/components/avatar-uploader";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";-import DModalCancel from "discourse/components/d-modal-cancel";-import RadioButton from "discourse/components/radio-button";-import boundAvatarTemplate from "discourse/helpers/bound-avatar-template";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import { isTesting } from "discourse/lib/environment";import { allowsImages } from "discourse/lib/uploads";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";+import DModalCancel from "discourse/ui-kit/d-modal-cancel";+import DRadioButton from "discourse/ui-kit/d-radio-button";+import dBoundAvatarTemplate from "discourse/ui-kit/helpers/d-bound-avatar-template";import { i18n } from "discourse-i18n";export default class AvatarSelectorModal extends Component {@@ -186,7 +186,7 @@ export default class AvatarSelectorModal extends Component {class="selectable-avatar"{{on "click" (fn this.selectAvatar avatar)}}>- {{boundAvatarTemplate avatar "huge"}}+ {{dBoundAvatarTemplate avatar "huge"}}</a>{{/each}}</div>@@ -197,7 +197,7 @@ export default class AvatarSelectorModal extends Component {{{#if this.showCustomAvatarSelector}}{{#if this.user.use_logo_small_as_avatar}}<div class="avatar-choice">- <RadioButton+ <DRadioButton@id="logo-small"@name="logo"@value="logo"@@ -205,7 +205,7 @@ export default class AvatarSelectorModal extends Component {@onChange={{this.onSelectedChanged}}/><label class="radio" for="logo-small">- {{boundAvatarTemplate+ {{dBoundAvatarTemplatethis.siteSettings.site_logo_small_url"large"}}@@ -214,7 +214,7 @@ export default class AvatarSelectorModal extends Component {</div>{{/if}}<div class="avatar-choice avatar-choice--system">- <RadioButton+ <DRadioButton@id="system-avatar"@name="avatar"@value="system"@@ -222,13 +222,13 @@ export default class AvatarSelectorModal extends Component {@onChange={{this.onSelectedChanged}}/><label class="radio" for="system-avatar">- {{boundAvatarTemplate this.user.system_avatar_template "large"}}+ {{dBoundAvatarTemplate this.user.system_avatar_template "large"}}{{i18n "user.change_avatar.letter_based"}}</label></div>{{#if this.allowGravatar}}<div class="avatar-choice avatar-choice--gravatar">- <RadioButton+ <DRadioButton@id="gravatar"@name="avatar"@value="gravatar"@@ -236,7 +236,7 @@ export default class AvatarSelectorModal extends Component {@onChange={{this.onSelectedChanged}}/><label class="radio" for="gravatar">- {{boundAvatarTemplate+ {{dBoundAvatarTemplatethis.user.gravatar_avatar_template"large"}}@@ -276,7 +276,7 @@ export default class AvatarSelectorModal extends Component {{{/if}}{{#if this.allowAvatarUpload}}<div class="avatar-choice avatar-choice--upload">- <RadioButton+ <DRadioButton@id="uploaded-avatar"@name="avatar"@value="custom"@@ -285,7 +285,7 @@ export default class AvatarSelectorModal extends Component {/><label class="radio" for="uploaded-avatar">{{#if this.user.custom_avatar_template}}- {{boundAvatarTemplate+ {{dBoundAvatarTemplatethis.user.custom_avatar_template"large"}}diff --git a/frontend/discourse/app/components/modal/bookmark.gjs b/frontend/discourse/app/components/modal/bookmark.gjsindex b5fe815c5bb..fd539617429 100644--- a/frontend/discourse/app/components/modal/bookmark.gjs+++ b/frontend/discourse/app/components/modal/bookmark.gjs@@ -9,14 +9,6 @@ import { trustHTML } from "@ember/template";import { isEmpty } from "@ember/utils";import ItsATrap from "@discourse/itsatrap";import { Promise } from "rsvp";-import DButton from "discourse/components/d-button";-import DModal, {- CLOSE_INITIATED_BY_CLICK_OUTSIDE,-} from "discourse/components/d-modal";-import DModalCancel from "discourse/components/d-modal-cancel";-import TimeShortcutPicker from "discourse/components/time-shortcut-picker";-import basePath from "discourse/helpers/base-path";-import icon from "discourse/helpers/d-icon";import { extractError } from "discourse/lib/ajax-error";import { formattedReminderTime } from "discourse/lib/bookmark";import discourseLater from "discourse/lib/later";@@ -28,6 +20,14 @@ import {import { now, parseCustomDatetime, startOfDay } from "discourse/lib/time-utils";import { AUTO_DELETE_PREFERENCES } from "discourse/models/bookmark";import ComboBox from "discourse/select-kit/components/combo-box";+import DButton from "discourse/ui-kit/d-button";+import DModal, {+ CLOSE_INITIATED_BY_CLICK_OUTSIDE,+} from "discourse/ui-kit/d-modal";+import DModalCancel from "discourse/ui-kit/d-modal-cancel";+import DTimeShortcutPicker from "discourse/ui-kit/d-time-shortcut-picker";+import dBasePath from "discourse/ui-kit/helpers/d-base-path";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";const BOOKMARK_BINDINGS = {@@ -420,7 +420,7 @@ export default class BookmarkModal extends Component {{{#if this.showExistingReminderAt}}<div class="alert alert-info existing-reminder-at-alert">- {{icon "far-clock"}}+ {{dIcon "far-clock"}}<span>{{i18n"bookmarks.reminders.existing_reminder"at_date_time=this.existingReminderAtFormatted@@ -434,7 +434,7 @@ export default class BookmarkModal extends Component {</label>{{#if this.userHasTimezoneSet}}- <TimeShortcutPicker+ <DTimeShortcutPicker@timeShortcuts={{this.timeOptions}}@prefilledDatetime={{this.prefilledDatetime}}@onTimeSelected={{this.onTimeSelected}}@@ -444,7 +444,7 @@ export default class BookmarkModal extends Component {/>{{else}}<div class="alert alert-info">{{trustHTML- (i18n "bookmarks.no_timezone" basePath=(basePath))+ (i18n "bookmarks.no_timezone" basePath=(dBasePath))}}</div>{{/if}}</div>diff --git a/frontend/discourse/app/components/modal/bulk-topic-actions.gjs b/frontend/discourse/app/components/modal/bulk-topic-actions.gjsindex bf735adc7e9..0e604779bed 100644--- a/frontend/discourse/app/components/modal/bulk-topic-actions.gjs+++ b/frontend/discourse/app/components/modal/bulk-topic-actions.gjs@@ -7,17 +7,17 @@ import { getOwner } from "@ember/owner";import { service } from "@ember/service";import { trustHTML } from "@ember/template";import { Promise } from "rsvp";-import ConditionalLoadingSection from "discourse/components/conditional-loading-section";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";import ManageTagsForm from "discourse/components/modal/bulk-topic-actions/manage-tags-form";import BulkPinOptions from "discourse/components/modal/feature-topic/bulk-pin-options";-import RadioButton from "discourse/components/radio-button";import { topicLevels } from "discourse/lib/notification-levels";import Category from "discourse/models/category";import Topic from "discourse/models/topic";-import autoFocus from "discourse/modifiers/auto-focus";import CategoryChooser from "discourse/select-kit/components/category-chooser";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSection from "discourse/ui-kit/d-conditional-loading-section";+import DModal from "discourse/ui-kit/d-modal";+import DRadioButton from "discourse/ui-kit/d-radio-button";+import dAutoFocus from "discourse/ui-kit/modifiers/d-auto-focus";import { i18n } from "discourse-i18n";const _customActions = {};@@ -422,7 +422,7 @@ export default class BulkTopicActions extends Component {class="topic-bulk-actions-modal"><:body>- <ConditionalLoadingSection+ <DConditionalLoadingSection@isLoading={{this.loading}}@title={{i18n "topics.bulk.performing"}}>@@ -478,7 +478,7 @@ export default class BulkTopicActions extends Component {<labelclass="radio notification-level-radio checkbox-label">- <RadioButton+ <DRadioButton@value={{level.id}}@name="notification_level"@selection={{this.notificationLevelId}}@@ -523,12 +523,12 @@ export default class BulkTopicActions extends Component {<textareaid="bulk-close-note"{{on "input" this.updateCloseNote}}- {{autoFocus}}+ {{dAutoFocus}}>{{this.closeNote}}</textarea></div>{{/if}}{{/if}}- </ConditionalLoadingSection>+ </DConditionalLoadingSection></:body><:footer>diff --git a/frontend/discourse/app/components/modal/bulk-topic-actions/manage-tags-form.gjs b/frontend/discourse/app/components/modal/bulk-topic-actions/manage-tags-form.gjsindex 4ea0784c7fd..ac8f4bc51b3 100644--- a/frontend/discourse/app/components/modal/bulk-topic-actions/manage-tags-form.gjs+++ b/frontend/discourse/app/components/modal/bulk-topic-actions/manage-tags-form.gjs@@ -3,7 +3,7 @@ import { array, fn, hash } from "@ember/helper";import { action } from "@ember/object";import { trustHTML } from "@ember/template";import Form from "discourse/components/form";-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class ManageTagsForm extends Component {@@ -233,7 +233,7 @@ export default class ManageTagsForm extends Component {</row.Col><row.Col @size={{1}} class="manage-tags-form__replace-arrow">- {{icon "arrow-right"}}+ {{dIcon "arrow-right"}}</row.Col><row.Col @size={{5}}>diff --git a/frontend/discourse/app/components/modal/change-owner.gjs b/frontend/discourse/app/components/modal/change-owner.gjsindex de3ec31b29e..232d67ba1ba 100644--- a/frontend/discourse/app/components/modal/change-owner.gjs+++ b/frontend/discourse/app/components/modal/change-owner.gjs@@ -5,11 +5,11 @@ import { on } from "@ember/modifier";import { action } from "@ember/object";import { trustHTML } from "@ember/template";import { isEmpty } from "@ember/utils";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";import DiscourseURL from "discourse/lib/url";import Topic from "discourse/models/topic";import EmailGroupUserChooser from "discourse/select-kit/components/email-group-user-chooser";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";export default class ChangeOwnerModal extends Component {diff --git a/frontend/discourse/app/components/modal/change-post-notice.gjs b/frontend/discourse/app/components/modal/change-post-notice.gjsindex 97497fe8aec..42f71b1e6ad 100644--- a/frontend/discourse/app/components/modal/change-post-notice.gjs+++ b/frontend/discourse/app/components/modal/change-post-notice.gjs@@ -5,11 +5,11 @@ import { on } from "@ember/modifier";import { action } from "@ember/object";import { service } from "@ember/service";import { isEmpty } from "@ember/utils";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";-import DModalCancel from "discourse/components/d-modal-cancel";import withEventValue from "discourse/helpers/with-event-value";import preventScrollOnFocus from "discourse/modifiers/prevent-scroll-on-focus";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";+import DModalCancel from "discourse/ui-kit/d-modal-cancel";import { i18n } from "discourse-i18n";export default class ChangePostNoticeModal extends Component {diff --git a/frontend/discourse/app/components/modal/change-reply-to.gjs b/frontend/discourse/app/components/modal/change-reply-to.gjsindex ab116c6c237..a00e1f91510 100644--- a/frontend/discourse/app/components/modal/change-reply-to.gjs+++ b/frontend/discourse/app/components/modal/change-reply-to.gjs@@ -1,11 +1,11 @@import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";import TopicTimeline from "discourse/components/topic-timeline";import { extractError } from "discourse/lib/ajax-error";import { not } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";export default class ChangeReplyTo extends Component {diff --git a/frontend/discourse/app/components/modal/change-timestamp.gjs b/frontend/discourse/app/components/modal/change-timestamp.gjsindex cc7546ed4dd..a423264d7be 100644--- a/frontend/discourse/app/components/modal/change-timestamp.gjs+++ b/frontend/discourse/app/components/modal/change-timestamp.gjs@@ -5,11 +5,11 @@ import { fn } from "@ember/helper";import { action } from "@ember/object";import { next } from "@ember/runloop";import { isEmpty } from "@ember/utils";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";import DatePickerPast from "discourse/components/date-picker-past";import DiscourseURL from "discourse/lib/url";import Topic from "discourse/models/topic";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";// Modal related to changing the timestamp of postsdiff --git a/frontend/discourse/app/components/modal/convert-to-public-topic.gjs b/frontend/discourse/app/components/modal/convert-to-public-topic.gjsindex 0121f12c04e..9c127ae7d77 100644--- a/frontend/discourse/app/components/modal/convert-to-public-topic.gjs+++ b/frontend/discourse/app/components/modal/convert-to-public-topic.gjs@@ -3,10 +3,10 @@ import { tracked } from "@glimmer/tracking";import { fn } from "@ember/helper";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";import { extractError } from "discourse/lib/ajax-error";import CategoryChooser from "discourse/select-kit/components/category-chooser";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";export default class ConvertToPublicTopic extends Component {diff --git a/frontend/discourse/app/components/modal/create-invite-bulk.gjs b/frontend/discourse/app/components/modal/create-invite-bulk.gjsindex d2986768e20..e1e5664c82c 100644--- a/frontend/discourse/app/components/modal/create-invite-bulk.gjs+++ b/frontend/discourse/app/components/modal/create-invite-bulk.gjs@@ -1,8 +1,8 @@import didInsert from "@ember/render-modifiers/modifiers/did-insert";import { trustHTML } from "@ember/template";import CreateInviteUploader from "discourse/components/create-invite-uploader";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";const CreateInviteBulk = <template>diff --git a/frontend/discourse/app/components/modal/create-invite.gjs b/frontend/discourse/app/components/modal/create-invite.gjsindex 3d688fbc9f1..14d2bc8cdbc 100644--- a/frontend/discourse/app/components/modal/create-invite.gjs+++ b/frontend/discourse/app/components/modal/create-invite.gjs@@ -5,11 +5,7 @@ import { on } from "@ember/modifier";import { action } from "@ember/object";import { service } from "@ember/service";import { trustHTML } from "@ember/template";-import CopyButton from "discourse/components/copy-button";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";import Form from "discourse/components/form";-import FutureDateInput from "discourse/components/future-date-input";import { extractError } from "discourse/lib/ajax-error";import { INVITE_DESCRIPTION_MAX_LENGTH } from "discourse/lib/constants";import { canNativeShare, nativeShare } from "discourse/lib/pwa-utils";@@ -21,6 +17,10 @@ import { FORMAT as DATE_INPUT_FORMAT } from "discourse/select-kit/components/futimport GroupChooser from "discourse/select-kit/components/group-chooser";import TopicChooser from "discourse/select-kit/components/topic-chooser";import { and, notEq, or } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DCopyButton from "discourse/ui-kit/d-copy-button";+import DFutureDateInput from "discourse/ui-kit/d-future-date-input";+import DModal from "discourse/ui-kit/d-modal";import I18n, { i18n } from "discourse-i18n";export default class CreateInvite extends Component {@@ -400,7 +400,7 @@ export default class CreateInvite extends Component {as |field|><field.Control>- <FutureDateInput+ <DFutureDateInput@clearable={{true}}@input={{field.value}}@noRelativeOptions={{true}}@@ -567,7 +567,7 @@ class ShareOrCopyInviteLink extends Component {@action={{this.nativeShare}}/>{{else}}- <CopyButton+ <DCopyButton@selector="input.invite-link"@translatedLabel={{i18n "user.invited.invite.copy_link"}}@translatedLabelAfterCopy={{i18n "user.invited.invite.link_copied"}}diff --git a/frontend/discourse/app/components/modal/customize-form-template-view.gjs b/frontend/discourse/app/components/modal/customize-form-template-view.gjsindex 5a808f0237f..d2cac48834e 100644--- a/frontend/discourse/app/components/modal/customize-form-template-view.gjs+++ b/frontend/discourse/app/components/modal/customize-form-template-view.gjs@@ -3,14 +3,14 @@ import { tracked } from "@glimmer/tracking";import { on } from "@ember/modifier";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";-import DModalCancel from "discourse/components/d-modal-cancel";-import DToggleSwitch from "discourse/components/d-toggle-switch";import Wrapper from "discourse/components/form-template-field/wrapper";-import HighlightedCode from "discourse/components/highlighted-code";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";+import DButton from "discourse/ui-kit/d-button";+import DHighlightedCode from "discourse/ui-kit/d-highlighted-code";+import DModal from "discourse/ui-kit/d-modal";+import DModalCancel from "discourse/ui-kit/d-modal-cancel";+import DToggleSwitch from "discourse/ui-kit/d-toggle-switch";import { i18n } from "discourse-i18n";export default class CustomizeFormTemplateViewModal extends Component {@@ -68,7 +68,7 @@ export default class CustomizeFormTemplateViewModal extends Component {{{#if this.showPreview}}<Wrapper @id={{@model.id}} />{{else}}- <HighlightedCode @lang="yaml" @code={{@model.template}} />+ <DHighlightedCode @lang="yaml" @code={{@model.template}} />{{/if}}</:body>diff --git a/frontend/discourse/app/components/modal/delete-themes-confirm.gjs b/frontend/discourse/app/components/modal/delete-themes-confirm.gjsindex 95bb2bcbad7..ec15214282a 100644--- a/frontend/discourse/app/components/modal/delete-themes-confirm.gjs+++ b/frontend/discourse/app/components/modal/delete-themes-confirm.gjs@@ -1,11 +1,11 @@import Component from "@glimmer/component";import { concat } from "@ember/helper";import { action } from "@ember/object";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";-import DModalCancel from "discourse/components/d-modal-cancel";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";+import DModalCancel from "discourse/ui-kit/d-modal-cancel";import { i18n } from "discourse-i18n";export default class DeleteThemesConfirmComponent extends Component {diff --git a/frontend/discourse/app/components/modal/delete-topic-confirm.gjs b/frontend/discourse/app/components/modal/delete-topic-confirm.gjsindex 596b4c2e06f..de3757d9206 100644--- a/frontend/discourse/app/components/modal/delete-topic-confirm.gjs+++ b/frontend/discourse/app/components/modal/delete-topic-confirm.gjs@@ -2,8 +2,8 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";// Modal that displays confirmation text when user deletes a topicdiff --git a/frontend/discourse/app/components/modal/delete-topic-disallowed.gjs b/frontend/discourse/app/components/modal/delete-topic-disallowed.gjsindex 4b19aa13187..0526f4fc834 100644--- a/frontend/discourse/app/components/modal/delete-topic-disallowed.gjs+++ b/frontend/discourse/app/components/modal/delete-topic-disallowed.gjs@@ -1,6 +1,6 @@import { trustHTML } from "@ember/template";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";const DeleteTopicDisallowed = <template>diff --git a/frontend/discourse/app/components/modal/discard-draft.gjs b/frontend/discourse/app/components/modal/discard-draft.gjsindex 98e253892a6..320b6e35fd4 100644--- a/frontend/discourse/app/components/modal/discard-draft.gjs+++ b/frontend/discourse/app/components/modal/discard-draft.gjs@@ -1,7 +1,7 @@import Component from "@glimmer/component";import { action } from "@ember/object";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";export default class DiscardDraftModal extends Component {diff --git a/frontend/discourse/app/components/modal/dismiss-new.gjs b/frontend/discourse/app/components/modal/dismiss-new.gjsindex 73da6133ca4..bd5cc1bf95b 100644--- a/frontend/discourse/app/components/modal/dismiss-new.gjs+++ b/frontend/discourse/app/components/modal/dismiss-new.gjs@@ -1,9 +1,9 @@import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";import PreferenceCheckbox from "discourse/components/preference-checkbox";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";export default class DismissNew extends Component {diff --git a/frontend/discourse/app/components/modal/dismiss-notification-confirmation.gjs b/frontend/discourse/app/components/modal/dismiss-notification-confirmation.gjsindex fdaf32f7e75..b419e06413d 100644--- a/frontend/discourse/app/components/modal/dismiss-notification-confirmation.gjs+++ b/frontend/discourse/app/components/modal/dismiss-notification-confirmation.gjs@@ -1,7 +1,7 @@import Component from "@glimmer/component";import { action } from "@ember/object";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";export default class DismissNotificationConfirmation extends Component {@actiondiff --git a/frontend/discourse/app/components/modal/dismiss-read.gjs b/frontend/discourse/app/components/modal/dismiss-read.gjsindex 4db8b494f5a..70a5f6cacd3 100644--- a/frontend/discourse/app/components/modal/dismiss-read.gjs+++ b/frontend/discourse/app/components/modal/dismiss-read.gjs@@ -1,9 +1,9 @@import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { fn } from "@ember/helper";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";import PreferenceCheckbox from "discourse/components/preference-checkbox";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";export default class DismissRead extends Component {diff --git a/frontend/discourse/app/components/modal/do-not-disturb.gjs b/frontend/discourse/app/components/modal/do-not-disturb.gjsindex e4b072a1029..cb9776c7c16 100644--- a/frontend/discourse/app/components/modal/do-not-disturb.gjs+++ b/frontend/discourse/app/components/modal/do-not-disturb.gjs@@ -2,11 +2,11 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";-import TapTile from "discourse/components/tap-tile";-import TapTileGrid from "discourse/components/tap-tile-grid";import { extractError } from "discourse/lib/ajax-error";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";+import DTapTile from "discourse/ui-kit/d-tap-tile";+import DTapTileGrid from "discourse/ui-kit/d-tap-tile-grid";import { i18n } from "discourse-i18n";export default class DoNotDisturb extends Component {@@ -39,40 +39,40 @@ export default class DoNotDisturb extends Component {class="do-not-disturb-modal"><:body>- <TapTileGrid as |grid|>- <TapTile+ <DTapTileGrid as |grid|>+ <DTapTile@tileId="30"@activeTile={{grid.activeTile}}@onChange={{this.saveDuration}}class="do-not-disturb-tile">{{i18n "pause_notifications.options.half_hour"}}- </TapTile>- <TapTile+ </DTapTile>+ <DTapTile@tileId="60"@activeTile={{grid.activeTile}}@onChange={{this.saveDuration}}class="do-not-disturb-tile">{{i18n "pause_notifications.options.one_hour"}}- </TapTile>- <TapTile+ </DTapTile>+ <DTapTile@tileId="120"@activeTile={{grid.activeTile}}@onChange={{this.saveDuration}}class="do-not-disturb-tile">{{i18n "pause_notifications.options.two_hours"}}- </TapTile>- <TapTile+ </DTapTile>+ <DTapTile@tileId="tomorrow"@activeTile={{grid.activeTile}}@onChange={{this.saveDuration}}class="do-not-disturb-tile">{{i18n "pause_notifications.options.tomorrow"}}- </TapTile>- </TapTileGrid>+ </DTapTile>+ </DTapTileGrid><DButton@action={{this.navigateToNotificationSchedule}}diff --git a/frontend/discourse/app/components/modal/download-calendar.gjs b/frontend/discourse/app/components/modal/download-calendar.gjsindex 2b8ca816c50..31fcc214dcc 100644--- a/frontend/discourse/app/components/modal/download-calendar.gjs+++ b/frontend/discourse/app/components/modal/download-calendar.gjs@@ -4,10 +4,10 @@ import { Input } from "@ember/component";import { fn } from "@ember/helper";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";-import RadioButton from "discourse/components/radio-button";import { downloadGoogle, downloadIcs } from "discourse/lib/download-calendar";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";+import DRadioButton from "discourse/ui-kit/d-radio-button";import { i18n } from "discourse-i18n";export default class DownloadCalendar extends Component {@@ -66,7 +66,7 @@ export default class DownloadCalendar extends Component {<div class="control-group"><div class="ics"><label class="radio" for="ics">- <RadioButton+ <DRadioButtonid="ics"@name="select-calendar"@value="ics"@@ -78,7 +78,7 @@ export default class DownloadCalendar extends Component {</div><div class="google"><label class="radio" for="google">- <RadioButton+ <DRadioButtonid="google"@name="select-calendar"@value="google"diff --git a/frontend/discourse/app/components/modal/edit-slow-mode.gjs b/frontend/discourse/app/components/modal/edit-slow-mode.gjsindex 01e7893f0a2..0b32dc67db2 100644--- a/frontend/discourse/app/components/modal/edit-slow-mode.gjs+++ b/frontend/discourse/app/components/modal/edit-slow-mode.gjs@@ -4,14 +4,14 @@ import { Input } from "@ember/component";import { fn } from "@ember/helper";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";-import FutureDateInput from "discourse/components/future-date-input";import { fromSeconds, toSeconds } from "discourse/helpers/slow-mode";import { extractError } from "discourse/lib/ajax-error";import { timeShortcuts } from "discourse/lib/time-shortcut";import Topic from "discourse/models/topic";import ComboBox from "discourse/select-kit/components/combo-box";+import DButton from "discourse/ui-kit/d-button";+import DFutureDateInput from "discourse/ui-kit/d-future-date-input";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";const SLOW_MODE_OPTIONS = [@@ -230,7 +230,7 @@ export default class EditSlowMode extends Component {{{/if}}<div class="control-group">- <FutureDateInput+ <DFutureDateInputclass="enabled-until"@label="topic.slow_mode_update.enabled_until"@labelClasses="slow-mode-label"diff --git a/frontend/discourse/app/components/modal/edit-topic-timer.gjs b/frontend/discourse/app/components/modal/edit-topic-timer.gjsindex 230006e2d25..96905c11937 100644--- a/frontend/discourse/app/components/modal/edit-topic-timer.gjs+++ b/frontend/discourse/app/components/modal/edit-topic-timer.gjs@@ -3,12 +3,12 @@ import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";import { trackedObject } from "@ember/reactive/collections";import { next } from "@ember/runloop";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";import EditTopicTimerForm from "discourse/components/edit-topic-timer-form";import { popupAjaxError } from "discourse/lib/ajax-error";import TopicTimer from "discourse/models/topic-timer";import { FORMAT } from "discourse/select-kit/components/future-date-input-selector";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";export const CLOSE_STATUS_TYPE = "close";diff --git a/frontend/discourse/app/components/modal/edit-user-directory-columns.gjs b/frontend/discourse/app/components/modal/edit-user-directory-columns.gjsindex 297590e192d..2b5e0ddca3d 100644--- a/frontend/discourse/app/components/modal/edit-user-directory-columns.gjs+++ b/frontend/discourse/app/components/modal/edit-user-directory-columns.gjs@@ -3,15 +3,15 @@ import { tracked } from "@glimmer/tracking";import { Input } from "@ember/component";import { fn } from "@ember/helper";import { action } from "@ember/object";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";import directoryColumnIsAutomatic from "discourse/helpers/directory-column-is-automatic";import directoryColumnIsUserField from "discourse/helpers/directory-column-is-user-field";import directoryTableHeaderTitle from "discourse/helpers/directory-table-header-title";-import loadingSpinner from "discourse/helpers/loading-spinner";import { reload } from "discourse/helpers/page-reloader";import { ajax } from "discourse/lib/ajax";import { extractError, popupAjaxError } from "discourse/lib/ajax-error";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";+import dLoadingSpinner from "discourse/ui-kit/helpers/d-loading-spinner";import { i18n } from "discourse-i18n";const UP = "up";@@ -121,7 +121,7 @@ export default class EditUserDirectoryColumns extends Component {><:body>{{#if this.loading}}- {{loadingSpinner size="large"}}+ {{dLoadingSpinner size="large"}}{{else}}<div class="edit-directory-columns-container">{{#each this.columns as |column|}}diff --git a/frontend/discourse/app/components/modal/explain-reviewable.gjs b/frontend/discourse/app/components/modal/explain-reviewable.gjsindex 28344fef87e..c39ff0df93b 100644--- a/frontend/discourse/app/components/modal/explain-reviewable.gjs+++ b/frontend/discourse/app/components/modal/explain-reviewable.gjs@@ -2,11 +2,11 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";import { service } from "@ember/service";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";import ScoreValue from "discourse/components/score-value";import float from "discourse/helpers/float";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";export default class ExplainReviewable extends Component {@@ -40,7 +40,7 @@ export default class ExplainReviewable extends Component {@title={{i18n "review.explain.title"}}><:body>- <ConditionalLoadingSpinner @condition={{this.loading}}>+ <DConditionalLoadingSpinner @condition={{this.loading}}><table><tbody><tr>@@ -93,7 +93,7 @@ export default class ExplainReviewable extends Component {</tr></tbody></table>- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner></:body><:footer><DButton @action={{@closeModal}} @label="close" />diff --git a/frontend/discourse/app/components/modal/fast-edit.gjs b/frontend/discourse/app/components/modal/fast-edit.gjsindex e8c05353195..adba5e01894 100644--- a/frontend/discourse/app/components/modal/fast-edit.gjs+++ b/frontend/discourse/app/components/modal/fast-edit.gjs@@ -1,5 +1,5 @@-import DModal from "discourse/components/d-modal";import FastEdit from "discourse/components/fast-edit";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";const FastEditModal = <template>diff --git a/frontend/discourse/app/components/modal/feature-topic-on-profile.gjs b/frontend/discourse/app/components/modal/feature-topic-on-profile.gjsindex 5d80a49e2c8..d407f433569 100644--- a/frontend/discourse/app/components/modal/feature-topic-on-profile.gjs+++ b/frontend/discourse/app/components/modal/feature-topic-on-profile.gjs@@ -2,10 +2,10 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";import ChooseTopic from "discourse/components/choose-topic";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";export default class FeatureTopicOnProfile extends Component {diff --git a/frontend/discourse/app/components/modal/feature-topic.gjs b/frontend/discourse/app/components/modal/feature-topic.gjsindex 21b6a96101f..ea295571334 100644--- a/frontend/discourse/app/components/modal/feature-topic.gjs+++ b/frontend/discourse/app/components/modal/feature-topic.gjs@@ -4,14 +4,14 @@ import { fn } from "@ember/helper";import { action } from "@ember/object";import { service } from "@ember/service";import { trustHTML } from "@ember/template";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";import PinOptionSection, {MAX_GLOBALLY_PINNED_TOPICS,} from "discourse/components/modal/feature-topic/pin-option-section";-import { categoryLinkHTML } from "discourse/helpers/category-link";import { ajax } from "discourse/lib/ajax";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DModal from "discourse/ui-kit/d-modal";+import { categoryLinkHTML } from "discourse/ui-kit/helpers/d-category-link";import { i18n } from "discourse-i18n";export default class FeatureTopic extends Component {@@ -146,7 +146,7 @@ export default class FeatureTopic extends Component {<div class="feature-section__description">{{#if @model.topic.pinned_globally}}<p>- <ConditionalLoadingSpinner+ <DConditionalLoadingSpinner@size="small"@condition={{this.loading}}>@@ -162,17 +162,17 @@ export default class FeatureTopic extends Component {(i18n "topic.feature_topic.not_pinned_globally")}}{{/if}}- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner></p><p>{{i18n "topic.feature_topic.global_pin_note"}}</p>{{else}}<p>- <ConditionalLoadingSpinner+ <DConditionalLoadingSpinner@size="small"@condition={{this.loading}}>{{trustHTML this.alreadyPinnedMessage}}- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner></p><p>{{i18n "topic.feature_topic.pin_note"}}</p>{{/if}}@@ -216,7 +216,7 @@ export default class FeatureTopic extends Component {<div class="feature-section"><div class="feature-section__description"><p>- <ConditionalLoadingSpinner+ <DConditionalLoadingSpinner@size="small"@condition={{this.loading}}>@@ -225,7 +225,7 @@ export default class FeatureTopic extends Component {{{else}}{{trustHTML (i18n "topic.feature_topic.no_banner_exists")}}{{/if}}- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner></p><p>{{i18n "topic.feature_topic.banner_note"}}diff --git a/frontend/discourse/app/components/modal/feature-topic/bulk-pin-options.gjs b/frontend/discourse/app/components/modal/feature-topic/bulk-pin-options.gjsindex 4209abe583b..4d1104d678f 100644--- a/frontend/discourse/app/components/modal/feature-topic/bulk-pin-options.gjs+++ b/frontend/discourse/app/components/modal/feature-topic/bulk-pin-options.gjs@@ -5,8 +5,8 @@ import { service } from "@ember/service";import PinOptionSection, {MAX_GLOBALLY_PINNED_TOPICS,} from "discourse/components/modal/feature-topic/pin-option-section";-import { categoryLinkHTML } from "discourse/helpers/category-link";import { ajax } from "discourse/lib/ajax";+import { categoryLinkHTML } from "discourse/ui-kit/helpers/d-category-link";import { i18n } from "discourse-i18n";export default class BulkPinOptions extends Component {diff --git a/frontend/discourse/app/components/modal/feature-topic/pin-option-section.gjs b/frontend/discourse/app/components/modal/feature-topic/pin-option-section.gjsindex f72e31cbdb5..4f1c6d3ff10 100644--- a/frontend/discourse/app/components/modal/feature-topic/pin-option-section.gjs+++ b/frontend/discourse/app/components/modal/feature-topic/pin-option-section.gjs@@ -3,11 +3,11 @@ import { cached } from "@glimmer/tracking";import { action } from "@ember/object";import { service } from "@ember/service";import { trustHTML } from "@ember/template";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";import Form from "discourse/components/form";-import FutureDateInput from "discourse/components/future-date-input";-import icon from "discourse/helpers/d-icon";import { FORMAT } from "discourse/select-kit/components/future-date-input-selector";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DFutureDateInput from "discourse/ui-kit/d-future-date-input";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export const MAX_GLOBALLY_PINNED_TOPICS = 4;@@ -59,15 +59,15 @@ export default class PinOptionSection extends Component {<div class="feature-section__description">{{#if @statsMessage}}<p>- <ConditionalLoadingSpinner @size="small" @condition={{@loading}}>+ <DConditionalLoadingSpinner @size="small" @condition={{@loading}}>{{trustHTML @statsMessage}}- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner></p>{{/if}}<p>{{@noteMessage}}</p><p class="feature-section__pin-message">{{trustHTML @pinMessage}}- {{icon "far-clock"}}</p>+ {{dIcon "far-clock"}}</p><form.Field@name="pinUntil"@@ -79,7 +79,7 @@ export default class PinOptionSection extends Component {as |field|><field.Control>- <FutureDateInput+ <DFutureDateInputclass="pin-until"@clearable={{true}}@input={{field.value}}diff --git a/frontend/discourse/app/components/modal/flag.gjs b/frontend/discourse/app/components/modal/flag.gjsindex f55d57e8d94..2b6d9c62a1e 100644--- a/frontend/discourse/app/components/modal/flag.gjs+++ b/frontend/discourse/app/components/modal/flag.gjs@@ -4,8 +4,6 @@ import { on } from "@ember/modifier";import { action } from "@ember/object";import { service } from "@ember/service";import { trustHTML } from "@ember/template";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";import FlagActionType from "discourse/components/flag-action-type";import FlagSelection from "discourse/components/flag-selection";import PluginOutlet from "discourse/components/plugin-outlet";@@ -15,6 +13,8 @@ import { reload } from "discourse/helpers/page-reloader";import { MAX_MESSAGE_LENGTH } from "discourse/models/post-action-type";import User from "discourse/models/user";import { not } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";const NOTIFY_MODERATORS_KEY = "notify_moderators";diff --git a/frontend/discourse/app/components/modal/forgot-password.gjs b/frontend/discourse/app/components/modal/forgot-password.gjsindex c933210af05..5baba3e5eee 100644--- a/frontend/discourse/app/components/modal/forgot-password.gjs+++ b/frontend/discourse/app/components/modal/forgot-password.gjs@@ -5,13 +5,13 @@ import { action } from "@ember/object";import { service } from "@ember/service";import { trustHTML } from "@ember/template";import { isEmpty } from "@ember/utils";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";import { ajax } from "discourse/lib/ajax";import { extractError } from "discourse/lib/ajax-error";import cookie from "discourse/lib/cookie";import getURL from "discourse/lib/get-url";import { escapeExpression } from "discourse/lib/utilities";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";export default class ForgotPassword extends Component {diff --git a/frontend/discourse/app/components/modal/form-template-form-preview.gjs b/frontend/discourse/app/components/modal/form-template-form-preview.gjsindex 6230b59e220..98ad056c289 100644--- a/frontend/discourse/app/components/modal/form-template-form-preview.gjs+++ b/frontend/discourse/app/components/modal/form-template-form-preview.gjs@@ -1,5 +1,5 @@-import DModal from "discourse/components/d-modal";import Wrapper from "discourse/components/form-template-field/wrapper";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";const FormTemplateFormPreview = <template>diff --git a/frontend/discourse/app/components/modal/fullscreen-code.gjs b/frontend/discourse/app/components/modal/fullscreen-code.gjsindex c2cd2c6764c..c50576f9e34 100644--- a/frontend/discourse/app/components/modal/fullscreen-code.gjs+++ b/frontend/discourse/app/components/modal/fullscreen-code.gjs@@ -2,11 +2,11 @@ import Component from "@glimmer/component";import { action } from "@ember/object";import didInsert from "@ember/render-modifiers/modifiers/did-insert";import { service } from "@ember/service";-import DModal from "discourse/components/d-modal";import PluginOutlet from "discourse/components/plugin-outlet";import lazyHash from "discourse/helpers/lazy-hash";import CodeblockButtons from "discourse/lib/codeblock-buttons";import highlightSyntax from "discourse/lib/highlight-syntax";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";export default class FullscreenCode extends Component {diff --git a/frontend/discourse/app/components/modal/fullscreen-table.gjs b/frontend/discourse/app/components/modal/fullscreen-table.gjsindex fc4dcbf28ee..96e86cc2fd0 100644--- a/frontend/discourse/app/components/modal/fullscreen-table.gjs+++ b/frontend/discourse/app/components/modal/fullscreen-table.gjs@@ -1,4 +1,4 @@-import DModal from "discourse/components/d-modal";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";const FullscreenTable = <template>diff --git a/frontend/discourse/app/components/modal/grant-badge.gjs b/frontend/discourse/app/components/modal/grant-badge.gjsindex 0610e6a33af..d4c54395b6c 100644--- a/frontend/discourse/app/components/modal/grant-badge.gjs+++ b/frontend/discourse/app/components/modal/grant-badge.gjs@@ -3,9 +3,6 @@ import { tracked } from "@glimmer/tracking";import { fn, hash } from "@ember/helper";import { action } from "@ember/object";import didInsert from "@ember/render-modifiers/modifiers/did-insert";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";import { extractError } from "discourse/lib/ajax-error";import getURL from "discourse/lib/get-url";import {@@ -16,6 +13,9 @@ import { autoTrackedArray } from "discourse/lib/tracked-tools";import Badge from "discourse/models/badge";import UserBadge from "discourse/models/user-badge";import ComboBox from "discourse/select-kit/components/combo-box";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";export default class GrantBadgeModal extends Component {@@ -99,7 +99,7 @@ export default class GrantBadgeModal extends Component {{{didInsert this.loadBadges}}><:body>- <ConditionalLoadingSpinner @condition={{this.loading}}>+ <DConditionalLoadingSpinner @condition={{this.loading}}>{{#if this.noAvailableBadges}}<p>{{i18n "admin.badges.no_badges"}}</p>{{else}}@@ -112,7 +112,7 @@ export default class GrantBadgeModal extends Component {/></p>{{/if}}- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner></:body><:footer><DButtondiff --git a/frontend/discourse/app/components/modal/group-add-members.gjs b/frontend/discourse/app/components/modal/group-add-members.gjsindex 0511196a57d..8e422f79cc5 100644--- a/frontend/discourse/app/components/modal/group-add-members.gjs+++ b/frontend/discourse/app/components/modal/group-add-members.gjs@@ -5,13 +5,13 @@ import { hash } from "@ember/helper";import { action } from "@ember/object";import { service } from "@ember/service";import { isEmpty } from "@ember/utils";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";import { extractError } from "discourse/lib/ajax-error";import { emailValid } from "discourse/lib/utilities";import EmailGroupUserChooser from "discourse/select-kit/components/email-group-user-chooser";import UserChooser from "discourse/select-kit/components/user-chooser";import { not, or } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";export default class GroupAddMembers extends Component {diff --git a/frontend/discourse/app/components/modal/group-default-notifications.gjs b/frontend/discourse/app/components/modal/group-default-notifications.gjsindex 07e0009d002..251cb8deea7 100644--- a/frontend/discourse/app/components/modal/group-default-notifications.gjs+++ b/frontend/discourse/app/components/modal/group-default-notifications.gjs@@ -1,7 +1,7 @@import Component from "@glimmer/component";import { action } from "@ember/object";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";export default class GroupDefaultNotifications extends Component {diff --git a/frontend/discourse/app/components/modal/history.gjs b/frontend/discourse/app/components/modal/history.gjsindex 360b4f25d21..2553743bde8 100644--- a/frontend/discourse/app/components/modal/history.gjs+++ b/frontend/discourse/app/components/modal/history.gjs@@ -3,18 +3,18 @@ import { tracked } from "@glimmer/tracking";import { concat } from "@ember/helper";import { action } from "@ember/object";import { service } from "@ember/service";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DModal from "discourse/components/d-modal";import { buildPermanentlyDeleteConfirmDialogArgs } from "discourse/components/dialog-messages/permanently-delete-confirm";import Revision from "discourse/components/modal/history/revision";import Revisions from "discourse/components/modal/history/revisions";import TopicFooter from "discourse/components/modal/history/topic-footer";-import { categoryBadgeHTML } from "discourse/helpers/category-link";-import dasherize from "discourse/helpers/dasherize";import { iconHTML } from "discourse/lib/icon-library";import { sanitizeAsync } from "discourse/lib/text";import Category from "discourse/models/category";import Post from "discourse/models/post";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DModal from "discourse/ui-kit/d-modal";+import { categoryBadgeHTML } from "discourse/ui-kit/helpers/d-category-link";+import dDasherize from "discourse/ui-kit/helpers/d-dasherize";import { i18n } from "discourse-i18n";function customTagArray(val) {@@ -386,13 +386,13 @@ export default class History extends Component {<DModal@title={{i18n this.modalTitleKey}}@closeModal={{@closeModal}}- class="history-modal -max {{concat '--mode-' (dasherize this.viewMode)}}"+ class="history-modal -max {{concat '--mode-' (dDasherize this.viewMode)}}"><:body>{{#if this.error}}<div class="alert alert-error">{{this.error}}</div>{{/if}}- <ConditionalLoadingSpinner @condition={{this.initialLoad}}>+ <DConditionalLoadingSpinner @condition={{this.initialLoad}}>{{#if this.postRevision}}<Revision@model={{this.postRevision}}@@ -419,7 +419,7 @@ export default class History extends Component {@viewMode={{this.viewMode}}/>{{/if}}- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner></:body><:footer>{{#if @model.editPost}}diff --git a/frontend/discourse/app/components/modal/history/revision.gjs b/frontend/discourse/app/components/modal/history/revision.gjsindex 826b6c5b4e9..2847d1bb07f 100644--- a/frontend/discourse/app/components/modal/history/revision.gjs+++ b/frontend/discourse/app/components/modal/history/revision.gjs@@ -4,12 +4,12 @@ import { LinkTo } from "@ember/routing";import { service } from "@ember/service";import { trustHTML } from "@ember/template";import PluginOutlet from "discourse/components/plugin-outlet";-import ageWithTooltip from "discourse/helpers/age-with-tooltip";-import boundAvatarTemplate from "discourse/helpers/bound-avatar-template";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import lazyHash from "discourse/helpers/lazy-hash";import { and, eq, not } from "discourse/truth-helpers";+import dAgeWithTooltip from "discourse/ui-kit/helpers/d-age-with-tooltip";+import dBoundAvatarTemplate from "discourse/ui-kit/helpers/d-bound-avatar-template";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class Revision extends Component {@@ -19,13 +19,13 @@ export default class Revision extends Component {<template><div id="revision"><div id="revision-details">- {{icon "pencil"}}+ {{dIcon "pencil"}}<LinkTo@route="user"@model={{@model.username}}class="revision-details__user">- {{boundAvatarTemplate @model.avatar_template "small"}}+ {{dBoundAvatarTemplate @model.avatar_template "small"}}{{#if this.siteSettings.prioritize_full_name_in_ux}}{{@model.acting_user_name}}{{else}}@@ -38,7 +38,7 @@ export default class Revision extends Component {/><span class="date">- {{ageWithTooltip @model.created_at format="medium"}}+ {{dAgeWithTooltip @model.created_at format="medium"}}</span>{{#if @model.edit_reason}}@@ -48,13 +48,13 @@ export default class Revision extends Component {{{#if this.site.desktopView}}<span>{{#if @model.user_changes}}- {{boundAvatarTemplate+ {{dBoundAvatarTemplate@model.user_changes.previous.avatar_template"small"}}{{@model.user_changes.previous.username}}→- {{boundAvatarTemplate+ {{dBoundAvatarTemplate@model.user_changes.current.avatar_template"small"}}@@ -63,14 +63,14 @@ export default class Revision extends Component {{{#if @model.reply_to_post_number_changes}}<span class="reply-to-changes">- {{icon "share"}}+ {{dIcon "share"}}{{#if @model.reply_to_post_number_changes.previous}}<span>#{{@model.reply_to_post_number_changes.previous.post_number}}</span>{{#if@model.reply_to_post_number_changes.previous.avatar_template}}- {{boundAvatarTemplate+ {{dBoundAvatarTemplate@model.reply_to_post_number_changes.previous.avatar_template"small"}}@@ -88,7 +88,7 @@ export default class Revision extends Component {{{#if@model.reply_to_post_number_changes.current.avatar_template}}- {{boundAvatarTemplate+ {{dBoundAvatarTemplate@model.reply_to_post_number_changes.current.avatar_template"small"}}@@ -103,14 +103,14 @@ export default class Revision extends Component {{{/if}}{{#if @model.wiki_changes}}- {{icon+ {{dIcon"far-pen-to-square"class=(if @model.wiki_changes.current "diff-ins" "diff-del")}}{{/if}}{{#if @model.post_type_changes}}- {{icon+ {{dIcon"shield-halved"class=(if(eq@@ -124,7 +124,7 @@ export default class Revision extends Component {{{/if}}{{#if @model.archetype_changes}}- {{icon+ {{dIcon(if(eq @model.archetype_changes.current "private_message")"envelope"@@ -139,13 +139,13 @@ export default class Revision extends Component {{{#if @previousCategory}}{{trustHTML @previousCategory}}{{else}}- {{icon "far-eye-slash" class="diff-del"}}+ {{dIcon "far-eye-slash" class="diff-del"}}{{/if}}→{{#if @currentCategory}}{{trustHTML @currentCategory}}{{else}}- {{icon "far-eye-slash" class="diff-ins"}}+ {{dIcon "far-eye-slash" class="diff-ins"}}{{/if}}{{/if}}</span>@@ -158,7 +158,7 @@ export default class Revision extends Component {<li><ahref- class={{concatClass+ class={{dConcatClass"inline-mode"(if (eq @viewMode "inline") "active")}}@@ -166,14 +166,14 @@ export default class Revision extends Component {title={{i18n "post.revisions.displays.inline.title"}}aria-label={{i18n "post.revisions.displays.inline.title"}}>- {{icon "far-square"}}+ {{dIcon "far-square"}}{{i18n "post.revisions.displays.inline.button"}}</a></li><li><ahref- class={{concatClass+ class={{dConcatClass"side-by-side-mode"(if (eq @viewMode "side_by_side") "active")}}@@ -181,14 +181,14 @@ export default class Revision extends Component {title={{i18n "post.revisions.displays.side_by_side.title"}}aria-label={{i18n "post.revisions.displays.side_by_side.title"}}>- {{icon "table-columns"}}+ {{dIcon "table-columns"}}{{i18n "post.revisions.displays.side_by_side.button"}}</a></li><li><ahref- class={{concatClass+ class={{dConcatClass"side-by-side-markdown-mode"(if (eq @viewMode "side_by_side_markdown") "active")}}@@ -200,7 +200,7 @@ export default class Revision extends Component {"post.revisions.displays.side_by_side_markdown.title"}}>- {{icon "table-columns"}}+ {{dIcon "table-columns"}}{{i18n "post.revisions.displays.side_by_side_markdown.button"}}</a></li>diff --git a/frontend/discourse/app/components/modal/history/revisions.gjs b/frontend/discourse/app/components/modal/history/revisions.gjsindex 29ce35b2839..35fac3e4d18 100644--- a/frontend/discourse/app/components/modal/history/revisions.gjs+++ b/frontend/discourse/app/components/modal/history/revisions.gjs@@ -8,11 +8,11 @@ import { trustHTML } from "@ember/template";import { tagName } from "@ember-decorators/component";import LinksRedirect from "discourse/components/links-redirect";import PluginOutlet from "discourse/components/plugin-outlet";-import Avatar from "discourse/helpers/bound-avatar-template";-import icon from "discourse/helpers/d-icon";-import discourseTags from "discourse/helpers/discourse-tags";import lazyHash from "discourse/helpers/lazy-hash";import { and, eq, not, or } from "discourse/truth-helpers";+import dBoundAvatarTemplate from "discourse/ui-kit/helpers/d-bound-avatar-template";+import dDiscourseTags from "discourse/ui-kit/helpers/d-discourse-tags";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";function tagClasses(tagChanges, state, className) {@@ -72,7 +72,7 @@ export default class Revisions extends Component {<div class="row revision__locale"><div class="revision-content --previous"><div class={{if @model.locale_changes.previous "diff-del"}}>- {{icon "globe"}}+ {{dIcon "globe"}}{{this.previousLocale}}</div></div>@@ -83,7 +83,7 @@ export default class Revisions extends Component {<div class="revision-content --current"><div class={{if @model.locale_changes.current "diff-ins"}}>- {{icon "globe"}}+ {{dIcon "globe"}}{{this.currentLocale}}</div></div>@@ -97,22 +97,28 @@ export default class Revisions extends Component {{{#if @mobileView}}{{#if @userChanges}}<div class="row">- {{Avatar @model.user_changes.previous.avatar_template "small"}}+ {{dBoundAvatarTemplate+ @model.user_changes.previous.avatar_template+ "small"+ }}{{@model.user_changes.previous.username}}→- {{Avatar @model.user_changes.current.avatar_template "small"}}+ {{dBoundAvatarTemplate+ @model.user_changes.current.avatar_template+ "small"+ }}{{@model.user_changes.current.username}}</div>{{/if}}{{#if @model.reply_to_post_number_changes}}<div class="row reply-to-changes">- {{icon "share"}}+ {{dIcon "share"}}{{#if @model.reply_to_post_number_changes.previous}}#{{@model.reply_to_post_number_changes.previous.post_number}}{{#if@model.reply_to_post_number_changes.previous.avatar_template}}- {{Avatar+ {{dBoundAvatarTemplate@model.reply_to_post_number_changes.previous.avatar_template"small"}}@@ -129,7 +135,7 @@ export default class Revisions extends Component {{{#if@model.reply_to_post_number_changes.current.avatar_template}}- {{Avatar+ {{dBoundAvatarTemplate@model.reply_to_post_number_changes.current.avatar_template"small"}}@@ -144,7 +150,7 @@ export default class Revisions extends Component {{{/if}}{{#if @model.wiki_changes}}<div class="row">- {{icon+ {{dIcon"far-pen-to-square"class=(if @model.wiki_changes.current "diff-ins" "diff-del")}}@@ -152,7 +158,7 @@ export default class Revisions extends Component {{{/if}}{{#if @model.archetype_changes}}<div class="row">- {{icon+ {{dIcon(if(eq @model.archetype_changes.current "private_message")"envelope"@@ -166,13 +172,13 @@ export default class Revisions extends Component {{{#if @previousCategory}}{{trustHTML @previousCategory}}{{else}}- {{icon "far-eye-slash" class="diff-del"}}+ {{dIcon "far-eye-slash" class="diff-del"}}{{/if}}→{{#if @currentCategory}}{{trustHTML @currentCategory}}{{else}}- {{icon "far-eye-slash" class="diff-ins"}}+ {{dIcon "far-eye-slash" class="diff-ins"}}{{/if}}</div>{{/if}}@@ -180,7 +186,7 @@ export default class Revisions extends Component {{{#if @model.tags_changes}}<div class="row -tag-revisions"><span class="tag-revision__wrapper --previous">- {{discourseTags+ {{dDiscourseTagsthis.fakePreviousTagsTopictagClasses=this.previousTagClassesMap}}@@ -191,7 +197,7 @@ export default class Revisions extends Component {{{/if}}<span class="tag-revision__wrapper --current">- {{discourseTags+ {{dDiscourseTagsthis.fakeCurrentTagsTopictagClasses=this.currentTagClassesMap}}diff --git a/frontend/discourse/app/components/modal/history/topic-footer.gjs b/frontend/discourse/app/components/modal/history/topic-footer.gjsindex 7616c9e6182..660286ed85a 100644--- a/frontend/discourse/app/components/modal/history/topic-footer.gjs+++ b/frontend/discourse/app/components/modal/history/topic-footer.gjs@@ -1,7 +1,7 @@import { trustHTML } from "@ember/template";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DButton from "discourse/components/d-button";import { and } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";const TopicFooter = <template><div id="revision-controls">@@ -22,9 +22,9 @@ const TopicFooter = <template>/></div><div id="revision-numbers" class={{unless @displayRevisions "invisible"}}>- <ConditionalLoadingSpinner @condition={{@loading}} @size="small">+ <DConditionalLoadingSpinner @condition={{@loading}} @size="small">{{trustHTML @revisionsText}}- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner></div><div class="revision-controls--forward"><DButtondiff --git a/frontend/discourse/app/components/modal/ignore-duration-with-username.gjs b/frontend/discourse/app/components/modal/ignore-duration-with-username.gjsindex 280c48ade43..2a33fb095c9 100644--- a/frontend/discourse/app/components/modal/ignore-duration-with-username.gjs+++ b/frontend/discourse/app/components/modal/ignore-duration-with-username.gjs@@ -4,15 +4,15 @@ import { tracked } from "@glimmer/tracking";import { fn, hash } from "@ember/helper";import { action } from "@ember/object";import { service } from "@ember/service";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";-import FutureDateInput from "discourse/components/future-date-input";-import icon from "discourse/helpers/d-icon";import { popupAjaxError } from "discourse/lib/ajax-error";import { timeShortcuts } from "discourse/lib/time-shortcut";import User from "discourse/models/user";import EmailGroupUserChooser from "discourse/select-kit/components/email-group-user-chooser";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DFutureDateInput from "discourse/ui-kit/d-future-date-input";+import DModal from "discourse/ui-kit/d-modal";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class IgnoreDurationModal extends Component {@@ -87,7 +87,7 @@ export default class IgnoreDurationModal extends Component {<:body>{{#if this.enableSelection}}<div class="controls tracking-controls">- <label>{{icon "far-eye-slash" class="icon"}}+ <label>{{dIcon "far-eye-slash" class="icon"}}{{i18n"user.user_notifications.ignore_duration_username"}}</label>@@ -98,7 +98,7 @@ export default class IgnoreDurationModal extends Component {/></div>{{/if}}- <FutureDateInput+ <DFutureDateInput@label="user.user_notifications.ignore_duration_when"@input={{readonly this.ignoredUntil}}@customShortcuts={{this.timeShortcuts}}@@ -114,7 +114,7 @@ export default class IgnoreDurationModal extends Component {@action={{this.ignore}}class="btn-primary"/>- <ConditionalLoadingSpinner @size="small" @condition={{this.loading}} />+ <DConditionalLoadingSpinner @size="small" @condition={{this.loading}} /></:footer></DModal></template>diff --git a/frontend/discourse/app/components/modal/json-schema-editor.gjs b/frontend/discourse/app/components/modal/json-schema-editor.gjsindex cd7daf65e56..b26ec48ab85 100644--- a/frontend/discourse/app/components/modal/json-schema-editor.gjs+++ b/frontend/discourse/app/components/modal/json-schema-editor.gjs@@ -5,9 +5,9 @@ import { action } from "@ember/object";import didInsert from "@ember/render-modifiers/modifiers/did-insert";import willDestroy from "@ember/render-modifiers/modifiers/will-destroy";import { waitForPromise } from "@ember/test-waiters";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";import { iconElement } from "discourse/lib/icon-library";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";export default class JsonSchemaEditorModal extends Component {diff --git a/frontend/discourse/app/components/modal/jump-to-post.gjs b/frontend/discourse/app/components/modal/jump-to-post.gjsindex 8d88167da42..deb3bbf4b88 100644--- a/frontend/discourse/app/components/modal/jump-to-post.gjs+++ b/frontend/discourse/app/components/modal/jump-to-post.gjs@@ -2,10 +2,10 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { Input } from "@ember/component";import { action } from "@ember/object";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";-import DModalCancel from "discourse/components/d-modal-cancel";-import DatePicker from "discourse/components/date-picker";+import DButton from "discourse/ui-kit/d-button";+import DDatePicker from "discourse/ui-kit/d-date-picker";+import DModal from "discourse/ui-kit/d-modal";+import DModalCancel from "discourse/ui-kit/d-modal-cancel";import { i18n } from "discourse-i18n";export default class JumpToPost extends Component {@@ -71,7 +71,7 @@ export default class JumpToPost extends Component {<span class="input-hint-text post-date">{{i18n "topic.progress.jump_prompt_to_date"}}</span>- <DatePicker+ <DDatePicker@value={{this.postDate}}@defaultDate="YYYY-MM-DD"id="post-date"diff --git a/frontend/discourse/app/components/modal/keyboard-shortcuts-help.gjs b/frontend/discourse/app/components/modal/keyboard-shortcuts-help.gjsindex bb7050d3656..c13fdda9aeb 100644--- a/frontend/discourse/app/components/modal/keyboard-shortcuts-help.gjs+++ b/frontend/discourse/app/components/modal/keyboard-shortcuts-help.gjs@@ -4,10 +4,10 @@ import { concat } from "@ember/helper";import { action } from "@ember/object";import { service } from "@ember/service";import { trustHTML } from "@ember/template";-import DModal from "discourse/components/d-modal";-import FilterInput from "discourse/components/filter-input";import { translateModKey } from "discourse/lib/utilities";import { extraKeyboardShortcutsHelp } from "discourse/services/keyboard-shortcuts";+import DFilterInput from "discourse/ui-kit/d-filter-input";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";const KEY = "keyboard_shortcuts_help";@@ -461,7 +461,7 @@ export default class KeyboardShortcutsHelp extends Component {<:body><div id="keyboard-shortcuts-help">- <FilterInput+ <DFilterInput@filterAction={{this.filterShortcuts}}@value={{this.searchTerm}}placeholder={{i18n "keyboard_shortcuts_help.search_placeholder"}}diff --git a/frontend/discourse/app/components/modal/move-to-topic.gjs b/frontend/discourse/app/components/modal/move-to-topic.gjsindex 63611150218..f581fdb8bcd 100644--- a/frontend/discourse/app/components/modal/move-to-topic.gjs+++ b/frontend/discourse/app/components/modal/move-to-topic.gjs@@ -8,11 +8,7 @@ import { trustHTML } from "@ember/template";import { isEmpty } from "@ember/utils";import ChooseMessage from "discourse/components/choose-message";import ChooseTopic from "discourse/components/choose-topic";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";import PluginOutlet from "discourse/components/plugin-outlet";-import RadioButton from "discourse/components/radio-button";-import TextField from "discourse/components/text-field";import lazyHash from "discourse/helpers/lazy-hash";import { extractError } from "discourse/lib/ajax-error";import { applyValueTransformer } from "discourse/lib/transformer";@@ -21,6 +17,10 @@ import { mergeTopic, movePosts } from "discourse/models/topic";import CategoryChooser from "discourse/select-kit/components/category-chooser";import EmailGroupUserChooser from "discourse/select-kit/components/email-group-user-chooser";import TagChooser from "discourse/select-kit/components/tag-chooser";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";+import DRadioButton from "discourse/ui-kit/d-radio-button";+import DTextField from "discourse/ui-kit/d-text-field";import { i18n } from "discourse-i18n";export default class MoveToTopic extends Component {@@ -222,7 +222,7 @@ export default class MoveToTopic extends Component {<div class="radios">{{#if this.canSplitToPM}}<label class="radio-label" for="move-to-new-message">- <RadioButton+ <DRadioButtonid="move-to-new-message"@name="move-to-entity"@value="new_message"@@ -233,7 +233,7 @@ export default class MoveToTopic extends Component {{{/if}}<label class="radio-label" for="move-to-existing-message">- <RadioButton+ <DRadioButtonid="move-to-existing-message"@name="move-to-entity"@value="existing_message"@@ -257,7 +257,7 @@ export default class MoveToTopic extends Component {<label>{{i18n"topic.move_to_new_message.message_title"}}</label>- <TextField+ <DTextField@value={{this.topicName}}@placeholderKey="composer.title_placeholder"id="split-topic-name"@@ -312,7 +312,7 @@ export default class MoveToTopic extends Component {<div class="radios">{{#if this.canSplitTopic}}<label class="radio-label" for="move-to-new-topic">- <RadioButton+ <DRadioButtonid="move-to-new-topic"@name="move-to-entity"@value="new_topic"@@ -323,7 +323,7 @@ export default class MoveToTopic extends Component {{{/if}}<label class="radio-label" for="move-to-existing-topic">- <RadioButton+ <DRadioButtonid="move-to-existing-topic"@name="move-to-entity"@value="existing_topic"@@ -334,7 +334,7 @@ export default class MoveToTopic extends Component {{{#if this.canSplitToPM}}<label class="radio-label" for="move-to-new-message">- <RadioButton+ <DRadioButtonid="move-to-new-message"@name="move-to-entity"@value="new_message"@@ -390,7 +390,7 @@ export default class MoveToTopic extends Component {<form class="split-new-topic-form"><div class="control-group"><label>{{i18n "topic.split_topic.topic_name"}}</label>- <TextField+ <DTextField@value={{this.topicName}}@placeholderKey="composer.title_placeholder"id="split-topic-name"@@ -455,7 +455,7 @@ export default class MoveToTopic extends Component {<label>{{i18n"topic.move_to_new_message.message_title"}}</label>- <TextField+ <DTextField@value={{this.topicName}}@placeholderKey="composer.title_placeholder"id="split-topic-name"diff --git a/frontend/discourse/app/components/modal/nested-activity-log.gjs b/frontend/discourse/app/components/modal/nested-activity-log.gjsindex 437d0254a28..fb39e9cd272 100644--- a/frontend/discourse/app/components/modal/nested-activity-log.gjs+++ b/frontend/discourse/app/components/modal/nested-activity-log.gjs@@ -1,11 +1,11 @@import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DModal from "discourse/components/d-modal";import NestedActivityLogItem from "discourse/components/modal/nested-activity-log/item";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";export default class NestedActivityLog extends Component {@@ -37,7 +37,7 @@ export default class NestedActivityLog extends Component {class="nested-activity-log-modal"><:body>- <ConditionalLoadingSpinner @condition={{this.loading}}>+ <DConditionalLoadingSpinner @condition={{this.loading}}>{{#if this.smallActions.length}}<ul class="nested-activity-log-modal__list">{{#each this.smallActions as |sa|}}@@ -52,7 +52,7 @@ export default class NestedActivityLog extends Component {{{i18n "nested_replies.activity_log.empty"}}</p>{{/if}}- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner></:body></DModal></template>diff --git a/frontend/discourse/app/components/modal/nested-activity-log/item.gjs b/frontend/discourse/app/components/modal/nested-activity-log/item.gjsindex cfecf836659..e20cfb9129c 100644--- a/frontend/discourse/app/components/modal/nested-activity-log/item.gjs+++ b/frontend/discourse/app/components/modal/nested-activity-log/item.gjs@@ -5,12 +5,12 @@ import {GROUP_ACTION_CODES,ICONS,} from "discourse/components/post/small-action";-import UserAvatar from "discourse/components/user-avatar";-import icon from "discourse/helpers/d-icon";import { autoUpdatingRelativeAge } from "discourse/lib/formatter";import getURL from "discourse/lib/get-url";import { userPath } from "discourse/lib/url";import { escapeExpression } from "discourse/lib/utilities";+import DUserAvatar from "discourse/ui-kit/d-user-avatar";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";const ACTIVITY_LOG_ICONS = {@@ -69,12 +69,12 @@ export default class NestedActivityLogItem extends Component {<template><li class="nested-activity-log-modal__item"><span class="nested-activity-log-modal__icon" aria-hidden="true">- {{icon this.iconName}}+ {{dIcon this.iconName}}</span><div class="nested-activity-log-modal__content"><div class="nested-activity-log-modal__desc">{{#if this.user}}- <UserAvatar+ <DUserAvatar@ariaHidden={{true}}@size="small"@user={{this.user}}diff --git a/frontend/discourse/app/components/modal/not-activated.gjs b/frontend/discourse/app/components/modal/not-activated.gjsindex 9ed548084a8..2b10071f32a 100644--- a/frontend/discourse/app/components/modal/not-activated.gjs+++ b/frontend/discourse/app/components/modal/not-activated.gjs@@ -3,8 +3,8 @@ import { action } from "@ember/object";import { service } from "@ember/service";import { trustHTML } from "@ember/template";import ActivationControls from "discourse/components/activation-controls";-import DModal from "discourse/components/d-modal";import { resendActivationEmail } from "discourse/lib/user-activation";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";import ActivationEdit from "./activation-edit";import ActivationResent from "./activation-resent";diff --git a/frontend/discourse/app/components/modal/post-enqueued.gjs b/frontend/discourse/app/components/modal/post-enqueued.gjsindex a38492ccfd6..1c830d2c418 100644--- a/frontend/discourse/app/components/modal/post-enqueued.gjs+++ b/frontend/discourse/app/components/modal/post-enqueued.gjs@@ -1,6 +1,6 @@import { trustHTML } from "@ember/template";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";const PostEnqueued = <template>diff --git a/frontend/discourse/app/components/modal/post-translations.gjs b/frontend/discourse/app/components/modal/post-translations.gjsindex bdc30fd1e52..eeee2feb294 100644--- a/frontend/discourse/app/components/modal/post-translations.gjs+++ b/frontend/discourse/app/components/modal/post-translations.gjs@@ -3,15 +3,15 @@ import { tracked } from "@glimmer/tracking";import { fn } from "@ember/helper";import { action } from "@ember/object";import { service } from "@ember/service";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DButton from "discourse/components/d-button";import DEditorOriginalTranslationPreview from "discourse/components/d-editor-original-translation-preview";-import DModal from "discourse/components/d-modal";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import Composer from "discourse/models/composer";import PostLocalization from "discourse/models/post-localization";import TopicLocalization from "discourse/models/topic-localization";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";export default class PostTranslationsModal extends Component {@@ -114,7 +114,7 @@ export default class PostTranslationsModal extends Component {class="post-translations-modal"><:body>- <ConditionalLoadingSpinner @size="large" @condition={{this.loading}} />+ <DConditionalLoadingSpinner @size="large" @condition={{this.loading}} />{{#if this.postLocalizations}}<table>diff --git a/frontend/discourse/app/components/modal/publish-page.gjs b/frontend/discourse/app/components/modal/publish-page.gjsindex 7340640aa8a..e35e59db9a4 100644--- a/frontend/discourse/app/components/modal/publish-page.gjs+++ b/frontend/discourse/app/components/modal/publish-page.gjs@@ -4,12 +4,12 @@ import { Input } from "@ember/component";import { on } from "@ember/modifier";import { action } from "@ember/object";import { service } from "@ember/service";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";-import TextField from "discourse/components/text-field";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DModal from "discourse/ui-kit/d-modal";+import DTextField from "discourse/ui-kit/d-text-field";import { i18n } from "discourse-i18n";const States = {@@ -180,7 +180,7 @@ export default class PublishPageModal extends Component {{{#if this.unpublished}}<p>{{i18n "topic.publish_page.unpublished"}}</p>{{else}}- <ConditionalLoadingSpinner @condition={{this.initializing}}>+ <DConditionalLoadingSpinner @condition={{this.initializing}}><p class="publish-description">{{i18n"topic.publish_page.description"}}</p>@@ -188,7 +188,7 @@ export default class PublishPageModal extends Component {<form><div class="controls"><label>{{i18n "topic.publish_page.slug"}}</label>- <TextField+ <DTextField@value={{this.publishedPage.slug}}@onChange={{this.checkSlug}}@onChangeImmediate={{this.startCheckSlug}}@@ -212,7 +212,7 @@ export default class PublishPageModal extends Component {</form><div class="publish-url">- <ConditionalLoadingSpinner @condition={{this.checking}} />+ <DConditionalLoadingSpinner @condition={{this.checking}} />{{#if this.existing}}<div class="current-url">@@ -240,7 +240,7 @@ export default class PublishPageModal extends Component {{{/if}}</div>- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner>{{/if}}</:body><:footer>diff --git a/frontend/discourse/app/components/modal/raw-email.gjs b/frontend/discourse/app/components/modal/raw-email.gjsindex 14b86f4d57c..91650205729 100644--- a/frontend/discourse/app/components/modal/raw-email.gjs+++ b/frontend/discourse/app/components/modal/raw-email.gjs@@ -2,11 +2,11 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { Textarea } from "@ember/component";import { action } from "@ember/object";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";import IframedHtml from "discourse/components/iframed-html";import Post from "discourse/models/post";import { eq } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";export default class RawEmailComponent extends Component {diff --git a/frontend/discourse/app/components/modal/reject-reason-reviewable.gjs b/frontend/discourse/app/components/modal/reject-reason-reviewable.gjsindex 7eb0a0f28d0..8519cd587c0 100644--- a/frontend/discourse/app/components/modal/reject-reason-reviewable.gjs+++ b/frontend/discourse/app/components/modal/reject-reason-reviewable.gjs@@ -1,8 +1,8 @@import Component from "@glimmer/component";import { Input, Textarea } from "@ember/component";import { action } from "@ember/object";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";export default class RejectReasonReviewableModal extends Component {diff --git a/frontend/discourse/app/components/modal/reorder-categories.gjs b/frontend/discourse/app/components/modal/reorder-categories.gjsindex f6cde99563a..c4cf06c029e 100644--- a/frontend/discourse/app/components/modal/reorder-categories.gjs+++ b/frontend/discourse/app/components/modal/reorder-categories.gjs@@ -5,13 +5,13 @@ import { on } from "@ember/modifier";import { action } from "@ember/object";import { service } from "@ember/service";import { compare } from "@ember/utils";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";-import categoryBadge from "discourse/helpers/category-badge";import withEventValue from "discourse/helpers/with-event-value";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import { eq, not } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";+import dCategoryBadge from "discourse/ui-kit/helpers/d-category-badge";import { i18n } from "discourse-i18n";class Entry {@@ -212,7 +212,7 @@ export default class ReorderCategories extends Component {><td><div class={{concat "reorder-categories-depth-" entry.depth}}>- {{categoryBadge entry.category allowUncategorized="true"}}+ {{dCategoryBadge entry.category allowUncategorized="true"}}</div></td>diff --git a/frontend/discourse/app/components/modal/request-group-membership-form.gjs b/frontend/discourse/app/components/modal/request-group-membership-form.gjsindex 2d667469b7b..bb68489b2cd 100644--- a/frontend/discourse/app/components/modal/request-group-membership-form.gjs+++ b/frontend/discourse/app/components/modal/request-group-membership-form.gjs@@ -5,14 +5,14 @@ import { fn } from "@ember/helper";import { on } from "@ember/modifier";import { action } from "@ember/object";import { isEmpty } from "@ember/utils";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";-import DModalCancel from "discourse/components/d-modal-cancel";-import ExpandingTextArea from "discourse/components/expanding-text-area";import withEventValue from "discourse/helpers/with-event-value";import { popupAjaxError } from "discourse/lib/ajax-error";import DiscourseURL from "discourse/lib/url";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DExpandingTextArea from "discourse/ui-kit/d-expanding-text-area";+import DModal from "discourse/ui-kit/d-modal";+import DModalCancel from "discourse/ui-kit/d-modal-cancel";import { i18n } from "discourse-i18n";export default class RequestGroupMembershipForm extends Component {@@ -56,7 +56,7 @@ export default class RequestGroupMembershipForm extends Component {{{i18n "groups.membership_request.reason"}}</label>- <ExpandingTextArea+ <DExpandingTextArea{{on "input" (withEventValue (fn (mut this.reason)))}}value={{this.reason}}maxlength="5000"@@ -73,7 +73,7 @@ export default class RequestGroupMembershipForm extends Component {/><DModalCancel @close={{@closeModal}} />- <ConditionalLoadingSpinner @size="small" @condition={{this.loading}} />+ <DConditionalLoadingSpinner @size="small" @condition={{this.loading}} /></:footer></DModal></template>diff --git a/frontend/discourse/app/components/modal/revise-and-reject-post-reviewable.gjs b/frontend/discourse/app/components/modal/revise-and-reject-post-reviewable.gjsindex 043910d1732..f8565557ca7 100644--- a/frontend/discourse/app/components/modal/revise-and-reject-post-reviewable.gjs+++ b/frontend/discourse/app/components/modal/revise-and-reject-post-reviewable.gjs@@ -5,12 +5,12 @@ import { fn } from "@ember/helper";import { action } from "@ember/object";import { service } from "@ember/service";import { isEmpty } from "@ember/utils";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";-import DTextarea from "discourse/components/d-textarea";import ReviewableQueuedPost from "discourse/components/reviewable/queued-post";import { popupAjaxError } from "discourse/lib/ajax-error";import ComboBox from "discourse/select-kit/components/combo-box";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";+import DTextarea from "discourse/ui-kit/d-textarea";import { i18n } from "discourse-i18n";const OTHER_REASON = "other_reason";diff --git a/frontend/discourse/app/components/modal/second-factor-add-security-key.gjs b/frontend/discourse/app/components/modal/second-factor-add-security-key.gjsindex 7fd5d81da13..67b0539aa74 100644--- a/frontend/discourse/app/components/modal/second-factor-add-security-key.gjs+++ b/frontend/discourse/app/components/modal/second-factor-add-security-key.gjs@@ -5,15 +5,15 @@ import { action } from "@ember/object";import didInsert from "@ember/render-modifiers/modifiers/did-insert";import { service } from "@ember/service";import { trustHTML } from "@ember/template";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";import {bufferToBase64,isWebauthnSupported,stringToBuffer,} from "discourse/lib/webauthn";import { MAX_SECOND_FACTOR_NAME_LENGTH } from "discourse/models/user";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";export default class SecondFactorAddSecurityKey extends Component {@@ -169,7 +169,7 @@ export default class SecondFactorAddSecurityKey extends Component {{{didInsert this.securityKeyRequested}}><:body>- <ConditionalLoadingSpinner @condition={{this.loading}}>+ <DConditionalLoadingSpinner @condition={{this.loading}}>{{#if this.errorMessage}}<div class="control-group"><div class="controls">@@ -208,7 +208,7 @@ export default class SecondFactorAddSecurityKey extends Component {{{/unless}}</div></div>- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner></:body></DModal></template>diff --git a/frontend/discourse/app/components/modal/second-factor-add-totp.gjs b/frontend/discourse/app/components/modal/second-factor-add-totp.gjsindex 623bbc09d05..0e9a825d348 100644--- a/frontend/discourse/app/components/modal/second-factor-add-totp.gjs+++ b/frontend/discourse/app/components/modal/second-factor-add-totp.gjs@@ -5,17 +5,17 @@ import { on } from "@ember/modifier";import { action } from "@ember/object";import didInsert from "@ember/render-modifiers/modifiers/did-insert";import { trustHTML } from "@ember/template";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";import PluginOutlet from "discourse/components/plugin-outlet";-import SecondFactorInput from "discourse/components/second-factor-input";import lazyHash from "discourse/helpers/lazy-hash";import withEventValue from "discourse/helpers/with-event-value";import {MAX_SECOND_FACTOR_NAME_LENGTH,SECOND_FACTOR_METHODS,} from "discourse/models/user";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DModal from "discourse/ui-kit/d-modal";+import DSecondFactorInput from "discourse/ui-kit/d-second-factor-input";import { i18n } from "discourse-i18n";export default class SecondFactorAddTotp extends Component {@@ -92,7 +92,7 @@ export default class SecondFactorAddTotp extends Component {{{didInsert this.totpRequested}}><:body>- <ConditionalLoadingSpinner @condition={{this.loading}}>+ <DConditionalLoadingSpinner @condition={{this.loading}}><PluginOutlet@name="user-second-factor-totp-modal-wrapper"@outletArgs={{lazyHash@@ -165,7 +165,7 @@ export default class SecondFactorAddTotp extends Component {{{i18n "user.second_factor.label"}}</label><div class="controls totp-app-token">- <SecondFactorInput+ <DSecondFactorInput@onChange={{fn (mut this.secondFactorToken)}}@secondFactorMethod={{this.totpType}}value={{this.secondFactorToken}}@@ -184,7 +184,7 @@ export default class SecondFactorAddTotp extends Component {</div></div></PluginOutlet>- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner></:body></DModal></template>diff --git a/frontend/discourse/app/components/modal/second-factor-backup-edit.gjs b/frontend/discourse/app/components/modal/second-factor-backup-edit.gjsindex 639ab39a39e..1c7257c5bb6 100644--- a/frontend/discourse/app/components/modal/second-factor-backup-edit.gjs+++ b/frontend/discourse/app/components/modal/second-factor-backup-edit.gjs@@ -4,10 +4,10 @@ import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";import { trustHTML } from "@ember/template";import BackupCodes from "discourse/components/backup-codes";-import ConditionalLoadingSection from "discourse/components/conditional-loading-section";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";import { debounce } from "discourse/lib/decorators";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSection from "discourse/ui-kit/d-conditional-loading-section";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";export default class SecondFactorBackupEdit extends Component {@@ -86,7 +86,7 @@ export default class SecondFactorBackupEdit extends Component {</div>{{/if}}- <ConditionalLoadingSection @isLoading={{this.loading}}>+ <DConditionalLoadingSection @isLoading={{this.loading}}>{{#if this.backupCodes}}<h3>{{i18n "user.second_factor_backup.codes.title"}}</h3><p>{{i18n "user.second_factor_backup.codes.description"}}</p>@@ -95,7 +95,7 @@ export default class SecondFactorBackupEdit extends Component {@backupCodes={{this.backupCodes}}/>{{/if}}- </ConditionalLoadingSection>+ </DConditionalLoadingSection>{{#if this.backupEnabled}}{{trustHTMLdiff --git a/frontend/discourse/app/components/modal/second-factor-edit-security-key.gjs b/frontend/discourse/app/components/modal/second-factor-edit-security-key.gjsindex 7ef6357f5e9..1b83874d027 100644--- a/frontend/discourse/app/components/modal/second-factor-edit-security-key.gjs+++ b/frontend/discourse/app/components/modal/second-factor-edit-security-key.gjs@@ -2,9 +2,9 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { Input } from "@ember/component";import { action } from "@ember/object";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";import { MAX_SECOND_FACTOR_NAME_LENGTH } from "discourse/models/user";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";export default class SecondFactorEditSecurityKey extends Component {diff --git a/frontend/discourse/app/components/modal/second-factor-edit.gjs b/frontend/discourse/app/components/modal/second-factor-edit.gjsindex 1362283ef5f..0703c37ba19 100644--- a/frontend/discourse/app/components/modal/second-factor-edit.gjs+++ b/frontend/discourse/app/components/modal/second-factor-edit.gjs@@ -2,9 +2,9 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { Input } from "@ember/component";import { action } from "@ember/object";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";import { MAX_SECOND_FACTOR_NAME_LENGTH } from "discourse/models/user";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";export default class SecondFactorEdit extends Component {diff --git a/frontend/discourse/app/components/modal/share-topic.gjs b/frontend/discourse/app/components/modal/share-topic.gjsindex 13e5e2cd352..82ac048809c 100644--- a/frontend/discourse/app/components/modal/share-topic.gjs+++ b/frontend/discourse/app/components/modal/share-topic.gjs@@ -4,9 +4,6 @@ import { action, computed } from "@ember/object";import { getOwner } from "@ember/owner";import { service } from "@ember/service";import { tagName } from "@ember-decorators/component";-import CopyButton from "discourse/components/copy-button";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";import CreateInvite from "discourse/components/modal/create-invite";import PluginOutlet from "discourse/components/plugin-outlet";import ShareSource from "discourse/components/share-source";@@ -16,6 +13,9 @@ import { longDateNoYear } from "discourse/lib/formatter";import { getAbsoluteURL } from "discourse/lib/get-url";import Sharing from "discourse/lib/sharing";import Category from "discourse/models/category";+import DButton from "discourse/ui-kit/d-button";+import DCopyButton from "discourse/ui-kit/d-copy-button";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";@tagName("")@@ -167,7 +167,7 @@ export default class ShareTopicModal extends Component {readonly={{true}}size="200"/>- <CopyButton @selector="input.invite-link" @ariaLabel="share.url" />+ <DCopyButton @selector="input.invite-link" @ariaLabel="share.url" /></div></div>diff --git a/frontend/discourse/app/components/modal/sidebar-section-form.gjs b/frontend/discourse/app/components/modal/sidebar-section-form.gjsindex 7e11022f7e8..a2884118d3e 100644--- a/frontend/discourse/app/components/modal/sidebar-section-form.gjs+++ b/frontend/discourse/app/components/modal/sidebar-section-form.gjs@@ -7,11 +7,8 @@ import { action } from "@ember/object";import { service } from "@ember/service";import { isEmpty } from "@ember/utils";import { tagName } from "@ember-decorators/component";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";import SectionFormLink from "discourse/components/sidebar/section-form-link";import DTooltip from "discourse/float-kit/components/d-tooltip";-import icon from "discourse/helpers/d-icon";import withEventValue from "discourse/helpers/with-event-value";import { ajax } from "discourse/lib/ajax";import { extractError } from "discourse/lib/ajax-error";@@ -21,6 +18,9 @@ import { afterRender, bind } from "discourse/lib/decorators";import { sanitize } from "discourse/lib/text";import { autoTrackedArray } from "discourse/lib/tracked-tools";import { and, not } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";class Section {@@ -658,7 +658,7 @@ export default class SidebarSectionForm extends Component {class="always-public-tooltip"><:trigger>- {{icon "square-check"}}+ {{dIcon "square-check"}}<span>{{i18n "sidebar.sections.custom.public"}}</span></:trigger></DTooltip>diff --git a/frontend/discourse/app/components/modal/spreadsheet-editor.gjs b/frontend/discourse/app/components/modal/spreadsheet-editor.gjsindex 095ed6d669c..8d6ebd11e32 100644--- a/frontend/discourse/app/components/modal/spreadsheet-editor.gjs+++ b/frontend/discourse/app/components/modal/spreadsheet-editor.gjs@@ -4,11 +4,6 @@ import { action } from "@ember/object";import didInsert from "@ember/render-modifiers/modifiers/did-insert";import { service } from "@ember/service";import { waitForPromise } from "@ember/test-waiters";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";-import DModalCancel from "discourse/components/d-modal-cancel";-import TextField from "discourse/components/text-field";import DTooltip from "discourse/float-kit/components/d-tooltip";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";@@ -17,6 +12,11 @@ import {replaceTableRaw,tokenRange,} from "discourse/lib/utilities";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DModal from "discourse/ui-kit/d-modal";+import DModalCancel from "discourse/ui-kit/d-modal-cancel";+import DTextField from "discourse/ui-kit/d-text-field";import { i18n } from "discourse-i18n";export default class SpreadsheetEditor extends Component {@@ -361,13 +361,13 @@ export default class SpreadsheetEditor extends Component {class="insert-table-modal"><:body>- <ConditionalLoadingSpinner @condition={{this.loading}}>+ <DConditionalLoadingSpinner @condition={{this.loading}}><div{{didInsert this.createSpreadsheet}}tabindex="1"class="jexcel_container"></div>- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner></:body><:footer>@@ -393,7 +393,7 @@ export default class SpreadsheetEditor extends Component {class="btn-edit-reason"/>{{#if this.showEditReason}}- <TextField+ <DTextField@value={{this.editReason}}@placeholderKey="table_builder.edit.modal.reason"/>diff --git a/frontend/discourse/app/components/modal/update-default-text-size.gjs b/frontend/discourse/app/components/modal/update-default-text-size.gjsindex cbde8903a4f..4096e7c5ef3 100644--- a/frontend/discourse/app/components/modal/update-default-text-size.gjs+++ b/frontend/discourse/app/components/modal/update-default-text-size.gjs@@ -1,7 +1,7 @@import Component from "@glimmer/component";import { action } from "@ember/object";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";export default class UpdateDefaultTextSize extends Component {diff --git a/frontend/discourse/app/components/modal/upsert-hyperlink.gjs b/frontend/discourse/app/components/modal/upsert-hyperlink.gjsindex eda87954b7b..a43e75a3b3b 100644--- a/frontend/discourse/app/components/modal/upsert-hyperlink.gjs+++ b/frontend/discourse/app/components/modal/upsert-hyperlink.gjs@@ -4,17 +4,17 @@ import { on } from "@ember/modifier";import { action } from "@ember/object";import { cancel } from "@ember/runloop";import { isEmpty } from "@ember/utils";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";import Form from "discourse/components/form";import TopicStatus from "discourse/components/topic-status";-import categoryLink from "discourse/helpers/category-link";-import discourseTags from "discourse/helpers/discourse-tags";-import loadingSpinner from "discourse/helpers/loading-spinner";-import replaceEmoji from "discourse/helpers/replace-emoji";import discourseDebounce from "discourse/lib/debounce";import { searchForTerm } from "discourse/lib/search";import { prefixProtocol } from "discourse/lib/url";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";+import dCategoryLink from "discourse/ui-kit/helpers/d-category-link";+import dDiscourseTags from "discourse/ui-kit/helpers/d-discourse-tags";+import dLoadingSpinner from "discourse/ui-kit/helpers/d-loading-spinner";+import dReplaceEmoji from "discourse/ui-kit/helpers/d-replace-emoji";import { i18n } from "discourse-i18n";export default class UpsertHyperlink extends Component {@@ -238,7 +238,7 @@ export default class UpsertHyperlink extends Component {</form.Field>{{#if this.searchLoading}}- {{loadingSpinner}}+ {{dLoadingSpinner}}{{/if}}{{#if this.searchResults}}@@ -251,13 +251,13 @@ export default class UpsertHyperlink extends Component {class="search-link"><TopicStatus @topic={{result}} @disableActions={{true}} />- {{replaceEmoji result.title}}+ {{dReplaceEmoji result.title}}<div class="search-category">{{#if result.category.parentCategory}}- {{categoryLink result.category.parentCategory}}+ {{dCategoryLink result.category.parentCategory}}{{/if}}- {{categoryLink result.category hideParent=true}}- {{discourseTags result}}+ {{dCategoryLink result.category hideParent=true}}+ {{dDiscourseTags result}}</div></a>{{/each}}diff --git a/frontend/discourse/app/components/modal/user-status.gjs b/frontend/discourse/app/components/modal/user-status.gjsindex 61694611b03..8950ca9e9a2 100644--- a/frontend/discourse/app/components/modal/user-status.gjs+++ b/frontend/discourse/app/components/modal/user-status.gjs@@ -4,16 +4,16 @@ import { action } from "@ember/object";import { trackedObject } from "@ember/reactive/collections";import { service } from "@ember/service";import ItsATrap from "@discourse/itsatrap";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";-import DModalCancel from "discourse/components/d-modal-cancel";-import TimeShortcutPicker from "discourse/components/time-shortcut-picker";import UserStatusPicker from "discourse/components/user-status-picker";import { popupAjaxError } from "discourse/lib/ajax-error";import {TIME_SHORTCUT_TYPES,timeShortcuts,} from "discourse/lib/time-shortcut";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";+import DModalCancel from "discourse/ui-kit/d-modal-cancel";+import DTimeShortcutPicker from "discourse/ui-kit/d-time-shortcut-picker";import { i18n } from "discourse-i18n";export default class UserStatusModal extends Component {@@ -123,7 +123,7 @@ export default class UserStatusModal extends Component {{{i18n "user_status.remove_status"}}</label>- <TimeShortcutPicker+ <DTimeShortcutPicker@timeShortcuts={{this.timeShortcuts}}@hiddenOptions={{this.hiddenTimeShortcutOptions}}@customLabels={{this.customTimeShortcutLabels}}diff --git a/frontend/discourse/app/components/more-topics.gjs b/frontend/discourse/app/components/more-topics.gjsindex 54fca639067..5df1e62b790 100644--- a/frontend/discourse/app/components/more-topics.gjs+++ b/frontend/discourse/app/components/more-topics.gjs@@ -2,8 +2,8 @@ import Component from "@glimmer/component";import { service } from "@ember/service";import { modifier } from "ember-modifier";import BrowseMore from "discourse/components/more-topics/browse-more";-import concatClass from "discourse/helpers/concat-class";import { eq } from "discourse/truth-helpers";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";export let registeredTabs = [];@@ -23,7 +23,7 @@ export default class MoreTopics extends Component {<div class="more-topics__container" {{this.syncTopic @topic}}>{{#if this.moreTopicsTabs.selectedTab}}<div- class={{concatClass+ class={{dConcatClass"more-topics__lists"(if (eq this.moreTopicsTabs.tabs.length 1) "single-list")}}diff --git a/frontend/discourse/app/components/more-topics/browse-more.gjs b/frontend/discourse/app/components/more-topics/browse-more.gjsindex b0db2796874..75e8ef97a0b 100644--- a/frontend/discourse/app/components/more-topics/browse-more.gjs+++ b/frontend/discourse/app/components/more-topics/browse-more.gjs@@ -1,9 +1,9 @@import Component from "@glimmer/component";import { service } from "@ember/service";import { trustHTML } from "@ember/template";-import { categoryBadgeHTML } from "discourse/helpers/category-link";import getURL from "discourse/lib/get-url";import { iconHTML } from "discourse/lib/icon-library";+import { categoryBadgeHTML } from "discourse/ui-kit/helpers/d-category-link";import I18n, { i18n } from "discourse-i18n";export default class BrowseMore extends Component {diff --git a/frontend/discourse/app/components/navigation-bar.gjs b/frontend/discourse/app/components/navigation-bar.gjsindex 08183f45755..435ee64edf0 100644--- a/frontend/discourse/app/components/navigation-bar.gjs+++ b/frontend/discourse/app/components/navigation-bar.gjs@@ -3,14 +3,14 @@ import { concat } from "@ember/helper";import { on } from "@ember/modifier";import { action } from "@ember/object";import { service } from "@ember/service";-import DropdownMenu from "discourse/components/dropdown-menu";import NavigationItem from "discourse/components/navigation-item";import PluginOutlet from "discourse/components/plugin-outlet";import DMenu from "discourse/float-kit/components/d-menu";-import icon from "discourse/helpers/d-icon";import lazyHash from "discourse/helpers/lazy-hash";import { filterTypeForMode } from "discourse/lib/filter-mode";import { applyValueTransformer } from "discourse/lib/transformer";+import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";+import dIcon from "discourse/ui-kit/helpers/d-icon";export default class NavigationBarComponent extends Component {@service site;@@ -61,11 +61,11 @@ export default class NavigationBarComponent extends Component {<spanclass="list-control-toggle-link__text">{{this.selectedNavItem.displayName}}</span>- {{icon this.navigationBarIcon}}+ {{dIcon this.navigationBarIcon}}</:trigger><:content>- <DropdownMenu {{on "click" this.dMenu.close}} as |dropdown|>+ <DDropdownMenu {{on "click" this.dMenu.close}} as |dropdown|>{{#each @navItems as |navItem|}}<NavigationItem@content={{navItem}}@@ -86,7 +86,7 @@ export default class NavigationBarComponent extends Component {}}/></dropdown.item>- </DropdownMenu>+ </DDropdownMenu></:content></DMenu></li>diff --git a/frontend/discourse/app/components/navigation-item.gjs b/frontend/discourse/app/components/navigation-item.gjsindex 4972168954e..3b24d1b0509 100644--- a/frontend/discourse/app/components/navigation-item.gjs+++ b/frontend/discourse/app/components/navigation-item.gjs@@ -3,8 +3,8 @@ import Component from "@ember/component";import { computed } from "@ember/object";import { dependentKeyCompat } from "@ember/object/compat";import { tagName } from "@ember-decorators/component";-import concatClass from "discourse/helpers/concat-class";import { filterTypeForMode } from "discourse/lib/filter-mode";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";@tagName("")export default class NavigationItem extends Component {@@ -88,7 +88,7 @@ export default class NavigationItem extends Component {<template><lititle={{this.content.title}}- class={{concatClass+ class={{dConcatClass(if this.active "active")(if this.content.hasIcon "has-icon")this.content.classNamesdiff --git a/frontend/discourse/app/components/nested-replies-expand-button.gjs b/frontend/discourse/app/components/nested-replies-expand-button.gjsindex e589d454f00..1da84af76cc 100644--- a/frontend/discourse/app/components/nested-replies-expand-button.gjs+++ b/frontend/discourse/app/components/nested-replies-expand-button.gjs@@ -1,5 +1,5 @@import Component from "@glimmer/component";-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";export default class NestedRepliesExpandButton extends Component {diff --git a/frontend/discourse/app/components/nested.gjs b/frontend/discourse/app/components/nested.gjsindex b26f65432cd..ef6553cad2e 100644--- a/frontend/discourse/app/components/nested.gjs+++ b/frontend/discourse/app/components/nested.gjs@@ -3,9 +3,6 @@ import { tracked } from "@glimmer/tracking";import { fn } from "@ember/helper";import { action } from "@ember/object";import { service } from "@ember/service";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DButton from "discourse/components/d-button";-import LoadMore from "discourse/components/load-more";import MoreTopics from "discourse/components/more-topics";import PluginOutlet from "discourse/components/plugin-outlet";import TopicMap from "discourse/components/topic-map";@@ -13,6 +10,9 @@ import lazyHash from "discourse/helpers/lazy-hash";import getURL from "discourse/lib/get-url";import PostStreamViewportTracker from "discourse/modifiers/post-stream-viewport-tracker";import { gt, includes } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DLoadMore from "discourse/ui-kit/d-load-more";import { i18n } from "discourse-i18n";import NestedFloatingActions from "./nested/floating-actions";import NestedHeader from "./nested/header";@@ -157,9 +157,9 @@ export default class Nested extends Component {{{/each}}</div>- <ConditionalLoadingSpinner @condition={{@loadingMore}} />+ <DConditionalLoadingSpinner @condition={{@loadingMore}} />- <LoadMore+ <DLoadMore@action={{@loadMoreRoots}}@enabled={{@hasMoreRoots}}@isLoading={{@loadingMore}}diff --git a/frontend/discourse/app/components/nested/context-view.gjs b/frontend/discourse/app/components/nested/context-view.gjsindex 07fc45b6ce6..ea3faec4e48 100644--- a/frontend/discourse/app/components/nested/context-view.gjs+++ b/frontend/discourse/app/components/nested/context-view.gjs@@ -6,14 +6,14 @@ import didInsert from "@ember/render-modifiers/modifiers/did-insert";import didUpdate from "@ember/render-modifiers/modifiers/did-update";import { cancel, next, schedule } from "@ember/runloop";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import MoreTopics from "discourse/components/more-topics";import PluginOutlet from "discourse/components/plugin-outlet";-import icon from "discourse/helpers/d-icon";import lazyHash from "discourse/helpers/lazy-hash";import getURL from "discourse/lib/get-url";import PostStreamViewportTracker from "discourse/modifiers/post-stream-viewport-tracker";import { or } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";import NestedFloatingActions from "./floating-actions";import NestedHeader from "./header";@@ -174,7 +174,7 @@ export default class NestedContextView extends Component {</div><div class="nested-context-view__banner">- <span class="nested-context-view__banner-icon">{{icon+ <span class="nested-context-view__banner-icon">{{dIcon"nested-thread"}}</span><span class="nested-context-view__banner-text">{{i18ndiff --git a/frontend/discourse/app/components/nested/floating-actions.gjs b/frontend/discourse/app/components/nested/floating-actions.gjsindex 1a745b57541..142c91888cd 100644--- a/frontend/discourse/app/components/nested/floating-actions.gjs+++ b/frontend/discourse/app/components/nested/floating-actions.gjs@@ -1,12 +1,12 @@import Component from "@glimmer/component";import { getOwner } from "@ember/owner";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import PluginOutlet from "discourse/components/plugin-outlet";import TopicAdminMenu from "discourse/components/topic-admin-menu";-import concatClass from "discourse/helpers/concat-class";import lazyHash from "discourse/helpers/lazy-hash";import TopicNotificationsButton from "discourse/select-kit/components/topic-notifications-button";+import DButton from "discourse/ui-kit/d-button";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";export default class NestedFloatingActions extends Component {@@ -22,7 +22,7 @@ export default class NestedFloatingActions extends Component {<template><div- class={{concatClass+ class={{dConcatClass"nested-view__floating-actions"(if this.composer.visible "--hidden")}}diff --git a/frontend/discourse/app/components/nested/header.gjs b/frontend/discourse/app/components/nested/header.gjsindex 2942ec51158..1cc354eb748 100644--- a/frontend/discourse/app/components/nested/header.gjs+++ b/frontend/discourse/app/components/nested/header.gjs@@ -4,8 +4,8 @@ import PluginOutlet from "discourse/components/plugin-outlet";import TopicCategory from "discourse/components/topic-category";import TopicMetadata from "discourse/components/topic-metadata";import TopicTitleEditor from "discourse/components/topic-title-editor";-import icon from "discourse/helpers/d-icon";import lazyHash from "discourse/helpers/lazy-hash";+import dIcon from "discourse/ui-kit/helpers/d-icon";<template><div class="nested-view__header">@@ -39,7 +39,7 @@ import lazyHash from "discourse/helpers/lazy-hash";{{trustHTML @topic.fancyTitle~}}{{~#if @topic.details.can_edit~}}<span class="edit-topic__wrapper">- {{icon "pencil" class="edit-topic"}}+ {{dIcon "pencil" class="edit-topic"}}</span>{{~/if}}</a>diff --git a/frontend/discourse/app/components/nested/post-children.gjs b/frontend/discourse/app/components/nested/post-children.gjsindex 0bff7f610ca..0b04892c471 100644--- a/frontend/discourse/app/components/nested/post-children.gjs+++ b/frontend/discourse/app/components/nested/post-children.gjs@@ -2,11 +2,11 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";import { service } from "@ember/service";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DButton from "discourse/components/d-button";-import concatClass from "discourse/helpers/concat-class";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";import processNode from "../../lib/process-node";import NestedPost from "./post";@@ -209,7 +209,7 @@ export default class NestedPostChildren extends Component {<template><div class="nested-post-children">- <ConditionalLoadingSpinner @condition={{this.loading}}>+ <DConditionalLoadingSpinner @condition={{this.loading}}>{{#each this.childNodes key="post.id" as |node|}}<NestedPost@post={{node.post}}@@ -237,7 +237,7 @@ export default class NestedPostChildren extends Component {{{#if this.hasMore}}<DButton- class={{concatClass+ class={{dConcatClass"btn-flat""nested-post-children__load-more"(if @parentLineHighlighted "--parent-line-highlighted")@@ -247,7 +247,7 @@ export default class NestedPostChildren extends Component {@translatedLabel={{this.loadMoreLabel}}/>{{/if}}- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner></div></template>}diff --git a/frontend/discourse/app/components/nested/post.gjs b/frontend/discourse/app/components/nested/post.gjsindex 9a207b9f781..d22178d3602 100644--- a/frontend/discourse/app/components/nested/post.gjs+++ b/frontend/discourse/app/components/nested/post.gjs@@ -6,7 +6,6 @@ import { action } from "@ember/object";import { getOwner } from "@ember/owner";import { service } from "@ember/service";import { modifier } from "ember-modifier";-import DButton from "discourse/components/d-button";import ShareTopicModal from "discourse/components/modal/share-topic";import NestedRepliesExpandButton from "discourse/components/nested-replies-expand-button";import PluginOutlet from "discourse/components/plugin-outlet";@@ -15,8 +14,6 @@ import PostCookedHtml from "discourse/components/post/cooked-html";import PostLinks from "discourse/components/post/links";import PostMenu from "discourse/components/post/menu";import PostMetaData from "discourse/components/post/meta-data";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import lazyHash from "discourse/helpers/lazy-hash";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";@@ -26,6 +23,9 @@ import postActionFeedback from "discourse/lib/post-action-feedback";import { nativeShare } from "discourse/lib/pwa-utils";import { clipboardCopy } from "discourse/lib/utilities";import { and, not, or } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";import nestedPostUrl from "../../lib/nested-post-url";import NestedPostChildren from "./post-children";@@ -330,7 +330,7 @@ export default class NestedPost extends Component {<template><div- class={{concatClass+ class={{dConcatClass"nested-post"this.depthClass(if @parentLineHighlighted "--parent-line-highlighted")@@ -361,7 +361,7 @@ export default class NestedPost extends Component {{{#unless this.isMobile}}{{#if this.isDeletedPlaceholder}}<div class="nested-post__placeholder-avatar">- {{icon "trash-can"}}+ {{dIcon "trash-can"}}</div>{{else if this.renderIgnoredPlaceholder}}<button@@ -373,9 +373,9 @@ export default class NestedPost extends Component {{{on "click" this.revealIgnoredContent}}>{{#if this.loadingIgnoredContent}}- {{icon "spinner" class="fa-spin"}}+ {{dIcon "spinner" class="fa-spin"}}{{else}}- {{icon "far-eye-slash"}}+ {{dIcon "far-eye-slash"}}{{/if}}</button>{{else}}@@ -385,7 +385,7 @@ export default class NestedPost extends Component {{{#if (and this.showDepthLine (not this.collapsed))}}<buttontype="button"- class={{concatClass+ class={{dConcatClass"nested-post__depth-line"(if this.lineHighlighted "nested-post__depth-line--highlighted")(unless this.expanded "nested-post__depth-line--collapsed")@@ -401,7 +401,7 @@ export default class NestedPost extends Component {>{{#if this.expanded}}<span class="nested-post__depth-line-icon">- {{icon "nested-circle-minus"}}+ {{dIcon "nested-circle-minus"}}</span>{{/if}}</button>@@ -415,7 +415,7 @@ export default class NestedPost extends Component {data-post-number={{@post.post_number}}{{on "click" this.toggleExpanded}}>- {{icon "nested-circle-plus"}}+ {{dIcon "nested-circle-plus"}}{{#if this.isDeletedPlaceholder}}<span class="nested-post__collapsed-username">{{i18n"nested_replies.deleted_post_placeholder"diff --git a/frontend/discourse/app/components/notification-consent-banner.gjs b/frontend/discourse/app/components/notification-consent-banner.gjsindex 62b6968a561..9eea3ccd556 100644--- a/frontend/discourse/app/components/notification-consent-banner.gjs+++ b/frontend/discourse/app/components/notification-consent-banner.gjs@@ -2,8 +2,8 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import { keyValueStore as pushNotificationKeyValueStore } from "discourse/lib/push-notifications";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";const userDismissedPromptKey = "dismissed-prompt";diff --git a/frontend/discourse/app/components/notifications-tracking.gjs b/frontend/discourse/app/components/notifications-tracking.gjsindex 7b955a716b4..39bfeee602d 100644--- a/frontend/discourse/app/components/notifications-tracking.gjs+++ b/frontend/discourse/app/components/notifications-tracking.gjs@@ -2,15 +2,15 @@ import Component from "@glimmer/component";import { fn } from "@ember/helper";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import DropdownMenu from "discourse/components/dropdown-menu";import PluginOutlet from "discourse/components/plugin-outlet";import DMenu from "discourse/float-kit/components/d-menu";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import lazyHash from "discourse/helpers/lazy-hash";import { allLevels, buttonDetails } from "discourse/lib/notification-levels";import { applyValueTransformer } from "discourse/lib/transformer";+import DButton from "discourse/ui-kit/d-button";+import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";function constructKey(prefix, level, suffix, key) {@@ -49,14 +49,14 @@ class NotificationsTrackingTrigger extends Component {<template><button- class={{concatClass+ class={{dConcatClass"btn btn-default"(if this.showFullTitle "btn-icon-text" "no-text")}}title={{this.tooltip}}...attributes>- {{icon @selectedLevel.icon}}+ {{dIcon @selectedLevel.icon}}{{#if this.showFullTitle}}<span class="d-button-label">@@ -65,7 +65,7 @@ class NotificationsTrackingTrigger extends Component {{{/if}}{{#if this.showCaret}}- {{icon "angle-down" class="notifications-tracking-btn__caret"}}+ {{dIcon "angle-down" class="notifications-tracking-btn__caret"}}{{/if}}</button></template>@@ -119,7 +119,7 @@ export default class NotificationsTracking extends Component {<DMenu@identifier="notifications-tracking"@modalForMobile={{true}}- @triggerClass={{concatClass+ @triggerClass={{dConcatClass"btn-default""btn-icon""notifications-tracking-trigger-btn"@@ -142,11 +142,11 @@ export default class NotificationsTracking extends Component {...attributes><:content>- <DropdownMenu as |dropdown|>+ <DDropdownMenu as |dropdown|>{{#each this.levels as |level|}}<dropdown.item><DButton- class={{concatClass+ class={{dConcatClass"notifications-tracking-btn"(this.isSelectedClass level)}}@@ -163,7 +163,7 @@ export default class NotificationsTracking extends Component {topic=@topic}}>- {{icon level.icon}}+ {{dIcon level.icon}}</PluginOutlet></div><div class="notifications-tracking-btn__texts">@@ -177,7 +177,7 @@ export default class NotificationsTracking extends Component {</DButton></dropdown.item>{{/each}}- </DropdownMenu>+ </DDropdownMenu></:content></DMenu></template>diff --git a/frontend/discourse/app/components/offline-indicator.gjs b/frontend/discourse/app/components/offline-indicator.gjsindex 4d158f36676..1600ee29598 100644--- a/frontend/discourse/app/components/offline-indicator.gjs+++ b/frontend/discourse/app/components/offline-indicator.gjs@@ -1,7 +1,7 @@import Component from "@glimmer/component";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";export default class OfflineIndicator extends Component {diff --git a/frontend/discourse/app/components/page-loading-slider.gjs b/frontend/discourse/app/components/page-loading-slider.gjsindex adfd4e04395..d642179be78 100644--- a/frontend/discourse/app/components/page-loading-slider.gjs+++ b/frontend/discourse/app/components/page-loading-slider.gjs@@ -5,9 +5,9 @@ import { action } from "@ember/object";import { run } from "@ember/runloop";import { service } from "@ember/service";import { trustHTML } from "@ember/template";-import concatClass from "discourse/helpers/concat-class";import { bind } from "discourse/lib/decorators";import { eq } from "discourse/truth-helpers";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";export default class PageLoadingSlider extends Component {@service loadingSlider;@@ -79,7 +79,7 @@ export default class PageLoadingSlider extends Component {<div{{on "transitionend" this.onContainerTransitionEnd}}style={{this.containerStyle}}- class={{concatClass+ class={{dConcatClass"loading-indicator-container"this.state(if this.capabilities.isAppWebview "discourse-hub-webview")diff --git a/frontend/discourse/app/components/parent-category-row.gjs b/frontend/discourse/app/components/parent-category-row.gjsindex 6fe1614ac02..501175a059e 100644--- a/frontend/discourse/app/components/parent-category-row.gjs+++ b/frontend/discourse/app/components/parent-category-row.gjs@@ -4,7 +4,6 @@ import { trustHTML } from "@ember/template";import CategoryListItem from "discourse/components/category-list-item";import CategoryTitleLink from "discourse/components/category-title-link";import CategoryUnread from "discourse/components/category-unread";-import DecoratedHtml from "discourse/components/decorated-html";import MobileCategoryTopic from "discourse/components/mobile-category-topic";import PluginOutlet from "discourse/components/plugin-outlet";import SubCategoryItem from "discourse/components/sub-category-item";@@ -12,9 +11,10 @@ import SubCategoryRow from "discourse/components/sub-category-row";import FeaturedTopic from "discourse/components/topic-list/featured-topic";import borderColor from "discourse/helpers/border-color";import categoryColorVariable from "discourse/helpers/category-color-variable";-import dirSpan from "discourse/helpers/dir-span";import lazyHash from "discourse/helpers/lazy-hash";import { gt } from "discourse/truth-helpers";+import DDecoratedHtml from "discourse/ui-kit/d-decorated-html";+import dDirSpan from "discourse/ui-kit/helpers/d-dir-span";import { i18n } from "discourse-i18n";export default class ParentCategoryRow extends CategoryListItem {@@ -54,8 +54,8 @@ export default class ParentCategoryRow extends CategoryListItem {{{#if this.category.description_excerpt}}<tr class="category-description"><td colspan="3">- <DecoratedHtml- @html={{dirSpan+ <DDecoratedHtml+ @html={{dDirSpanthis.category.description_excerpthtmlSafe="true"}}@@ -147,8 +147,8 @@ export default class ParentCategoryRow extends CategoryListItem {{{#if this.category.description_excerpt}}<div class="category-description">- <DecoratedHtml- @html={{dirSpan+ <DDecoratedHtml+ @html={{dDirSpanthis.category.description_excerpthtmlSafe="true"}}diff --git a/frontend/discourse/app/components/passkey-login-button.gjs b/frontend/discourse/app/components/passkey-login-button.gjsindex 66d04409be6..fe849fb4d48 100644--- a/frontend/discourse/app/components/passkey-login-button.gjs+++ b/frontend/discourse/app/components/passkey-login-button.gjs@@ -1,4 +1,4 @@-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";const PasskeyLoginButton = <template><DButtondiff --git a/frontend/discourse/app/components/pinned-options.gjs b/frontend/discourse/app/components/pinned-options.gjsindex 8374b6a716f..fd551ba73cd 100644--- a/frontend/discourse/app/components/pinned-options.gjs+++ b/frontend/discourse/app/components/pinned-options.gjs@@ -2,11 +2,11 @@ import Component from "@glimmer/component";import { fn } from "@ember/helper";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import DropdownMenu from "discourse/components/dropdown-menu";import DMenu from "discourse/float-kit/components/d-menu";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";+import DButton from "discourse/ui-kit/d-button";+import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";const UNPINNED = "unpinned";@@ -46,13 +46,13 @@ class PinnedOptionsTrigger extends Component {<template><button- class={{concatClass+ class={{dConcatClass"btn btn-default"(if this.showFullTitle "btn-icon-text" "no-text")}}...attributes>- {{icon this.iconName}}+ {{dIcon this.iconName}}{{#if this.showFullTitle}}<span class="d-button-label">@@ -61,7 +61,7 @@ class PinnedOptionsTrigger extends Component {{{/if}}{{#if this.showCaret}}- {{icon "angle-down" class="pinned-options-btn__caret"}}+ {{dIcon "angle-down" class="pinned-options-btn__caret"}}{{/if}}</button></template>@@ -114,7 +114,7 @@ export default class PinnedOptions extends Component {<DMenu@identifier="pinned-options"@modalForMobile={{true}}- @triggerClass={{concatClass+ @triggerClass={{dConcatClass"btn-default""pinned-options-trigger-btn"@triggerClass@@ -132,11 +132,11 @@ export default class PinnedOptions extends Component {...attributes><:content>- <DropdownMenu as |dropdown|>+ <DDropdownMenu as |dropdown|>{{#each this.options as |option|}}<dropdown.item><DButton- class={{concatClass+ class={{dConcatClass"pinned-options-btn"(this.isSelectedClass option.id)}}@@ -144,7 +144,7 @@ export default class PinnedOptions extends Component {data-pinned-state={{option.id}}><div class="pinned-options-btn__icons">- {{icon option.icon}}+ {{dIcon option.icon}}</div><div class="pinned-options-btn__texts"><span class="pinned-options-btn__label">@@ -159,7 +159,7 @@ export default class PinnedOptions extends Component {</DButton></dropdown.item>{{/each}}- </DropdownMenu>+ </DDropdownMenu></:content></DMenu></template>diff --git a/frontend/discourse/app/components/post-list/bulk-controls.gjs b/frontend/discourse/app/components/post-list/bulk-controls.gjsindex 3ee67f36e6c..5c10d860890 100644--- a/frontend/discourse/app/components/post-list/bulk-controls.gjs+++ b/frontend/discourse/app/components/post-list/bulk-controls.gjs@@ -1,9 +1,9 @@import Component from "@glimmer/component";import { fn } from "@ember/helper";import { action } from "@ember/object";-import DButton from "discourse/components/d-button";-import DropdownMenu from "discourse/components/dropdown-menu";import DMenu from "discourse/float-kit/components/d-menu";+import DButton from "discourse/ui-kit/d-button";+import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";import { i18n } from "discourse-i18n";/**@@ -67,7 +67,7 @@ export default class PostListBulkControls extends Component {class="bulk-actions-dropdown"><:content>- <DropdownMenu as |dropdown|>+ <DDropdownMenu as |dropdown|>{{#each @bulkActions as |bulkAction|}}<dropdown.item><DButton@@ -79,7 +79,7 @@ export default class PostListBulkControls extends Component {/></dropdown.item>{{/each}}- </DropdownMenu>+ </DDropdownMenu></:content></DMenu>{{/if}}diff --git a/frontend/discourse/app/components/post-list/index.gjs b/frontend/discourse/app/components/post-list/index.gjsindex c514081f24a..1772bf66127 100644--- a/frontend/discourse/app/components/post-list/index.gjs+++ b/frontend/discourse/app/components/post-list/index.gjs@@ -35,13 +35,13 @@import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import LoadMore from "discourse/components/load-more";import PostListBulkControls from "discourse/components/post-list/bulk-controls";import PostListItem from "discourse/components/post-list/item";-import concatClass from "discourse/helpers/concat-class";import hideApplicationFooter from "discourse/helpers/hide-application-footer";import { popupAjaxError } from "discourse/lib/ajax-error";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DLoadMore from "discourse/ui-kit/d-load-more";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";import { addUniqueValuesToArray } from "../../lib/array-tools";@@ -89,7 +89,7 @@ export default class PostList extends Component {{{hideApplicationFooter}}{{/if}}- <LoadMore @action={{this.loadMore}}>+ <DLoadMore @action={{this.loadMore}}>{{#if @bulkSelectEnabled}}{{#if @bulkSelectHelper.hasSelection}}<PostListBulkControls@@ -100,7 +100,7 @@ export default class PostList extends Component {{{/if}}<div- class={{concatClass+ class={{dConcatClass"post-list"(if @bulkSelectEnabled "post-list--bulk-select")}}@@ -140,7 +140,7 @@ export default class PostList extends Component {{{/unless}}{{/each}}</div>- <ConditionalLoadingSpinner @condition={{this.loading}} />- </LoadMore>+ <DConditionalLoadingSpinner @condition={{this.loading}} />+ </DLoadMore></template>}diff --git a/frontend/discourse/app/components/post-list/item/details.gjs b/frontend/discourse/app/components/post-list/item/details.gjsindex 53be00bc848..9872936ac60 100644--- a/frontend/discourse/app/components/post-list/item/details.gjs+++ b/frontend/discourse/app/components/post-list/item/details.gjs@@ -1,17 +1,17 @@import Component from "@glimmer/component";import { fn } from "@ember/helper";import { trustHTML } from "@ember/template";-import DButton from "discourse/components/d-button";import PluginOutlet from "discourse/components/plugin-outlet";import TopicStatus from "discourse/components/topic-status";-import avatar from "discourse/helpers/avatar";-import categoryLink from "discourse/helpers/category-link";-import icon from "discourse/helpers/d-icon";-import formatDate from "discourse/helpers/format-date";import lazyHash from "discourse/helpers/lazy-hash";import getURL from "discourse/lib/get-url";import { prioritizeNameInUx } from "discourse/lib/settings";import { or } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import dAvatar from "discourse/ui-kit/helpers/d-avatar";+import dCategoryLink from "discourse/ui-kit/helpers/d-category-link";+import dFormatDate from "discourse/ui-kit/helpers/d-format-date";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class PostListItemDetails extends Component {@@ -88,24 +88,24 @@ export default class PostListItemDetails extends Component {<div class="post-list-item__metadata">{{#if @post.category}}<span class="category stream-post-category">- {{categoryLink @post.category}}+ {{dCategoryLink @post.category}}</span>{{/if}}<span class="time">- {{formatDate @post.created_at leaveAgo="true"}}+ {{dFormatDate @post.created_at leaveAgo="true"}}</span>{{#if @post.deleted_by}}<span class="delete-info">- {{icon "trash-can"}}- {{avatar+ {{dIcon "trash-can"}}+ {{dAvatar@post.deleted_byimageSize="tiny"extraClasses="actor"ignoreTitle="true"}}- {{formatDate @item.deleted_at leaveAgo="true"}}+ {{dFormatDate @item.deleted_at leaveAgo="true"}}</span>{{/if}}</div>diff --git a/frontend/discourse/app/components/post-list/item/index.gjs b/frontend/discourse/app/components/post-list/item/index.gjsindex 56a2a671f9c..facf018cf07 100644--- a/frontend/discourse/app/components/post-list/item/index.gjs+++ b/frontend/discourse/app/components/post-list/item/index.gjs@@ -4,15 +4,15 @@ import { on } from "@ember/modifier";import { action } from "@ember/object";import { service } from "@ember/service";import { trustHTML } from "@ember/template";-import DButton from "discourse/components/d-button";-import DecoratedHtml from "discourse/components/decorated-html";import ExpandPost from "discourse/components/expand-post";import PostListItemDetails from "discourse/components/post-list/item/details";-import avatar from "discourse/helpers/avatar";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import { userPath } from "discourse/lib/url";import { or } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DDecoratedHtml from "discourse/ui-kit/d-decorated-html";+import dAvatar from "discourse/ui-kit/helpers/d-avatar";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";export default class PostListItem extends Component {@service site;@@ -81,7 +81,7 @@ export default class PostListItem extends Component {}get itemClasses() {- return concatClass(+ return dConcatClass("post-list-item",this.moderatorActionClass,this.primaryGroupClass,@@ -118,7 +118,7 @@ export default class PostListItem extends Component {{{#if this.isDraft}}<div class="draft-icon">- {{icon this.draftIcon class="icon"}}+ {{dIcon this.draftIcon class="icon"}}</div>{{else}}<a@@ -127,7 +127,7 @@ export default class PostListItem extends Component {class="avatar-link"><div class="avatar-wrapper">- {{avatar+ {{dAvatarthis.userimageSize="large"extraClasses="actor"@@ -180,7 +180,7 @@ export default class PostListItem extends Component {data-user-id={{@post.user_id}}class="excerpt">- <DecoratedHtml+ <DDecoratedHtml@html={{trustHTML (or @post.expandedExcerpt @post.excerpt)}}@className="cooked"/>diff --git a/frontend/discourse/app/components/post-stream.gjs b/frontend/discourse/app/components/post-stream.gjsindex 06e3d9487b8..e8e03d553eb 100644--- a/frontend/discourse/app/components/post-stream.gjs+++ b/frontend/discourse/app/components/post-stream.gjs@@ -4,15 +4,15 @@ import { concat, fn, get, hash } from "@ember/helper";import { action } from "@ember/object";import { next, schedule } from "@ember/runloop";import { service } from "@ember/service";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";import PluginOutlet from "discourse/components/plugin-outlet";import PostFilteredNotice from "discourse/components/post/filtered-notice";-import concatClass from "discourse/helpers/concat-class";import lazyHash from "discourse/helpers/lazy-hash";import { bind } from "discourse/lib/decorators";import { Placeholder } from "discourse/models/post-stream";import PostStreamViewportTracker from "discourse/modifiers/post-stream-viewport-tracker";import { and, not } from "discourse/truth-helpers";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import Post from "./post";import PostGap from "./post/gap";import PostLoadMoreAccessible from "./post/load-more-accessible";@@ -288,7 +288,7 @@ export default class PostStream extends Component {}<template>- <ConditionalLoadingSpinner @condition={{@postStream.loadingAbove}} />+ <DConditionalLoadingSpinner @condition={{@postStream.loadingAbove}} /><divclass="post-stream"{{this.viewportTracker.setup@@ -351,7 +351,7 @@ export default class PostStream extends Component {}}<PostComponentid={{postId}}- class={{concatClass+ class={{dConcatClass(if cloakingData.active "post-stream--cloaked")(if keyboardSelected "selected")}}@@ -455,6 +455,6 @@ export default class PostStream extends Component {/>{{/if}}</div>- <ConditionalLoadingSpinner @condition={{@postStream.loadingBelow}} />+ <DConditionalLoadingSpinner @condition={{@postStream.loadingBelow}} /></template>}diff --git a/frontend/discourse/app/components/post-text-selection-toolbar.gjs b/frontend/discourse/app/components/post-text-selection-toolbar.gjsindex bf393525931..e2614491698 100644--- a/frontend/discourse/app/components/post-text-selection-toolbar.gjs+++ b/frontend/discourse/app/components/post-text-selection-toolbar.gjs@@ -3,13 +3,13 @@ import { fn } from "@ember/helper";import { on } from "@ember/modifier";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import PluginOutlet from "discourse/components/plugin-outlet";-import concatClass from "discourse/helpers/concat-class";import lazyHash from "discourse/helpers/lazy-hash";import { getAbsoluteURL } from "discourse/lib/get-url";import Sharing from "discourse/lib/sharing";import { clipboardCopy, postUrl } from "discourse/lib/utilities";+import DButton from "discourse/ui-kit/d-button";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";export default class PostTextSelectionToolbar extends Component {@@ -88,7 +88,7 @@ export default class PostTextSelectionToolbar extends Component {}<template>- <div class={{concatClass "quote-button" "visible"}}>+ <div class={{dConcatClass "quote-button" "visible"}}><div class="buttons"><PluginOutlet@name="post-text-buttons"diff --git a/frontend/discourse/app/components/post-translation-editor.gjs b/frontend/discourse/app/components/post-translation-editor.gjsindex 55147c4ffab..4c19cc221c6 100644--- a/frontend/discourse/app/components/post-translation-editor.gjs+++ b/frontend/discourse/app/components/post-translation-editor.gjs@@ -3,11 +3,11 @@ import { action } from "@ember/object";import didInsert from "@ember/render-modifiers/modifiers/did-insert";import willDestroy from "@ember/render-modifiers/modifiers/will-destroy";import { service } from "@ember/service";-import DEditor from "discourse/components/d-editor";-import TextField from "discourse/components/text-field";import lazyHash from "discourse/helpers/lazy-hash";import { popupAjaxError } from "discourse/lib/ajax-error";import PostLocalization from "discourse/models/post-localization";+import DEditor from "discourse/ui-kit/d-editor";+import DTextField from "discourse/ui-kit/d-text-field";import { i18n } from "discourse-i18n";export default class PostTranslationEditor extends Component {@@ -83,7 +83,7 @@ export default class PostTranslationEditor extends Component {{{#if this.composer.model.post.firstPost}}<div class="topic-title-translator title-and-category with-preview"><div class="title-input-column">- <TextField+ <DTextField@value={{this.composer.model.title}}@id="translated-topic-title"@maxLength={{this.siteSettings.max_topic_title_length}}diff --git a/frontend/discourse/app/components/post.gjs b/frontend/discourse/app/components/post.gjsindex 5cea1979be5..cfdde2bd62f 100644--- a/frontend/discourse/app/components/post.gjs+++ b/frontend/discourse/app/components/post.gjs@@ -8,7 +8,6 @@ import { trackedArray, trackedMap } from "@ember/reactive/collections";import { service } from "@ember/service";import { TrackedAsyncData } from "ember-async-data";import { modifier } from "ember-modifier";-import DButton from "discourse/components/d-button";import ShareTopicModal from "discourse/components/modal/share-topic";import PluginOutlet from "discourse/components/plugin-outlet";import PostA11yHeading from "discourse/components/post/a11y-heading";@@ -22,7 +21,6 @@ import PostMetaData from "discourse/components/post/meta-data";import PostMetaDataReplyToTab from "discourse/components/post/meta-data/reply-to-tab";import PostNotice from "discourse/components/post/notice";import TopicMap from "discourse/components/topic-map";-import concatClass from "discourse/helpers/concat-class";import lazyHash from "discourse/helpers/lazy-hash";import { isTesting } from "discourse/lib/environment";import { relativeAge } from "discourse/lib/formatter";@@ -36,6 +34,8 @@ import {import DiscourseURL from "discourse/lib/url";import { clipboardCopy } from "discourse/lib/utilities";import { and, eq, not, or } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";export default class Post extends Component {@@ -410,7 +410,7 @@ export default class Post extends Component {...attributesclass={{unless@cloaked- (concatClass+ (dConcatClass"topic-post""clearfix"(unless this.site.mobileView "post--sticky-avatar sticky-avatar")@@ -425,7 +425,7 @@ export default class Post extends Component {(if @post.deleted "post--deleted deleted")(if@post.primary_group_name- (concatClass+ (dConcatClass(concat "post--group-" @post.primary_group_name)(concat "group-" @post.primary_group_name))@@ -466,7 +466,7 @@ export default class Post extends Component {<PluginOutlet @name="post-article" @outletArgs={{postOutletArgs}}><articleid={{@elementId}}- class={{concatClass+ class={{dConcatClass"boxed""onscreen-post"(if@@ -545,7 +545,7 @@ export default class Post extends Component {/></PluginOutlet><div- class={{concatClass+ class={{dConcatClass"post__regular regular""post__contents contents"(ifdiff --git a/frontend/discourse/app/components/post/actions-summary.gjs b/frontend/discourse/app/components/post/actions-summary.gjsindex c8fc5e406f3..08a1a9c3b8c 100644--- a/frontend/discourse/app/components/post/actions-summary.gjs+++ b/frontend/discourse/app/components/post/actions-summary.gjs@@ -1,6 +1,6 @@-import UserAvatar from "discourse/components/user-avatar";-import icon from "discourse/helpers/d-icon";-import formatDate from "discourse/helpers/format-date";+import DUserAvatar from "discourse/ui-kit/d-user-avatar";+import dFormatDate from "discourse/ui-kit/helpers/d-format-date";+import dIcon from "discourse/ui-kit/helpers/d-icon";const PostActionsSummary = <template>{{#each @post.actionsSummary key="id" as |actionSummary|}}@@ -9,9 +9,9 @@ const PostActionsSummary = <template>{{/each}}{{#if @post.deletedAt}}<div class="post-action deleted-post">- {{icon "trash-can"}}- <UserAvatar @size="tiny" @user={{@post.deletedBy}} />- {{formatDate @post.deletedAt format="tiny"}}+ {{dIcon "trash-can"}}+ <DUserAvatar @size="tiny" @user={{@post.deletedBy}} />+ {{dFormatDate @post.deletedAt format="tiny"}}</div>{{/if}}</template>;diff --git a/frontend/discourse/app/components/post/avatar.gjs b/frontend/discourse/app/components/post/avatar.gjsindex 28fa071ebb0..95cfdf6f2e8 100644--- a/frontend/discourse/app/components/post/avatar.gjs+++ b/frontend/discourse/app/components/post/avatar.gjs@@ -1,12 +1,12 @@import Component from "@glimmer/component";import { cached } from "@glimmer/tracking";import PluginOutlet from "discourse/components/plugin-outlet";-import UserAvatar from "discourse/components/user-avatar";-import UserAvatarFlair from "discourse/components/user-avatar-flair";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import lazyHash from "discourse/helpers/lazy-hash";import { applyValueTransformer } from "discourse/lib/transformer";+import DUserAvatar from "discourse/ui-kit/d-user-avatar";+import DUserAvatarFlair from "discourse/ui-kit/d-user-avatar-flair";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";export default class PostAvatar extends Component {@cached@@ -69,7 +69,7 @@ export default class PostAvatar extends Component {}<template>- <div class={{concatClass "topic-avatar" this.additionalClasses}}>+ <div class={{dConcatClass "topic-avatar" this.additionalClasses}}>{{#let(lazyHashpost=@post@@ -82,9 +82,9 @@ export default class PostAvatar extends Component {<PluginOutlet @name="post-avatar" @outletArgs={{avatarOutletArgs}}><div class="post-avatar">{{#if this.userWasDeleted}}- {{icon "trash-can" class="deleted-user-avatar"}}+ {{dIcon "trash-can" class="deleted-user-avatar"}}{{else}}- <UserAvatar+ <DUserAvatarclass="main-avatar"tabindex="-1"@hideTitle={{true}}@@ -96,7 +96,7 @@ export default class PostAvatar extends Component {@name="post-avatar-flair"@outletArgs={{avatarOutletArgs}}>- <UserAvatarFlair @user={{this.user}} />+ <DUserAvatarFlair @user={{this.user}} /></PluginOutlet>{{/if}}{{#if @displayPosterName}}diff --git a/frontend/discourse/app/components/post/cooked-html.gjs b/frontend/discourse/app/components/post/cooked-html.gjsindex 14618778706..efe9fc74a48 100644--- a/frontend/discourse/app/components/post/cooked-html.gjs+++ b/frontend/discourse/app/components/post/cooked-html.gjs@@ -4,10 +4,6 @@ import { trackedMap } from "@ember/reactive/collections";import { service } from "@ember/service";import { trustHTML } from "@ember/template";import curryComponent from "ember-curry-component";-import DecoratedHtml, {- applyHtmlDecorators,- NON_STREAM_HTML_DECORATOR,-} from "discourse/components/decorated-html";import lazyHash from "discourse/helpers/lazy-hash";import { bind } from "discourse/lib/decorators";import { isRailsTesting, isTesting } from "discourse/lib/environment";@@ -18,6 +14,10 @@ import decorateQuoteControls from "discourse/lib/post-cooked-html-decorators/quoimport decorateSearchHighlight from "discourse/lib/post-cooked-html-decorators/search-highlight";import decorateSelectionBarrier from "discourse/lib/post-cooked-html-decorators/selection-barrier";import decorateStatefulHtmlElements from "discourse/lib/post-cooked-html-decorators/stateful-html-elements";+import DDecoratedHtml, {+ applyHtmlDecorators,+ NON_STREAM_HTML_DECORATOR,+} from "discourse/ui-kit/d-decorated-html";import { i18n } from "discourse-i18n";const detachedDocument = document.implementation.createHTMLDocument("detached");@@ -184,7 +184,7 @@ export default class PostCookedHtml extends Component {}<template>- <DecoratedHtml+ <DDecoratedHtml@className={{this.className}}@decorate={{this.decorate}}@decorateArgs={{lazyHashdiff --git a/frontend/discourse/app/components/post/embedded.gjs b/frontend/discourse/app/components/post/embedded.gjsindex c32c05c531c..d384e770cd6 100644--- a/frontend/discourse/app/components/post/embedded.gjs+++ b/frontend/discourse/app/components/post/embedded.gjs@@ -1,4 +1,4 @@-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";import PostAvatar from "./avatar";import PostCookedHtml from "./cooked-html";@@ -22,9 +22,9 @@ const PostEmbedded = <template>title={{i18n "topic.jump_reply"}}>{{#if @above}}- {{icon "arrow-up"}}+ {{dIcon "arrow-up"}}{{else}}- {{icon "arrow-down"}}+ {{dIcon "arrow-down"}}{{/if}}{{i18n "topic.jump_reply_button"}}</a>diff --git a/frontend/discourse/app/components/post/filtered-notice.gjs b/frontend/discourse/app/components/post/filtered-notice.gjsindex ad30f005ff7..07eb7ec6eec 100644--- a/frontend/discourse/app/components/post/filtered-notice.gjs+++ b/frontend/discourse/app/components/post/filtered-notice.gjs@@ -1,10 +1,10 @@import Component from "@glimmer/component";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import PostMetaDataPosterName from "discourse/components/post/meta-data/poster-name";-import UserAvatar from "discourse/components/user-avatar";import DiscourseURL from "discourse/lib/url";+import DButton from "discourse/ui-kit/d-button";+import DUserAvatar from "discourse/ui-kit/d-user-avatar";import { i18n } from "discourse-i18n";export default class PostFilteredNotice extends Component {@@ -66,7 +66,7 @@ export default class PostFilteredNotice extends Component {</span><span class="filtered-user-row"><span class="filtered-avatar">- <UserAvatar @size="small" @user={{this.sourcePost}} />+ <DUserAvatar @size="small" @user={{this.sourcePost}} /></span><DButtonclass="filtered-jump-to-post"@@ -98,7 +98,7 @@ export default class PostFilteredNotice extends Component {}}</span><span class="filtered-avatar">- <UserAvatar @size="small" @user={{this.firstUserPost}} />+ <DUserAvatar @size="small" @user={{this.firstUserPost}} /></span><PostMetaDataPosterName @post={{this.firstUserPost}} /><FilterShowAllBtndiff --git a/frontend/discourse/app/components/post/links.gjs b/frontend/discourse/app/components/post/links.gjsindex 90249a7a0af..532c1237328 100644--- a/frontend/discourse/app/components/post/links.gjs+++ b/frontend/discourse/app/components/post/links.gjs@@ -1,10 +1,10 @@import Component from "@glimmer/component";import { cached, tracked } from "@glimmer/tracking";import { action } from "@ember/object";-import DButton from "discourse/components/d-button";-import icon from "discourse/helpers/d-icon";-import replaceEmoji from "discourse/helpers/replace-emoji";import { gt } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import dIcon from "discourse/ui-kit/helpers/d-icon";+import dReplaceEmoji from "discourse/ui-kit/helpers/d-replace-emoji";import { i18n } from "discourse-i18n";const MAX_COLLAPSED_LINKS = 5;@@ -55,8 +55,8 @@ export default class PostLinks extends Component {data-clicks={{if (gt link.clicks 0) link.clicks}}href={{link.url}}>- {{icon "link"}}- <span> {{replaceEmoji link.title}}</span>+ {{dIcon "link"}}+ <span> {{dReplaceEmoji link.title}}</span></a></li>{{/each}}diff --git a/frontend/discourse/app/components/post/load-more-accessible.gjs b/frontend/discourse/app/components/post/load-more-accessible.gjsindex 1ce43742beb..14d728ad0fb 100644--- a/frontend/discourse/app/components/post/load-more-accessible.gjs+++ b/frontend/discourse/app/components/post/load-more-accessible.gjs@@ -2,7 +2,7 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";import { service } from "@ember/service";-import LoadMore from "discourse/components/load-more";+import DLoadMore from "discourse/ui-kit/d-load-more";import { i18n } from "discourse-i18n";export default class PostLoadMoreAccessible extends Component {@@ -54,7 +54,7 @@ export default class PostLoadMoreAccessible extends Component {}<template>- <LoadMore+ <DLoadMore@action={{this.handleLoadAndAnnouncement}}@enabled={{this.enabled}}/>diff --git a/frontend/discourse/app/components/post/menu.gjs b/frontend/discourse/app/components/post/menu.gjsindex a01b393b248..87939a7cb15 100644--- a/frontend/discourse/app/components/post/menu.gjs+++ b/frontend/discourse/app/components/post/menu.gjs@@ -9,11 +9,7 @@ import { isEmpty, isPresent } from "@ember/utils";import AdminPostMenu from "discourse/components/admin-post-menu";import DeleteTopicDisallowedModal from "discourse/components/modal/delete-topic-disallowed";import PluginOutlet from "discourse/components/plugin-outlet";-import SmallUserList, {- smallUserAttrs,-} from "discourse/components/small-user-list";import UserTip from "discourse/components/user-tip";-import concatClass from "discourse/helpers/concat-class";import lazyHash from "discourse/helpers/lazy-hash";import DAG from "discourse/lib/dag";import {@@ -22,6 +18,10 @@ import {applyValueTransformer,} from "discourse/lib/transformer";import { and } from "discourse/truth-helpers";+import DSmallUserList, {+ smallUserAttrs,+} from "discourse/ui-kit/d-small-user-list";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";import PostMenuButtonConfig from "./menu/button-config";import PostMenuButtonWrapper from "./menu/button-wrapper";@@ -619,7 +619,7 @@ export default class PostMenu extends Component {><nav{{! this.collapsed is included in the check below because "Show More" button can be overriden to be always visible }}- class={{concatClass+ class={{dConcatClass"post-controls"(if(and@@ -657,7 +657,7 @@ export default class PostMenu extends Component {{{/each}}</div></nav>- <SmallUserList+ <DSmallUserListclass="who-read"@addSelf={{false}}@isVisible={{this.isWhoReadVisible}}diff --git a/frontend/discourse/app/components/post/menu/buttons/add-translation.gjs b/frontend/discourse/app/components/post/menu/buttons/add-translation.gjsindex e354f7fac05..861a2e7c085 100644--- a/frontend/discourse/app/components/post/menu/buttons/add-translation.gjs+++ b/frontend/discourse/app/components/post/menu/buttons/add-translation.gjs@@ -1,15 +1,15 @@import Component from "@glimmer/component";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import DEditorOriginalTranslationPreview from "discourse/components/d-editor-original-translation-preview";-import DropdownMenu from "discourse/components/dropdown-menu";import PostTranslationsModal from "discourse/components/modal/post-translations";import PluginOutlet from "discourse/components/plugin-outlet";import DMenu from "discourse/float-kit/components/d-menu";import lazyHash from "discourse/helpers/lazy-hash";import { ajax } from "discourse/lib/ajax";import Composer from "discourse/models/composer";+import DButton from "discourse/ui-kit/d-button";+import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";import { i18n } from "discourse-i18n";export default class PostMenuAddTranslationButton extends Component {@@ -82,7 +82,7 @@ export default class PostMenuAddTranslationButton extends Component {@arrow={{false}}><:content>- <DropdownMenu as |dropdown|>+ <DDropdownMenu as |dropdown|><PluginOutlet@name="post-menu-translations-dropdown"@outletArgs={{lazyHash dropdown=dropdown post=@post}}@@ -106,7 +106,7 @@ export default class PostMenuAddTranslationButton extends Component {/></dropdown.item></PluginOutlet>- </DropdownMenu>+ </DDropdownMenu></:content></DMenu>{{/if}}diff --git a/frontend/discourse/app/components/post/menu/buttons/admin.gjs b/frontend/discourse/app/components/post/menu/buttons/admin.gjsindex c7b59540c40..dfc313daa01 100644--- a/frontend/discourse/app/components/post/menu/buttons/admin.gjs+++ b/frontend/discourse/app/components/post/menu/buttons/admin.gjs@@ -1,5 +1,5 @@import Component from "@glimmer/component";-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";export default class PostMenuAdminButton extends Component {static shouldRender(args, context) {diff --git a/frontend/discourse/app/components/post/menu/buttons/copy-link.gjs b/frontend/discourse/app/components/post/menu/buttons/copy-link.gjsindex b2d96b3c8be..1750790e617 100644--- a/frontend/discourse/app/components/post/menu/buttons/copy-link.gjs+++ b/frontend/discourse/app/components/post/menu/buttons/copy-link.gjs@@ -1,4 +1,4 @@-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";const PostMenuCopyLinkButton = <template><DButtondiff --git a/frontend/discourse/app/components/post/menu/buttons/delete.gjs b/frontend/discourse/app/components/post/menu/buttons/delete.gjsindex 8318cee3b74..f5b72e63390 100644--- a/frontend/discourse/app/components/post/menu/buttons/delete.gjs+++ b/frontend/discourse/app/components/post/menu/buttons/delete.gjs@@ -1,5 +1,5 @@import Component from "@glimmer/component";-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";export const BUTTON_ACTION_MODE_DELETE = "delete";export const BUTTON_ACTION_MODE_DELETE_TOPIC = "delete-topic";diff --git a/frontend/discourse/app/components/post/menu/buttons/edit.gjs b/frontend/discourse/app/components/post/menu/buttons/edit.gjsindex 71ad722cb8f..a875633a70d 100644--- a/frontend/discourse/app/components/post/menu/buttons/edit.gjs+++ b/frontend/discourse/app/components/post/menu/buttons/edit.gjs@@ -1,7 +1,7 @@import Component from "@glimmer/component";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import concatClass from "discourse/helpers/concat-class";+import DButton from "discourse/ui-kit/d-button";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";export default class PostMenuEditButton extends Component {static hidden(args) {@@ -28,7 +28,7 @@ export default class PostMenuEditButton extends Component {<template><DButton- class={{concatClass+ class={{dConcatClass"post-action-menu__edit""edit"(if @post.wiki "create")diff --git a/frontend/discourse/app/components/post/menu/buttons/flag.gjs b/frontend/discourse/app/components/post/menu/buttons/flag.gjsindex 7e67bae6640..3d48ebbcbae 100644--- a/frontend/discourse/app/components/post/menu/buttons/flag.gjs+++ b/frontend/discourse/app/components/post/menu/buttons/flag.gjs@@ -1,10 +1,10 @@import Component from "@glimmer/component";import { action } from "@ember/object";-import DButton from "discourse/components/d-button";-import concatClass from "discourse/helpers/concat-class";import { applyValueTransformer } from "discourse/lib/transformer";import DiscourseURL from "discourse/lib/url";import { gt } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";export default class PostMenuFlagButton extends Component {static shouldRender(args, helper) {@@ -47,7 +47,7 @@ export default class PostMenuFlagButton extends Component {<div class="double-button">{{#if @post.reviewable_id}}<DButton- class={{concatClass+ class={{dConcatClass"button-count"(if (gt @post.reviewable_score_pending_count 0) "has-pending")}}@@ -58,7 +58,7 @@ export default class PostMenuFlagButton extends Component {</DButton>{{/if}}<DButton- class={{concatClass+ class={{dConcatClass"post-action-menu__flag create-flag"this.dynamicFlagButtonClass}}diff --git a/frontend/discourse/app/components/post/menu/buttons/like.gjs b/frontend/discourse/app/components/post/menu/buttons/like.gjsindex 3f233eb90a1..fe32c6b2fc4 100644--- a/frontend/discourse/app/components/post/menu/buttons/like.gjs+++ b/frontend/discourse/app/components/post/menu/buttons/like.gjs@@ -2,10 +2,10 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import concatClass from "discourse/helpers/concat-class";import discourseLater from "discourse/lib/later";import { applyValueTransformer } from "discourse/lib/transformer";+import DButton from "discourse/ui-kit/d-button";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import LikedUsersList from "../liked-users-list";export default class PostMenuLikeButton extends Component {@@ -61,7 +61,7 @@ export default class PostMenuLikeButton extends Component {<template>{{#if @post.showLike}}<div- class={{concatClass+ class={{dConcatClass"double-button"(if @post.liked "has-liked" "")"post-action-menu__double-button"@@ -71,7 +71,7 @@ export default class PostMenuLikeButton extends Component {<LikedUsersList ...attributes @post={{@post}} />{{/if}}<DButton- class={{concatClass+ class={{dConcatClass"post-action-menu__like""toggle-like""btn-icon"diff --git a/frontend/discourse/app/components/post/menu/buttons/read.gjs b/frontend/discourse/app/components/post/menu/buttons/read.gjsindex aec8ecd9bfe..8adf897de49 100644--- a/frontend/discourse/app/components/post/menu/buttons/read.gjs+++ b/frontend/discourse/app/components/post/menu/buttons/read.gjs@@ -1,5 +1,5 @@import Component from "@glimmer/component";-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";export default class PostMenuReadButton extends Component {diff --git a/frontend/discourse/app/components/post/menu/buttons/replies.gjs b/frontend/discourse/app/components/post/menu/buttons/replies.gjsindex c4104c48f16..e0961eb4d63 100644--- a/frontend/discourse/app/components/post/menu/buttons/replies.gjs+++ b/frontend/discourse/app/components/post/menu/buttons/replies.gjs@@ -1,8 +1,8 @@import Component from "@glimmer/component";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import icon from "discourse/helpers/d-icon";import { and, not } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class PostMenuRepliesButton extends Component {@@ -70,7 +70,7 @@ export default class PostMenuRepliesButton extends Component {To get the desired effect will use the {{yield}} in the DButton component to our advantageintroducing manually the icon after the label--}}- {{~icon (if @state.repliesShown "chevron-up" "chevron-down")~}}+ {{~dIcon (if @state.repliesShown "chevron-up" "chevron-down")~}}</DButton></template>}diff --git a/frontend/discourse/app/components/post/menu/buttons/reply.gjs b/frontend/discourse/app/components/post/menu/buttons/reply.gjsindex 7bc61612330..0ccc2859789 100644--- a/frontend/discourse/app/components/post/menu/buttons/reply.gjs+++ b/frontend/discourse/app/components/post/menu/buttons/reply.gjs@@ -1,7 +1,7 @@import Component from "@glimmer/component";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import concatClass from "discourse/helpers/concat-class";+import DButton from "discourse/ui-kit/d-button";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";export default class PostMenuReplyButton extends Component {@@ -20,7 +20,7 @@ export default class PostMenuReplyButton extends Component {<template><DButton- class={{concatClass+ class={{dConcatClass"post-action-menu__reply""reply"(if this.showLabel "create fade-out")diff --git a/frontend/discourse/app/components/post/menu/buttons/share.gjs b/frontend/discourse/app/components/post/menu/buttons/share.gjsindex daa6dbe6892..099a3828e08 100644--- a/frontend/discourse/app/components/post/menu/buttons/share.gjs+++ b/frontend/discourse/app/components/post/menu/buttons/share.gjs@@ -1,4 +1,4 @@-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";const PostMenuShareButton = <template><DButtondiff --git a/frontend/discourse/app/components/post/menu/buttons/show-more.gjs b/frontend/discourse/app/components/post/menu/buttons/show-more.gjsindex 99c384b3272..cadb2c0f207 100644--- a/frontend/discourse/app/components/post/menu/buttons/show-more.gjs+++ b/frontend/discourse/app/components/post/menu/buttons/show-more.gjs@@ -1,5 +1,5 @@import Component from "@glimmer/component";-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";export default class PostMenuShowMoreButton extends Component {static shouldRender(args) {diff --git a/frontend/discourse/app/components/post/menu/liked-users-list.gjs b/frontend/discourse/app/components/post/menu/liked-users-list.gjsindex 4c123f211e3..f3bd03b5e64 100644--- a/frontend/discourse/app/components/post/menu/liked-users-list.gjs+++ b/frontend/discourse/app/components/post/menu/liked-users-list.gjs@@ -3,14 +3,14 @@ import { tracked } from "@glimmer/tracking";import { on } from "@ember/modifier";import { action } from "@ember/object";import { service } from "@ember/service";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DButton from "discourse/components/d-button";import PluginOutlet from "discourse/components/plugin-outlet";-import UserAvatar from "discourse/components/user-avatar";import DMenu from "discourse/float-kit/components/d-menu";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import lazyHash from "discourse/helpers/lazy-hash";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DUserAvatar from "discourse/ui-kit/d-user-avatar";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";import PostLikedUsersMenu from "./liked-users-menu";@@ -117,7 +117,7 @@ export default class LikedUsersList extends Component {"post.sr_post_like_count_button"}}- class={{concatClass+ class={{dConcatClass"btn btn-flat no-text""post-action-menu__like-count""like-count"@@ -130,7 +130,7 @@ export default class LikedUsersList extends Component {...attributes>{{#if this.buttonIcon}}- {{icon this.buttonIcon}}+ {{dIcon this.buttonIcon}}{{/if}}{{@post.likeCount}}</button>@@ -139,7 +139,7 @@ export default class LikedUsersList extends Component {@modalForMobile={{true}}@identifier="post-like-users_{{@post.id}}"@onShow={{this.fetchLikedUsers}}- @triggerClass={{concatClass+ @triggerClass={{dConcatClass"post-action-menu__like-count""like-count""btn-flat"@@ -156,12 +156,12 @@ export default class LikedUsersList extends Component {{{@post.likeCount}}</:trigger><:content>- <ConditionalLoadingSpinner+ <DConditionalLoadingSpinner@condition={{this.loadingLikedUsers}}class="liked-users-list__container"><span class="liked-users-list__count">- {{icon "d-liked" class="liked-users-list__count-icon"}}+ {{dIcon "d-liked" class="liked-users-list__count-icon"}}{{@post.likeCount}}</span><div class="liked-users-list">@@ -172,7 +172,7 @@ export default class LikedUsersList extends Component {@name="liked-users-list-avatar"@outletArgs={{lazyHash user=user post=@post}}>- <UserAvatar+ <DUserAvatarclass="trigger-user-card"@user={{user}}@size="small"@@ -198,7 +198,7 @@ export default class LikedUsersList extends Component {@name="liked-users-list-avatar"@outletArgs={{lazyHash user=user post=@post}}>- <UserAvatar+ <DUserAvatarclass="trigger-user-card"@user={{user}}@size="small"@@ -217,7 +217,7 @@ export default class LikedUsersList extends Component {{{/if}}{{/if}}</div>- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner></:content></DMenu>{{/if}}diff --git a/frontend/discourse/app/components/post/menu/liked-users-menu.gjs b/frontend/discourse/app/components/post/menu/liked-users-menu.gjsindex 5d2494c3d26..b2fa8e75068 100644--- a/frontend/discourse/app/components/post/menu/liked-users-menu.gjs+++ b/frontend/discourse/app/components/post/menu/liked-users-menu.gjs@@ -1,8 +1,8 @@import Component from "@glimmer/component";import PluginOutlet from "discourse/components/plugin-outlet";-import UserAvatar from "discourse/components/user-avatar";import lazyHash from "discourse/helpers/lazy-hash";import { ajax } from "discourse/lib/ajax";+import DUserAvatar from "discourse/ui-kit/d-user-avatar";import { i18n } from "discourse-i18n";import PostUsersMenu from "./post-users-menu";@@ -45,7 +45,7 @@ export default class PostLikedUsersMenu extends Component {@name="liked-users-list-avatar"@outletArgs={{lazyHash user=user post=this.post}}>- <UserAvatar class="trigger-user-card" @user={{user}} @size="small" />+ <DUserAvatar class="trigger-user-card" @user={{user}} @size="small" /></PluginOutlet></:avatar></PostUsersMenu>diff --git a/frontend/discourse/app/components/post/menu/post-users-menu.gjs b/frontend/discourse/app/components/post/menu/post-users-menu.gjsindex 65d482fa86f..c33c2f0ecee 100644--- a/frontend/discourse/app/components/post/menu/post-users-menu.gjs+++ b/frontend/discourse/app/components/post/menu/post-users-menu.gjs@@ -5,11 +5,11 @@ import didInsert from "@ember/render-modifiers/modifiers/did-insert";import { schedule } from "@ember/runloop";import { service } from "@ember/service";import { trustHTML } from "@ember/template";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import LoadMore from "discourse/components/load-more";-import UserAvatar from "discourse/components/user-avatar";-import UserLink from "discourse/components/user-link";-import icon from "discourse/helpers/d-icon";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DLoadMore from "discourse/ui-kit/d-load-more";+import DUserAvatar from "discourse/ui-kit/d-user-avatar";+import DUserLink from "discourse/ui-kit/d-user-link";+import dIcon from "discourse/ui-kit/helpers/d-icon";const PAGE_SIZE = 30;@@ -94,7 +94,7 @@ export default class PostUsersMenu extends Component {style={{this.bodyStyle}}{{didInsert this.loadInitial}}>- <LoadMore+ <DLoadMore@action={{this.loadMore}}@enabled={{this.canLoadMore}}@isLoading={{this.loading}}@@ -105,36 +105,36 @@ export default class PostUsersMenu extends Component {{{#if (has-block "avatar")}}{{yield user to="avatar"}}{{else}}- <UserAvatar @user={{user}} @size="small" />+ <DUserAvatar @user={{user}} @size="small" />{{/if}}<div class="post-users-popup__user-info">- <UserLink+ <DUserLink@username={{user.username}}class="post-users-popup__name">{{this.displayName user}}- </UserLink>+ </DUserLink>{{#unless this.siteSettings.prioritize_username_in_ux}}- <UserLink+ <DUserLink@username={{user.username}}class="post-users-popup__username">@{{user.username}}- </UserLink>+ </DUserLink>{{/unless}}</div>{{#if (has-block "reaction")}}{{yield user to="reaction"}}{{else}}- {{icon "d-liked" class="post-users-popup__reaction"}}+ {{dIcon "d-liked" class="post-users-popup__reaction"}}{{/if}}</div>{{/each}}- <ConditionalLoadingSpinner+ <DConditionalLoadingSpinner@condition={{this.loading}}@size="small"/>- </LoadMore>+ </DLoadMore></div></div></template>diff --git a/frontend/discourse/app/components/post/meta-data/date.gjs b/frontend/discourse/app/components/post/meta-data/date.gjsindex d770e450214..df53c9b0bf2 100644--- a/frontend/discourse/app/components/post/meta-data/date.gjs+++ b/frontend/discourse/app/components/post/meta-data/date.gjs@@ -3,9 +3,9 @@ import { on } from "@ember/modifier";import { action } from "@ember/object";import { service } from "@ember/service";import ShareTopicModal from "discourse/components/modal/share-topic";-import RelativeDate from "discourse/components/relative-date";-import concatClass from "discourse/helpers/concat-class";import { and } from "discourse/truth-helpers";+import DRelativeDate from "discourse/ui-kit/d-relative-date";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";export default class PostMetaDataDate extends Component {@@ -26,7 +26,7 @@ export default class PostMetaDataDate extends Component {<template><div class="post-info post-date"><a- class={{concatClass+ class={{dConcatClass"post-date"(if (and @post.wiki @post.last_wiki_edit) "last-wiki-edit")}}@@ -34,7 +34,7 @@ export default class PostMetaDataDate extends Component {title={{i18n "post.sr_date"}}{{on "click" this.showShareModal}}>- <RelativeDate @date={{@post.displayDate}} />+ <DRelativeDate @date={{@post.displayDate}} /></a></div></template>diff --git a/frontend/discourse/app/components/post/meta-data/edits-indicator.gjs b/frontend/discourse/app/components/post/meta-data/edits-indicator.gjsindex b580f2b3a9c..625ad79b50e 100644--- a/frontend/discourse/app/components/post/meta-data/edits-indicator.gjs+++ b/frontend/discourse/app/components/post/meta-data/edits-indicator.gjs@@ -1,10 +1,10 @@import Component from "@glimmer/component";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import concatClass from "discourse/helpers/concat-class";import { longDate } from "discourse/lib/formatter";import { applyValueTransformer } from "discourse/lib/transformer";+import DButton from "discourse/ui-kit/d-button";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";export default class PostMetaDataEditsIndicator extends Component {@@ -52,7 +52,7 @@ export default class PostMetaDataEditsIndicator extends Component {<template><div class="post-info edits"><DButton- class={{concatClass+ class={{dConcatClass"btn-flat"(historyHeat this.siteSettings this.updatedAt)(if @post.wiki "wiki")diff --git a/frontend/discourse/app/components/post/meta-data/email-indicator.gjs b/frontend/discourse/app/components/post/meta-data/email-indicator.gjsindex 3e569f40a64..0b175cdf869 100644--- a/frontend/discourse/app/components/post/meta-data/email-indicator.gjs+++ b/frontend/discourse/app/components/post/meta-data/email-indicator.gjs@@ -2,8 +2,8 @@ import Component from "@glimmer/component";import { on } from "@ember/modifier";import { action } from "@ember/object";import { service } from "@ember/service";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class PostMetaDataEmailIndicator extends Component {@@ -33,7 +33,7 @@ export default class PostMetaDataEmailIndicator extends Component {<template>{{! template-lint-disable no-invalid-interactive }}<div- class={{concatClass+ class={{dConcatClass"post-info""via-email"(if this.canViewRawEmail "raw-email")@@ -41,7 +41,7 @@ export default class PostMetaDataEmailIndicator extends Component {title={{this.title}}{{on "click" this.onShowRawEmail}}>- {{icon this.icon}}+ {{dIcon this.icon}}</div></template>}diff --git a/frontend/discourse/app/components/post/meta-data/locked-indicator.gjs b/frontend/discourse/app/components/post/meta-data/locked-indicator.gjsindex 4e294e860f7..6ad7e31a741 100644--- a/frontend/discourse/app/components/post/meta-data/locked-indicator.gjs+++ b/frontend/discourse/app/components/post/meta-data/locked-indicator.gjs@@ -1,9 +1,9 @@-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";const PostMetaDataLockedIndicator = <template><div class="post-info post-locked" title={{i18n "post.locked"}}>- {{icon "lock"}}+ {{dIcon "lock"}}</div></template>;diff --git a/frontend/discourse/app/components/post/meta-data/poster-name.gjs b/frontend/discourse/app/components/post/meta-data/poster-name.gjsindex d6fe914d3fc..5ee3fa5efda 100644--- a/frontend/discourse/app/components/post/meta-data/poster-name.gjs+++ b/frontend/discourse/app/components/post/meta-data/poster-name.gjs@@ -5,10 +5,6 @@ import GroupLink from "discourse/components/group-link";import PluginOutlet from "discourse/components/plugin-outlet";import PostMetaDataPosterNameIcon from "discourse/components/post/meta-data/poster-name/icon";import UserBadge from "discourse/components/user-badge";-import UserLink from "discourse/components/user-link";-import UserStatusMessage from "discourse/components/user-status-message";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import helperFn from "discourse/helpers/helper-fn";import lazyHash from "discourse/helpers/lazy-hash";import userPrioritizedName from "discourse/helpers/user-prioritized-name";@@ -17,6 +13,10 @@ import getURL from "discourse/lib/get-url";import { applyValueTransformer } from "discourse/lib/transformer";import { formatUsername } from "discourse/lib/utilities";import { and, or } from "discourse/truth-helpers";+import DUserLink from "discourse/ui-kit/d-user-link";+import DUserStatusMessage from "discourse/ui-kit/d-user-status-message";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class PostMetaDataPosterName extends Component {@@ -147,7 +147,7 @@ export default class PostMetaDataPosterName extends Component {<PostMetaDataPosterNameIcons @post={{@post}} />{{/if}}<span- class={{concatClass+ class={{dConcatClass"first"(if this.nameFirst "full-name" "username")(if this.user.staff "staff")@@ -172,24 +172,24 @@ export default class PostMetaDataPosterName extends Component {user=this.user}}>- <UserLink @user={{this.user}}>+ <DUserLink @user={{this.user}}>{{this.name}}{{#if this.showGlyph}}{{#if (or this.user.moderator @post.group_moderator)}}- {{icon+ {{dIcon"shield-halved"translatedTitle=(i18n "user.moderator_tooltip")}}{{/if}}{{/if}}- </UserLink>+ </DUserLink></PluginOutlet></span>{{#if this.showNameAndGroup}}{{#if this.shouldDisplaySecondName}}<span- class={{concatClass+ class={{dConcatClass"second"(if this.nameFirst "username" "full-name")}}@@ -204,19 +204,19 @@ export default class PostMetaDataPosterName extends Component {user=this.user}}>- <UserLink @user={{this.user}}>+ <DUserLink @user={{this.user}}>{{#if this.nameFirst}}{{formatUsername this.user.username}}{{else}}{{this.user.name}}{{/if}}- </UserLink>+ </DUserLink></PluginOutlet></span>{{/if}}{{#if this.userTitle}}- <span class={{concatClass "user-title" this.titleClassNames}}>+ <span class={{dConcatClass "user-title" this.titleClassNames}}>{{#if (and this.user.primary_group_name @post.title_is_group)}}<GroupLink@name={{this.user.primary_group_name}}@@ -232,7 +232,7 @@ export default class PostMetaDataPosterName extends Component {{{#if this.shouldShowUserStatus}}<span class="user-status-message-wrap">- <UserStatusMessage @status={{this.user.status}} />+ <DUserStatusMessage @status={{this.user.status}} /></span>{{/if}}diff --git a/frontend/discourse/app/components/post/meta-data/poster-name/icon.gjs b/frontend/discourse/app/components/post/meta-data/poster-name/icon.gjsindex d818d33fabc..39b44a48484 100644--- a/frontend/discourse/app/components/post/meta-data/poster-name/icon.gjs+++ b/frontend/discourse/app/components/post/meta-data/poster-name/icon.gjs@@ -1,8 +1,8 @@import Component from "@glimmer/component";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";-import emoji from "discourse/helpers/emoji";import { not } from "discourse/truth-helpers";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dEmoji from "discourse/ui-kit/helpers/d-emoji";+import dIcon from "discourse/ui-kit/helpers/d-icon";export default class PostMetaDataPosterNameIcon extends Component {get emojis() {@@ -18,7 +18,7 @@ export default class PostMetaDataPosterNameIcon extends Component {}<template>- <span class={{concatClass "poster-icon" @className}} title={{@title}}>+ <span class={{dConcatClass "poster-icon" @className}} title={{@title}}>{{#if @url}}<a href={{@url}}><Content@@ -42,10 +42,10 @@ export default class PostMetaDataPosterNameIcon extends Component {const Content = <template>{{#if @icon}}- {{icon @icon}}+ {{dIcon @icon}}{{else if @emojis}}{{#each @emojis as |emojiName|}}- {{emoji emojiName skipEmojiTitle=(not @emojiTitle)}}+ {{dEmoji emojiName skipEmojiTitle=(not @emojiTitle)}}{{/each}}{{/if}}{{@text}}diff --git a/frontend/discourse/app/components/post/meta-data/read-indicator.gjs b/frontend/discourse/app/components/post/meta-data/read-indicator.gjsindex e7015f7bc33..e7409e10cd9 100644--- a/frontend/discourse/app/components/post/meta-data/read-indicator.gjs+++ b/frontend/discourse/app/components/post/meta-data/read-indicator.gjs@@ -1,13 +1,13 @@-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";const PostMetaDataReadIndicator = <template><div- class={{concatClass "read-state" (if @post.read "read")}}+ class={{dConcatClass "read-state" (if @post.read "read")}}title={{i18n "post.unread"}}>- {{icon "circle"}}+ {{dIcon "circle"}}</div></template>;diff --git a/frontend/discourse/app/components/post/meta-data/reply-to-tab.gjs b/frontend/discourse/app/components/post/meta-data/reply-to-tab.gjsindex a9842fe98e3..7c8ae0fd9c6 100644--- a/frontend/discourse/app/components/post/meta-data/reply-to-tab.gjs+++ b/frontend/discourse/app/components/post/meta-data/reply-to-tab.gjs@@ -3,10 +3,10 @@ import { on } from "@ember/modifier";import { action } from "@ember/object";import { service } from "@ember/service";import PluginOutlet from "discourse/components/plugin-outlet";-import avatar from "discourse/helpers/avatar";-import icon from "discourse/helpers/d-icon";import lazyHash from "discourse/helpers/lazy-hash";import userPrioritizedName from "discourse/helpers/user-prioritized-name";+import dAvatar from "discourse/ui-kit/helpers/d-avatar";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class PostMetaDataReplyToTab extends Component {@@ -41,13 +41,13 @@ export default class PostMetaDataReplyToTab extends Component {{{#if @repliesAbove.isPending}}<div class="spinner small"></div>{{else}}- {{icon "share"}}+ {{dIcon "share"}}{{/if}}<PluginOutlet@name="post-meta-data-reply-to-tab-info"@outletArgs={{lazyHash post=@post}}>- {{avatar @post.reply_to_user imageSize="small"}}+ {{dAvatar @post.reply_to_user imageSize="small"}}<span>{{userPrioritizedName @post.reply_to_user}}</span></PluginOutlet></a>diff --git a/frontend/discourse/app/components/post/meta-data/select-post.gjs b/frontend/discourse/app/components/post/meta-data/select-post.gjsindex 8b084ddd006..a2f2b3b18f7 100644--- a/frontend/discourse/app/components/post/meta-data/select-post.gjs+++ b/frontend/discourse/app/components/post/meta-data/select-post.gjs@@ -1,5 +1,5 @@-import DButton from "discourse/components/d-button";import { and, not } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";const PostMetaDataSelectPost = <template><div class="select-posts">diff --git a/frontend/discourse/app/components/post/meta-data/whisper-indicator.gjs b/frontend/discourse/app/components/post/meta-data/whisper-indicator.gjsindex 4fcac6ec96c..ee66f027254 100644--- a/frontend/discourse/app/components/post/meta-data/whisper-indicator.gjs+++ b/frontend/discourse/app/components/post/meta-data/whisper-indicator.gjs@@ -1,6 +1,6 @@import Component from "@glimmer/component";import { service } from "@ember/service";-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class PostMetaDataWhisperIndicator extends Component {@@ -22,7 +22,7 @@ export default class PostMetaDataWhisperIndicator extends Component {<template><div class="post-info whisper" title={{this.title}}>- {{icon "far-eye-slash"}}+ {{dIcon "far-eye-slash"}}</div></template>}diff --git a/frontend/discourse/app/components/post/notice.gjs b/frontend/discourse/app/components/post/notice.gjsindex fa090954bb1..a1d82864985 100644--- a/frontend/discourse/app/components/post/notice.gjs+++ b/frontend/discourse/app/components/post/notice.gjs@@ -1,7 +1,7 @@import Component from "@glimmer/component";import { dasherize } from "@ember/string";-import concatClass from "discourse/helpers/concat-class";import { applyValueTransformer } from "discourse/lib/transformer";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import PostNoticeCustom from "./notice/custom";import PostNoticeNewUser from "./notice/new-user";import PostNoticeReturningUser from "./notice/returning-user";@@ -37,7 +37,7 @@ export default class PostNotice extends Component {}<template>- <div class={{concatClass "post-notice" (dasherize this.type)}}>+ <div class={{dConcatClass "post-notice" (dasherize this.type)}}><this.Component @notice={{@post.notice}} @post={{@post}} /></div></template>diff --git a/frontend/discourse/app/components/post/notice/custom.gjs b/frontend/discourse/app/components/post/notice/custom.gjsindex 9c0d156dd92..55082c1eceb 100644--- a/frontend/discourse/app/components/post/notice/custom.gjs+++ b/frontend/discourse/app/components/post/notice/custom.gjs@@ -2,10 +2,10 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { trustHTML } from "@ember/template";import { modifier } from "ember-modifier";-import ConditionalInElement from "discourse/components/conditional-in-element";-import UserLink from "discourse/components/user-link";-import icon from "discourse/helpers/d-icon";import { prioritizeNameInUx } from "discourse/lib/settings";+import DConditionalInElement from "discourse/ui-kit/d-conditional-in-element";+import DUserLink from "discourse/ui-kit/d-user-link";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class PostNoticeCustom extends Component {@@ -26,7 +26,7 @@ export default class PostNoticeCustom extends Component {}<template>- {{icon "user-shield"}}+ {{dIcon "user-shield"}}<div class="post-notice-message" {{this.registerCreatedByLink}}>{{trustHTML @notice.cooked}}{{#if this.createdByName}}@@ -39,15 +39,15 @@ export default class PostNoticeCustom extends Component {{{/if}}{{! #in-element is used as an strategy to render the HTML content in the string from a real componentinstead defining it from a string }}- <ConditionalInElement @element={{this.createdByAnchorElement}}>- <UserLink+ <DConditionalInElement @element={{this.createdByAnchorElement}}>+ <DUserLinktitle={{this.createdByName}}@username={{@post.notice_created_by_user.username}}@ariaHidden={{false}}>{{this.createdByName}}- </UserLink>- </ConditionalInElement>+ </DUserLink>+ </DConditionalInElement></div></template>}diff --git a/frontend/discourse/app/components/post/notice/new-user.gjs b/frontend/discourse/app/components/post/notice/new-user.gjsindex 5bff64bd30e..4b97f30c14a 100644--- a/frontend/discourse/app/components/post/notice/new-user.gjs+++ b/frontend/discourse/app/components/post/notice/new-user.gjs@@ -1,7 +1,7 @@import Component from "@glimmer/component";import { service } from "@ember/service";-import emoji from "discourse/helpers/emoji";import { prioritizeNameInUx } from "discourse/lib/settings";+import dEmoji from "discourse/ui-kit/helpers/d-emoji";import { i18n } from "discourse-i18n";export default class PostNoticeNewUser extends Component {@@ -15,7 +15,7 @@ export default class PostNoticeNewUser extends Component {}<template>- {{emoji "tada"}}+ {{dEmoji "tada"}}<p>{{i18n "post.notice.new_user" user=this.user}}</p></template>}diff --git a/frontend/discourse/app/components/post/notice/returning-user.gjs b/frontend/discourse/app/components/post/notice/returning-user.gjsindex 10229e9203f..c9743749d26 100644--- a/frontend/discourse/app/components/post/notice/returning-user.gjs+++ b/frontend/discourse/app/components/post/notice/returning-user.gjs@@ -1,5 +1,5 @@-import emoji from "discourse/helpers/emoji";import { relativeAgeMediumSpan } from "discourse/lib/formatter";+import dEmoji from "discourse/ui-kit/helpers/d-emoji";import { i18n } from "discourse-i18n";import PostNoticeNewUser from "./new-user";@@ -11,7 +11,7 @@ export default class PostNoticeReturningUser extends PostNoticeNewUser {}<template>- {{emoji "wave"}}+ {{dEmoji "wave"}}<p>{{i18n "post.notice.returning_user" user=this.user time=this.time}}</p></template>}diff --git a/frontend/discourse/app/components/post/quoted-content.gjs b/frontend/discourse/app/components/post/quoted-content.gjsindex 4cc53857ca3..12b2114bf83 100644--- a/frontend/discourse/app/components/post/quoted-content.gjs+++ b/frontend/discourse/app/components/post/quoted-content.gjs@@ -5,17 +5,17 @@ import { on } from "@ember/modifier";import { action } from "@ember/object";import { service } from "@ember/service";import { modifier as modifierFn } from "ember-modifier";-import AsyncContent from "discourse/components/async-content";-import DButton from "discourse/components/d-button";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";-import element from "discourse/helpers/element";import elementClass from "discourse/helpers/element-class";import { ajax } from "discourse/lib/ajax";import { makeArray } from "discourse/lib/helpers";import highlightHTML from "discourse/lib/highlight-html";import { postUrl } from "discourse/lib/utilities";import { eq } from "discourse/truth-helpers";+import DAsyncContent from "discourse/ui-kit/d-async-content";+import DButton from "discourse/ui-kit/d-button";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dElement from "discourse/ui-kit/helpers/d-element";+import dIcon from "discourse/ui-kit/helpers/d-icon";import PostCookedHtml from "./cooked-html";export default class PostQuotedContent extends Component {@@ -126,7 +126,7 @@ export default class PostQuotedContent extends Component {}get OptionalWrapperComponent() {- return this.args.wrapperElement ? element("") : element("aside");+ return this.args.wrapperElement ? dElement("") : dElement("aside");}@action@@ -171,7 +171,7 @@ export default class PostQuotedContent extends Component {<this.OptionalWrapperComponent...attributesrole="none"- class={{concatClass+ class={{dConcatClass"quote"(if @quotedPostNotFound "quote-post-not-found")(if this.isQuotedPostIgnored "ignored-user")@@ -230,7 +230,7 @@ export default class PostQuotedContent extends Component {>{{! rendering the icon in the block instead of using the parameter `@icon` prevents DButton from addingextra whitespace that will interfere with the text captured when quoting a quoted content }}- {{~icon this.toggleIcon~}}+ {{~dIcon this.toggleIcon~}}</DButton>{{~/if~}}{{~#if this.shouldDisplayNavigateToPostButton~}}@@ -242,7 +242,7 @@ export default class PostQuotedContent extends Component {>{{! rendering the icon in the block instead of using the parameter `@icon` prevents DButton from addingextra whitespace that will interfere with the text captured when quoting a quoted content }}- {{~icon this.navigateToPostIcon~}}+ {{~dIcon this.navigateToPostIcon~}}</DButton>{{~/if~}}</div>@@ -251,7 +251,7 @@ export default class PostQuotedContent extends Component {<blockquote id={{@id}}>{{~#unless this.isQuotedPostIgnored~}}{{~#if this.expanded~}}- <AsyncContent+ <DAsyncContent@asyncData={{this.loadQuotedPost}}@context={{hashtopicNumber=@quotedTopicId@@ -275,11 +275,11 @@ export default class PostQuotedContent extends Component {<:error as |error AsyncContentInlineErrorMessage|>{{~#if (eq error.jqXHR.status 403)~}}<div class="quote-error expanded-quote icon-only">- {{~icon "lock"~}}+ {{~dIcon "lock"~}}</div>{{~else if (eq error.jqXHR.status 404)~}}<div class="quote-error expanded-quote icon-only">- {{~icon "trash-can"~}}+ {{~dIcon "trash-can"~}}</div>{{~else~}}<div class="quote-error expanded-quote">@@ -287,7 +287,7 @@ export default class PostQuotedContent extends Component {</div>{{~/if~}}</:error>- </AsyncContent>+ </DAsyncContent>{{~else~}}<PostCookedHtml@className="post__contents-cooked-quote"diff --git a/frontend/discourse/app/components/post/small-action.gjs b/frontend/discourse/app/components/post/small-action.gjsindex cf2823260ee..b1c686dba37 100644--- a/frontend/discourse/app/components/post/small-action.gjs+++ b/frontend/discourse/app/components/post/small-action.gjs@@ -4,16 +4,16 @@ import { concat } from "@ember/helper";import { trackedMap } from "@ember/reactive/collections";import { service } from "@ember/service";import { trustHTML } from "@ember/template";-import DButton from "discourse/components/d-button";import PostCookedHtml from "discourse/components/post/cooked-html";-import UserAvatar from "discourse/components/user-avatar";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import { autoUpdatingRelativeAge, relativeAge } from "discourse/lib/formatter";import getURL from "discourse/lib/get-url";import { applyValueTransformer } from "discourse/lib/transformer";import { userPath } from "discourse/lib/url";import { escapeExpression } from "discourse/lib/utilities";+import DButton from "discourse/ui-kit/d-button";+import DUserAvatar from "discourse/ui-kit/d-user-avatar";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";import PostA11yHeading from "./a11y-heading";@@ -165,7 +165,7 @@ export default class PostSmallAction extends Component {id={{@elementId}}class={{unless@cloaked- (concatClass+ (dConcatClass"small-action""onscreen-post"(if @post.deleted "deleted")@@ -178,11 +178,11 @@ export default class PostSmallAction extends Component {data-user-id={{@post.user_id}}><div class="topic-avatar">- {{icon this.icon}}+ {{dIcon this.icon}}</div><div class="small-action-desc"><div class="small-action-contents">- <UserAvatar+ <DUserAvatar@ariaHidden={{false}}@size="small"@user={{@post.user}}diff --git a/frontend/discourse/app/components/post/visited-line.gjs b/frontend/discourse/app/components/post/visited-line.gjsindex b0e2246f139..5fcd302e65f 100644--- a/frontend/discourse/app/components/post/visited-line.gjs+++ b/frontend/discourse/app/components/post/visited-line.gjs@@ -1,11 +1,11 @@import { concat } from "@ember/helper";-import concatClass from "discourse/helpers/concat-class";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";const PostVisitedLine = <template><div class="small-action topic-post-visited"><div- class={{concatClass+ class={{dConcatClass"topic-post-visited-line"(concat "post-" @post.post_number)}}diff --git a/frontend/discourse/app/components/powered-by-discourse.gjs b/frontend/discourse/app/components/powered-by-discourse.gjsindex d2878357b9c..6383f6059f6 100644--- a/frontend/discourse/app/components/powered-by-discourse.gjs+++ b/frontend/discourse/app/components/powered-by-discourse.gjs@@ -1,6 +1,6 @@import Component from "@glimmer/component";import { modifier as modifierFn } from "ember-modifier";-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class PoweredByDiscourse extends Component {@@ -21,7 +21,7 @@ export default class PoweredByDiscourse extends Component {><span class="powered-by-discourse__content"><span class="powered-by-discourse__logo">- {{icon "fab-discourse"}}+ {{dIcon "fab-discourse"}}</span><span>{{i18n "powered_by_discourse"}}</span></span>diff --git a/frontend/discourse/app/components/preference-checkbox.gjs b/frontend/discourse/app/components/preference-checkbox.gjsindex 147f7ba2723..ce57bc4212e 100644--- a/frontend/discourse/app/components/preference-checkbox.gjs+++ b/frontend/discourse/app/components/preference-checkbox.gjs@@ -1,9 +1,9 @@import { Input } from "@ember/component";-import concatClass from "discourse/helpers/concat-class";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";const PreferenceCheckbox = <template>- <div class={{concatClass "controls" @class}} ...attributes>+ <div class={{dConcatClass "controls" @class}} ...attributes><label class="checkbox-label"><Input @type="checkbox" @checked={{@checked}} disabled={{@disabled}} />diff --git a/frontend/discourse/app/components/private-message-glyph.gjs b/frontend/discourse/app/components/private-message-glyph.gjsindex 79860d269ea..2aa9cc8ada9 100644--- a/frontend/discourse/app/components/private-message-glyph.gjs+++ b/frontend/discourse/app/components/private-message-glyph.gjs@@ -1,4 +1,4 @@-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";const PrivateMessageGlyph = <template>@@ -6,12 +6,12 @@ const PrivateMessageGlyph = <template>{{#if @href}}<a href={{@href}} title={{i18n @title}} aria-label={{i18n @ariaLabel}}><span class="private-message-glyph-wrapper">- {{icon "envelope" class="private-message-glyph"}}+ {{dIcon "envelope" class="private-message-glyph"}}</span></a>{{~else}}<span class="private-message-glyph-wrapper">- {{icon "envelope" class="private-message-glyph"}}+ {{dIcon "envelope" class="private-message-glyph"}}</span>{{~/if}}{{/if}}diff --git a/frontend/discourse/app/components/pwa-install-banner.gjs b/frontend/discourse/app/components/pwa-install-banner.gjsindex c62794a90b2..b40c91e544b 100644--- a/frontend/discourse/app/components/pwa-install-banner.gjs+++ b/frontend/discourse/app/components/pwa-install-banner.gjs@@ -4,8 +4,8 @@ import { hash } from "@ember/helper";import { action } from "@ember/object";import { service } from "@ember/service";import { modifier as modifierFn } from "ember-modifier";-import DButton from "discourse/components/d-button";import DiscourseLinkedText from "discourse/components/discourse-linked-text";+import DButton from "discourse/ui-kit/d-button";const USER_DISMISSED_PROMPT_KEY = "dismissed-pwa-install-banner";diff --git a/frontend/discourse/app/components/relative-date.gjs b/frontend/discourse/app/components/relative-date.gjsdeleted file mode 100644index 7f013936a37..00000000000--- a/frontend/discourse/app/components/relative-date.gjs+++ /dev/null@@ -1,5 +0,0 @@-import ageWithTooltip from "discourse/helpers/age-with-tooltip";--const RelativeDate = <template>{{ageWithTooltip @date}}</template>;--export default RelativeDate;diff --git a/frontend/discourse/app/components/review-filters.gjs b/frontend/discourse/app/components/review-filters.gjsindex 82a4095533c..effd49213a4 100644--- a/frontend/discourse/app/components/review-filters.gjs+++ b/frontend/discourse/app/components/review-filters.gjs@@ -1,12 +1,12 @@import { fn, hash } from "@ember/helper";-import DButton from "discourse/components/d-button";-import DateTimeInputRange from "discourse/components/date-time-input-range";import PluginOutlet from "discourse/components/plugin-outlet";import lazyHash from "discourse/helpers/lazy-hash";import CategoryChooser from "discourse/select-kit/components/category-chooser";import ComboBox from "discourse/select-kit/components/combo-box";import EmailGroupUserChooser from "discourse/select-kit/components/email-group-user-chooser";import { eq } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DDateTimeInputRange from "discourse/ui-kit/d-date-time-input-range";import { i18n } from "discourse-i18n";export default <template>@@ -175,7 +175,7 @@ export default <template><label class="filter-label">{{i18n "review.date_filter"}}</label>- <DateTimeInputRange+ <DDateTimeInputRange@from={{@controller.filterFromDate}}@to={{@controller.filterToDate}}@onChange={{@controller.setRange}}diff --git a/frontend/discourse/app/components/reviewable-bundled-action.gjs b/frontend/discourse/app/components/reviewable-bundled-action.gjsindex 3316446b1e6..3b1eeb1e0c0 100644--- a/frontend/discourse/app/components/reviewable-bundled-action.gjs+++ b/frontend/discourse/app/components/reviewable-bundled-action.gjs@@ -3,10 +3,10 @@ import { hash } from "@ember/helper";import { action } from "@ember/object";import { service } from "@ember/service";import { dasherize } from "@ember/string";-import DButton from "discourse/components/d-button";-import concatClass from "discourse/helpers/concat-class";import { isRTL } from "discourse/lib/text-direction";import DropdownSelectBox from "discourse/select-kit/components/dropdown-select-box";+import DButton from "discourse/ui-kit/d-button";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";export default class ReviewableBundledAction extends Component {@service site;@@ -64,7 +64,7 @@ export default class ReviewableBundledAction extends Component {customStyle=truebtnCustomClasses=this.buttonClass}}- class={{concatClass+ class={{dConcatClass"reviewable-action-dropdown""btn-icon-text"(dasherize this.first.id)@@ -76,7 +76,7 @@ export default class ReviewableBundledAction extends Component {@action={{this.perform}}@translatedLabel={{this.first.label}}@disabled={{@reviewableUpdating}}- class={{concatClass+ class={{dConcatClass"reviewable-action"(dasherize this.first.id)this.first.button_classdiff --git a/frontend/discourse/app/components/reviewable-claimed-topic.gjs b/frontend/discourse/app/components/reviewable-claimed-topic.gjsindex 078dbc85767..0179159c9cd 100644--- a/frontend/discourse/app/components/reviewable-claimed-topic.gjs+++ b/frontend/discourse/app/components/reviewable-claimed-topic.gjs@@ -1,9 +1,9 @@import Component from "@glimmer/component";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";+import DButton from "discourse/ui-kit/d-button";export default class ReviewableClaimedTopic extends Component {@service currentUser;diff --git a/frontend/discourse/app/components/reviewable-created-by-name.gjs b/frontend/discourse/app/components/reviewable-created-by-name.gjsindex aaff95033e0..930a1c3232f 100644--- a/frontend/discourse/app/components/reviewable-created-by-name.gjs+++ b/frontend/discourse/app/components/reviewable-created-by-name.gjs@@ -1,16 +1,16 @@import PluginOutlet from "discourse/components/plugin-outlet";-import UserLink from "discourse/components/user-link";-import icon from "discourse/helpers/d-icon";import lazyHash from "discourse/helpers/lazy-hash";+import DUserLink from "discourse/ui-kit/d-user-link";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";const ReviewableCreatedByName = <template><div class="names"><span class="username">{{#if @user}}- <UserLink @user={{@user}}>{{@user.username}}</UserLink>+ <DUserLink @user={{@user}}>{{@user.username}}</DUserLink>{{#if @user.silenced}}- {{icon "ban" title="user.silenced_tooltip"}}+ {{dIcon "ban" title="user.silenced_tooltip"}}{{/if}}{{else}}{{i18n "review.deleted_user"}}diff --git a/frontend/discourse/app/components/reviewable-created-by.gjs b/frontend/discourse/app/components/reviewable-created-by.gjsindex 0e4bba74095..36c503125f7 100644--- a/frontend/discourse/app/components/reviewable-created-by.gjs+++ b/frontend/discourse/app/components/reviewable-created-by.gjs@@ -1,18 +1,18 @@-import UserLink from "discourse/components/user-link";-import avatar from "discourse/helpers/avatar";-import icon from "discourse/helpers/d-icon";+import DUserLink from "discourse/ui-kit/d-user-link";+import dAvatar from "discourse/ui-kit/helpers/d-avatar";+import dIcon from "discourse/ui-kit/helpers/d-icon";const ReviewableCreatedBy = <template><div class="created-by">{{#if @user}}- <UserLink @user={{@user}}>- {{avatar @user imageSize=(if @avatarSize @avatarSize "large")}}+ <DUserLink @user={{@user}}>+ {{dAvatar @user imageSize=(if @avatarSize @avatarSize "large")}}{{#if @showUsername}}<span class="username">{{@user.username}}</span>{{/if}}- </UserLink>+ </DUserLink>{{else}}- {{icon "trash-can" class="deleted-user-avatar"}}+ {{dIcon "trash-can" class="deleted-user-avatar"}}{{/if}}</div></template>;diff --git a/frontend/discourse/app/components/reviewable-field-editor.gjs b/frontend/discourse/app/components/reviewable-field-editor.gjsindex 05545592fbe..a5d3a5391d8 100644--- a/frontend/discourse/app/components/reviewable-field-editor.gjs+++ b/frontend/discourse/app/components/reviewable-field-editor.gjs@@ -1,7 +1,7 @@/* eslint-disable ember/no-classic-components */import Component from "@ember/component";import { tagName } from "@ember-decorators/component";-import DEditor from "discourse/components/d-editor";+import DEditor from "discourse/ui-kit/d-editor";@tagName("")export default class ReviewableFieldEditor extends Component {diff --git a/frontend/discourse/app/components/reviewable-post-edits.gjs b/frontend/discourse/app/components/reviewable-post-edits.gjsindex fa367472bdd..a20f7228eed 100644--- a/frontend/discourse/app/components/reviewable-post-edits.gjs+++ b/frontend/discourse/app/components/reviewable-post-edits.gjs@@ -3,10 +3,10 @@ import Component from "@ember/component";import { action, computed } from "@ember/object";import { service } from "@ember/service";import { tagName } from "@ember-decorators/component";-import DButton from "discourse/components/d-button";import HistoryModal from "discourse/components/modal/history";import { historyHeat } from "discourse/components/post/meta-data/edits-indicator";import { longDate } from "discourse/lib/formatter";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";@tagName("")diff --git a/frontend/discourse/app/components/reviewable-tags.gjs b/frontend/discourse/app/components/reviewable-tags.gjsindex 937472851a4..7efbbb7296d 100644--- a/frontend/discourse/app/components/reviewable-tags.gjs+++ b/frontend/discourse/app/components/reviewable-tags.gjs@@ -1,9 +1,9 @@-import discourseTags from "discourse/helpers/discourse-tags";+import dDiscourseTags from "discourse/ui-kit/helpers/d-discourse-tags";const ReviewableTags = <template>{{#if @tags}}<div class="list-tags">- {{discourseTags @topic tags=@tags}}+ {{dDiscourseTags @topic tags=@tags}}</div>{{/if}}</template>;diff --git a/frontend/discourse/app/components/reviewable-topic-link.gjs b/frontend/discourse/app/components/reviewable-topic-link.gjsindex 055a8d1b24b..e16aa539693 100644--- a/frontend/discourse/app/components/reviewable-topic-link.gjs+++ b/frontend/discourse/app/components/reviewable-topic-link.gjs@@ -5,8 +5,8 @@ import { LinkTo } from "@ember/routing";import { tagName } from "@ember-decorators/component";import ReviewableTags from "discourse/components/reviewable-tags";import TopicStatus from "discourse/components/topic-status";-import categoryBadge from "discourse/helpers/category-badge";import highlightWatchedWords from "discourse/lib/highlight-watched-words";+import dCategoryBadge from "discourse/ui-kit/helpers/d-category-badge";import { i18n } from "discourse-i18n";@tagName("")@@ -24,7 +24,7 @@ export default class ReviewableTopicLink extends Component {this.reviewable.topic.fancyTitlethis.reviewable}}</a>- {{categoryBadge this.reviewable.category}}+ {{dCategoryBadge this.reviewable.category}}<ReviewableTags@topic={{this.reviewable.topic}}@tags={{this.reviewable.topic_tags}}diff --git a/frontend/discourse/app/components/reviewable/created-by.gjs b/frontend/discourse/app/components/reviewable/created-by.gjsindex 9463ff72c85..8e5157b4c95 100644--- a/frontend/discourse/app/components/reviewable/created-by.gjs+++ b/frontend/discourse/app/components/reviewable/created-by.gjs@@ -1,7 +1,7 @@import ReviewableCreatedByName from "discourse/components/reviewable-created-by-name";-import UserLink from "discourse/components/user-link";-import avatar from "discourse/helpers/avatar";-import icon from "discourse/helpers/d-icon";+import DUserLink from "discourse/ui-kit/d-user-link";+import dAvatar from "discourse/ui-kit/helpers/d-avatar";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";/**@@ -20,11 +20,11 @@ import { i18n } from "discourse-i18n";<template><div class="created-by">{{#if @user}}- <UserLink @user={{@user}}>{{avatar @user imageSize="small"}}</UserLink>+ <DUserLink @user={{@user}}>{{dAvatar @user imageSize="small"}}</DUserLink><ReviewableCreatedByName @user={{@user}} />{{else}}<div class="deleted-user">- {{icon "trash-can" class="deleted-user-avatar"}}+ {{dIcon "trash-can" class="deleted-user-avatar"}}<span class="deleted-user-name">{{i18n "review.deleted_user"}}</span></div>{{/if}}diff --git a/frontend/discourse/app/components/reviewable/help-resources.gjs b/frontend/discourse/app/components/reviewable/help-resources.gjsindex c4a186115d4..4cdd7b44fa1 100644--- a/frontend/discourse/app/components/reviewable/help-resources.gjs+++ b/frontend/discourse/app/components/reviewable/help-resources.gjs@@ -1,8 +1,8 @@import Component from "@glimmer/component";import { service } from "@ember/service";import { isPresent } from "@ember/utils";-import icon from "discourse/helpers/d-icon";import getURL from "discourse/lib/get-url";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class HelpResources extends Component {@@ -21,7 +21,7 @@ export default class HelpResources extends Component {{{#if this.moderatorGuideUrl}}<li class="review-resources__item"><span class="review-resources__icon">- {{icon "book"}}+ {{dIcon "book"}}</span><a href={{this.moderatorGuideUrl}} class="review-resources__link">{{i18n "review.help.community_moderation_guide"}}@@ -30,7 +30,7 @@ export default class HelpResources extends Component {{{/if}}<li class="review-resources__item"><span class="review-resources__icon">- {{icon "book"}}+ {{dIcon "book"}}</span><ahref="https://meta.discourse.org/t/-/63116"@@ -41,7 +41,7 @@ export default class HelpResources extends Component {</li><li class="review-resources__item"><span class="review-resources__icon">- {{icon "book"}}+ {{dIcon "book"}}</span><ahref="https://meta.discourse.org/t/-/123464"@@ -52,7 +52,7 @@ export default class HelpResources extends Component {</li><li class="review-resources__item"><span class="review-resources__icon">- {{icon "book"}}+ {{dIcon "book"}}</span><ahref="https://meta.discourse.org/t/-/343541"diff --git a/frontend/discourse/app/components/reviewable/index.gjs b/frontend/discourse/app/components/reviewable/index.gjsindex e60d14c32c0..5ccec83d2a6 100644--- a/frontend/discourse/app/components/reviewable/index.gjs+++ b/frontend/discourse/app/components/reviewable/index.gjs@@ -1,11 +1,11 @@import Component from "@glimmer/component";import { getOwner } from "@ember/owner";import { dasherize } from "@ember/string";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import LoadMore from "discourse/components/load-more";import ReviewFilters from "discourse/components/review-filters";import ReviewableItem from "discourse/components/reviewable/item";import { bind } from "discourse/lib/decorators";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DLoadMore from "discourse/ui-kit/d-load-more";import { i18n } from "discourse-i18n";export default class ReviewIndexRefresh extends Component {@@ -33,7 +33,7 @@ export default class ReviewIndexRefresh extends Component {<ReviewFilters @controller={{@controller}} /><div class="reviewable-list">{{#if @controller.reviewables.content}}- <LoadMore @action={{@controller.loadMore}}>+ <DLoadMore @action={{@controller.loadMore}}><div class="reviewables">{{#each @controller.reviewables.content as |r|}}{{#if (this.reviewableComponentExists r)}}@@ -41,8 +41,8 @@ export default class ReviewIndexRefresh extends Component {{{/if}}{{/each}}</div>- </LoadMore>- <ConditionalLoadingSpinner+ </DLoadMore>+ <DConditionalLoadingSpinner@condition={{@controller.reviewables.loadingMore}}/>{{else}}diff --git a/frontend/discourse/app/components/reviewable/ip-lookup.gjs b/frontend/discourse/app/components/reviewable/ip-lookup.gjsindex af52f0d4cb3..846667b6eb6 100644--- a/frontend/discourse/app/components/reviewable/ip-lookup.gjs+++ b/frontend/discourse/app/components/reviewable/ip-lookup.gjs@@ -6,11 +6,11 @@ import { service } from "@ember/service";import { trustHTML } from "@ember/template";import IpLookupAccountsTable from "discourse/admin/components/ip-lookup-accounts-table";import AdminUser from "discourse/admin/models/admin-user";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";const MAX_ACCOUNTS_TO_DELETE = 50;@@ -146,7 +146,7 @@ export default class ReviewableIpLookup extends Component {<template>{{#if this.showIpLookup}}{{#if this.loading}}- <ConditionalLoadingSpinner @size="small" @condition={{this.loading}} />+ <DConditionalLoadingSpinner @size="small" @condition={{this.loading}} />{{else if this.location}}<div class="reviewable-ip-lookup"><div class="review-insight__item">@@ -211,7 +211,7 @@ const OtherAccountsModal = <template>><:body>{{#if @model.otherAccountsLoading}}- <ConditionalLoadingSpinner+ <DConditionalLoadingSpinner@size="small"@condition={{@model.otherAccountsLoading}}/>diff --git a/frontend/discourse/app/components/reviewable/item.gjs b/frontend/discourse/app/components/reviewable/item.gjsindex 6d2555ec184..0b25996fdcf 100644--- a/frontend/discourse/app/components/reviewable/item.gjs+++ b/frontend/discourse/app/components/reviewable/item.gjs@@ -9,8 +9,6 @@ import { service } from "@ember/service";import { classify, dasherize } from "@ember/string";import { tagName } from "@ember-decorators/component";import ScrubRejectedUserModal from "discourse/admin/components/modal/scrub-rejected-user";-import DButton from "discourse/components/d-button";-import HorizontalOverflowNav from "discourse/components/horizontal-overflow-nav";import ExplainReviewableModal from "discourse/components/modal/explain-reviewable";import RejectReasonReviewableModal from "discourse/components/modal/reject-reason-reviewable";import ReviseAndRejectPostReviewable from "discourse/components/modal/revise-and-reject-post-reviewable";@@ -21,11 +19,7 @@ import ReviewableTimeline from "discourse/components/reviewable/timeline";import ReviewableBundledAction from "discourse/components/reviewable-bundled-action";import ReviewableClaimedTopic from "discourse/components/reviewable-claimed-topic";import ReviewableCreatedBy from "discourse/components/reviewable-created-by";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";-import dasherizeHelper from "discourse/helpers/dasherize";import editableValue from "discourse/helpers/editable-value";-import formatDate from "discourse/helpers/format-date";import { newReviewableStatus } from "discourse/helpers/reviewable-status";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";@@ -39,6 +33,12 @@ import Composer from "discourse/models/composer";import { PENDING } from "discourse/models/reviewable";import Topic from "discourse/models/topic";import { eq, not } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DHorizontalOverflowNav from "discourse/ui-kit/d-horizontal-overflow-nav";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dDasherize from "discourse/ui-kit/helpers/d-dasherize";+import dFormatDate from "discourse/ui-kit/helpers/d-format-date";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";let _components = {};@@ -765,7 +765,7 @@ export default class ReviewableItem extends Component {title={{i18n "review.copy_permalink_title"}}class="btn btn-transparent reviewable-permalink-copy">- {{icon "d-post-share"}}+ {{dIcon "d-post-share"}}</button>{{newReviewableStatus@@ -774,14 +774,14 @@ export default class ReviewableItem extends Component {}}<span class="reviewable-created-date">- {{formatDate this.reviewable.created_at format="tiny"}}+ {{dFormatDate this.reviewable.created_at format="tiny"}}</span></div>{{#if this.editing}}<div class="editable-fields">{{#each this.reviewable.editable_fields as |f|}}- <div class="editable-field {{dasherizeHelper f.id}}">+ <div class="editable-field {{dDasherize f.id}}">{{#let(lookupComponent this (concat "reviewable-field-" f.type))as |FieldComponent|@@ -813,12 +813,12 @@ export default class ReviewableItem extends Component {<div class="review-item__insights"><div class="d-nav-submenu">- <HorizontalOverflowNav+ <DHorizontalOverflowNav@ariaLabel="Review tabs"class="d-nav-submenu__tabs"><li- class={{concatClass+ class={{dConcatClass"timeline"(if (eq this.activeTab "timeline") "active")}}@@ -832,7 +832,7 @@ export default class ReviewableItem extends Component {</a></li><li- class={{concatClass+ class={{dConcatClass"insights"(if (eq this.activeTab "insights") "active")}}@@ -845,7 +845,7 @@ export default class ReviewableItem extends Component {{{i18n "review.insights.title"}}</a></li>- </HorizontalOverflowNav>+ </DHorizontalOverflowNav></div>{{#if this.insightsOpened}}@@ -919,7 +919,7 @@ export default class ReviewableItem extends Component {<div class="review-item__moderator-actions --extra">{{#if this.reviewable.claimed_by}}<div class="review-item__assigned">- {{icon "user-plus"}}+ {{dIcon "user-plus"}}<ReviewableCreatedBy@showUsername={{true}}@avatarSize="small"diff --git a/frontend/discourse/app/components/reviewable/post.gjs b/frontend/discourse/app/components/reviewable/post.gjsindex 5051f59124f..1bdf0dc858b 100644--- a/frontend/discourse/app/components/reviewable/post.gjs+++ b/frontend/discourse/app/components/reviewable/post.gjs@@ -1,8 +1,5 @@import Component from "@glimmer/component";import { trustHTML } from "@ember/template";-import DecoratedHtml, {- applyHtmlDecorators,-} from "discourse/components/decorated-html";import PluginOutlet from "discourse/components/plugin-outlet";import ReviewableCreatedBy from "discourse/components/reviewable/created-by";import ReviewableTopicLink from "discourse/components/reviewable/topic-link";@@ -10,6 +7,9 @@ import ReviewablePostEdits from "discourse/components/reviewable-post-edits";import lazyHash from "discourse/helpers/lazy-hash";import { bind } from "discourse/lib/decorators";import highlightHTML from "discourse/lib/highlight-html";+import DDecoratedHtml, {+ applyHtmlDecorators,+} from "discourse/ui-kit/d-decorated-html";import { i18n } from "discourse-i18n";export default class ReviewablePost extends Component {@@ -71,7 +71,7 @@ export default class ReviewablePost extends Component {<p>{{i18n "review.deleted_post"}}</p></div>{{else}}- <DecoratedHtml+ <DDecoratedHtml@className="review-item__post-content"@html={{trustHTML @reviewable.cooked}}@decorate={{this.decorate}}diff --git a/frontend/discourse/app/components/reviewable/queued-post.gjs b/frontend/discourse/app/components/reviewable/queued-post.gjsindex 8c6439f8691..31522ebedae 100644--- a/frontend/discourse/app/components/reviewable/queued-post.gjs+++ b/frontend/discourse/app/components/reviewable/queued-post.gjs@@ -7,10 +7,10 @@ import PluginOutlet from "discourse/components/plugin-outlet";import ReviewableCreatedBy from "discourse/components/reviewable/created-by";import ReviewableTopicLink from "discourse/components/reviewable/topic-link";import ReviewableTags from "discourse/components/reviewable-tags";-import categoryBadge from "discourse/helpers/category-badge";-import icon from "discourse/helpers/d-icon";import lazyHash from "discourse/helpers/lazy-hash";import highlightWatchedWords from "discourse/lib/highlight-watched-words";+import dCategoryBadge from "discourse/ui-kit/helpers/d-category-badge";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class ReviewableQueuedPost extends Component {@@ -35,11 +35,11 @@ export default class ReviewableQueuedPost extends Component {<div class="title-text">{{highlightWatchedWords @reviewable.fancy_title @reviewable}}</div>- {{categoryBadge @reviewable.category}}+ {{dCategoryBadge @reviewable.category}}<ReviewableTags @tags={{@reviewable.payload.tags}} />{{#if @reviewable.payload.via_email}}<a href {{on "click" this.showRawEmail}} class="show-raw-email">- {{icon "envelope" title="post.via_email"}}+ {{dIcon "envelope" title="post.via_email"}}</a>{{/if}}</ReviewableTopicLink>diff --git a/frontend/discourse/app/components/reviewable/timeline.gjs b/frontend/discourse/app/components/reviewable/timeline.gjsindex 62d2db8a9e5..699baee068a 100644--- a/frontend/discourse/app/components/reviewable/timeline.gjs+++ b/frontend/discourse/app/components/reviewable/timeline.gjs@@ -4,19 +4,19 @@ import { fn } from "@ember/helper";import { action } from "@ember/object";import { service } from "@ember/service";import { trustHTML } from "@ember/template";-import DButton from "discourse/components/d-button";-import DecoratedHtml from "discourse/components/decorated-html";-import InterpolatedTranslation from "discourse/components/interpolated-translation";import ReviewableFlagReason from "discourse/components/reviewable/flag-reason";import ReviewableNoteForm from "discourse/components/reviewable/note-form";-import UserLink from "discourse/components/user-link";-import avatar from "discourse/helpers/avatar";-import icon from "discourse/helpers/d-icon";-import formatDate from "discourse/helpers/format-date";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import escape from "discourse/lib/escape";import { and, eq } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DDecoratedHtml from "discourse/ui-kit/d-decorated-html";+import DInterpolatedTranslation from "discourse/ui-kit/d-interpolated-translation";+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 dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";const HISTORY_CLAIMED_ID = 3;@@ -243,14 +243,14 @@ export default class ReviewableTimeline extends Component {{{#each this.timelineEvents as |event|}}<div class="timeline-event"><div class="timeline-event__icon">- {{icon event.icon}}+ {{dIcon event.icon}}</div><div class="timeline-event__content"><div class="timeline-event__main"><div class="timeline-event__text"><div class="timeline-event__title">- <InterpolatedTranslation+ <DInterpolatedTranslation@key={{event.titleKey}}as |Placeholder|>@@ -259,19 +259,19 @@ export default class ReviewableTimeline extends Component {</Placeholder><Placeholder @name="username">- {{avatar event.user imageSize="tiny"}}- <UserLink+ {{dAvatar event.user imageSize="tiny"}}+ <DUserLink@user={{event.user}}- >{{event.user.username}}</UserLink>+ >{{event.user.username}}</DUserLink></Placeholder><Placeholder @name="relativeDate">- {{formatDate event.date format="medium"}}+ {{dFormatDate event.date format="medium"}}</Placeholder>- </InterpolatedTranslation>+ </DInterpolatedTranslation></div>{{#if event.description}}- <DecoratedHtml+ <DDecoratedHtml@className="timeline-event__description"@html={{event.description}}/>@@ -297,7 +297,7 @@ export default class ReviewableTimeline extends Component {{{else}}<div class="timeline-empty"><div class="timeline-empty__icon">- {{icon "clock"}}+ {{dIcon "clock"}}</div><p class="timeline-empty__message">{{i18n "review.timeline.no_events"}}diff --git a/frontend/discourse/app/components/reviewable/topic-link.gjs b/frontend/discourse/app/components/reviewable/topic-link.gjsindex 090ec5c764c..a1ff68c113b 100644--- a/frontend/discourse/app/components/reviewable/topic-link.gjs+++ b/frontend/discourse/app/components/reviewable/topic-link.gjs@@ -2,8 +2,8 @@ import { array } from "@ember/helper";import { LinkTo } from "@ember/routing";import ReviewableTags from "discourse/components/reviewable-tags";import TopicStatus from "discourse/components/topic-status";-import categoryBadge from "discourse/helpers/category-badge";import highlightWatchedWords from "discourse/lib/highlight-watched-words";+import dCategoryBadge from "discourse/ui-kit/helpers/d-category-badge";import { i18n } from "discourse-i18n";/**@@ -50,7 +50,7 @@ import { i18n } from "discourse-i18n";<div class="reviewable-topic-link__details">{{#if @reviewable.category}}<div class="reviewable-topic-link__details-category-badge">- {{categoryBadge @reviewable.category}}+ {{dCategoryBadge @reviewable.category}}</div>{{/if}}diff --git a/frontend/discourse/app/components/rich-hashtag-autocomplete-results.gjs b/frontend/discourse/app/components/rich-hashtag-autocomplete-results.gjsindex 2b3f78935e4..81e0ca4c23d 100644--- a/frontend/discourse/app/components/rich-hashtag-autocomplete-results.gjs+++ b/frontend/discourse/app/components/rich-hashtag-autocomplete-results.gjs@@ -8,8 +8,8 @@ import { action } from "@ember/object";import didInsert from "@ember/render-modifiers/modifiers/did-insert";import didUpdate from "@ember/render-modifiers/modifiers/did-update";import { trustHTML } from "@ember/template";-import scrollIntoView from "discourse/modifiers/scroll-into-view";import { eq } from "discourse/truth-helpers";+import dScrollIntoView from "discourse/ui-kit/modifiers/d-scroll-into-view";/*** @typedef {import("discourse/lib/types/d-autocomplete").RichHashtagAutocompleteResult} RichHashtagAutocompleteResult@@ -64,7 +64,7 @@ export default class RichHashtagAutocompleteResults extends Component {{{#each @results as |result index|}}<liclass="hashtag-autocomplete__option"- {{scrollIntoView (this.shouldScroll index)}}+ {{dScrollIntoView (this.shouldScroll index)}}><aclass="hashtag-autocomplete__linkdiff --git a/frontend/discourse/app/components/search-advanced-options.gjs b/frontend/discourse/app/components/search-advanced-options.gjsindex c7def014ce5..9d9849d9d36 100644--- a/frontend/discourse/app/components/search-advanced-options.gjs+++ b/frontend/discourse/app/components/search-advanced-options.gjs@@ -6,11 +6,7 @@ import { on } from "@ember/modifier";import { action, computed } from "@ember/object";import { service } from "@ember/service";import { tagName } from "@ember-decorators/component";-import DButton from "discourse/components/d-button";-import DateInput from "discourse/components/date-input";import PluginOutlet from "discourse/components/plugin-outlet";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import lazyHash from "discourse/helpers/lazy-hash";import withEventValue from "discourse/helpers/with-event-value";import { escapeExpression } from "discourse/lib/utilities";@@ -20,6 +16,10 @@ import MultiSelect from "discourse/select-kit/components/multi-select";import SearchAdvancedCategoryChooser from "discourse/select-kit/components/search-advanced-category-chooser";import TagChooser from "discourse/select-kit/components/tag-chooser";import UserChooser from "discourse/select-kit/components/user-chooser";+import DButton from "discourse/ui-kit/d-button";+import DDateInput from "discourse/ui-kit/d-date-input";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";const REGEXP_BLOCKS = /(([^" \t\n\x0B\f\r]+)?(("[^"]+")?))/g;@@ -809,7 +809,7 @@ export default class SearchAdvancedOptions extends Component {<template><div- class={{concatClass+ class={{dConcatClass"advanced-filters"(if this.isExpanded "--is-expanded")}}@@ -825,7 +825,7 @@ export default class SearchAdvancedOptions extends Component {<span class="badge-notification">{{this.submittedFilterCount}}</span>{{/if}}{{i18n "search.advanced.title"}}- {{icon (if this.isExpanded "chevron-up" "chevron-down")}}+ {{dIcon (if this.isExpanded "chevron-up" "chevron-down")}}</DButton><PluginOutlet@name="full-page-search-advanced-header"@@ -968,7 +968,7 @@ export default class SearchAdvancedOptions extends Component {@value={{this.searchedTerms.time.when}}@onChange={{this.onChangeWhenTime}}/>- <DateInput+ <DDateInput@date={{this.searchedTerms.time.days}}@onChange={{this.onChangeWhenDate}}@inputId="search-post-date"@@ -994,7 +994,7 @@ export default class SearchAdvancedOptions extends Component {(withEventValue this.onChangeSearchTermMinPostCount)}}/>- {{icon "left-right"}}+ {{dIcon "left-right"}}<Input@type="number"@value={{readonly this.searchedTerms.max_posts}}@@ -1027,7 +1027,7 @@ export default class SearchAdvancedOptions extends Component {(withEventValue this.onChangeSearchTermMinViews)}}/>- {{icon "left-right"}}+ {{dIcon "left-right"}}<Input@type="number"@value={{readonly this.searchedTerms.max_views}}diff --git a/frontend/discourse/app/components/search-menu.gjs b/frontend/discourse/app/components/search-menu.gjsindex a72d2aa3014..dfaeedfb321 100644--- a/frontend/discourse/app/components/search-menu.gjs+++ b/frontend/discourse/app/components/search-menu.gjs@@ -7,16 +7,13 @@ import didInsert from "@ember/render-modifiers/modifiers/did-insert";import { cancel } from "@ember/runloop";import { service } from "@ember/service";import { Promise } from "rsvp";-import DButton from "discourse/components/d-button";import MenuPanel from "discourse/components/menu-panel";import PluginOutlet from "discourse/components/plugin-outlet";import AdvancedButton from "discourse/components/search-menu/advanced-button";import ClearButton from "discourse/components/search-menu/clear-button";import Results from "discourse/components/search-menu/results";import SearchTerm from "discourse/components/search-menu/search-term";-import concatClass from "discourse/helpers/concat-class";import lazyHash from "discourse/helpers/lazy-hash";-import loadingSpinner from "discourse/helpers/loading-spinner";import { popupAjaxError } from "discourse/lib/ajax-error";import { search as searchCategoryTag } from "discourse/lib/category-tag-search";import discourseDebounce from "discourse/lib/debounce";@@ -29,7 +26,10 @@ import {} from "discourse/lib/search";import DiscourseURL from "discourse/lib/url";import userSearch from "discourse/lib/user-search";-import { CANCELLED_STATUS } from "discourse/modifiers/d-autocomplete";+import DButton from "discourse/ui-kit/d-button";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dLoadingSpinner from "discourse/ui-kit/helpers/d-loading-spinner";+import { CANCELLED_STATUS } from "discourse/ui-kit/modifiers/d-autocomplete";const CATEGORY_SLUG_REGEXP = /(\#[a-zA-Z0-9\-:]*)$/gi;const USERNAME_REGEXP = /(\@[a-zA-Z0-9\-\_]*)$/gi;@@ -412,7 +412,7 @@ export default class SearchMenu extends Component {><div class="search-input-wrapper"><div- class={{concatClass+ class={{dConcatClass"search-input"(concat "search-input--" @location)}}@@ -457,7 +457,7 @@ export default class SearchMenu extends Component {{{#if this.loading}}<div class="searching">- {{loadingSpinner}}+ {{dLoadingSpinner}}</div>{{else}}<div class="searching">diff --git a/frontend/discourse/app/components/search-menu/advanced-button.gjs b/frontend/discourse/app/components/search-menu/advanced-button.gjsindex 57eb5f062eb..61e722d2638 100644--- a/frontend/discourse/app/components/search-menu/advanced-button.gjs+++ b/frontend/discourse/app/components/search-menu/advanced-button.gjs@@ -1,4 +1,4 @@-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";<template>diff --git a/frontend/discourse/app/components/search-menu/clear-button.gjs b/frontend/discourse/app/components/search-menu/clear-button.gjsindex a5f414df286..9f1b3d96e21 100644--- a/frontend/discourse/app/components/search-menu/clear-button.gjs+++ b/frontend/discourse/app/components/search-menu/clear-button.gjs@@ -1,5 +1,5 @@import { on } from "@ember/modifier";-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";<template>@@ -10,6 +10,6 @@ import { i18n } from "discourse-i18n";href{{on "click" @clearSearch}}>- {{icon "xmark"}}+ {{dIcon "xmark"}}</a></template>diff --git a/frontend/discourse/app/components/search-menu/results.gjs b/frontend/discourse/app/components/search-menu/results.gjsindex c8e0aa0b615..e48d543b380 100644--- a/frontend/discourse/app/components/search-menu/results.gjs+++ b/frontend/discourse/app/components/search-menu/results.gjs@@ -1,6 +1,5 @@import Component from "@glimmer/component";import { service } from "@ember/service";-import ConditionalLoadingSection from "discourse/components/conditional-loading-section";import PluginOutlet from "discourse/components/plugin-outlet";import Assistant from "discourse/components/search-menu/results/assistant";import InitialOptions from "discourse/components/search-menu/results/initial-options";@@ -8,6 +7,7 @@ import MoreLink from "discourse/components/search-menu/results/more-link";import Types from "discourse/components/search-menu/results/types";import lazyHash from "discourse/helpers/lazy-hash";import { and, not } from "discourse/truth-helpers";+import DConditionalLoadingSection from "discourse/ui-kit/d-conditional-loading-section";import { i18n } from "discourse-i18n";import CategoryViewComponent from "./results/type/category";import GroupViewComponent from "./results/type/group";@@ -61,7 +61,7 @@ export default class Results extends Component {<template>{{#unless this.inTopicContext}}- <ConditionalLoadingSection @isLoading={{this.loading}}>+ <DConditionalLoadingSection @isLoading={{this.loading}}><div class="results"><PluginOutlet@name="search-menu-results-top"@@ -146,7 +146,7 @@ export default class Results extends Component {}}/></div>- </ConditionalLoadingSection>+ </DConditionalLoadingSection>{{/unless}}</template>}diff --git a/frontend/discourse/app/components/search-menu/results/assistant-item.gjs b/frontend/discourse/app/components/search-menu/results/assistant-item.gjsindex f3f0850deed..bfb62e5d643 100644--- a/frontend/discourse/app/components/search-menu/results/assistant-item.gjs+++ b/frontend/discourse/app/components/search-menu/results/assistant-item.gjs@@ -5,11 +5,11 @@ import { service } from "@ember/service";import Category from "discourse/components/search-menu/results/type/category";import Tag from "discourse/components/search-menu/results/type/tag";import User from "discourse/components/search-menu/results/type/user";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import { debounce } from "discourse/lib/decorators";import getURL from "discourse/lib/get-url";import { and, or } from "discourse/truth-helpers";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";const _itemSelectCallbacks = [];@@ -143,14 +143,14 @@ export default class AssistantItem extends Component {{{! template-lint-disable no-pointer-down-event-binding }}{{! template-lint-disable no-invalid-interactive }}<li- class={{concatClass @typeClass "search-menu-assistant-item"}}+ class={{dConcatClass @typeClass "search-menu-assistant-item"}}{{on "keydown" this.onKeydown}}{{on "click" this.onClick}}data-usage={{@usage}}>- <a class={{concatClass @typeClass "search-link"}} href={{this.href}}>+ <a class={{dConcatClass @typeClass "search-link"}} href={{this.href}}><span class="search-icon-wrapper" aria-label={{i18n "search.title"}}>- {{icon (or @icon "magnifying-glass")}}+ {{dIcon (or @icon "magnifying-glass")}}</span><span class="search-item-wrapper">{{#if this.prefix}}@@ -167,7 +167,7 @@ export default class AssistantItem extends Component {<Category @result={{@category}} />{{#if (and @tag @isIntersection)}}<span class="search-item-tag">- {{icon "tag"}}{{@tag}}+ {{dIcon "tag"}}{{@tag}}</span>{{/if}}{{else if @tag}}diff --git a/frontend/discourse/app/components/search-menu/results/blurb.gjs b/frontend/discourse/app/components/search-menu/results/blurb.gjsindex 714507174a8..bf5a4548d1a 100644--- a/frontend/discourse/app/components/search-menu/results/blurb.gjs+++ b/frontend/discourse/app/components/search-menu/results/blurb.gjs@@ -2,14 +2,14 @@ import Component from "@glimmer/component";import { service } from "@ember/service";import { trustHTML } from "@ember/template";import HighlightedSearch from "discourse/components/search-menu/highlighted-search";-import ageWithTooltip from "discourse/helpers/age-with-tooltip";+import dAgeWithTooltip from "discourse/ui-kit/helpers/d-age-with-tooltip";export default class Blurb extends Component {@service siteSettings;<template><span class="blurb">- {{ageWithTooltip @result.created_at}}+ {{dAgeWithTooltip @result.created_at}}<span class="blurb__separator"> - </span>{{#if this.siteSettings.use_pg_headlines_for_excerpt}}<span>{{trustHTML @result.blurb}}</span>diff --git a/frontend/discourse/app/components/search-menu/results/random-quick-tip.gjs b/frontend/discourse/app/components/search-menu/results/random-quick-tip.gjsindex d38ca488d64..2c571105245 100644--- a/frontend/discourse/app/components/search-menu/results/random-quick-tip.gjs+++ b/frontend/discourse/app/components/search-menu/results/random-quick-tip.gjs@@ -2,7 +2,7 @@ import Component from "@glimmer/component";import { on } from "@ember/modifier";import { action } from "@ember/object";import { service } from "@ember/service";-import concatClass from "discourse/helpers/concat-class";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";const DEFAULT_QUICK_TIPS = [@@ -76,7 +76,7 @@ export default class RandomQuickTip extends Component {<template><li class="search-random-quick-tip"><button- class={{concatClass+ class={{dConcatClass"tip-label"(if this.randomTip.clickable "tip-clickable")}}diff --git a/frontend/discourse/app/components/search-menu/results/recent-searches.gjs b/frontend/discourse/app/components/search-menu/results/recent-searches.gjsindex 79d69221500..6fd62147bf1 100644--- a/frontend/discourse/app/components/search-menu/results/recent-searches.gjs+++ b/frontend/discourse/app/components/search-menu/results/recent-searches.gjs@@ -1,9 +1,9 @@import Component from "@glimmer/component";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import AssistantItem from "discourse/components/search-menu/results/assistant-item";import User from "discourse/models/user";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";export default class RecentSearches extends Component {diff --git a/frontend/discourse/app/components/search-menu/results/type/category.gjs b/frontend/discourse/app/components/search-menu/results/type/category.gjsindex 5884adc54ac..34c1f6b76e8 100644--- a/frontend/discourse/app/components/search-menu/results/type/category.gjs+++ b/frontend/discourse/app/components/search-menu/results/type/category.gjs@@ -1,7 +1,7 @@-import categoryLink from "discourse/helpers/category-link";+import dCategoryLink from "discourse/ui-kit/helpers/d-category-link";const Category = <template>- {{categoryLink @result link=false allowUncategorized=true}}+ {{dCategoryLink @result link=false allowUncategorized=true}}</template>;export default Category;diff --git a/frontend/discourse/app/components/search-menu/results/type/group.gjs b/frontend/discourse/app/components/search-menu/results/type/group.gjsindex a0c9dc942ae..6d331aa0099 100644--- a/frontend/discourse/app/components/search-menu/results/type/group.gjs+++ b/frontend/discourse/app/components/search-menu/results/type/group.gjs@@ -1,18 +1,18 @@-import AvatarFlair from "discourse/components/avatar-flair";-import icon from "discourse/helpers/d-icon";import { or } from "discourse/truth-helpers";+import DAvatarFlair from "discourse/ui-kit/d-avatar-flair";+import dIcon from "discourse/ui-kit/helpers/d-icon";const Group = <template><div class="group-result {{if @result.flairUrl '--with-flair'}}">{{#if @result.flairUrl}}- <AvatarFlair+ <DAvatarFlair@flairName={{@result.name}}@flairUrl={{@result.flairUrl}}@flairBgColor={{@result.flairBgColor}}@flairColor={{@result.flairColor}}/>{{else}}- {{icon "users"}}+ {{dIcon "users"}}{{/if}}<div class="group-names {{if @result.fullName '--group-with-slug'}}"><span class="name">{{or @result.fullName @result.name}}</span>diff --git a/frontend/discourse/app/components/search-menu/results/type/tag.gjs b/frontend/discourse/app/components/search-menu/results/type/tag.gjsindex ba1c89935ed..dd0dc27f759 100644--- a/frontend/discourse/app/components/search-menu/results/type/tag.gjs+++ b/frontend/discourse/app/components/search-menu/results/type/tag.gjs@@ -1,10 +1,10 @@-import icon from "discourse/helpers/d-icon";-import discourseTag from "discourse/helpers/discourse-tag";import { or } from "discourse/truth-helpers";+import dDiscourseTag from "discourse/ui-kit/helpers/d-discourse-tag";+import dIcon from "discourse/ui-kit/helpers/d-icon";const Tag = <template>- {{icon "tag"}}- {{discourseTag (or @result.name @result) tagName="span"}}+ {{dIcon "tag"}}+ {{dDiscourseTag (or @result.name @result) tagName="span"}}</template>;export default Tag;diff --git a/frontend/discourse/app/components/search-menu/results/type/topic.gjs b/frontend/discourse/app/components/search-menu/results/type/topic.gjsindex 36c039b7305..b5d62427feb 100644--- a/frontend/discourse/app/components/search-menu/results/type/topic.gjs+++ b/frontend/discourse/app/components/search-menu/results/type/topic.gjs@@ -5,11 +5,11 @@ import PluginOutlet from "discourse/components/plugin-outlet";import HighlightedSearch from "discourse/components/search-menu/highlighted-search";import Blurb from "discourse/components/search-menu/results/blurb";import TopicStatus from "discourse/components/topic-status";-import categoryLink from "discourse/helpers/category-link";-import discourseTags from "discourse/helpers/discourse-tags";import lazyHash from "discourse/helpers/lazy-hash";-import replaceEmoji from "discourse/helpers/replace-emoji";import { and } from "discourse/truth-helpers";+import dCategoryLink from "discourse/ui-kit/helpers/d-category-link";+import dDiscourseTags from "discourse/ui-kit/helpers/d-discourse-tags";+import dReplaceEmoji from "discourse/ui-kit/helpers/d-replace-emoji";export default class Results extends Component {@service siteSettings;@@ -36,7 +36,7 @@ export default class Results extends Component {)}}<a href={{if @withTopicUrl @result.url}}>- {{replaceEmoji (trustHTML @result.topic_title_headline)}}+ {{dReplaceEmoji (trustHTML @result.topic_title_headline)}}</a>{{else}}<a href={{if @withTopicUrl @result.url}}>@@ -50,12 +50,12 @@ export default class Results extends Component {</span></span><span class="second-line">- {{categoryLink+ {{dCategoryLink@result.topic.categorylink=(if @withTopicUrl true false)}}{{#if this.siteSettings.tagging_enabled}}- {{discourseTags @result.topic tagName="span"}}+ {{dDiscourseTags @result.topic tagName="span"}}{{/if}}</span></span>diff --git a/frontend/discourse/app/components/search-menu/results/type/user.gjs b/frontend/discourse/app/components/search-menu/results/type/user.gjsindex 4a2b31b908a..0f6757eb1d6 100644--- a/frontend/discourse/app/components/search-menu/results/type/user.gjs+++ b/frontend/discourse/app/components/search-menu/results/type/user.gjs@@ -1,9 +1,9 @@-import avatar from "discourse/helpers/avatar";import formatUsername from "discourse/helpers/format-username";import { and } from "discourse/truth-helpers";+import dAvatar from "discourse/ui-kit/helpers/d-avatar";const User = <template>- {{avatar+ {{dAvatar@resultimageSize="small"[email protected]_templatediff --git a/frontend/discourse/app/components/search-result-entry.gjs b/frontend/discourse/app/components/search-result-entry.gjsindex 019b613aa8c..ad99d645377 100644--- a/frontend/discourse/app/components/search-result-entry.gjs+++ b/frontend/discourse/app/components/search-result-entry.gjs@@ -14,14 +14,14 @@ import HighlightSearch from "discourse/components/highlight-search";import PluginOutlet from "discourse/components/plugin-outlet";import TopicStatus from "discourse/components/topic-status";import TrackSelected from "discourse/components/track-selected";-import avatar from "discourse/helpers/avatar";-import categoryLink from "discourse/helpers/category-link";-import icon from "discourse/helpers/d-icon";-import discourseTags from "discourse/helpers/discourse-tags";-import formatDate from "discourse/helpers/format-date";import lazyHash from "discourse/helpers/lazy-hash";import { wantsNewWindow } from "discourse/lib/intercept-click";import { logSearchLinkClick } from "discourse/lib/search";+import dAvatar from "discourse/ui-kit/helpers/d-avatar";+import dCategoryLink from "discourse/ui-kit/helpers/d-category-link";+import dDiscourseTags from "discourse/ui-kit/helpers/d-discourse-tags";+import dFormatDate from "discourse/ui-kit/helpers/d-format-date";+import dIcon from "discourse/ui-kit/helpers/d-icon";@tagName("div")@classNames("fps-result")@@ -58,7 +58,7 @@ export default class SearchResultEntry extends Component {><div class="author"><a href={{this.post.userPath}} data-user-card={{this.post.username}}>- {{avatar this.post imageSize="large"}}+ {{dAvatar this.post imageSize="large"}}</a></div>@@ -105,11 +105,11 @@ export default class SearchResultEntry extends Component {<div class="search-category">{{#if this.post.topic.category.parentCategory}}- {{categoryLink this.post.topic.category.parentCategory}}+ {{dCategoryLink this.post.topic.category.parentCategory}}{{/if}}- {{categoryLink this.post.topic.category hideParent=true}}+ {{dCategoryLink this.post.topic.category hideParent=true}}{{#if this.post.topic}}- {{discourseTags this.post.topic}}+ {{dDiscourseTags this.post.topic}}{{/if}}<span><PluginOutlet@@ -131,7 +131,7 @@ export default class SearchResultEntry extends Component {><div class="blurb container"><span class="date">- {{formatDate this.post.created_at format="tiny"}}+ {{dFormatDate this.post.created_at format="tiny"}}{{#if this.post.blurb}}<span class="separator">-</span>{{/if}}@@ -157,7 +157,7 @@ export default class SearchResultEntry extends Component {{{#if this.post.like_count}}<span class="like-count"><span class="value">{{this.post.like_count}}</span>- {{icon "heart"}}+ {{dIcon "heart"}}</span>{{/if}}{{/if}}diff --git a/frontend/discourse/app/components/search-text-field.js b/frontend/discourse/app/components/search-text-field.jsindex 074099268a0..8b5fc3d6991 100644--- a/frontend/discourse/app/components/search-text-field.js+++ b/frontend/discourse/app/components/search-text-field.js@@ -3,11 +3,11 @@ import { computed } from "@ember/object";import { getOwner } from "@ember/owner";import { on } from "@ember-decorators/object";import $ from "jquery";-import TextField from "discourse/components/text-field";import { applySearchAutocomplete } from "discourse/lib/search";+import DTextField from "discourse/ui-kit/d-text-field";import { i18n } from "discourse-i18n";-export default class SearchTextField extends TextField {+export default class SearchTextField extends DTextField {autocomplete = "off";enterkeyhint = "search";autocapitalize = "none";diff --git a/frontend/discourse/app/components/security-key-form.gjs b/frontend/discourse/app/components/security-key-form.gjsindex 7a2ad345e6c..130c34f65ce 100644--- a/frontend/discourse/app/components/security-key-form.gjs+++ b/frontend/discourse/app/components/security-key-form.gjs@@ -1,8 +1,8 @@import Component from "@glimmer/component";import { on } from "@ember/modifier";import { action } from "@ember/object";-import DButton from "discourse/components/d-button";import { SECOND_FACTOR_METHODS } from "discourse/models/user";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";export default class SecurityKeyForm extends Component {diff --git a/frontend/discourse/app/components/selected-posts.gjs b/frontend/discourse/app/components/selected-posts.gjsindex e91a88dc231..2478a9ffbf0 100644--- a/frontend/discourse/app/components/selected-posts.gjs+++ b/frontend/discourse/app/components/selected-posts.gjs@@ -2,9 +2,9 @@import Component from "@ember/component";import { on } from "@ember/modifier";import { tagName } from "@ember-decorators/component";-import CountI18n from "discourse/components/count-i18n";-import DButton from "discourse/components/d-button";import routeAction from "discourse/helpers/route-action";+import DButton from "discourse/ui-kit/d-button";+import DCountI18n from "discourse/ui-kit/d-count-i18n";import { i18n } from "discourse-i18n";@tagName("")@@ -12,7 +12,7 @@ export default class SelectedPosts extends Component {<template><div ...attributes><p>- <CountI18n+ <DCountI18n@key="topic.multi_select.description"@count={{this.selectedPostsCount}}/>diff --git a/frontend/discourse/app/components/share-panel.gjs b/frontend/discourse/app/components/share-panel.gjsindex ddcae4002b1..478ce74aab3 100644--- a/frontend/discourse/app/components/share-panel.gjs+++ b/frontend/discourse/app/components/share-panel.gjs@@ -3,11 +3,11 @@ import Component from "@ember/component";import { action, computed, set } from "@ember/object";import { trustHTML } from "@ember/template";import { isEmpty } from "@ember/utils";-import DTextarea from "discourse/components/d-textarea";import ShareSource from "discourse/components/share-source";import discourseLater from "discourse/lib/later";import Sharing from "discourse/lib/sharing";import { escapeExpression } from "discourse/lib/utilities";+import DTextarea from "discourse/ui-kit/d-textarea";import { i18n } from "discourse-i18n";export default class SharePanel extends Component {diff --git a/frontend/discourse/app/components/share-source.gjs b/frontend/discourse/app/components/share-source.gjsindex f178028c0cd..e14bf96c56f 100644--- a/frontend/discourse/app/components/share-source.gjs+++ b/frontend/discourse/app/components/share-source.gjs@@ -1,6 +1,6 @@import { fn } from "@ember/helper";-import DButton from "discourse/components/d-button";import { or } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";const ShareSource = <template><DButtondiff --git a/frontend/discourse/app/components/shared-draft-controls.gjs b/frontend/discourse/app/components/shared-draft-controls.gjsindex 9fdb07dda1d..ee4c97c4d95 100644--- a/frontend/discourse/app/components/shared-draft-controls.gjs+++ b/frontend/discourse/app/components/shared-draft-controls.gjs@@ -3,8 +3,8 @@ import Component from "@ember/component";import { action, computed } from "@ember/object";import { service } from "@ember/service";import { tagName } from "@ember-decorators/component";-import DButton from "discourse/components/d-button";import CategoryChooser from "discourse/select-kit/components/category-chooser";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";@tagName("")diff --git a/frontend/discourse/app/components/sidebar/back-to-forum.gjs b/frontend/discourse/app/components/sidebar/back-to-forum.gjsindex 9d46a6a9557..8934d82ddb9 100644--- a/frontend/discourse/app/components/sidebar/back-to-forum.gjs+++ b/frontend/discourse/app/components/sidebar/back-to-forum.gjs@@ -1,7 +1,7 @@import Component from "@glimmer/component";import { service } from "@ember/service";-import icon from "discourse/helpers/d-icon";import getURL from "discourse/lib/get-url";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class BackToForum extends Component {@@ -27,7 +27,7 @@ export default class BackToForum extends Component {<template><a href={{this.href}} class="sidebar-sections__back-to-forum">- {{icon "arrow-left"}}+ {{dIcon "arrow-left"}}<span>{{i18n "sidebar.back_to_forum"}}</span></a>diff --git a/frontend/discourse/app/components/sidebar/common/custom-section.gjs b/frontend/discourse/app/components/sidebar/common/custom-section.gjsindex 95621f1be7d..94851ae0429 100644--- a/frontend/discourse/app/components/sidebar/common/custom-section.gjs+++ b/frontend/discourse/app/components/sidebar/common/custom-section.gjs@@ -1,11 +1,11 @@import Component from "@glimmer/component";import { getOwner } from "@ember/owner";import { service } from "@ember/service";-import replaceEmoji from "discourse/helpers/replace-emoji";import CommonCommunitySection from "discourse/lib/sidebar/common/community-section/section";import Section from "discourse/lib/sidebar/section";import AdminCommunitySection from "discourse/lib/sidebar/user/community-section/admin-section";import { or } from "discourse/truth-helpers";+import dReplaceEmoji from "discourse/ui-kit/helpers/d-replace-emoji";import MoreSectionLink from "../more-section-link";import MoreSectionLinks from "../more-section-links";import SectionComponent from "../section";@@ -59,7 +59,7 @@ export default class SidebarCustomSection extends Component {{{#each this.section.links as |link|}}<SectionLink@badgeText={{link.badgeText}}- @content={{replaceEmoji link.text}}+ @content={{dReplaceEmoji link.text}}@currentWhen={{link.currentWhen}}@href={{or link.value link.href}}@linkClass={{link.linkDragCss}}diff --git a/frontend/discourse/app/components/sidebar/edit-navigation-menu/categories-modal.gjs b/frontend/discourse/app/components/sidebar/edit-navigation-menu/categories-modal.gjsindex e5a1fbb90e6..71a72aff693 100644--- a/frontend/discourse/app/components/sidebar/edit-navigation-menu/categories-modal.gjs+++ b/frontend/discourse/app/components/sidebar/edit-navigation-menu/categories-modal.gjs@@ -6,19 +6,19 @@ import { action } from "@ember/object";import { trackedSet } from "@ember/reactive/collections";import didInsert from "@ember/render-modifiers/modifiers/did-insert";import { service } from "@ember/service";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DecoratedHtml from "discourse/components/decorated-html";import EditNavigationMenuModal from "discourse/components/sidebar/edit-navigation-menu/modal";import borderColor from "discourse/helpers/border-color";-import categoryBadge from "discourse/helpers/category-badge";-import concatClass from "discourse/helpers/concat-class";-import dirSpan from "discourse/helpers/dir-span";import { popupAjaxError } from "discourse/lib/ajax-error";import discourseDebounce from "discourse/lib/debounce";import { INPUT_DELAY } from "discourse/lib/environment";import { serializedAction, splitWhere } from "discourse/lib/utilities";import Category from "discourse/models/category";import { gt, has } from "discourse/truth-helpers";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DDecoratedHtml from "discourse/ui-kit/d-decorated-html";+import dCategoryBadge from "discourse/ui-kit/helpers/d-category-badge";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dDirSpan from "discourse/ui-kit/helpers/d-dir-span";import { i18n } from "discourse-i18n";export default class SidebarEditNavigationMenuCategoriesModal extends Component {@@ -266,9 +266,9 @@ export default class SidebarEditNavigationMenuCategoriesModal extends Component@closeModal={{@closeModal}}class="sidebar__edit-navigation-menu__categories-modal">- <ConditionalLoadingSpinner @condition={{this.initialLoad}}>+ <DConditionalLoadingSpinner @condition={{this.initialLoad}}><form- class={{concatClass+ class={{dConcatClass"sidebar-categories-form"(if this.filtered "--filtered")}}@@ -294,15 +294,15 @@ export default class SidebarEditNavigationMenuCategoriesModal extends Component><div class="sidebar-categories-form__category-wrapper"><div class="sidebar-categories-form__category-badge">- {{categoryBadge category}}+ {{dCategoryBadge category}}</div>{{#unless category.parentCategory}}<divclass="sidebar-categories-form__category-description">- <DecoratedHtml- @html={{dirSpan+ <DDecoratedHtml+ @html={{dDirSpancategory.description_excerpthtmlSafe="true"}}@@ -331,9 +331,9 @@ export default class SidebarEditNavigationMenuCategoriesModal extends Component</div>{{/each}}</form>- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner>- <ConditionalLoadingSpinner @condition={{this.loadingMore}} />+ <DConditionalLoadingSpinner @condition={{this.loadingMore}} /></EditNavigationMenuModal></template>}diff --git a/frontend/discourse/app/components/sidebar/edit-navigation-menu/modal.gjs b/frontend/discourse/app/components/sidebar/edit-navigation-menu/modal.gjsindex 0c1a71eef5b..2d22278e04e 100644--- a/frontend/discourse/app/components/sidebar/edit-navigation-menu/modal.gjs+++ b/frontend/discourse/app/components/sidebar/edit-navigation-menu/modal.gjs@@ -3,11 +3,11 @@ import { tracked } from "@glimmer/tracking";import { fn, hash } from "@ember/helper";import { on } from "@ember/modifier";import { action } from "@ember/object";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";-import icon from "discourse/helpers/d-icon";import withEventValue from "discourse/helpers/with-event-value";import DropdownSelectBox from "discourse/select-kit/components/dropdown-select-box";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class SidebarEditNavigationMenuModal extends Component {@@ -70,7 +70,7 @@ export default class SidebarEditNavigationMenuModal extends Component {<:belowHeader><div class="sidebar__edit-navigation-menu__filter"><div class="sidebar__edit-navigation-menu__filter-input">- {{icon+ {{dIcon"magnifying-glass"class="sidebar__edit-navigation-menu__filter-input-icon"}}diff --git a/frontend/discourse/app/components/sidebar/edit-navigation-menu/tags-modal.gjs b/frontend/discourse/app/components/sidebar/edit-navigation-menu/tags-modal.gjsindex 6bdbb77634d..8a689e8918f 100644--- a/frontend/discourse/app/components/sidebar/edit-navigation-menu/tags-modal.gjs+++ b/frontend/discourse/app/components/sidebar/edit-navigation-menu/tags-modal.gjs@@ -6,12 +6,12 @@ import { action } from "@ember/object";import { trackedSet } from "@ember/reactive/collections";import didInsert from "@ember/render-modifiers/modifiers/did-insert";import { service } from "@ember/service";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import loadingSpinner from "discourse/helpers/loading-spinner";import { popupAjaxError } from "discourse/lib/ajax-error";import discourseDebounce from "discourse/lib/debounce";import { INPUT_DELAY } from "discourse/lib/environment";import { gt, has, or } from "discourse/truth-helpers";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import dLoadingSpinner from "discourse/ui-kit/helpers/d-loading-spinner";import { i18n } from "discourse-i18n";import EditNavigationMenuModal from "./modal";@@ -196,7 +196,7 @@ export default class SidebarEditNavigationMenuTagsModal extends Component {class="sidebar__edit-navigation-menu__tags-modal">{{#if this.tagsLoading}}- {{loadingSpinner size="large"}}+ {{dLoadingSpinner size="large"}}{{else}}<form class="sidebar-tags-form">{{#each this.tags.content as |tag|}}@@ -236,7 +236,7 @@ export default class SidebarEditNavigationMenuTagsModal extends Component {</form>{{/if}}- <ConditionalLoadingSpinner @condition={{this.tags.loadingMore}} />+ <DConditionalLoadingSpinner @condition={{this.tags.loadingMore}} /></EditNavigationMenuModal></template>}diff --git a/frontend/discourse/app/components/sidebar/filter.gjs b/frontend/discourse/app/components/sidebar/filter.gjsindex 72c7d8b230b..721b6b4b352 100644--- a/frontend/discourse/app/components/sidebar/filter.gjs+++ b/frontend/discourse/app/components/sidebar/filter.gjs@@ -2,7 +2,7 @@ import Component from "@glimmer/component";import { on } from "@ember/modifier";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";export default class Filter extends Component {diff --git a/frontend/discourse/app/components/sidebar/footer.gjs b/frontend/discourse/app/components/sidebar/footer.gjsindex 94ddc08fffb..9eaa98a4d78 100644--- a/frontend/discourse/app/components/sidebar/footer.gjs+++ b/frontend/discourse/app/components/sidebar/footer.gjs@@ -1,13 +1,13 @@import Component from "@glimmer/component";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import InterfaceColorSelector from "discourse/components/interface-color-selector";import KeyboardShortcutsHelp from "discourse/components/modal/keyboard-shortcuts-help";import SidebarSectionForm from "discourse/components/modal/sidebar-section-form";import PluginOutlet from "discourse/components/plugin-outlet";import mobile from "discourse/lib/mobile";import { MAIN_PANEL } from "discourse/lib/sidebar/panels";+import DButton from "discourse/ui-kit/d-button";export default class SidebarFooter extends Component {@service capabilities;diff --git a/frontend/discourse/app/components/sidebar/more-section-link.gjs b/frontend/discourse/app/components/sidebar/more-section-link.gjsindex ee541e8c9b3..72cbf47ffb3 100644--- a/frontend/discourse/app/components/sidebar/more-section-link.gjs+++ b/frontend/discourse/app/components/sidebar/more-section-link.gjs@@ -1,11 +1,11 @@-import replaceEmoji from "discourse/helpers/replace-emoji";import { or } from "discourse/truth-helpers";+import dReplaceEmoji from "discourse/ui-kit/helpers/d-replace-emoji";import SectionLink from "./section-link";const SidebarMoreSectionLink = <template><SectionLink@badgeText={{@sectionLink.badgeText}}- @content={{replaceEmoji @sectionLink.text}}+ @content={{dReplaceEmoji @sectionLink.text}}@currentWhen={{@sectionLink.currentWhen}}@href={{or @sectionLink.href @sectionLink.value}}@linkName={{@sectionLink.name}}diff --git a/frontend/discourse/app/components/sidebar/more-section-links.gjs b/frontend/discourse/app/components/sidebar/more-section-links.gjsindex 63fba9b3a60..087d6152235 100644--- a/frontend/discourse/app/components/sidebar/more-section-links.gjs+++ b/frontend/discourse/app/components/sidebar/more-section-links.gjs@@ -5,8 +5,8 @@ import { on } from "@ember/modifier";import { action } from "@ember/object";import { service } from "@ember/service";import { isEmpty } from "@ember/utils";-import DropdownMenu from "discourse/components/dropdown-menu";import DMenu from "discourse/float-kit/components/d-menu";+import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";import MoreSectionLink from "./more-section-link";import MoreSectionTrigger from "./more-section-trigger";import SectionLinkButton from "./section-link-button";@@ -93,7 +93,7 @@ export default class SidebarMoreSectionLinks extends Component {><:content as |menu|>- <DropdownMenu as |dropdown|>+ <DDropdownMenu as |dropdown|>{{#each this.sectionLinks as |sectionLink|}}<MoreSectionLink@sectionLink={{sectionLink}}@@ -115,7 +115,7 @@ export default class SidebarMoreSectionLinks extends Component {/></dropdown.item>{{/if}}- </DropdownMenu>+ </DDropdownMenu></:content></DMenu></li>diff --git a/frontend/discourse/app/components/sidebar/more-section-trigger.gjs b/frontend/discourse/app/components/sidebar/more-section-trigger.gjsindex ed464268ef4..15c8c7de79b 100644--- a/frontend/discourse/app/components/sidebar/more-section-trigger.gjs+++ b/frontend/discourse/app/components/sidebar/more-section-trigger.gjs@@ -1,10 +1,10 @@-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";const MoreSectionTrigger = <template><button ...attributes type="button" class="sidebar-section-link sidebar-row"><span class="sidebar-section-link-prefix icon">- {{icon "ellipsis-vertical"}}+ {{dIcon "ellipsis-vertical"}}</span><span class="sidebar-section-link-content-text">{{i18n "sidebar.more"}}diff --git a/frontend/discourse/app/components/sidebar/search.gjs b/frontend/discourse/app/components/sidebar/search.gjsindex f4fb702c897..4ded362de6f 100644--- a/frontend/discourse/app/components/sidebar/search.gjs+++ b/frontend/discourse/app/components/sidebar/search.gjs@@ -2,8 +2,8 @@ import Component from "@glimmer/component";import { on } from "@ember/modifier";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import { translateModKey } from "discourse/lib/utilities";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";export default class Search extends Component {diff --git a/frontend/discourse/app/components/sidebar/section-form-link.gjs b/frontend/discourse/app/components/sidebar/section-form-link.gjsindex 15bd49ba9b1..a6e0f4d2a5b 100644--- a/frontend/discourse/app/components/sidebar/section-form-link.gjs+++ b/frontend/discourse/app/components/sidebar/section-form-link.gjs@@ -5,12 +5,12 @@ import { fn } from "@ember/helper";import { on } from "@ember/modifier";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import DIconGridPicker from "discourse/components/d-icon-grid-picker";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import withEventValue from "discourse/helpers/with-event-value";import discourseLater from "discourse/lib/later";+import DButton from "discourse/ui-kit/d-button";+import DIconGridPicker from "discourse/ui-kit/d-icon-grid-picker";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class SectionFormLink extends Component {@@ -88,7 +88,7 @@ export default class SectionFormLink extends Component {role="row"data-row-id={{@link.objectId}}draggable="true"- class={{concatClass+ class={{dConcatClass"sidebar-section-form-link""row-wrapper"this.dragCssClass@@ -96,7 +96,7 @@ export default class SectionFormLink extends Component {>{{#if this.site.desktopView}}<div class="draggable" data-link-name={{@link.name}}>- {{icon "grip-lines"}}+ {{dIcon "grip-lines"}}</div>{{/if}}diff --git a/frontend/discourse/app/components/sidebar/section-header.gjs b/frontend/discourse/app/components/sidebar/section-header.gjsindex 58c2d60be09..0a26a6f1c74 100644--- a/frontend/discourse/app/components/sidebar/section-header.gjs+++ b/frontend/discourse/app/components/sidebar/section-header.gjs@@ -1,4 +1,4 @@-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";const SidebarSectionHeader = <template>{{#if @collapsable}}diff --git a/frontend/discourse/app/components/sidebar/section-link-button.gjs b/frontend/discourse/app/components/sidebar/section-link-button.gjsindex 3502f0a91c4..7310b40bf27 100644--- a/frontend/discourse/app/components/sidebar/section-link-button.gjs+++ b/frontend/discourse/app/components/sidebar/section-link-button.gjs@@ -2,7 +2,7 @@ import Component from "@glimmer/component";import { on } from "@ember/modifier";import { action } from "@ember/object";import { service } from "@ember/service";-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";const MORE_MENU = "sidebar-more-section";@@ -37,7 +37,7 @@ export default class SidebarSectionLinkButton extends Component {data-list-item-name={{@text}}><span class="sidebar-section-link-prefix icon">- {{icon @icon}}+ {{dIcon @icon}}</span><span class="sidebar-section-link-content-text">diff --git a/frontend/discourse/app/components/sidebar/section-link-prefix.gjs b/frontend/discourse/app/components/sidebar/section-link-prefix.gjsindex afd317cbd5f..df56f351f62 100644--- a/frontend/discourse/app/components/sidebar/section-link-prefix.gjs+++ b/frontend/discourse/app/components/sidebar/section-link-prefix.gjs@@ -2,10 +2,10 @@ import Component from "@glimmer/component";import { concat } from "@ember/helper";import { trustHTML } from "@ember/template";import { isHex } from "discourse/components/sidebar/section-link";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";-import replaceEmoji from "discourse/helpers/replace-emoji";import { eq } from "discourse/truth-helpers";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";+import dReplaceEmoji from "discourse/ui-kit/helpers/d-replace-emoji";export default class SidebarSectionLinkPrefix extends Component {get prefixValue() {@@ -43,7 +43,7 @@ export default class SidebarSectionLinkPrefix extends Component {{{#if @prefixType}}<spanstyle={{if @prefixColor (trustHTML (concat "color: " @prefixColor))}}- class={{concatClass+ class={{dConcatClass"sidebar-section-link-prefix"@prefixType@prefixCSSClass@@ -56,9 +56,9 @@ export default class SidebarSectionLinkPrefix extends Component {{{this.prefixValue}}</span>{{else if (eq @prefixType "icon")}}- {{icon this.prefixValue class="prefix-icon"}}+ {{dIcon this.prefixValue class="prefix-icon"}}{{else if (eq @prefixType "emoji")}}- {{replaceEmoji this.prefixValue class="prefix-emoji"}}+ {{dReplaceEmoji this.prefixValue class="prefix-emoji"}}{{else if (eq @prefixType "square")}}<spanstyle={{trustHTML@@ -71,7 +71,7 @@ export default class SidebarSectionLinkPrefix extends Component {{{/if}}{{#if @prefixBadge}}- {{icon @prefixBadge class="prefix-badge"}}+ {{dIcon @prefixBadge class="prefix-badge"}}{{/if}}</span>{{/if}}diff --git a/frontend/discourse/app/components/sidebar/section-link.gjs b/frontend/discourse/app/components/sidebar/section-link.gjsindex f9c9188a29b..4f7f4139b5d 100644--- a/frontend/discourse/app/components/sidebar/section-link.gjs+++ b/frontend/discourse/app/components/sidebar/section-link.gjs@@ -8,11 +8,11 @@ import didUpdate from "@ember/render-modifiers/modifiers/did-update";import { LinkTo } from "@ember/routing";import { schedule } from "@ember/runloop";import { service } from "@ember/service";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import { bind } from "discourse/lib/decorators";import deprecated from "discourse/lib/deprecated";import { and, eq, not, or } from "discourse/truth-helpers";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import SectionLinkPrefix from "./section-link-prefix";/**@@ -213,7 +213,7 @@ export default class SectionLink extends Component {/><span- class={{concatClass+ class={{dConcatClass"sidebar-section-link-content-text"@contentCSSClass}}@@ -234,14 +234,14 @@ export default class SectionLink extends Component {{{#if @suffixValue}}<span- class={{concatClass+ class={{dConcatClass"sidebar-section-link-suffix"@suffixType@suffixCSSClass}}>{{#if (eq @suffixType "icon")}}- {{icon @suffixValue}}+ {{dIcon @suffixValue}}{{/if}}</span>{{/if}}@@ -256,7 +256,7 @@ export default class SectionLink extends Component {class="sidebar-section-hover-button btn-flat">{{#if (eq @hoverType "icon")}}- {{icon @hoverValue class="hover-icon"}}+ {{dIcon @hoverValue class="hover-icon"}}{{/if}}</button></span>@@ -281,7 +281,7 @@ export default class SectionLink extends Component {/><span- class={{concatClass+ class={{dConcatClass"sidebar-section-link-content-text"@contentCSSClass}}@@ -302,14 +302,14 @@ export default class SectionLink extends Component {{{#if @suffixValue}}<span- class={{concatClass+ class={{dConcatClass"sidebar-section-link-suffix"@suffixType@suffixCSSClass}}>{{#if (eq @suffixType "icon")}}- {{icon @suffixValue}}+ {{dIcon @suffixValue}}{{/if}}</span>{{/if}}@@ -323,7 +323,7 @@ export default class SectionLink extends Component {class="sidebar-section-hover-button btn-flat">{{#if (eq @hoverType "icon")}}- {{icon @hoverValue class="hover-icon"}}+ {{dIcon @hoverValue class="hover-icon"}}{{/if}}</button></span>diff --git a/frontend/discourse/app/components/sidebar/section.gjs b/frontend/discourse/app/components/sidebar/section.gjsindex 0263fec3804..00be8d9b98b 100644--- a/frontend/discourse/app/components/sidebar/section.gjs+++ b/frontend/discourse/app/components/sidebar/section.gjs@@ -7,14 +7,14 @@ import { next } from "@ember/runloop";import { service } from "@ember/service";import { isEmpty } from "@ember/utils";import DTooltip from "discourse/float-kit/components/d-tooltip";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import { bind } from "discourse/lib/decorators";import {getCollapsedSidebarSectionKey,getSidebarSectionContentId,} from "discourse/lib/sidebar/helpers";import DropdownSelectBox from "discourse/select-kit/components/dropdown-select-box";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";import SectionHeader from "./section-header";@@ -165,7 +165,7 @@ export default class SidebarSection extends Component {<div{{didInsert this.setExpandedState}}data-section-name={{@sectionName}}- class={{concatClass+ class={{dConcatClass"sidebar-section""sidebar-section-wrapper"(if@@ -187,7 +187,7 @@ export default class SidebarSection extends Component {>{{#if @collapsable}}<span class="sidebar-section-header-caret">- {{icon this.headerCaretIcon}}+ {{dIcon this.headerCaretIcon}}</span>{{/if}}@@ -203,7 +203,7 @@ export default class SidebarSection extends Component {<spanclass="sidebar-section-header-global-indicator__content">- {{icon "shield-halved"}}+ {{dIcon "shield-halved"}}{{i18n "sidebar.sections.global_section"}}</span></DTooltip>@@ -218,7 +218,7 @@ export default class SidebarSection extends Component {title={{headerAction.title}}class="sidebar-section-header-button btn-icon btn-flat">- {{icon @headerActionsIcon}}+ {{dIcon @headerActionsIcon}}</button>{{/each}}{{/if}}diff --git a/frontend/discourse/app/components/sidebar/switch-panel-buttons.gjs b/frontend/discourse/app/components/sidebar/switch-panel-buttons.gjsindex 58b8a666785..a3a0862037e 100644--- a/frontend/discourse/app/components/sidebar/switch-panel-buttons.gjs+++ b/frontend/discourse/app/components/sidebar/switch-panel-buttons.gjs@@ -3,7 +3,7 @@ import { tracked } from "@glimmer/tracking";import { fn } from "@ember/helper";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";export default class SwitchPanelButtons extends Component {@service router;diff --git a/frontend/discourse/app/components/sidebar/toggle-all-sections.gjs b/frontend/discourse/app/components/sidebar/toggle-all-sections.gjsindex 0821c314d72..61bfee284a1 100644--- a/frontend/discourse/app/components/sidebar/toggle-all-sections.gjs+++ b/frontend/discourse/app/components/sidebar/toggle-all-sections.gjs@@ -1,8 +1,8 @@import Component from "@glimmer/component";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import { getCollapsedSidebarSectionKey } from "discourse/lib/sidebar/helpers";+import DButton from "discourse/ui-kit/d-button";export default class ToggleAllSections extends Component {@service sidebarState;diff --git a/frontend/discourse/app/components/signup-cta.gjs b/frontend/discourse/app/components/signup-cta.gjsindex 6743076d4f9..2901c7386bb 100644--- a/frontend/discourse/app/components/signup-cta.gjs+++ b/frontend/discourse/app/components/signup-cta.gjs@@ -4,10 +4,10 @@ import { action } from "@ember/object";import { trustHTML } from "@ember/template";import { tagName } from "@ember-decorators/component";import { on } from "@ember-decorators/object";-import DButton from "discourse/components/d-button";-import replaceEmoji from "discourse/helpers/replace-emoji";import routeAction from "discourse/helpers/route-action";import discourseLater from "discourse/lib/later";+import DButton from "discourse/ui-kit/d-button";+import dReplaceEmoji from "discourse/ui-kit/helpers/d-replace-emoji";import { i18n } from "discourse-i18n";@tagName("")@@ -37,8 +37,8 @@ export default class SignupCta extends Component {{{#if this.session.hideSignupCta}}<h3>{{i18n "signup_cta.hidden_for_session"}}</h3>{{else}}- <h3>{{replaceEmoji (trustHTML (i18n "signup_cta.intro"))}}</h3>- <p>{{replaceEmoji (trustHTML (i18n "signup_cta.value_prop"))}}</p>+ <h3>{{dReplaceEmoji (trustHTML (i18n "signup_cta.intro"))}}</h3>+ <p>{{dReplaceEmoji (trustHTML (i18n "signup_cta.value_prop"))}}</p><div class="buttons"><DButtondiff --git a/frontend/discourse/app/components/signup-page-cta.gjs b/frontend/discourse/app/components/signup-page-cta.gjsindex e21e46a934d..3f65ba2fd4a 100644--- a/frontend/discourse/app/components/signup-page-cta.gjs+++ b/frontend/discourse/app/components/signup-page-cta.gjs@@ -1,6 +1,6 @@import { trustHTML } from "@ember/template";-import DButton from "discourse/components/d-button";import PluginOutlet from "discourse/components/plugin-outlet";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";const SignupPageCta = <template>diff --git a/frontend/discourse/app/components/signup-progress-bar.gjs b/frontend/discourse/app/components/signup-progress-bar.gjsindex 06db1696fdc..5773c5a19d9 100644--- a/frontend/discourse/app/components/signup-progress-bar.gjs+++ b/frontend/discourse/app/components/signup-progress-bar.gjs@@ -3,7 +3,7 @@ import { tracked } from "@glimmer/tracking";import { concat } from "@ember/helper";import { action } from "@ember/object";import { service } from "@ember/service";-import concatClass from "discourse/helpers/concat-class";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";export default class SignupProgressBar extends Component {@service siteSettings;@@ -43,7 +43,7 @@ export default class SignupProgressBar extends Component {<div class="signup-progress-bar">{{#each this.steps as |step index|}}<div- class={{concatClass+ class={{dConcatClass"signup-progress-bar__segment"(concat "--" (this.getStepState index))}}diff --git a/frontend/discourse/app/components/slow-mode-info.gjs b/frontend/discourse/app/components/slow-mode-info.gjsindex 4fe069518db..2a2eb4d5b0a 100644--- a/frontend/discourse/app/components/slow-mode-info.gjs+++ b/frontend/discourse/app/components/slow-mode-info.gjs@@ -2,11 +2,11 @@import Component from "@ember/component";import { action, computed } from "@ember/object";import { tagName } from "@ember-decorators/component";-import DButton from "discourse/components/d-button";-import icon from "discourse/helpers/d-icon";import { durationTextFromSeconds } from "discourse/helpers/slow-mode";import { popupAjaxError } from "discourse/lib/ajax-error";import Topic from "discourse/models/topic";+import DButton from "discourse/ui-kit/d-button";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";@tagName("")@@ -33,7 +33,7 @@ export default class SlowModeInfo extends Component {<div class="topic-status-info"><h3 class="slow-mode-heading"><span>- {{icon "hourglass-start"}}+ {{dIcon "hourglass-start"}}{{i18n"topic.slow_mode_notice.duration"duration=this.durationTextdiff --git a/frontend/discourse/app/components/software-update-prompt.gjs b/frontend/discourse/app/components/software-update-prompt.gjsindex c873c71e444..a1d2f2e9b3c 100644--- a/frontend/discourse/app/components/software-update-prompt.gjs+++ b/frontend/discourse/app/components/software-update-prompt.gjs@@ -3,11 +3,11 @@ import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";import { cancel } from "@ember/runloop";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import concatClass from "discourse/helpers/concat-class";import { bind } from "discourse/lib/decorators";import { isTesting } from "discourse/lib/environment";import discourseLater from "discourse/lib/later";+import DButton from "discourse/ui-kit/d-button";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";export default class SoftwareUpdatePrompt extends Component {@@ -78,7 +78,7 @@ export default class SoftwareUpdatePrompt extends Component {<template>{{#if this.showPrompt}}<div- class={{concatClass+ class={{dConcatClass"software-update-prompt"(if this.animatePrompt "require-software-refresh")}}diff --git a/frontend/discourse/app/components/sub-category-item.gjs b/frontend/discourse/app/components/sub-category-item.gjsindex d9283aae9e5..038fe57f9be 100644--- a/frontend/discourse/app/components/sub-category-item.gjs+++ b/frontend/discourse/app/components/sub-category-item.gjs@@ -2,8 +2,8 @@ import CategoryListItem from "discourse/components/category-list-item";import CategoryTitleBefore from "discourse/components/category-title-before";import CategoryUnread from "discourse/components/category-unread";import PluginOutlet from "discourse/components/plugin-outlet";-import categoryLink from "discourse/helpers/category-link";import lazyHash from "discourse/helpers/lazy-hash";+import dCategoryLink from "discourse/ui-kit/helpers/d-category-link";export default class SubCategoryItem extends CategoryListItem {<template>@@ -19,11 +19,11 @@ export default class SubCategoryItem extends CategoryListItem {>{{#unless this.isMuted}}{{#if this.site.mobileView}}- {{categoryLink this.category}}+ {{dCategoryLink this.category}}{{else}}<span class="subcategory"><CategoryTitleBefore @category={{this.category}} />- {{categoryLink this.category hideParent="true"}}+ {{dCategoryLink this.category hideParent="true"}}{{#unless this.hideUnread}}<CategoryUnread@category={{this.category}}diff --git a/frontend/discourse/app/components/sub-category-row.gjs b/frontend/discourse/app/components/sub-category-row.gjsindex 05973d8b92f..f7a476b2d7f 100644--- a/frontend/discourse/app/components/sub-category-row.gjs+++ b/frontend/discourse/app/components/sub-category-row.gjs@@ -1,9 +1,9 @@import CategoryListItem from "discourse/components/category-list-item";import CategoryTitleLink from "discourse/components/category-title-link";-import DecoratedHtml from "discourse/components/decorated-html";import SubCategoryItem from "discourse/components/sub-category-item";import borderColor from "discourse/helpers/border-color";-import dirSpan from "discourse/helpers/dir-span";+import DDecoratedHtml from "discourse/ui-kit/d-decorated-html";+import dDirSpan from "discourse/ui-kit/helpers/d-dir-span";export default class SubCategoryRow extends CategoryListItem {<template>@@ -48,8 +48,8 @@ export default class SubCategoryRow extends CategoryListItem {<CategoryTitleLink @tagName="h4" @category={{this.category}} />{{#if this.category.description_excerpt}}<div class="category-description subcategory-description">- <DecoratedHtml- @html={{dirSpan+ <DDecoratedHtml+ @html={{dDirSpanthis.category.description_excerpthtmlSafe="true"}}diff --git a/frontend/discourse/app/components/tag-groups-form.gjs b/frontend/discourse/app/components/tag-groups-form.gjsindex 0de3ab42f3c..83e8bc483d7 100644--- a/frontend/discourse/app/components/tag-groups-form.gjs+++ b/frontend/discourse/app/components/tag-groups-form.gjs@@ -6,14 +6,14 @@ import { service } from "@ember/service";import { isEmpty } from "@ember/utils";import { tagName } from "@ember-decorators/component";import BufferedProxy from "ember-buffered-proxy/proxy";-import DButton from "discourse/components/d-button";-import RadioButton from "discourse/components/radio-button";-import TextField from "discourse/components/text-field";import { popupAjaxError } from "discourse/lib/ajax-error";import { AUTO_GROUPS } from "discourse/lib/constants";import PermissionType from "discourse/models/permission-type";import GroupChooser from "discourse/select-kit/components/group-chooser";import TagChooser from "discourse/select-kit/components/tag-chooser";+import DButton from "discourse/ui-kit/d-button";+import DRadioButton from "discourse/ui-kit/d-radio-button";+import DTextField from "discourse/ui-kit/d-text-field";import { i18n } from "discourse-i18n";@tagName("")@@ -137,7 +137,7 @@ export default class TagGroupsForm extends Component {<section class="group-name"><label>{{i18n "tagging.groups.name_placeholder"}}</label><div>- <TextField @value={{this.buffered.name}} /></div>+ <DTextField @value={{this.buffered.name}} /></div></section><section class="group-tags-list">@@ -186,7 +186,7 @@ export default class TagGroupsForm extends Component {<section class="group-visibility"><div class="group-visibility-option">- <RadioButton+ <DRadioButton@name="tag-permissions-choice"@value="public"@id="public-permission"@@ -199,7 +199,7 @@ export default class TagGroupsForm extends Component {</label></div><div class="group-visibility-option">- <RadioButton+ <DRadioButton@name="tag-permissions-choice"@value="visible"@id="visible-permission"@@ -224,7 +224,7 @@ export default class TagGroupsForm extends Component {</div></div><div class="group-visibility-option">- <RadioButton+ <DRadioButton@name="tag-permissions-choice"@value="private"@id="private-permission"diff --git a/frontend/discourse/app/components/tag-info-button.gjs b/frontend/discourse/app/components/tag-info-button.gjsindex dc64c3de569..7375b6e732d 100644--- a/frontend/discourse/app/components/tag-info-button.gjs+++ b/frontend/discourse/app/components/tag-info-button.gjs@@ -1,7 +1,7 @@import Component from "@glimmer/component";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";export default class TagInfoButton extends Component {@service router;diff --git a/frontend/discourse/app/components/tag-list.gjs b/frontend/discourse/app/components/tag-list.gjsindex f5bb63d5590..c65351c4902 100644--- a/frontend/discourse/app/components/tag-list.gjs+++ b/frontend/discourse/app/components/tag-list.gjs@@ -3,12 +3,12 @@ import Component from "@ember/component";import { computed } from "@ember/object";import { tagName } from "@ember-decorators/component";import CategoryTitleLink from "discourse/components/category-title-link";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";-import discourseTag from "discourse/helpers/discourse-tag";import { arraySortedByProperties } from "discourse/lib/array-tools";import { slugify } from "discourse/lib/utilities";import Category from "discourse/models/category";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dDiscourseTag from "discourse/ui-kit/helpers/d-discourse-tag";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";@tagName("")@@ -49,7 +49,7 @@ export default class TagList extends Component {<template><div- class={{concatClass+ class={{dConcatClass"tags-list""tag-list"this.categoryClass@@ -72,7 +72,7 @@ export default class TagList extends Component {{{/if}}{{#each this.sortedTags as |tag|}}<div class="tag-box">- {{discourseTag+ {{dDiscourseTagtagdescription=tag.descriptionisPrivateMessage=this.isPrivateMessage@@ -80,7 +80,7 @@ export default class TagList extends Component {tagsForUser=this.tagsForUser}}{{#if tag.pmOnly}}- {{icon "envelope"}}+ {{dIcon "envelope"}}{{/if}}{{#if tag.totalCount}}<span class="tag-count">diff --git a/frontend/discourse/app/components/tag-settings.gjs b/frontend/discourse/app/components/tag-settings.gjsindex 3520c0a8e2a..02cb8a273ff 100644--- a/frontend/discourse/app/components/tag-settings.gjs+++ b/frontend/discourse/app/components/tag-settings.gjs@@ -4,10 +4,7 @@ import { array, concat, hash } from "@ember/helper";import { action } from "@ember/object";import { LinkTo } from "@ember/routing";import { service } from "@ember/service";-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DPageHeader from "discourse/components/d-page-header";import Form from "discourse/components/form";-import HorizontalOverflowNav from "discourse/components/horizontal-overflow-nav";import AddSynonymsConfirmation from "discourse/components/tag-settings/add-synonyms-confirmation";import TagSettingsLocalizations from "discourse/components/tag-settings/localizations";import { ajax } from "discourse/lib/ajax";@@ -15,6 +12,9 @@ import { popupAjaxError } from "discourse/lib/ajax-error";import MiniTagChooser from "discourse/select-kit/components/mini-tag-chooser";import TagDropdown from "discourse/select-kit/components/tag-dropdown";import { eq } from "discourse/truth-helpers";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DHorizontalOverflowNav from "discourse/ui-kit/d-horizontal-overflow-nav";+import DPageHeader from "discourse/ui-kit/d-page-header";import { i18n } from "discourse-i18n";export default class TagSettings extends Component {@@ -263,7 +263,7 @@ export default class TagSettings extends Component {{{#if this.showLocalizationsTab}}<div class="d-nav-submenu">- <HorizontalOverflowNav class="d-nav-submenu__tabs">+ <DHorizontalOverflowNav class="d-nav-submenu__tabs"><li><LinkTo@route="tag.edit.tab"@@ -288,7 +288,7 @@ export default class TagSettings extends Component {{{i18n "tagging.settings.localizations"}}</LinkTo></li>- </HorizontalOverflowNav>+ </DHorizontalOverflowNav></div>{{/if}}diff --git a/frontend/discourse/app/components/tag-settings/add-synonyms-confirmation.gjs b/frontend/discourse/app/components/tag-settings/add-synonyms-confirmation.gjsindex c341f339521..aaa0c997eb8 100644--- a/frontend/discourse/app/components/tag-settings/add-synonyms-confirmation.gjs+++ b/frontend/discourse/app/components/tag-settings/add-synonyms-confirmation.gjs@@ -1,5 +1,5 @@import Component from "@glimmer/component";-import InterpolatedTranslation from "discourse/components/interpolated-translation";+import DInterpolatedTranslation from "discourse/ui-kit/d-interpolated-translation";export default class AddSynonymsConfirmation extends Component {get synonymNames() {@@ -12,7 +12,7 @@ export default class AddSynonymsConfirmation extends Component {<template><p>- <InterpolatedTranslation+ <DInterpolatedTranslation@key="tagging.settings.add_synonyms_confirm"as |Placeholder|>@@ -22,7 +22,7 @@ export default class AddSynonymsConfirmation extends Component {<Placeholder @name="tagName"><b>{{this.tagName}}</b></Placeholder>- </InterpolatedTranslation>+ </DInterpolatedTranslation></p></template>}diff --git a/frontend/discourse/app/components/toolbar-popup-menu-options.gjs b/frontend/discourse/app/components/toolbar-popup-menu-options.gjsindex 435fc455edc..248b1dc2e9c 100644--- a/frontend/discourse/app/components/toolbar-popup-menu-options.gjs+++ b/frontend/discourse/app/components/toolbar-popup-menu-options.gjs@@ -4,14 +4,14 @@ import { action } from "@ember/object";import { service } from "@ember/service";import { trustHTML } from "@ember/template";import { modifier } from "ember-modifier";-import DButton from "discourse/components/d-button";-import DropdownMenu from "discourse/components/dropdown-menu";import DMenu from "discourse/float-kit/components/d-menu";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import { iconHTML } from "discourse/lib/icon-library";import { translateModKey } from "discourse/lib/utilities";import { PLATFORM_KEY_MODIFIER } from "discourse/services/keyboard-shortcuts";+import DButton from "discourse/ui-kit/d-button";+import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class ToolbarPopupMenuOptions extends Component {@@ -183,12 +183,12 @@ export default class ToolbarPopupMenuOptions extends Component {@offset={{5}}@onKeydown={{@onKeydown}}tabindex="-1"- @triggerClass={{concatClass "toolbar__button" @class}}+ @triggerClass={{dConcatClass "toolbar__button" @class}}@class="toolbar-popup-menu-options"title={{@title}}><:trigger>- {{icon (this.getIcon this.args)}}+ {{dIcon (this.getIcon this.args)}}{{#if this.triggerLabel}}<span class="toolbar-popup-menu-options__trigger-label">{{this.triggerLabel}}@@ -196,7 +196,7 @@ export default class ToolbarPopupMenuOptions extends Component {{{/if}}</:trigger><:content>- <DropdownMenu {{this.trackScrollability}} as |dropdown|>+ <DDropdownMenu {{this.trackScrollability}} as |dropdown|>{{#if @header}}<li class="dropdown-menu__header">{{@header}}</li>{{/if}}@@ -208,12 +208,12 @@ export default class ToolbarPopupMenuOptions extends Component {@icon={{this.getIcon option}}@action={{fn this.onSelect option}}data-name={{option.name}}- class={{concatClass (if (this.getActive option) "--active")}}+ class={{dConcatClass (if (this.getActive option) "--active")}}aria-keyshortcuts={{option.ariaKeyshortcuts}}/></dropdown.item>{{/each}}- </DropdownMenu>+ </DDropdownMenu></:content></DMenu></template>diff --git a/frontend/discourse/app/components/topic-admin-menu.gjs b/frontend/discourse/app/components/topic-admin-menu.gjsindex 9e3b0399534..8a6feaaec77 100644--- a/frontend/discourse/app/components/topic-admin-menu.gjs+++ b/frontend/discourse/app/components/topic-admin-menu.gjs@@ -2,16 +2,16 @@ import Component from "@glimmer/component";import { fn } from "@ember/helper";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import DropdownMenu from "discourse/components/dropdown-menu";import DMenu from "discourse/float-kit/components/d-menu";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import getURL from "discourse/lib/get-url";import DiscourseURL from "discourse/lib/url";import { and, not, or } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";export default class TopicAdminMenu extends Component {@service adminTopicMenuButtons;@@ -135,10 +135,10 @@ export default class TopicAdminMenu extends Component {@triggerClass="btn-default btn-icon toggle-admin-menu {{@buttonClasses}}"><:trigger>- {{icon "wrench"}}+ {{dIcon "wrench"}}</:trigger><:content>- <DropdownMenu as |dropdown|>+ <DDropdownMenu as |dropdown|>{{#if(orthis.currentUser.canManageTopic@@ -344,13 +344,13 @@ export default class TopicAdminMenu extends Component {@label={{button.label}}@translatedLabel={{button.translatedLabel}}@icon={{button.icon}}- class={{concatClass "btn-transparent" button.className}}+ class={{dConcatClass "btn-transparent" button.className}}@action={{fn this.onExtraButtonAction button.action}}/></dropdown.item>{{/each}}{{/if}}- </DropdownMenu>+ </DDropdownMenu></:content></DMenu>{{/if}}diff --git a/frontend/discourse/app/components/topic-bookmark-post-submenu.gjs b/frontend/discourse/app/components/topic-bookmark-post-submenu.gjsindex a1438e55f0c..bf8088acf42 100644--- a/frontend/discourse/app/components/topic-bookmark-post-submenu.gjs+++ b/frontend/discourse/app/components/topic-bookmark-post-submenu.gjs@@ -1,7 +1,7 @@import Component from "@glimmer/component";import { action } from "@ember/object";-import DButton from "discourse/components/d-button";-import DropdownMenu from "discourse/components/dropdown-menu";+import DButton from "discourse/ui-kit/d-button";+import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";import { i18n } from "discourse-i18n";export default class TopicBookmarkPostSubmenu extends Component {@@ -28,7 +28,7 @@ export default class TopicBookmarkPostSubmenu extends Component {}<template>- <DropdownMenu class="topic-bookmark-post-submenu" as |dropdown|>+ <DDropdownMenu class="topic-bookmark-post-submenu" as |dropdown|><dropdown.itemclass="bookmark-menu__row --jump"data-menu-option-id="jump"@@ -68,6 +68,6 @@ export default class TopicBookmarkPostSubmenu extends Component {class="bookmark-menu__row-btn --danger"/></dropdown.item>- </DropdownMenu>+ </DDropdownMenu></template>}diff --git a/frontend/discourse/app/components/topic-bookmarks-menu.gjs b/frontend/discourse/app/components/topic-bookmarks-menu.gjsindex df2217dc3e1..6484bebe423 100644--- a/frontend/discourse/app/components/topic-bookmarks-menu.gjs+++ b/frontend/discourse/app/components/topic-bookmarks-menu.gjs@@ -3,12 +3,9 @@ import { action } from "@ember/object";import { getOwner } from "@ember/owner";import { service } from "@ember/service";import BookmarkMenu from "discourse/components/bookmark-menu";-import DButton from "discourse/components/d-button";-import DropdownMenu from "discourse/components/dropdown-menu";import BookmarkModal from "discourse/components/modal/bookmark";import TopicBookmarkPostSubmenu from "discourse/components/topic-bookmark-post-submenu";import DMenu from "discourse/float-kit/components/d-menu";-import concatClass from "discourse/helpers/concat-class";import { popupAjaxError } from "discourse/lib/ajax-error";import { BookmarkFormData } from "discourse/lib/bookmark-form-data";import TopicBookmarkManager from "discourse/lib/topic-bookmark-manager";@@ -18,6 +15,9 @@ import {NOT_BOOKMARKED,WITH_REMINDER_ICON,} from "discourse/models/bookmark";+import DButton from "discourse/ui-kit/d-button";+import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";export default class TopicBookmarksMenu extends Component {@@ -342,11 +342,11 @@ export default class TopicBookmarksMenu extends Component {@arrow={{false}}><:content>- <DropdownMenu as |dropdown|>+ <DDropdownMenu as |dropdown|>{{! Post bookmark submenu triggers }}{{#each this.postBookmarks as |bookmark|}}<dropdown.item- class={{concatClass+ class={{dConcatClass"bookmark-menu__row --post-bookmark"(if bookmark.name "--has-name")}}@@ -385,7 +385,7 @@ export default class TopicBookmarksMenu extends Component {{{#if this.topicBookmark}}<dropdown.divider /><dropdown.item- class={{concatClass+ class={{dConcatClass"bookmark-menu__row --edit"(if this.topicBookmark.name "--has-name")}}@@ -449,7 +449,7 @@ export default class TopicBookmarksMenu extends Component {/></dropdown.item>{{/if}}- </DropdownMenu>+ </DDropdownMenu></:content></DMenu>{{else}}diff --git a/frontend/discourse/app/components/topic-category.gjs b/frontend/discourse/app/components/topic-category.gjsindex 39e48dc10d1..162a7894894 100644--- a/frontend/discourse/app/components/topic-category.gjs+++ b/frontend/discourse/app/components/topic-category.gjs@@ -2,10 +2,10 @@import Component from "@ember/component";import { tagName } from "@ember-decorators/component";import PluginOutlet from "discourse/components/plugin-outlet";-import boundCategoryLink from "discourse/helpers/bound-category-link";-import discourseTags from "discourse/helpers/discourse-tags";import lazyHash from "discourse/helpers/lazy-hash";import topicFeaturedLink from "discourse/helpers/topic-featured-link";+import dBoundCategoryLink from "discourse/ui-kit/helpers/d-bound-category-link";+import dDiscourseTags from "discourse/ui-kit/helpers/d-discourse-tags";// Injections don't occur without a class@tagName("")@@ -13,7 +13,7 @@ export default class TopicCategory extends Component {<template><div ...attributes>{{#unless this.topic.isPrivateMessage}}- {{boundCategoryLink+ {{dBoundCategoryLinkthis.topic.categoryancestors=this.topic.category.predecessorshideParent=true@@ -22,7 +22,7 @@ export default class TopicCategory extends Component {<div class="topic-header-extra">{{#if this.siteSettings.tagging_enabled}}<div class="list-tags">- {{discourseTags this.topic mode="list" tags=this.topic.tags}}+ {{dDiscourseTags this.topic mode="list" tags=this.topic.tags}}</div>{{/if}}{{#if this.siteSettings.topic_featured_link_enabled}}diff --git a/frontend/discourse/app/components/topic-dismiss-buttons.gjs b/frontend/discourse/app/components/topic-dismiss-buttons.gjsindex ccf647536cb..b2127ddae0c 100644--- a/frontend/discourse/app/components/topic-dismiss-buttons.gjs+++ b/frontend/discourse/app/components/topic-dismiss-buttons.gjs@@ -1,8 +1,8 @@import Component from "@glimmer/component";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import DismissReadModal from "discourse/components/modal/dismiss-read";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";export default class TopicDismissButtons extends Component {diff --git a/frontend/discourse/app/components/topic-drafts-dropdown.gjs b/frontend/discourse/app/components/topic-drafts-dropdown.gjsindex c2a71a41582..e9a7bb7b205 100644--- a/frontend/discourse/app/components/topic-drafts-dropdown.gjs+++ b/frontend/discourse/app/components/topic-drafts-dropdown.gjs@@ -3,15 +3,15 @@ import { tracked } from "@glimmer/tracking";import { fn } from "@ember/helper";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import DComboButton from "discourse/components/d-combo-button";-import DropdownMenu from "discourse/components/dropdown-menu";import DiscourseURL from "discourse/lib/url";import {NEW_PRIVATE_MESSAGE_KEY,NEW_TOPIC_KEY,} from "discourse/models/composer";import { or } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DComboButton from "discourse/ui-kit/d-combo-button";+import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";import { i18n } from "discourse-i18n";const DRAFTS_LIMIT = 4;@@ -123,7 +123,7 @@ export default class TopicDraftsDropdown extends Component {aria-label={{i18n "drafts.dropdown.title"}}class={{@btnTypeClass}}>- <DropdownMenu as |dropdown|>+ <DDropdownMenu as |dropdown|>{{#each this.drafts as |draft|}}<dropdown.item class="topic-drafts-item"><DButton@@ -154,7 +154,7 @@ export default class TopicDraftsDropdown extends Component {</DButton></dropdown.item>{{/if}}- </DropdownMenu>+ </DDropdownMenu></combo.Menu>{{/if}}</DComboButton>diff --git a/frontend/discourse/app/components/topic-entrance.gjs b/frontend/discourse/app/components/topic-entrance.gjsindex 7f172e4904c..2ee97da4091 100644--- a/frontend/discourse/app/components/topic-entrance.gjs+++ b/frontend/discourse/app/components/topic-entrance.gjs@@ -7,10 +7,10 @@ import { trustHTML } from "@ember/template";import { classNameBindings } from "@ember-decorators/component";import { on } from "@ember-decorators/object";import $ from "jquery";-import DButton from "discourse/components/d-button";-import icon from "discourse/helpers/d-icon";import { bind } from "discourse/lib/decorators";import DiscourseURL from "discourse/lib/url";+import DButton from "discourse/ui-kit/d-button";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";function entranceDate(dt, showTime) {@@ -213,7 +213,7 @@ export default class TopicEntrance extends Component {title={{i18n "topic_entrance.jump_top_button_title"}}class="btn-default full jump-top">- {{icon "backward-step"}}+ {{dIcon "backward-step"}}{{trustHTML this.topDate}}</DButton>@@ -227,7 +227,7 @@ export default class TopicEntrance extends Component {class="btn-default full jump-bottom">{{trustHTML this.bottomDate}}- {{icon "forward-step"}}+ {{dIcon "forward-step"}}</DButton></template>}diff --git a/frontend/discourse/app/components/topic-footer-buttons.gjs b/frontend/discourse/app/components/topic-footer-buttons.gjsindex 870cc11b972..b592c835932 100644--- a/frontend/discourse/app/components/topic-footer-buttons.gjs+++ b/frontend/discourse/app/components/topic-footer-buttons.gjs@@ -4,16 +4,12 @@ import { concat, hash } from "@ember/helper";import { computed, set } from "@ember/object";import { compare } from "@ember/utils";import { tagName } from "@ember-decorators/component";-import DButton from "discourse/components/d-button";-import DropdownMenu from "discourse/components/dropdown-menu";import PinnedButton from "discourse/components/pinned-button";import PluginOutlet from "discourse/components/plugin-outlet";import TopicAdminMenu from "discourse/components/topic-admin-menu";import TopicBookmarksMenu from "discourse/components/topic-bookmarks-menu";import UserTip from "discourse/components/user-tip";import DMenu from "discourse/float-kit/components/d-menu";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import lazyHash from "discourse/helpers/lazy-hash";import { NotificationLevels } from "discourse/lib/notification-levels";import { getTopicFooterButtons } from "discourse/lib/register-topic-footer-button";@@ -21,6 +17,10 @@ import { getTopicFooterDropdowns } from "discourse/lib/register-topic-footer-droimport DropdownSelectBox from "discourse/select-kit/components/dropdown-select-box";import TopicNotificationsButton from "discourse/select-kit/components/topic-notifications-button";import { eq, gt } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";function bind(fn, context) {@@ -178,7 +178,7 @@ export default class TopicFooterButtons extends Component {@translatedAriaLabel={{actionable.ariaLabel}}@disabled={{actionable.disabled}}id={{concat "topic-footer-button-" actionable.id}}- class={{concatClass+ class={{dConcatClass"btn-default""topic-footer-button"actionable.classNames@@ -196,7 +196,7 @@ export default class TopicFooterButtons extends Component {none=actionable.noneItemdisabled=actionable.disabled}}- class={{concatClass+ class={{dConcatClass"topic-footer-dropdown"actionable.classNames}}@@ -214,7 +214,7 @@ export default class TopicFooterButtons extends Component {@translatedAriaLabel={{this.loneDropdownButton.ariaLabel}}@disabled={{this.loneDropdownButton.disabled}}id={{concat "topic-footer-button-" this.loneDropdownButton.id}}- class={{concatClass+ class={{dConcatClass"btn-default""topic-footer-button"this.loneDropdownButton.classNames@@ -227,10 +227,10 @@ export default class TopicFooterButtons extends Component {class="topic-footer-button btn-default"><:trigger>- {{icon "ellipsis-vertical"}}+ {{dIcon "ellipsis-vertical"}}</:trigger><:content>- <DropdownMenu as |dropdown|>+ <DDropdownMenu as |dropdown|>{{#each this.dropdownButtons key="id" as |button|}}<dropdown.item><DButton@@ -241,7 +241,7 @@ export default class TopicFooterButtons extends Component {@translatedAriaLabel={{button.ariaLabel}}@disabled={{button.disabled}}id={{concat "topic-footer-button-" button.id}}- class={{concatClass+ class={{dConcatClass"btn-default""topic-footer-button"button.classNames@@ -249,7 +249,7 @@ export default class TopicFooterButtons extends Component {/></dropdown.item>{{/each}}- </DropdownMenu>+ </DDropdownMenu></:content></DMenu>{{/if}}diff --git a/frontend/discourse/app/components/topic-list/action-list.gjs b/frontend/discourse/app/components/topic-list/action-list.gjsindex d471a772a3f..5e9f37dcb5d 100644--- a/frontend/discourse/app/components/topic-list/action-list.gjs+++ b/frontend/discourse/app/components/topic-list/action-list.gjs@@ -1,9 +1,9 @@-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";const ActionList = <template>{{#if @postNumbers}}<div class="post-actions" ...attributes>- {{icon @icon}}+ {{dIcon @icon}}{{#each @postNumbers as |postNumber|}}<a href="{{@topic.url}}/{{postNumber}}">#{{postNumber}}</a>{{/each}}diff --git a/frontend/discourse/app/components/topic-list/featured-topic.gjs b/frontend/discourse/app/components/topic-list/featured-topic.gjsindex 865acb03b05..61fbe271577 100644--- a/frontend/discourse/app/components/topic-list/featured-topic.gjs+++ b/frontend/discourse/app/components/topic-list/featured-topic.gjs@@ -2,8 +2,8 @@ import { on } from "@ember/modifier";import { trustHTML } from "@ember/template";import TopicPostBadges from "discourse/components/topic-post-badges";import TopicStatus from "discourse/components/topic-status";-import ageWithTooltip from "discourse/helpers/age-with-tooltip";import { wantsNewWindow } from "discourse/lib/intercept-click";+import dAgeWithTooltip from "discourse/ui-kit/helpers/d-age-with-tooltip";const onTimestampClick = function (event) {if (wantsNewWindow(event)) {@@ -33,7 +33,7 @@ const FeaturedTopic = <template>{{on "click" onTimestampClick}}href={{@topic.lastPostUrl}}class="last-posted-at"- >{{ageWithTooltip @topic.last_posted_at}}</a>+ >{{dAgeWithTooltip @topic.last_posted_at}}</a></div></template>;diff --git a/frontend/discourse/app/components/topic-list/header/bulk-select-cell.gjs b/frontend/discourse/app/components/topic-list/header/bulk-select-cell.gjsindex fbfb671d9cc..9c466ea7dcf 100644--- a/frontend/discourse/app/components/topic-list/header/bulk-select-cell.gjs+++ b/frontend/discourse/app/components/topic-list/header/bulk-select-cell.gjs@@ -1,5 +1,5 @@import { on } from "@ember/modifier";-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";const BulkSelectCell = <template>@@ -10,7 +10,7 @@ const BulkSelectCell = <template>title={{i18n "topics.bulk.toggle"}}class="btn-transparent bulk-select no-text --primary">- {{icon "list-check"}}+ {{dIcon "list-check"}}</button>{{/if}}</th>diff --git a/frontend/discourse/app/components/topic-list/header/sortable-column.gjs b/frontend/discourse/app/components/topic-list/header/sortable-column.gjsindex 6942349bcae..cd22465e3e8 100644--- a/frontend/discourse/app/components/topic-list/header/sortable-column.gjs+++ b/frontend/discourse/app/components/topic-list/header/sortable-column.gjs@@ -4,9 +4,9 @@ import { action } from "@ember/object";import { service } from "@ember/service";import PluginOutlet from "discourse/components/plugin-outlet";import TopicBulkSelectDropdown from "discourse/components/topic-list/topic-bulk-select-dropdown";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import lazyHash from "discourse/helpers/lazy-hash";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class SortableColumn extends Component {@@ -73,7 +73,7 @@ export default class SortableColumn extends Component {data-sort-order={{@order}}scope="col"aria-sort={{this.ariaSort}}- class={{concatClass+ class={{dConcatClass"topic-list-data"@order(if @sortable "sortable")@@ -89,7 +89,7 @@ export default class SortableColumn extends Component {title={{i18n "topics.bulk.toggle"}}class="btn-transparent bulk-select no-text">- {{icon "list-check"}}+ {{dIcon "list-check"}}</button>{{/if}}@@ -120,7 +120,7 @@ export default class SortableColumn extends Component {<button aria-pressed={{this.isSorting}}>{{this.localizedName}}{{#if this.isSorting}}- {{icon (if @ascending "chevron-up" "chevron-down")}}+ {{dIcon (if @ascending "chevron-up" "chevron-down")}}{{/if}}</button>{{else}}diff --git a/frontend/discourse/app/components/topic-list/header/topic-cell.gjs b/frontend/discourse/app/components/topic-list/header/topic-cell.gjsindex c2af06a581f..8dc3cc94c4d 100644--- a/frontend/discourse/app/components/topic-list/header/topic-cell.gjs+++ b/frontend/discourse/app/components/topic-list/header/topic-cell.gjs@@ -1,7 +1,7 @@import Component from "@glimmer/component";import { fn } from "@ember/helper";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";import SortableColumn from "./sortable-column";export default class TopicCell extends Component {diff --git a/frontend/discourse/app/components/topic-list/item.gjs b/frontend/discourse/app/components/topic-list/item.gjsindex 2e093f88a58..b7456e3b538 100644--- a/frontend/discourse/app/components/topic-list/item.gjs+++ b/frontend/discourse/app/components/topic-list/item.gjs@@ -12,12 +12,6 @@ import PostCountOrBadges from "discourse/components/topic-list/post-count-or-badimport TopicExcerpt from "discourse/components/topic-list/topic-excerpt";import TopicLink from "discourse/components/topic-list/topic-link";import TopicStatus from "discourse/components/topic-status";-import UserLink from "discourse/components/user-link";-import avatar from "discourse/helpers/avatar";-import categoryLink from "discourse/helpers/category-link";-import concatClass from "discourse/helpers/concat-class";-import discourseTags from "discourse/helpers/discourse-tags";-import formatDate from "discourse/helpers/format-date";import lazyHash from "discourse/helpers/lazy-hash";import topicFeaturedLink from "discourse/helpers/topic-featured-link";import {@@ -31,6 +25,12 @@ import {} from "discourse/lib/transformer";import DiscourseURL from "discourse/lib/url";import { and, eq } from "discourse/truth-helpers";+import DUserLink from "discourse/ui-kit/d-user-link";+import dAvatar from "discourse/ui-kit/helpers/d-avatar";+import dCategoryLink from "discourse/ui-kit/helpers/d-category-link";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dDiscourseTags from "discourse/ui-kit/helpers/d-discourse-tags";+import dFormatDate from "discourse/ui-kit/helpers/d-format-date";import { i18n } from "discourse-i18n";export default class Item extends Component {@@ -290,7 +290,7 @@ export default class Item extends Component {data-topic-id={{@topic.id}}role={{this.role}}aria-level={{this.ariaLevel}}- class={{concatClass+ class={{dConcatClass"topic-list-item"(if @topic.category (concat "category-" @topic.category.fullSlug))(if (eq @topic @lastVisitedTopic) "last-visit")@@ -331,7 +331,7 @@ export default class Item extends Component {>{{#if this.useMobileLayout}}<td- class={{concatClass+ class={{dConcatClass"topic-list-data"(if @bulkSelectEnabled "bulk-select-enabled")}}@@ -348,17 +348,17 @@ export default class Item extends Component {@name="topic-list-item-mobile-avatar"@outletArgs={{lazyHash topic=@topic}}>- <UserLink+ <DUserLink@ariaLabel={{i18n"latest_poster_link"}}@username={{@topic.lastPosterUser.username}}>- {{avatar+ {{dAvatar@topic.lastPosterUserimageSize="large"- }}</UserLink>+ }}</DUserLink></PluginOutlet>{{/if}}</div>@@ -433,7 +433,7 @@ export default class Item extends Component {@name="topic-list-before-category"@outletArgs={{lazyHash topic=@topic}}/>- {{categoryLink @topic.category}}+ {{dCategoryLink @topic.category}}{{~! no whitespace ~}}<PluginOutlet@name="topic-list-after-category"@@ -441,7 +441,7 @@ export default class Item extends Component {/>{{~! no whitespace ~}}{{/unless}}{{~! no whitespace ~}}- {{discourseTags @topic mode="list"}}+ {{dDiscourseTags @topic mode="list"}}</span><div class="num activity last">@@ -450,7 +450,7 @@ export default class Item extends Component {@outletArgs={{lazyHash topic=@topic}}><span title={{@topic.bumpedAtTitle}} class="age activity">- <a href={{@topic.lastPostUrl}}>{{formatDate+ <a href={{@topic.lastPostUrl}}>{{dFormatDate@topic.bumpedAtformat="tiny"noTitle="true"diff --git a/frontend/discourse/app/components/topic-list/item/activity-cell.gjs b/frontend/discourse/app/components/topic-list/item/activity-cell.gjsindex 3beed10e467..d21373625f5 100644--- a/frontend/discourse/app/components/topic-list/item/activity-cell.gjs+++ b/frontend/discourse/app/components/topic-list/item/activity-cell.gjs@@ -1,14 +1,14 @@import { trustHTML } from "@ember/template";import PluginOutlet from "discourse/components/plugin-outlet";import coldAgeClass from "discourse/helpers/cold-age-class";-import concatClass from "discourse/helpers/concat-class";-import formatDate from "discourse/helpers/format-date";import lazyHash from "discourse/helpers/lazy-hash";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dFormatDate from "discourse/ui-kit/helpers/d-format-date";const ActivityCell = <template><tdtitle={{trustHTML @topic.bumpedAtTitle}}- class={{concatClass+ class={{dConcatClass"activity num topic-list-data"(coldAgeClass @topic.createdAt [email protected] class="")}}@@ -20,7 +20,7 @@ const ActivityCell = <template>@name="topic-list-before-relative-date"@outletArgs={{lazyHash topic=@topic}}/>- {{~formatDate @topic.bumpedAt format="tiny" noTitle="true"~}}+ {{~dFormatDate @topic.bumpedAt format="tiny" noTitle="true"~}}</a></td></template>;diff --git a/frontend/discourse/app/components/topic-list/item/likes-cell.gjs b/frontend/discourse/app/components/topic-list/item/likes-cell.gjsindex 20b15d7f0a1..87c6486dd61 100644--- a/frontend/discourse/app/components/topic-list/item/likes-cell.gjs+++ b/frontend/discourse/app/components/topic-list/item/likes-cell.gjs@@ -1,13 +1,13 @@-import icon from "discourse/helpers/d-icon";-import number from "discourse/helpers/number";import { gt } from "discourse/truth-helpers";+import dIcon from "discourse/ui-kit/helpers/d-icon";+import dNumber from "discourse/ui-kit/helpers/d-number";const LikesCell = <template><td class="num likes topic-list-data">{{#if (gt @topic.like_count 0)}}<a href={{@topic.summaryUrl}}>- {{number @topic.like_count}}- {{icon "heart"}}+ {{dNumber @topic.like_count}}+ {{dIcon "heart"}}</a>{{/if}}</td>diff --git a/frontend/discourse/app/components/topic-list/item/op-likes-cell.gjs b/frontend/discourse/app/components/topic-list/item/op-likes-cell.gjsindex 11dc62bae6b..56ebda97237 100644--- a/frontend/discourse/app/components/topic-list/item/op-likes-cell.gjs+++ b/frontend/discourse/app/components/topic-list/item/op-likes-cell.gjs@@ -1,13 +1,13 @@-import icon from "discourse/helpers/d-icon";-import number from "discourse/helpers/number";import { gt } from "discourse/truth-helpers";+import dIcon from "discourse/ui-kit/helpers/d-icon";+import dNumber from "discourse/ui-kit/helpers/d-number";const OpLikesCell = <template><td class="num likes">{{#if (gt @topic.op_like_count 0)}}<a href={{@topic.summaryUrl}}>- {{number @topic.op_like_count}}- {{icon "heart"}}+ {{dNumber @topic.op_like_count}}+ {{dIcon "heart"}}</a>{{/if}}</td>diff --git a/frontend/discourse/app/components/topic-list/item/posters-cell.gjs b/frontend/discourse/app/components/topic-list/item/posters-cell.gjsindex 4c1cbadd1ba..a85ceb0371f 100644--- a/frontend/discourse/app/components/topic-list/item/posters-cell.gjs+++ b/frontend/discourse/app/components/topic-list/item/posters-cell.gjs@@ -1,5 +1,5 @@-import UserLink from "discourse/components/user-link";-import avatar from "discourse/helpers/avatar";+import DUserLink from "discourse/ui-kit/d-user-link";+import dAvatar from "discourse/ui-kit/helpers/d-avatar";const PostersCell = <template><td class="posters topic-list-data">@@ -7,18 +7,18 @@ const PostersCell = <template>{{#if poster.moreCount}}<a class="posters-more-count">{{poster.moreCount}}</a>{{else}}- <UserLink+ <DUserLink@username={{poster.user.username}}@href={{poster.user.path}}class={{poster.extraClasses}}>- {{avatar+ {{dAvatarposteravatarTemplatePath="user.avatar_template"usernamePath="user.username"namePath="user.name"imageSize="small"- }}</UserLink>+ }}</DUserLink>{{/if}}{{/each}}</td>diff --git a/frontend/discourse/app/components/topic-list/item/replies-cell.gjs b/frontend/discourse/app/components/topic-list/item/replies-cell.gjsindex eeba78e12ad..71bbadef72e 100644--- a/frontend/discourse/app/components/topic-list/item/replies-cell.gjs+++ b/frontend/discourse/app/components/topic-list/item/replies-cell.gjs@@ -1,9 +1,9 @@import Component from "@glimmer/component";import { service } from "@ember/service";import PluginOutlet from "discourse/components/plugin-outlet";-import element from "discourse/helpers/element";import lazyHash from "discourse/helpers/lazy-hash";-import number from "discourse/helpers/number";+import dElement from "discourse/ui-kit/helpers/d-element";+import dNumber from "discourse/ui-kit/helpers/d-number";import { i18n } from "discourse-i18n";export default class RepliesCell extends Component {@@ -49,7 +49,7 @@ export default class RepliesCell extends Component {}get wrapperElement() {- return element(this.args.tagName ?? "td");+ return dElement(this.args.tagName ?? "td");}<template>@@ -65,7 +65,7 @@ export default class RepliesCell extends Component {@name="topic-list-before-reply-count"@outletArgs={{lazyHash topic=@topic}}/>- {{number @topic.replyCount noTitle="true"}}+ {{dNumber @topic.replyCount noTitle="true"}}</a></this.wrapperElement></template>diff --git a/frontend/discourse/app/components/topic-list/item/topic-cell.gjs b/frontend/discourse/app/components/topic-list/item/topic-cell.gjsindex 19a229e1211..129cf9a13a5 100644--- a/frontend/discourse/app/components/topic-list/item/topic-cell.gjs+++ b/frontend/discourse/app/components/topic-list/item/topic-cell.gjs@@ -10,11 +10,11 @@ import TopicLink from "discourse/components/topic-list/topic-link";import UnreadIndicator from "discourse/components/topic-list/unread-indicator";import TopicPostBadges from "discourse/components/topic-post-badges";import TopicStatus from "discourse/components/topic-status";-import categoryLink from "discourse/helpers/category-link";-import discourseTags from "discourse/helpers/discourse-tags";import lazyHash from "discourse/helpers/lazy-hash";import topicFeaturedLink from "discourse/helpers/topic-featured-link";import { groupPath } from "discourse/lib/url";+import dCategoryLink from "discourse/ui-kit/helpers/d-category-link";+import dDiscourseTags from "discourse/ui-kit/helpers/d-discourse-tags";export default class TopicCell extends Component {get participantGroups() {@@ -104,7 +104,7 @@ export default class TopicCell extends Component {/>{{#unless @hideCategory}}{{#unless @topic.isPinnedUncategorized}}- {{categoryLink @topic.category}}+ {{dCategoryLink @topic.category}}{{/unless}}{{/unless}}<PluginOutlet@@ -112,7 +112,7 @@ export default class TopicCell extends Component {@outletArgs={{lazyHash topic=@topic}}/>- {{discourseTags @topic mode="list" tagsForUser=@tagsForUser}}+ {{dDiscourseTags @topic mode="list" tagsForUser=@tagsForUser}}{{#if this.participantGroups}}<ParticipantGroups @groups={{this.participantGroups}} />diff --git a/frontend/discourse/app/components/topic-list/item/views-cell.gjs b/frontend/discourse/app/components/topic-list/item/views-cell.gjsindex 74b75d7e986..916893ab7ee 100644--- a/frontend/discourse/app/components/topic-list/item/views-cell.gjs+++ b/frontend/discourse/app/components/topic-list/item/views-cell.gjs@@ -1,15 +1,15 @@import PluginOutlet from "discourse/components/plugin-outlet";-import concatClass from "discourse/helpers/concat-class";import lazyHash from "discourse/helpers/lazy-hash";-import number from "discourse/helpers/number";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dNumber from "discourse/ui-kit/helpers/d-number";const ViewsCell = <template>- <td class={{concatClass "num views topic-list-data" @topic.viewsHeat}}>+ <td class={{dConcatClass "num views topic-list-data" @topic.viewsHeat}}><PluginOutlet@name="topic-list-before-view-count"@outletArgs={{lazyHash topic=@topic}}/>- {{number @topic.views numberKey="views_long"}}+ {{dNumber @topic.views numberKey="views_long"}}</td></template>;diff --git a/frontend/discourse/app/components/topic-list/latest-topic-list-item.gjs b/frontend/discourse/app/components/topic-list/latest-topic-list-item.gjsindex de8bcd3cc8b..ecafb569cd1 100644--- a/frontend/discourse/app/components/topic-list/latest-topic-list-item.gjs+++ b/frontend/discourse/app/components/topic-list/latest-topic-list-item.gjs@@ -4,17 +4,17 @@ import PluginOutlet from "discourse/components/plugin-outlet";import ItemRepliesCell from "discourse/components/topic-list/item/replies-cell";import TopicPostBadges from "discourse/components/topic-post-badges";import TopicStatus from "discourse/components/topic-status";-import UserAvatarFlair from "discourse/components/user-avatar-flair";-import UserLink from "discourse/components/user-link";-import avatar from "discourse/helpers/avatar";-import categoryLink from "discourse/helpers/category-link";-import concatClass from "discourse/helpers/concat-class";-import discourseTags from "discourse/helpers/discourse-tags";-import formatDate from "discourse/helpers/format-date";import lazyHash from "discourse/helpers/lazy-hash";import topicFeaturedLink from "discourse/helpers/topic-featured-link";-import topicLink from "discourse/helpers/topic-link";import { applyValueTransformer } from "discourse/lib/transformer";+import DUserAvatarFlair from "discourse/ui-kit/d-user-avatar-flair";+import DUserLink from "discourse/ui-kit/d-user-link";+import dAvatar from "discourse/ui-kit/helpers/d-avatar";+import dCategoryLink from "discourse/ui-kit/helpers/d-category-link";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dDiscourseTags from "discourse/ui-kit/helpers/d-discourse-tags";+import dFormatDate from "discourse/ui-kit/helpers/d-format-date";+import dTopicLink from "discourse/ui-kit/helpers/d-topic-link";export default class LatestTopicListItem extends Component {get tagClassNames() {@@ -33,7 +33,7 @@ export default class LatestTopicListItem extends Component {<template><divdata-topic-id={{@topic.id}}- class={{concatClass+ class={{dConcatClass"latest-topic-list-item"this.tagClassNames(if @topic.category (concat "category-" @topic.category.fullSlug))@@ -57,10 +57,10 @@ export default class LatestTopicListItem extends Component {@outletArgs={{lazyHash topic=@topic}}><div class="topic-poster">- <UserLink @user={{@topic.lastPosterUser}}>- {{avatar @topic.lastPosterUser imageSize="large"}}- </UserLink>- <UserAvatarFlair @user={{@topic.lastPosterUser}} />+ <DUserLink @user={{@topic.lastPosterUser}}>+ {{dAvatar @topic.lastPosterUser imageSize="large"}}+ </DUserLink>+ <DUserAvatarFlair @user={{@topic.lastPosterUser}} /></div></PluginOutlet>@@ -72,7 +72,7 @@ export default class LatestTopicListItem extends Component {><TopicStatus @topic={{@topic}} @context="topic-list" />- {{topicLink @topic}}+ {{dTopicLink @topic}}{{~#if @topic.featured_link}} {{topicFeaturedLink @topic}}{{/if~}}@@ -98,8 +98,8 @@ export default class LatestTopicListItem extends Component {}}@outletArgs={{lazyHash topic=@topic}}>- {{categoryLink @topic.category~}}- {{~discourseTags @topic mode="list"}}+ {{dCategoryLink @topic.category~}}+ {{~dDiscourseTags @topic mode="list"}}</PluginOutlet></div></div>@@ -123,7 +123,7 @@ export default class LatestTopicListItem extends Component {<ahref={{@topic.lastPostUrl}}title={{@topic.bumpedAtTitle}}- >{{formatDate @topic.bumpedAt format="tiny" noTitle="true"}}</a>+ >{{dFormatDate @topic.bumpedAt format="tiny" noTitle="true"}}</a></div></PluginOutlet></div>diff --git a/frontend/discourse/app/components/topic-list/list.gjs b/frontend/discourse/app/components/topic-list/list.gjsindex db173b9fc77..50922a737a0 100644--- a/frontend/discourse/app/components/topic-list/list.gjs+++ b/frontend/discourse/app/components/topic-list/list.gjs@@ -4,7 +4,6 @@ import { service } from "@ember/service";import PluginOutlet from "discourse/components/plugin-outlet";import Header from "discourse/components/topic-list/header";import Item from "discourse/components/topic-list/item";-import concatClass from "discourse/helpers/concat-class";import lazyHash from "discourse/helpers/lazy-hash";import DAG from "discourse/lib/dag";import {@@ -12,6 +11,7 @@ import {applyValueTransformer,} from "discourse/lib/transformer";import { eq, or } from "discourse/truth-helpers";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";import HeaderActivityCell from "./header/activity-cell";import HeaderBulkSelectCell from "./header/bulk-select-cell";@@ -183,7 +183,7 @@ export default class TopicList extends Component {<template>{{! template-lint-disable table-groups }}<table- class={{concatClass+ class={{dConcatClass"topic-list"(if this.bulkSelectEnabled "sticky-header bulk-select-enabled")this.additionalClasses@@ -193,7 +193,7 @@ export default class TopicList extends Component {><caption class="sr-only">{{i18n "sr_topic_list_caption"}}</caption><thead- class={{concatClass+ class={{dConcatClass"topic-list-header"(if this.moreTopicsTabs.tabs.length "--has-tabs")}}diff --git a/frontend/discourse/app/components/topic-list/new-list-header-controls.gjs b/frontend/discourse/app/components/topic-list/new-list-header-controls.gjsindex 82412908a25..980f9b7a21e 100644--- a/frontend/discourse/app/components/topic-list/new-list-header-controls.gjs+++ b/frontend/discourse/app/components/topic-list/new-list-header-controls.gjs@@ -1,7 +1,7 @@import Component from "@glimmer/component";import { fn } from "@ember/helper";import { on } from "@ember/modifier";-import concatClass from "discourse/helpers/concat-class";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";export default class NewListHeaderControls extends Component {@@ -40,7 +40,7 @@ export default class NewListHeaderControls extends Component {<template><button{{on "click" (fn @changeNewListSubset null)}}- class={{concatClass+ class={{dConcatClass"topics-replies-toggle --all"(if this.allActive "active")}}@@ -51,7 +51,7 @@ export default class NewListHeaderControls extends Component {<button{{on "click" (fn @changeNewListSubset "topics")}}- class={{concatClass+ class={{dConcatClass"topics-replies-toggle --topics"(if this.topicsActive "active")}}@@ -62,7 +62,7 @@ export default class NewListHeaderControls extends Component {<button{{on "click" (fn @changeNewListSubset "replies")}}- class={{concatClass+ class={{dConcatClass"topics-replies-toggle --replies"(if this.repliesActive "active")}}diff --git a/frontend/discourse/app/components/topic-list/participant-groups.gjs b/frontend/discourse/app/components/topic-list/participant-groups.gjsindex 87f1a9f9776..e22fd1d3014 100644--- a/frontend/discourse/app/components/topic-list/participant-groups.gjs+++ b/frontend/discourse/app/components/topic-list/participant-groups.gjs@@ -1,4 +1,4 @@-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";const ParticipantGroups = <template>@@ -14,7 +14,7 @@ const ParticipantGroups = <template>data-group-card={{group.name}}class="user-group trigger-group-card">- {{icon "users"}}+ {{dIcon "users"}}{{group.name}}</a></div>diff --git a/frontend/discourse/app/components/topic-list/topic-excerpt.gjs b/frontend/discourse/app/components/topic-list/topic-excerpt.gjsindex 2ad29aacd5d..6b8cf9d25fa 100644--- a/frontend/discourse/app/components/topic-list/topic-excerpt.gjs+++ b/frontend/discourse/app/components/topic-list/topic-excerpt.gjs@@ -1,10 +1,10 @@-import dirSpan from "discourse/helpers/dir-span";+import dDirSpan from "discourse/ui-kit/helpers/d-dir-span";import { i18n } from "discourse-i18n";const TopicExcerpt = <template>{{#if @topic.hasExcerpt}}<a href={{@topic.url}} class="topic-excerpt">- {{dirSpan @topic.escapedExcerpt htmlSafe="true"}}+ {{dDirSpan @topic.escapedExcerpt htmlSafe="true"}}{{#if @topic.excerptTruncated}}<span class="topic-excerpt-more">{{i18n "read_more"}}</span>diff --git a/frontend/discourse/app/components/topic-list/unread-indicator.gjs b/frontend/discourse/app/components/topic-list/unread-indicator.gjsindex fe2eec382f9..e5b245e78dd 100644--- a/frontend/discourse/app/components/topic-list/unread-indicator.gjs+++ b/frontend/discourse/app/components/topic-list/unread-indicator.gjs@@ -1,7 +1,7 @@import Component from "@glimmer/component";import { service } from "@ember/service";-import icon from "discourse/helpers/d-icon";import { bind } from "discourse/lib/decorators";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class UnreadIndicator extends Component {@@ -32,7 +32,7 @@ export default class UnreadIndicator extends Component {title={{i18n "topic.unread_indicator"}}class="badge badge-notification unread-indicator">- {{~icon "asterisk"~}}+ {{~dIcon "asterisk"~}}</span>{{~/if~}}</template>diff --git a/frontend/discourse/app/components/topic-localized-content-toggle.gjs b/frontend/discourse/app/components/topic-localized-content-toggle.gjsindex 72625d500c9..d714e1827c6 100644--- a/frontend/discourse/app/components/topic-localized-content-toggle.gjs+++ b/frontend/discourse/app/components/topic-localized-content-toggle.gjs@@ -2,10 +2,10 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import concatClass from "discourse/helpers/concat-class";import { ajax } from "discourse/lib/ajax";import cookie, { removeCookie } from "discourse/lib/cookie";+import DButton from "discourse/ui-kit/d-button";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";const SHOW_ORIGINAL_COOKIE = "content-localization-show-original";@@ -83,7 +83,7 @@ export default class TopicLocalizedContentToggle extends Component {<DButton@icon="language"@title={{this.title}}- class={{concatClass+ class={{dConcatClass"btn btn-default btn-toggle-localized-content no-text"(unless this.showingOriginal "--active")}}diff --git a/frontend/discourse/app/components/topic-map/private-message-map.gjs b/frontend/discourse/app/components/topic-map/private-message-map.gjsindex a68b2381e2c..0f519fd801c 100644--- a/frontend/discourse/app/components/topic-map/private-message-map.gjs+++ b/frontend/discourse/app/components/topic-map/private-message-map.gjs@@ -2,10 +2,10 @@ import Component from "@glimmer/component";import { hash } from "@ember/helper";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import avatar from "discourse/helpers/bound-avatar-template";-import icon from "discourse/helpers/d-icon";import { groupPath } from "discourse/lib/url";+import DButton from "discourse/ui-kit/d-button";+import dBoundAvatarTemplate from "discourse/ui-kit/helpers/d-bound-avatar-template";+import dIcon from "discourse/ui-kit/helpers/d-icon";export default class PrivateMessageMap extends Component {@service site;@@ -73,7 +73,7 @@ class PmMapUserGroup extends Component {<template><div class="user group" data-id={{@model.id}}><a href={{this.groupUrl}} class="group-link">- {{icon "users"}}+ {{dIcon "users"}}<span class="group-name">{{@model.name}}</span></a>{{#if this.canRemoveLink}}@@ -123,7 +123,11 @@ class PmMapUser extends Component {title={{@model.username}}aria-hidden="true">- {{avatar @model.avatar_template "tiny" (hash title=this.avatarTitle)}}+ {{dBoundAvatarTemplate+ @model.avatar_template+ "tiny"+ (hash title=this.avatarTitle)+ }}</a><span class="username">{{@model.username}}</span></a>diff --git a/frontend/discourse/app/components/topic-map/topic-map-link.gjs b/frontend/discourse/app/components/topic-map/topic-map-link.gjsindex b26f25c179f..339def698db 100644--- a/frontend/discourse/app/components/topic-map/topic-map-link.gjs+++ b/frontend/discourse/app/components/topic-map/topic-map-link.gjs@@ -1,6 +1,6 @@import Component from "@glimmer/component";-import replaceEmoji from "discourse/helpers/replace-emoji";import { and } from "discourse/truth-helpers";+import dReplaceEmoji from "discourse/ui-kit/helpers/d-replace-emoji";import { i18n } from "discourse-i18n";const TRUNCATE_LENGTH_LIMIT = 85;@@ -33,7 +33,7 @@ export default class TopicMapLink extends Component {><span class="content">{{#if @title}}- {{replaceEmoji this.truncatedContent}}+ {{dReplaceEmoji this.truncatedContent}}{{else}}{{this.truncatedContent}}{{/if}}diff --git a/frontend/discourse/app/components/topic-map/topic-map-summary.gjs b/frontend/discourse/app/components/topic-map/topic-map-summary.gjsindex 75a07ac11e2..c06413ffb4f 100644--- a/frontend/discourse/app/components/topic-map/topic-map-summary.gjs+++ b/frontend/discourse/app/components/topic-map/topic-map-summary.gjs@@ -5,21 +5,21 @@ import { action } from "@ember/object";import didInsert from "@ember/render-modifiers/modifiers/did-insert";import { service } from "@ember/service";import { trustHTML } from "@ember/template";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DButton from "discourse/components/d-button";import PluginOutlet from "discourse/components/plugin-outlet";import TopicMapLink from "discourse/components/topic-map/topic-map-link";import TopicParticipants from "discourse/components/topic-map/topic-participants";import TopicViews from "discourse/components/topic-map/topic-views";import TopicViewsChart from "discourse/components/topic-map/topic-views-chart";import DMenu from "discourse/float-kit/components/d-menu";-import avatar from "discourse/helpers/bound-avatar-template";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import lazyHash from "discourse/helpers/lazy-hash";-import number from "discourse/helpers/number";import { ajax } from "discourse/lib/ajax";import { emojiUnescape } from "discourse/lib/text";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import dBoundAvatarTemplate from "discourse/ui-kit/helpers/d-bound-avatar-template";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";+import dNumber from "discourse/ui-kit/helpers/d-number";import { i18n } from "discourse-i18n";const TRUNCATED_LINKS_LIMIT = 5;@@ -237,7 +237,7 @@ export default class TopicMapSummary extends Component {<template><div- class={{concatClass+ class={{dConcatClass"topic-map__stats"(if this.loneStat "--single-stat")(if this.manyStats "--many-stats")@@ -254,14 +254,14 @@ export default class TopicMapSummary extends Component {@onShow={{this.fetchViews}}><:trigger>- {{number this.minViewsCount noTitle="true"}}+ {{dNumber this.minViewsCount noTitle="true"}}<span class="topic-map__stat-label">{{i18n "views_lowercase" count=this.minViewsCount}}</span></:trigger><:content><h3>{{i18n "topic_map.menu_titles.views"}}</h3>- <ConditionalLoadingSpinner @condition={{this.loading}}>+ <DConditionalLoadingSpinner @condition={{this.loading}}>{{#if this.shouldShowViewsChart}}<TopicViewsChart@views={{this.views}}@@ -270,7 +270,7 @@ export default class TopicMapSummary extends Component {{{else}}<TopicViews @views={{this.views}} />{{/if}}- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner></:content></DMenu>@@ -286,7 +286,7 @@ export default class TopicMapSummary extends Component {@autofocus={{true}}><:trigger>- {{number @topic.like_count noTitle="true"}}+ {{dNumber @topic.like_count noTitle="true"}}<span class="topic-map__stat-label">{{i18n "likes_lowercase" [email protected]_count}}</span>@@ -295,7 +295,7 @@ export default class TopicMapSummary extends Component {<h3 {{didInsert this.fetchMostLiked}}>{{i18n"topic_map.menu_titles.replies"}}</h3>- <ConditionalLoadingSpinner @condition={{this.loading}}>+ <DConditionalLoadingSpinner @condition={{this.loading}}><PluginOutlet@name="most-liked-replies"@outletArgs={{lazyHash@@ -308,7 +308,7 @@ export default class TopicMapSummary extends Component {<li><a href={{this.postUrl post}}><span class="like-section__user">- {{avatar+ {{dBoundAvatarTemplatepost.avatar_template"tiny"(hash title=post.username)@@ -317,7 +317,7 @@ export default class TopicMapSummary extends Component {</span><span class="like-section__likes">{{post.like_count}}- {{icon "heart"}}</span>+ {{dIcon "heart"}}</span><p>{{trustHTML (emojiUnescape post.blurb)}}</p>@@ -326,7 +326,7 @@ export default class TopicMapSummary extends Component {{{/each}}</ul></PluginOutlet>- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner></:content></DMenu>{{/if}}@@ -343,7 +343,11 @@ export default class TopicMapSummary extends Component {@autofocus={{true}}><:trigger>- {{number this.linksCount maxDisplay=LINKS_THRESHOLD noTitle="true"}}+ {{dNumber+ this.linksCount+ maxDisplay=LINKS_THRESHOLD+ noTitle="true"+ }}<span class="topic-map__stat-label">{{i18n "links_lowercase" count=this.linksCount}}</span>@@ -390,7 +394,7 @@ export default class TopicMapSummary extends Component {@autofocus={{true}}><:trigger>- {{number @topic.participant_count noTitle="true"}}+ {{dNumber @topic.participant_count noTitle="true"}}<span class="topic-map__stat-label">{{i18n "users_lowercase" [email protected]_count}}</span>diff --git a/frontend/discourse/app/components/topic-map/topic-participant.gjs b/frontend/discourse/app/components/topic-map/topic-participant.gjsindex 403bd28fc82..af98f254232 100644--- a/frontend/discourse/app/components/topic-map/topic-participant.gjs+++ b/frontend/discourse/app/components/topic-map/topic-participant.gjs@@ -1,12 +1,12 @@import Component from "@glimmer/component";import { trustHTML } from "@ember/template";import PluginOutlet from "discourse/components/plugin-outlet";-import UserAvatarFlair from "discourse/components/user-avatar-flair";-import UserLink from "discourse/components/user-link";import lazyHash from "discourse/helpers/lazy-hash";import { avatarImg } from "discourse/lib/avatar-utils";import { userPath } from "discourse/lib/url";import { gt } from "discourse/truth-helpers";+import DUserAvatarFlair from "discourse/ui-kit/d-user-avatar-flair";+import DUserLink from "discourse/ui-kit/d-user-link";const addTopicParticipantClassesCallbacks = [];@@ -60,7 +60,7 @@ export default class TopicParticipant extends Component {@outletArgs={{lazyHash participant=@participant}}><div class={{this.participantClasses}}>- <UserLink+ <DUserLink@username={{@participant.username}}@href={{this.userUrl}}class={{this.linkClasses}}@@ -71,8 +71,8 @@ export default class TopicParticipant extends Component {{{#if (gt @participant.post_count 1)}}<span class="post-count">{{@participant.post_count}}</span>{{/if}}- <UserAvatarFlair @user={{@participant}} />- </UserLink>+ <DUserAvatarFlair @user={{@participant}} />+ </DUserLink></div></PluginOutlet></template>diff --git a/frontend/discourse/app/components/topic-metadata.gjs b/frontend/discourse/app/components/topic-metadata.gjsindex d878e3df372..8ec755c14a5 100644--- a/frontend/discourse/app/components/topic-metadata.gjs+++ b/frontend/discourse/app/components/topic-metadata.gjs@@ -1,9 +1,9 @@import { hash } from "@ember/helper";-import DButton from "discourse/components/d-button";import PluginOutlet from "discourse/components/plugin-outlet";import lazyHash from "discourse/helpers/lazy-hash";import CategoryChooser from "discourse/select-kit/components/category-chooser";import MiniTagChooser from "discourse/select-kit/components/mini-tag-chooser";+import DButton from "discourse/ui-kit/d-button";<template>{{#if @showCategoryChooser}}diff --git a/frontend/discourse/app/components/topic-navigation-popup.gjs b/frontend/discourse/app/components/topic-navigation-popup.gjsindex f236b5ca4d3..02d5f46a46e 100644--- a/frontend/discourse/app/components/topic-navigation-popup.gjs+++ b/frontend/discourse/app/components/topic-navigation-popup.gjs@@ -2,7 +2,7 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";// For use in pluginsexport default class TopicNavigationPopup extends Component {diff --git a/frontend/discourse/app/components/topic-progress.gjs b/frontend/discourse/app/components/topic-progress.gjsindex d521e91f8c4..29432ec3ec4 100644--- a/frontend/discourse/app/components/topic-progress.gjs+++ b/frontend/discourse/app/components/topic-progress.gjs@@ -4,8 +4,8 @@ import { action, computed, set } from "@ember/object";import { scheduleOnce } from "@ember/runloop";import { trustHTML } from "@ember/template";import { classNameBindings } from "@ember-decorators/component";-import DButton from "discourse/components/d-button";import PluginOutlet from "discourse/components/plugin-outlet";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";@classNameBindings("docked")diff --git a/frontend/discourse/app/components/topic-reply-choice-dialog.gjs b/frontend/discourse/app/components/topic-reply-choice-dialog.gjsindex 9d6428dc3a1..2f6f6cf6c0b 100644--- a/frontend/discourse/app/components/topic-reply-choice-dialog.gjs+++ b/frontend/discourse/app/components/topic-reply-choice-dialog.gjs@@ -1,11 +1,11 @@import Component from "@glimmer/component";import { hash } from "@ember/helper";import { action } from "@ember/object";-import DButton from "discourse/components/d-button";-import { categoryLinkHTML } from "discourse/helpers/category-link";-import icon from "discourse/helpers/d-icon";-import discourseTags from "discourse/helpers/discourse-tags";import { eq } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import { categoryLinkHTML } from "discourse/ui-kit/helpers/d-category-link";+import dDiscourseTags from "discourse/ui-kit/helpers/d-discourse-tags";+import dIcon from "discourse/ui-kit/helpers/d-icon";const TopicLabelButton = <template><DButton @action={{@action}} ...attributes>@@ -14,25 +14,25 @@ const TopicLabelButton = <template><span class="topic-statuses">{{#if (eq @topic.archetype "private_message")}}<span class="topic-status --private-message">- {{icon "envelope"}}+ {{dIcon "envelope"}}</span>{{/if}}{{#if @topic.bookmarked}}<span class="topic-status --bookmarked">- {{icon "bookmark"}}+ {{dIcon "bookmark"}}</span>{{/if}}{{#if @topic.closed}}<span class="topic-status --closed">- {{icon "topic.closed"}}+ {{dIcon "topic.closed"}}</span>{{/if}}{{#if @topic.pinned}}<span class="topic-status --pinned">- {{icon "thumbtack"}}+ {{dIcon "thumbtack"}}</span>{{/if}}@@ -43,7 +43,7 @@ const TopicLabelButton = <template></div><div class="topic-title__bottom-line">{{categoryLinkHTML @topic.category (hash link=false)}}- {{discourseTags @topic}}+ {{dDiscourseTags @topic}}</div></div></DButton>diff --git a/frontend/discourse/app/components/topic-status.gjs b/frontend/discourse/app/components/topic-status.gjsindex 36810fa190d..47a95831644 100644--- a/frontend/discourse/app/components/topic-status.gjs+++ b/frontend/discourse/app/components/topic-status.gjs@@ -3,17 +3,17 @@ import { on } from "@ember/modifier";import { action } from "@ember/object";import { service } from "@ember/service";import PluginOutlet from "discourse/components/plugin-outlet";-import icon from "discourse/helpers/d-icon";-import element from "discourse/helpers/element";import lazyHash from "discourse/helpers/lazy-hash";import { and } from "discourse/truth-helpers";+import dElement from "discourse/ui-kit/helpers/d-element";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class TopicStatus extends Component {@service currentUser;get wrapperElement() {- return element(this.args.tagName ?? "span");+ return dElement(this.args.tagName ?? "span");}get canAct() {@@ -35,36 +35,36 @@ export default class TopicStatus extends Component {href={{@topic.url}}title={{i18n "topic_statuses.bookmarked.help"}}class="topic-status --bookmarked"- >{{icon "bookmark"}}</a>+ >{{dIcon "bookmark"}}</a>{{~/if~}}{{~#if (and @topic.closed @topic.archived)~}}<spantitle={{i18n "topic_statuses.locked_and_archived.help"}}class="topic-status --closed --archived"- >{{icon "topic.closed"}}</span>+ >{{dIcon "topic.closed"}}</span>{{~else if @topic.closed~}}<spantitle={{i18n "topic_statuses.locked.help"}}class="topic-status --closed"- >{{icon "topic.closed"}}</span>+ >{{dIcon "topic.closed"}}</span>{{~else if @topic.archived~}}<spantitle={{i18n "topic_statuses.archived.help"}}class="topic-status --archived"- >{{icon "topic.closed"}}</span>+ >{{dIcon "topic.closed"}}</span>{{~/if~}}{{~#if @topic.is_warning~}}<spantitle={{i18n "topic_statuses.warning.help"}}class="topic-status --warning topic-status-warning"- >{{icon "envelope"}}</span>+ >{{dIcon "envelope"}}</span>{{~else if (and @showPrivateMessageIcon @topic.isPrivateMessage)~}}<spantitle={{i18n "topic_statuses.personal_message.help"}}class="topic-status --personal-message"- >{{icon "envelope"}}</span>+ >{{dIcon "envelope"}}</span>{{~/if~}}{{~#if @topic.pinned~}}@@ -74,12 +74,12 @@ export default class TopicStatus extends Component {hreftitle={{i18n "topic_statuses.pinned.help"}}class="topic-status --pinned pin-toggle-button"- >{{icon "thumbtack"}}</a>+ >{{dIcon "thumbtack"}}</a>{{~else~}}<spantitle={{i18n "topic_statuses.pinned.help"}}class="topic-status --pinned"- >{{icon "thumbtack"}}</span>+ >{{dIcon "thumbtack"}}</span>{{~/if~}}{{~else if @topic.unpinned~}}{{~#if this.canAct~}}@@ -88,12 +88,12 @@ export default class TopicStatus extends Component {hreftitle={{i18n "topic_statuses.unpinned.help"}}class="topic-status --unpinned pin-toggle-button"- >{{icon "thumbtack" class="unpinned"}}</a>+ >{{dIcon "thumbtack" class="unpinned"}}</a>{{~else~}}<spantitle={{i18n "topic_statuses.unpinned.help"}}class="topic-status --unpinned"- >{{icon "thumbtack" class="unpinned"}}</span>+ >{{dIcon "thumbtack" class="unpinned"}}</span>{{~/if~}}{{~/if~}}@@ -104,7 +104,7 @@ export default class TopicStatus extends Component {}}class="topic-status --invisible"- >{{icon "far-eye-slash"}}</span>+ >{{dIcon "far-eye-slash"}}</span>{{~/if~}}<PluginOutlet@name="after-topic-status"diff --git a/frontend/discourse/app/components/topic-timeline.gjs b/frontend/discourse/app/components/topic-timeline.gjsindex a01572d65cd..1a2d778c98d 100644--- a/frontend/discourse/app/components/topic-timeline.gjs+++ b/frontend/discourse/app/components/topic-timeline.gjs@@ -3,7 +3,7 @@ import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";import { modifier } from "ember-modifier";import Container from "discourse/components/topic-timeline/container";-import concatClass from "discourse/helpers/concat-class";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";export default class TopicTimeline extends Component {@tracked docked = false;@@ -35,7 +35,7 @@ export default class TopicTimeline extends Component {<template><div{{this.addShowClass}}- class={{concatClass+ class={{dConcatClass"timeline-container"(if @fullscreen "timeline-fullscreen")(if this.docked "timeline-docked")diff --git a/frontend/discourse/app/components/topic-timeline/back-button.gjs b/frontend/discourse/app/components/topic-timeline/back-button.gjsindex 411844cbf23..277b03662d8 100644--- a/frontend/discourse/app/components/topic-timeline/back-button.gjs+++ b/frontend/discourse/app/components/topic-timeline/back-button.gjs@@ -1,4 +1,4 @@-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";const BackButton = <template><DButtondiff --git a/frontend/discourse/app/components/topic-timeline/container.gjs b/frontend/discourse/app/components/topic-timeline/container.gjsindex 230e4392c78..e7872b02fe4 100644--- a/frontend/discourse/app/components/topic-timeline/container.gjs+++ b/frontend/discourse/app/components/topic-timeline/container.gjs@@ -6,16 +6,11 @@ import { action } from "@ember/object";import didInsert from "@ember/render-modifiers/modifiers/did-insert";import { service } from "@ember/service";import { trustHTML } from "@ember/template";-import DButton from "discourse/components/d-button";import PluginOutlet from "discourse/components/plugin-outlet";import { actionDescriptionHtml } from "discourse/components/post-action-description";import TopicAdminMenu from "discourse/components/topic-admin-menu";import TopicLocalizedContentToggle from "discourse/components/topic-localized-content-toggle";import UserTip from "discourse/components/user-tip";-import ageWithTooltip from "discourse/helpers/age-with-tooltip";-import categoryLink from "discourse/helpers/category-link";-import icon from "discourse/helpers/d-icon";-import discourseTags from "discourse/helpers/discourse-tags";import lazyHash from "discourse/helpers/lazy-hash";import topicFeaturedLink from "discourse/helpers/topic-featured-link";import { bind, debounce } from "discourse/lib/decorators";@@ -23,6 +18,11 @@ import domUtils from "discourse/lib/dom-utils";import { headerOffset } from "discourse/lib/offset-calculator";import TopicNotificationsButton from "discourse/select-kit/components/topic-notifications-button";import { and, not, or } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import dAgeWithTooltip from "discourse/ui-kit/helpers/d-age-with-tooltip";+import dCategoryLink from "discourse/ui-kit/helpers/d-category-link";+import dDiscourseTags from "discourse/ui-kit/helpers/d-discourse-tags";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";import BackButton from "./back-button";import Scroller from "./scroller";@@ -523,7 +523,7 @@ export default class TopicTimelineScrollArea extends Component {<div class="topic-header-extra">{{#if this.showTags}}<div class="list-tags">- {{discourseTags @model mode="list" [email protected]}}+ {{dDiscourseTags @model mode="list" [email protected]}}</div>{{/if}}{{#if this.siteSettings.topic_featured_link_enabled}}@@ -535,9 +535,9 @@ export default class TopicTimelineScrollArea extends Component {{{#if (and (not @model.isPrivateMessage) @model.category)}}<div class="topic-category">{{#if @model.category.parentCategory}}- {{categoryLink @model.category.parentCategory}}+ {{dCategoryLink @model.category.parentCategory}}{{/if}}- {{categoryLink @model.category}}+ {{dCategoryLink @model.category}}</div>{{/if}}@@ -636,7 +636,7 @@ export default class TopicTimelineScrollArea extends Component {{{#if (and this.hasBackPosition this.showButton)}}<div class="timeline-last-read" style={{this.lastReadStyle}}>- {{icon "minus" class="progress"}}+ {{dIcon "minus" class="progress"}}<BackButton @onGoBack={{this.goBack}} /></div>{{/if}}@@ -649,7 +649,7 @@ export default class TopicTimelineScrollArea extends Component {class="now-date"><span>- {{ageWithTooltip this.nowDate this.nowDateOptions}}+ {{dAgeWithTooltip this.nowDate this.nowDateOptions}}</span></a></div>diff --git a/frontend/discourse/app/components/topic-timeline/scroller.gjs b/frontend/discourse/app/components/topic-timeline/scroller.gjsindex 44a3ed106e3..509c454c6df 100644--- a/frontend/discourse/app/components/topic-timeline/scroller.gjs+++ b/frontend/discourse/app/components/topic-timeline/scroller.gjs@@ -4,8 +4,8 @@ import {SCROLLER_HEIGHT,timelineDate,} from "discourse/components/topic-timeline/container";-import draggable from "discourse/modifiers/draggable";import { and, not } from "discourse/truth-helpers";+import dDraggable from "discourse/ui-kit/modifiers/d-draggable";import { i18n } from "discourse-i18n";import BackButton from "./back-button";@@ -25,7 +25,7 @@ export default class TopicTimelineScroller extends Component {<template><div- {{draggable+ {{dDraggabledidStartDrag=@didStartDragdidEndDrag=@didEndDragdragMove=@dragMovediff --git a/frontend/discourse/app/components/topic-timer-info.gjs b/frontend/discourse/app/components/topic-timer-info.gjsindex 7ca93984742..ba1d13a8439 100644--- a/frontend/discourse/app/components/topic-timer-info.gjs+++ b/frontend/discourse/app/components/topic-timer-info.gjs@@ -5,12 +5,12 @@ import { cancel, next } from "@ember/runloop";import { trustHTML } from "@ember/template";import { tagName } from "@ember-decorators/component";import { on } from "@ember-decorators/object";-import DButton from "discourse/components/d-button";import { DELETE_REPLIES_TYPE } from "discourse/components/modal/edit-topic-timer";import { isTesting } from "discourse/lib/environment";import { iconHTML } from "discourse/lib/icon-library";import discourseLater from "discourse/lib/later";import Category from "discourse/models/category";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";@tagName("")diff --git a/frontend/discourse/app/components/topic-title-editor.gjs b/frontend/discourse/app/components/topic-title-editor.gjsindex 1353f4ada2a..f234658b00f 100644--- a/frontend/discourse/app/components/topic-title-editor.gjs+++ b/frontend/discourse/app/components/topic-title-editor.gjs@@ -1,9 +1,9 @@import Component from "@glimmer/component";import { service } from "@ember/service";-import TextField from "discourse/components/text-field";-import icon from "discourse/helpers/d-icon";import lazyHash from "discourse/helpers/lazy-hash";-import autoFocus from "discourse/modifiers/auto-focus";+import DTextField from "discourse/ui-kit/d-text-field";+import dIcon from "discourse/ui-kit/helpers/d-icon";+import dAutoFocus from "discourse/ui-kit/modifiers/d-auto-focus";import { i18n } from "discourse-i18n";import PluginOutlet from "./plugin-outlet";@@ -19,7 +19,7 @@ export default class TopicTitleEditor extends Component {<div class="edit-title__wrapper">{{#if @isEditingLocalization}}<span class="editing-localization-indicator">- {{icon "language"}}+ {{dIcon "language"}}{{i18n"topic.localizations.editing_translation"language=this.translationLocaleName@@ -31,20 +31,20 @@ export default class TopicTitleEditor extends Component {@outletArgs={{lazyHash model=@model buffered=@buffered}}>{{#if @isEditingLocalization}}- <TextField+ <DTextField@id="edit-title"@value={{@translationTitle}}@maxlength={{this.siteSettings.max_topic_title_length}}@autofocus={{true}}- {{autoFocus}}+ {{dAutoFocus}}/>{{else}}- <TextField+ <DTextField@id="edit-title"@value={{@bufferedTitle}}@maxlength={{this.siteSettings.max_topic_title_length}}@autofocus={{true}}- {{autoFocus}}+ {{dAutoFocus}}/>{{/if}}</PluginOutlet>diff --git a/frontend/discourse/app/components/topic-title.gjs b/frontend/discourse/app/components/topic-title.gjsindex 753515b9622..b22969c214c 100644--- a/frontend/discourse/app/components/topic-title.gjs+++ b/frontend/discourse/app/components/topic-title.gjs@@ -5,7 +5,7 @@ import willDestroy from "@ember/render-modifiers/modifiers/will-destroy";import { service } from "@ember/service";import PluginOutlet from "discourse/components/plugin-outlet";import lazyHash from "discourse/helpers/lazy-hash";-import observeIntersection from "discourse/modifiers/observe-intersection";+import dObserveIntersection from "discourse/ui-kit/modifiers/d-observe-intersection";export default class TopicTitle extends Component {@service header;@@ -45,7 +45,7 @@ export default class TopicTitle extends Component {{{! template-lint-disable no-invalid-interactive }}<div{{on "keydown" this.keyDown}}- {{observeIntersection this.handleIntersectionChange}}+ {{dObserveIntersection this.handleIntersectionChange}}{{willDestroy this.handleTitleDestroy}}id="topic-title"class="container"diff --git a/frontend/discourse/app/components/uppy-image-uploader.gjs b/frontend/discourse/app/components/uppy-image-uploader.gjsindex 279d7d8090b..66c85502139 100644--- a/frontend/discourse/app/components/uppy-image-uploader.gjs+++ b/frontend/discourse/app/components/uppy-image-uploader.gjs@@ -8,14 +8,14 @@ import { service } from "@ember/service";import { trustHTML } from "@ember/template";import { isEmpty } from "@ember/utils";import { modifier } from "ember-modifier";-import DButton from "discourse/components/d-button";-import PickFilesButton from "discourse/components/pick-files-button";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import { getURLWithCDN } from "discourse/lib/get-url";import lightbox from "discourse/lib/lightbox";import { authorizesOneOrMoreExtensions, isVideo } from "discourse/lib/uploads";import UppyUpload from "discourse/lib/uppy/uppy-upload";+import DButton from "discourse/ui-kit/d-button";+import DPickFilesButton from "discourse/ui-kit/d-pick-files-button";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";// Args: id, type, imageUrl, placeholderUrl, additionalParams, onUploadDone, onUploadDeleted, disabled, allowVideo, previewSize@@ -170,7 +170,7 @@ export default class UppyImageUploader extends Component {...attributes><div- class={{concatClass+ class={{dConcatClass"file-uploader__preview input-xxlarge"this.previewSizeClass}}@@ -237,8 +237,8 @@ export default class UppyImageUploader extends Component {tabindex="0"{{on "keydown" this.handleKeyboardActivation}}>- {{icon "upload"}}- <PickFilesButton+ {{dIcon "upload"}}+ <DPickFilesButton@registerFileInput={{this.uppyUpload.setup}}@fileInputDisabled={{this.disabled}}@acceptedFormatsOverride={{this.acceptedFormats}}@@ -278,8 +278,8 @@ export default class UppyImageUploader extends Component {tabindex="0"{{on "keydown" this.handleKeyboardActivation}}>- {{icon "upload"}}- <PickFilesButton+ {{dIcon "upload"}}+ <DPickFilesButton@registerFileInput={{this.uppyUpload.setup}}@fileInputDisabled={{this.disabled}}@acceptedFormatsOverride={{this.acceptedFormats}}diff --git a/frontend/discourse/app/components/user-autocomplete-results.gjs b/frontend/discourse/app/components/user-autocomplete-results.gjsindex c428d777945..364fe4d7590 100644--- a/frontend/discourse/app/components/user-autocomplete-results.gjs+++ b/frontend/discourse/app/components/user-autocomplete-results.gjs@@ -7,10 +7,10 @@ import { on } from "@ember/modifier";import { action } from "@ember/object";import didInsert from "@ember/render-modifiers/modifiers/did-insert";import didUpdate from "@ember/render-modifiers/modifiers/did-update";-import avatar from "discourse/helpers/avatar";-import icon from "discourse/helpers/d-icon";import { formatUsername } from "discourse/lib/utilities";-import scrollIntoView from "discourse/modifiers/scroll-into-view";+import dAvatar from "discourse/ui-kit/helpers/d-avatar";+import dIcon from "discourse/ui-kit/helpers/d-icon";+import dScrollIntoView from "discourse/ui-kit/modifiers/d-scroll-into-view";/*** @typedef {import("discourse/lib/types/d-autocomplete").UserEmailGroupResult} UserEmailGroupResult@@ -113,7 +113,7 @@ export default class UserAutocompleteResults extends Component {{{#each @results as |result index|}}<lidata-index={{result.index}}- {{scrollIntoView (this.shouldScroll index)}}+ {{dScrollIntoView (this.shouldScroll index)}}><ahref@@ -122,7 +122,7 @@ export default class UserAutocompleteResults extends Component {{{on "click" (fn this.handleResultClick result index)}}>{{#if result.isUser}}- {{avatar result imageSize="tiny"}}+ {{dAvatar result imageSize="tiny"}}<span class="text-content"><span class="username">{{formatUsernameresult.username@@ -135,12 +135,12 @@ export default class UserAutocompleteResults extends Component {<span class="user-status"></span>{{/if}}{{else if result.isEmail}}- {{icon "envelope"}}+ {{dIcon "envelope"}}<span class="text-content username">{{formatUsernameresult.username}}</span>{{else if result.isGroup}}- {{icon "users"}}+ {{dIcon "users"}}<span class="text-content"><span class="username">{{result.name}}</span><span class="name">{{result.full_name}}</span>diff --git a/frontend/discourse/app/components/user-badge.gjs b/frontend/discourse/app/components/user-badge.gjsindex 0c2f3b0056d..f05f3188f20 100644--- a/frontend/discourse/app/components/user-badge.gjs+++ b/frontend/discourse/app/components/user-badge.gjs@@ -1,5 +1,5 @@import Component from "@glimmer/component";-import BadgeButton from "discourse/components/badge-button";+import DBadgeButton from "discourse/ui-kit/d-badge-button";export default class UserBadge extends Component {get showGrantCount() {@@ -15,11 +15,11 @@ export default class UserBadge extends Component {<template><a class="user-card-badge-link" href={{this.badgeUrl}}>- <BadgeButton @badge={{@badge}} @showName={{@showName}}>+ <DBadgeButton @badge={{@badge}} @showName={{@showName}}>{{#if this.showGrantCount}}<span class="count"> (×{{@count}})</span>{{/if}}- </BadgeButton>+ </DBadgeButton></a></template>}diff --git a/frontend/discourse/app/components/user-card-contents.gjs b/frontend/discourse/app/components/user-card-contents.gjsindex faf93678484..4cdf5bfb58d 100644--- a/frontend/discourse/app/components/user-card-contents.gjs+++ b/frontend/discourse/app/components/user-card-contents.gjs@@ -13,18 +13,10 @@ import {} from "@ember-decorators/component";import { observes, on as onEvent } from "@ember-decorators/object";import CardContentsBase from "discourse/components/card-contents-base";-import DButton from "discourse/components/d-button";-import HtmlWithLinks from "discourse/components/html-with-links";import PluginOutlet from "discourse/components/plugin-outlet";-import UserAvatarFlair from "discourse/components/user-avatar-flair";import UserBadge from "discourse/components/user-badge";-import boundAvatar from "discourse/helpers/bound-avatar";-import icon from "discourse/helpers/d-icon";-import formatDate from "discourse/helpers/format-date";-import formatDuration from "discourse/helpers/format-duration";import formatUsername from "discourse/helpers/format-username";import lazyHash from "discourse/helpers/lazy-hash";-import replaceEmoji from "discourse/helpers/replace-emoji";import userStatus from "discourse/helpers/user-status";import CanCheckEmailsHelper from "discourse/lib/can-check-emails-helper";import { durationTiny } from "discourse/lib/formatter";@@ -34,6 +26,14 @@ import { prioritizeNameInUx } from "discourse/lib/settings";import { emojiUnescape } from "discourse/lib/text";import { escapeExpression } from "discourse/lib/utilities";import User from "discourse/models/user";+import DButton from "discourse/ui-kit/d-button";+import DHtmlWithLinks from "discourse/ui-kit/d-html-with-links";+import DUserAvatarFlair from "discourse/ui-kit/d-user-avatar-flair";+import dBoundAvatar from "discourse/ui-kit/helpers/d-bound-avatar";+import dFormatDate from "discourse/ui-kit/helpers/d-format-date";+import dFormatDuration from "discourse/ui-kit/helpers/d-format-duration";+import dIcon from "discourse/ui-kit/helpers/d-icon";+import dReplaceEmoji from "discourse/ui-kit/helpers/d-replace-emoji";import { i18n } from "discourse-i18n";@classNames("user-card")@@ -457,7 +457,7 @@ export default class UserCardContents extends CardContentsBase {><div class="user-card-avatar" aria-hidden="true">{{#if this.contentHidden}}- <span class="card-huge-avatar">{{boundAvatar+ <span class="card-huge-avatar">{{dBoundAvatarthis.user"huge"}}</span>@@ -467,18 +467,18 @@ export default class UserCardContents extends CardContentsBase {class="card-huge-avatar"tabindex="-1">- {{boundAvatar this.user "huge"}}+ {{dBoundAvatar this.user "huge"}}{{#if this.isOwnCard}}<span class="own-avatar-pencil"><span class="own-avatar-pencil--icon">- {{icon "pencil"}}+ {{dIcon "pencil"}}</span></span>{{/if}}</a>{{/if}}- <UserAvatarFlair @user={{this.user}} />+ <DUserAvatarFlair @user={{this.user}} /><div><PluginOutlet@@ -557,7 +557,7 @@ export default class UserCardContents extends CardContentsBase {<span class="user-status__description">{{this.user.status.description}}</span>- {{formatDate this.user.status.ends_at format="tiny"}}+ {{dFormatDate this.user.status.ends_at format="tiny"}}</div>{{/if}}<div>@@ -650,7 +650,7 @@ export default class UserCardContents extends CardContentsBase {{{#if this.user.suspend_reason}}<div class="suspended"><div class="suspension-date">- {{icon "ban"}}+ {{dIcon "ban"}}{{#if this.user.suspendedForever}}{{i18n "user.suspended_permanently"}}{{else}}@@ -673,7 +673,7 @@ export default class UserCardContents extends CardContentsBase {{{#if this.user.silence_reason}}<div class="silenced"><div class="silence-date">- {{icon "microphone-slash"}}+ {{dIcon "microphone-slash"}}{{#if this.user.silencedForever}}{{i18n "user.silenced_permanently"}}{{else}}@@ -695,9 +695,9 @@ export default class UserCardContents extends CardContentsBase {{{/if}}{{#unless this.isRestricted}}<div class="bio">- <HtmlWithLinks>+ <DHtmlWithLinks>{{trustHTML this.user.bio_excerpt}}- </HtmlWithLinks>+ </DHtmlWithLinks></div>{{/unless}}</div>@@ -713,7 +713,7 @@ export default class UserCardContents extends CardContentsBase {this.user.featured_topic.slugthis.user.featured_topic.id}}- >{{replaceEmoji+ >{{dReplaceEmoji(trustHTML this.user.featured_topic.fancy_title)}}</LinkTo></div>@@ -725,7 +725,7 @@ export default class UserCardContents extends CardContentsBase {<div class="location-and-website">{{#if this.user.website_name}}<span class="website-name">- {{icon "globe"}}+ {{dIcon "globe"}}{{#if this.linkWebsite}}{{! template-lint-disable link-rel-noopener }}<a@@ -746,13 +746,13 @@ export default class UserCardContents extends CardContentsBase {{{/if}}{{#if this.user.location}}<span class="location">- {{icon "location-dot"}}+ {{dIcon "location-dot"}}<span>{{this.user.location}}</span></span>{{/if}}{{#if this.showUserLocalTime}}<span class="local-time" title={{i18n "local_time"}}>- {{icon "far-clock"}}+ {{dIcon "far-clock"}}<span>{{this.formattedUserLocalTime}}</span></span>{{/if}}@@ -773,21 +773,21 @@ export default class UserCardContents extends CardContentsBase {{{#if this.user.last_posted_at}}<div class="metadata__last-posted"><span class="desc">{{i18n "last_post"}}</span>- {{formatDate+ {{dFormatDatethis.user.last_posted_atleaveAgo="true"}}</div>{{/if}}<div class="metadata__user-created"><span class="desc">{{i18n "joined"}}</span>- {{formatDate this.user.created_at leaveAgo="true"}}</div>+ {{dFormatDate this.user.created_at leaveAgo="true"}}</div>{{#if this.user.time_read}}<divclass="metadata__time-read"title={{this.timeReadTooltip}}><span class="desc">{{i18n "time_read"}}</span>- {{formatDuration this.user.time_read}}+ {{dFormatDuration this.user.time_read}}{{#if this.showRecentTimeRead}}<span>({{i18n@@ -800,7 +800,7 @@ export default class UserCardContents extends CardContentsBase {{{/if}}{{#if this.showCheckEmail}}<div class="metadata__email">- {{icon "envelope" title="user.email.title"}}+ {{dIcon "envelope" title="user.email.title"}}{{#if this.user.email}}{{this.user.email}}{{else}}diff --git a/frontend/discourse/app/components/user-fields/confirm.gjs b/frontend/discourse/app/components/user-fields/confirm.gjsindex 7808a50e28c..a6bfb42da5c 100644--- a/frontend/discourse/app/components/user-fields/confirm.gjs+++ b/frontend/discourse/app/components/user-fields/confirm.gjs@@ -1,7 +1,7 @@import { Input } from "@ember/component";import { concat } from "@ember/helper";import { trustHTML } from "@ember/template";-import InputTip from "discourse/components/input-tip";+import DInputTip from "discourse/ui-kit/d-input-tip";import { i18n } from "discourse-i18n";import UserFieldBase from "./base";@@ -34,7 +34,7 @@ export default class UserFieldConfirm extends UserFieldBase {>*</span>{{/if}}{{/unless}}</span></label>- <InputTip+ <DInputTip@validation={{@validation}}class={{unless @validation.reason "hidden"}}/>diff --git a/frontend/discourse/app/components/user-fields/date.gjs b/frontend/discourse/app/components/user-fields/date.gjsindex 1fe4485f40e..e7e1f0259f3 100644--- a/frontend/discourse/app/components/user-fields/date.gjs+++ b/frontend/discourse/app/components/user-fields/date.gjs@@ -1,7 +1,7 @@import { Input } from "@ember/component";import { concat } from "@ember/helper";import { trustHTML } from "@ember/template";-import InputTip from "discourse/components/input-tip";+import DInputTip from "discourse/ui-kit/d-input-tip";import { i18n } from "discourse-i18n";import UserFieldBase from "./base";@@ -22,7 +22,7 @@ export default class UserFieldDate extends UserFieldBase {{{i18n "user_fields.optional"}}{{/unless~}}</label>{{#if this.validation.failed}}- <InputTip @validation={{this.validation}} />+ <DInputTip @validation={{this.validation}} />{{else}}<div class="instructions">{{trustHTML this.field.description}}</div>{{/if}}diff --git a/frontend/discourse/app/components/user-fields/dropdown.gjs b/frontend/discourse/app/components/user-fields/dropdown.gjsindex 3b5c2f8296d..3b9c11bc33c 100644--- a/frontend/discourse/app/components/user-fields/dropdown.gjs+++ b/frontend/discourse/app/components/user-fields/dropdown.gjs@@ -1,7 +1,7 @@import { concat, fn, hash } from "@ember/helper";import { trustHTML } from "@ember/template";-import InputTip from "discourse/components/input-tip";import ComboBox from "discourse/select-kit/components/combo-box";+import DInputTip from "discourse/ui-kit/d-input-tip";import { i18n } from "discourse-i18n";import UserFieldBase from "./base";@@ -27,7 +27,7 @@ export default class UserFieldDropdown extends UserFieldBase {@options={{hash none=this.noneLabel}}/>{{#if this.validation.failed}}- <InputTip @validation={{this.validation}} />+ <DInputTip @validation={{this.validation}} />{{else}}<div class="instructions">{{trustHTML this.field.description}}</div>{{/if}}diff --git a/frontend/discourse/app/components/user-fields/multiselect.gjs b/frontend/discourse/app/components/user-fields/multiselect.gjsindex 5f3ac9a5327..d4f65d3f70a 100644--- a/frontend/discourse/app/components/user-fields/multiselect.gjs+++ b/frontend/discourse/app/components/user-fields/multiselect.gjs@@ -1,7 +1,7 @@import { concat, fn, hash } from "@ember/helper";import { trustHTML } from "@ember/template";-import InputTip from "discourse/components/input-tip";import MultiSelect from "discourse/select-kit/components/multi-select";+import DInputTip from "discourse/ui-kit/d-input-tip";import { i18n } from "discourse-i18n";import UserFieldBase from "./base";@@ -27,7 +27,7 @@ export default class UserFieldMultiselect extends UserFieldBase {@options={{hash none=this.noneLabel}}/>{{#if this.validation.failed}}- <InputTip @validation={{this.validation}} />+ <DInputTip @validation={{this.validation}} />{{else}}<div class="instructions">{{trustHTML this.field.description}}</div>{{/if}}diff --git a/frontend/discourse/app/components/user-fields/text.gjs b/frontend/discourse/app/components/user-fields/text.gjsindex 2f8b1212a10..3080b368f3f 100644--- a/frontend/discourse/app/components/user-fields/text.gjs+++ b/frontend/discourse/app/components/user-fields/text.gjs@@ -1,7 +1,7 @@import { Input } from "@ember/component";import { concat } from "@ember/helper";import { trustHTML } from "@ember/template";-import InputTip from "discourse/components/input-tip";+import DInputTip from "discourse/ui-kit/d-input-tip";import { i18n } from "discourse-i18n";import UserFieldBase from "./base";@@ -22,7 +22,7 @@ export default class UserFieldText extends UserFieldBase {{{i18n "user_fields.optional"}}{{/unless~}}</label>{{#if this.validation.failed}}- <InputTip @validation={{this.validation}} />+ <DInputTip @validation={{this.validation}} />{{else}}<div class="instructions">{{trustHTML this.field.description}}</div>{{/if}}diff --git a/frontend/discourse/app/components/user-fields/textarea.gjs b/frontend/discourse/app/components/user-fields/textarea.gjsindex d259518c76d..9f4469ec688 100644--- a/frontend/discourse/app/components/user-fields/textarea.gjs+++ b/frontend/discourse/app/components/user-fields/textarea.gjs@@ -1,7 +1,7 @@import { Textarea } from "@ember/component";import { concat } from "@ember/helper";import { trustHTML } from "@ember/template";-import InputTip from "discourse/components/input-tip";+import DInputTip from "discourse/ui-kit/d-input-tip";import { i18n } from "discourse-i18n";import UserFieldBase from "./base";@@ -23,7 +23,7 @@ export default class UserFieldTextArea extends UserFieldBase {{{i18n "user_fields.optional"}}{{/unless~}}</label>{{#if this.validation.failed}}- <InputTip @validation={{this.validation}} />+ <DInputTip @validation={{this.validation}} />{{else}}<div class="instructions">{{trustHTML this.field.description}}</div>{{/if}}diff --git a/frontend/discourse/app/components/user-flag-percentage.gjs b/frontend/discourse/app/components/user-flag-percentage.gjsindex de818bb2a7c..7a09a82b31a 100644--- a/frontend/discourse/app/components/user-flag-percentage.gjs+++ b/frontend/discourse/app/components/user-flag-percentage.gjs@@ -1,7 +1,7 @@import Component from "@glimmer/component";import { cached } from "@glimmer/tracking";-import icon from "discourse/helpers/d-icon";import { gte } from "discourse/truth-helpers";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class UserFlagPercentage extends Component {@@ -57,7 +57,7 @@ export default class UserFlagPercentage extends Component {<spanclass="percentage-label {{this.percentage.className}}">{{this.percentage.label}}</span>- {{icon this.percentage.icon}}+ {{dIcon this.percentage.icon}}</div>{{/if}}</template>diff --git a/frontend/discourse/app/components/user-menu/bookmarks-list-empty-state.gjs b/frontend/discourse/app/components/user-menu/bookmarks-list-empty-state.gjsindex 665aa36dfdc..96e25c61688 100644--- a/frontend/discourse/app/components/user-menu/bookmarks-list-empty-state.gjs+++ b/frontend/discourse/app/components/user-menu/bookmarks-list-empty-state.gjs@@ -1,12 +1,12 @@import { trustHTML } from "@ember/template";-import EmptyState from "discourse/components/empty-state";-import icon from "discourse/helpers/d-icon";+import DEmptyState from "discourse/ui-kit/d-empty-state";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";const BookmarksListEmptyState = <template>- <EmptyState+ <DEmptyState@title={{i18n "user.no_bookmarks_title"}}- @body={{trustHTML (i18n "user.no_bookmarks_body" icon=(icon "bookmark"))}}+ @body={{trustHTML (i18n "user.no_bookmarks_body" icon=(dIcon "bookmark"))}}/></template>;diff --git a/frontend/discourse/app/components/user-menu/icon-avatar.gjs b/frontend/discourse/app/components/user-menu/icon-avatar.gjsindex 77ab6748523..d4104c44352 100644--- a/frontend/discourse/app/components/user-menu/icon-avatar.gjs+++ b/frontend/discourse/app/components/user-menu/icon-avatar.gjs@@ -1,11 +1,11 @@-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import { avatarUrl, translateSize } from "discourse/lib/avatar-utils";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";const avatarPx = translateSize("medium");const IconAvatar = <template>- <div class={{concatClass "icon-avatar" @data.classNames}}>+ <div class={{dConcatClass "icon-avatar" @data.classNames}}>{{!--avoiding {{avatar}} helper because its html would be fullyre-rendered whenever arguments change, even if the argument values@@ -20,7 +20,7 @@ const IconAvatar = <template>class="avatar"/><div class="icon-avatar__icon-wrapper">- {{icon @data.icon}}+ {{dIcon @data.icon}}</div></div></template>;diff --git a/frontend/discourse/app/components/user-menu/items-list-empty-state.gjs b/frontend/discourse/app/components/user-menu/items-list-empty-state.gjsindex eb07a2dbe49..1cd5bc2dac2 100644--- a/frontend/discourse/app/components/user-menu/items-list-empty-state.gjs+++ b/frontend/discourse/app/components/user-menu/items-list-empty-state.gjs@@ -1,8 +1,8 @@-import EmptyState from "discourse/components/empty-state";+import DEmptyState from "discourse/ui-kit/d-empty-state";import { i18n } from "discourse-i18n";const ItemsListEmptyState = <template>- <EmptyState @title={{i18n "user_menu.generic_no_items"}} />+ <DEmptyState @title={{i18n "user_menu.generic_no_items"}} /></template>;export default ItemsListEmptyState;diff --git a/frontend/discourse/app/components/user-menu/items-list.gjs b/frontend/discourse/app/components/user-menu/items-list.gjsindex 1388deb6a49..abef3bb06d7 100644--- a/frontend/discourse/app/components/user-menu/items-list.gjs+++ b/frontend/discourse/app/components/user-menu/items-list.gjs@@ -4,11 +4,11 @@ import { on } from "@ember/modifier";import { action } from "@ember/object";import { getOwner } from "@ember/owner";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import PluginOutlet from "discourse/components/plugin-outlet";import MenuItem from "discourse/components/user-menu/menu-item";-import icon from "discourse/helpers/d-icon";import lazyHash from "discourse/helpers/lazy-hash";+import DButton from "discourse/ui-kit/d-button";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class UserMenuItemsList extends Component {@@ -127,7 +127,7 @@ export default class UserMenuItemsList extends Component {@translatedAriaLabel={{this.showAllTitle}}@translatedTitle={{this.showAllTitle}}>- {{icon "chevron-down" aria-label=this.showAllTitle}}+ {{dIcon "chevron-down" aria-label=this.showAllTitle}}</DButton>{{/if}}{{#if this.showDismiss}}@@ -137,7 +137,7 @@ export default class UserMenuItemsList extends Component {title={{this.dismissTitle}}{{on "click" this.dismissButtonClick}}>- {{icon "check"}}+ {{dIcon "check"}}{{i18n "user.dismiss"}}</button>{{/if}}diff --git a/frontend/discourse/app/components/user-menu/likes-list-empty-state.gjs b/frontend/discourse/app/components/user-menu/likes-list-empty-state.gjsindex 531981ef17f..962f6502c34 100644--- a/frontend/discourse/app/components/user-menu/likes-list-empty-state.gjs+++ b/frontend/discourse/app/components/user-menu/likes-list-empty-state.gjs@@ -1,10 +1,10 @@import { trustHTML } from "@ember/template";-import EmptyState from "discourse/components/empty-state";import getUrl from "discourse/lib/get-url";+import DEmptyState from "discourse/ui-kit/d-empty-state";import { i18n } from "discourse-i18n";const LikesListEmptyState = <template>- <EmptyState+ <DEmptyState@title={{i18n "user.no_likes_title"}}@body={{trustHTML(i18ndiff --git a/frontend/discourse/app/components/user-menu/menu-item.gjs b/frontend/discourse/app/components/user-menu/menu-item.gjsindex 611d74e7aea..7394a943680 100644--- a/frontend/discourse/app/components/user-menu/menu-item.gjs+++ b/frontend/discourse/app/components/user-menu/menu-item.gjs@@ -3,8 +3,8 @@ import { concat } from "@ember/helper";import { on } from "@ember/modifier";import { action } from "@ember/object";import PluginOutlet from "discourse/components/plugin-outlet";-import icon from "discourse/helpers/d-icon";-import replaceEmoji from "discourse/helpers/replace-emoji";+import dIcon from "discourse/ui-kit/helpers/d-icon";+import dReplaceEmoji from "discourse/ui-kit/helpers/d-replace-emoji";export default class UserMenuItem extends Component {get className() {@@ -34,7 +34,7 @@ export default class UserMenuItem extends Component {get description() {const description = this.#item.description;if (description) {- return replaceEmoji(description);+ return dReplaceEmoji(description);}}@@ -84,7 +84,7 @@ export default class UserMenuItem extends Component {{{#if this.iconComponent}}<this.iconComponent @data={{this.iconComponentArgs}} />{{else}}- {{icon this.icon}}+ {{dIcon this.icon}}{{/if}}<div>{{#if this.label}}diff --git a/frontend/discourse/app/components/user-menu/menu-tab.gjs b/frontend/discourse/app/components/user-menu/menu-tab.gjsindex c7d389befe4..8e6723f39c7 100644--- a/frontend/discourse/app/components/user-menu/menu-tab.gjs+++ b/frontend/discourse/app/components/user-menu/menu-tab.gjs@@ -1,6 +1,6 @@import Component from "@glimmer/component";import { on } from "@ember/modifier";-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";export default class UserMenuTab extends Component {get isActive() {@@ -42,7 +42,7 @@ export default class UserMenuTab extends Component {{{on "click" @onTabClick}}{{on "keydown" @onTabClick}}>- {{icon @tab.icon}}+ {{dIcon @tab.icon}}{{#if @tab.count}}<spanaria-hidden="true"diff --git a/frontend/discourse/app/components/user-menu/messages-list-empty-state.gjs b/frontend/discourse/app/components/user-menu/messages-list-empty-state.gjsindex d51c3f145d1..5465d44e359 100644--- a/frontend/discourse/app/components/user-menu/messages-list-empty-state.gjs+++ b/frontend/discourse/app/components/user-menu/messages-list-empty-state.gjs@@ -1,16 +1,16 @@import { trustHTML } from "@ember/template";-import EmptyState from "discourse/components/empty-state";-import icon from "discourse/helpers/d-icon";import getUrl from "discourse/lib/get-url";+import DEmptyState from "discourse/ui-kit/d-empty-state";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";const MessagesListEmptyState = <template>- <EmptyState+ <DEmptyState@title={{i18n "user.no_messages_title"}}@body={{trustHTML(i18n"user.no_messages_body"- icon=(icon "envelope")+ icon=(dIcon "envelope")aboutUrl=(getUrl "/about"))}}diff --git a/frontend/discourse/app/components/user-menu/notifications-list-empty-state.gjs b/frontend/discourse/app/components/user-menu/notifications-list-empty-state.gjsindex a0666dbdf8d..5707c96c30a 100644--- a/frontend/discourse/app/components/user-menu/notifications-list-empty-state.gjs+++ b/frontend/discourse/app/components/user-menu/notifications-list-empty-state.gjs@@ -1,16 +1,16 @@import { trustHTML } from "@ember/template";-import EmptyState from "discourse/components/empty-state";-import icon from "discourse/helpers/d-icon";import getUrl from "discourse/lib/get-url";+import DEmptyState from "discourse/ui-kit/d-empty-state";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";const NotificationsListEmptyState = <template>- <EmptyState+ <DEmptyState@title={{i18n "user.no_notifications_title"}}@body={{trustHTML(i18n"user.no_notifications_body"- icon=(icon "bell")+ icon=(dIcon "bell")preferencesUrl=(getUrl "/my/preferences/notifications"))}}diff --git a/frontend/discourse/app/components/user-menu/other-notifications-list-empty-state.gjs b/frontend/discourse/app/components/user-menu/other-notifications-list-empty-state.gjsindex 3abdabce2e4..e0e62e99a72 100644--- a/frontend/discourse/app/components/user-menu/other-notifications-list-empty-state.gjs+++ b/frontend/discourse/app/components/user-menu/other-notifications-list-empty-state.gjs@@ -1,9 +1,9 @@import { trustHTML } from "@ember/template";-import EmptyState from "discourse/components/empty-state";+import DEmptyState from "discourse/ui-kit/d-empty-state";import { i18n } from "discourse-i18n";const OtherNotificationsListEmptyState = <template>- <EmptyState+ <DEmptyState@title={{i18n "user.no_other_notifications_title"}}@body={{trustHTML (i18n "user.no_other_notifications_body")}}/>diff --git a/frontend/discourse/app/components/user-menu/profile-tab-content.gjs b/frontend/discourse/app/components/user-menu/profile-tab-content.gjsindex 528d9ba3738..bad46df59a3 100644--- a/frontend/discourse/app/components/user-menu/profile-tab-content.gjs+++ b/frontend/discourse/app/components/user-menu/profile-tab-content.gjs@@ -2,17 +2,17 @@ import Component from "@glimmer/component";import { action } from "@ember/object";import { LinkTo } from "@ember/routing";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import DoNotDisturbModal from "discourse/components/modal/do-not-disturb";import UserStatusModal from "discourse/components/modal/user-status";-import ageWithTooltip from "discourse/helpers/age-with-tooltip";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";-import emoji from "discourse/helpers/emoji";import routeAction from "discourse/helpers/route-action";import { ajax } from "discourse/lib/ajax";import DoNotDisturb from "discourse/lib/do-not-disturb";import { userPath } from "discourse/lib/url";+import DButton from "discourse/ui-kit/d-button";+import dAgeWithTooltip from "discourse/ui-kit/helpers/d-age-with-tooltip";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dEmoji from "discourse/ui-kit/helpers/d-emoji";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";const _extraItems = [];@@ -125,15 +125,15 @@ export default class UserMenuProfileTabContent extends Component {class="btn-flat profile-tab-btn">{{#if this.currentUser.status}}- {{emoji this.currentUser.status.emoji}}+ {{dEmoji this.currentUser.status.emoji}}<span class="item-label">{{this.currentUser.status.description}}{{#if this.currentUser.status.ends_at}}- {{ageWithTooltip this.currentUser.status.ends_at}}+ {{dAgeWithTooltip this.currentUser.status.ends_at}}{{/if}}</span>{{else}}- {{icon "circle-plus"}}+ {{dIcon "circle-plus"}}<span class="item-label">{{i18n "user_status.set_custom_status"}}</span>@@ -143,7 +143,7 @@ export default class UserMenuProfileTabContent extends Component {{{/if}}<li- class={{concatClass+ class={{dConcatClass"presence-toggle"(unless this.isPresenceHidden "enabled")}}@@ -153,7 +153,7 @@ export default class UserMenuProfileTabContent extends Component {@action={{this.togglePresence}}class="btn-flat profile-tab-btn">- {{icon (if this.isPresenceHidden "toggle-off" "toggle-on")}}+ {{dIcon (if this.isPresenceHidden "toggle-off" "toggle-on")}}<span class="item-label">{{#if this.isPresenceHidden}}{{i18n "presence_toggle.offline"}}@@ -165,7 +165,7 @@ export default class UserMenuProfileTabContent extends Component {</li><li- class={{concatClass+ class={{dConcatClass"do-not-disturb"(if this.isInDoNotDisturb "enabled")}}@@ -174,12 +174,12 @@ export default class UserMenuProfileTabContent extends Component {@action={{this.doNotDisturbClick}}class="btn-flat profile-tab-btn">- {{icon (if this.isInDoNotDisturb "toggle-on" "toggle-off")}}+ {{dIcon (if this.isInDoNotDisturb "toggle-on" "toggle-off")}}<span class="item-label">{{#if this.isInDoNotDisturb}}<span>{{i18n "pause_notifications.label"}}</span>{{#if this.showDoNotDisturbEndDate}}- {{ageWithTooltip this.doNotDisturbDateTime}}+ {{dAgeWithTooltip this.doNotDisturbDateTime}}{{/if}}{{else}}{{i18n "pause_notifications.label"}}@@ -192,7 +192,7 @@ export default class UserMenuProfileTabContent extends Component {<li class="summary"><LinkTo @route="user.summary" @model={{this.currentUser}}>- {{icon "user"}}+ {{dIcon "user"}}<span class="item-label">{{i18n "user.summary.title"}}</span>@@ -201,7 +201,7 @@ export default class UserMenuProfileTabContent extends Component {<li class="activity"><LinkTo @route="userActivity" @model={{this.currentUser}}>- {{icon "bars-staggered"}}+ {{dIcon "bars-staggered"}}<span class="item-label">{{i18n "user.activity_stream"}}</span>@@ -211,7 +211,7 @@ export default class UserMenuProfileTabContent extends Component {{{#if this.currentUser.can_invite_to_forum}}<li class="invites"><LinkTo @route="userInvited" @model={{this.currentUser}}>- {{icon "user-plus"}}+ {{dIcon "user-plus"}}<span class="item-label">{{i18n "user.invited.title"}}</span>@@ -221,7 +221,7 @@ export default class UserMenuProfileTabContent extends Component {<li class="drafts"><LinkTo @route="userActivity.drafts" @model={{this.currentUser}}>- {{icon "user_menu.drafts"}}+ {{dIcon "user_menu.drafts"}}<span class="item-label">{{#if this.currentUser.draft_count}}{{i18n@@ -237,7 +237,7 @@ export default class UserMenuProfileTabContent extends Component {<li class="preferences"><LinkTo @route="preferences" @model={{this.currentUser}}>- {{icon "gear"}}+ {{dIcon "gear"}}<span class="item-label">{{i18n "user.preferences.title"}}</span>@@ -257,12 +257,12 @@ export default class UserMenuProfileTabContent extends Component {class="btn-flat profile-tab-btn">{{#if this.currentUser.is_anonymous}}- {{icon "ban"}}+ {{dIcon "ban"}}<span class="item-label">{{i18n "switch_from_anon"}}</span>{{else}}- {{icon "user-secret"}}+ {{dIcon "user-secret"}}<span class="item-label">{{i18n "switch_to_anon"}}</span>@@ -275,7 +275,7 @@ export default class UserMenuProfileTabContent extends Component {<li class={{item.className}}><a href={{item.href}}>{{#if item.icon}}- {{icon item.icon}}+ {{dIcon item.icon}}{{/if}}<span class="item-label">{{item.content}}@@ -289,7 +289,7 @@ export default class UserMenuProfileTabContent extends Component {@action={{routeAction "logout"}}class="btn-flat profile-tab-btn">- {{icon "right-from-bracket"}}+ {{dIcon "right-from-bracket"}}<span class="item-label">{{i18n "user.log_out"}}</span>diff --git a/frontend/discourse/app/components/user-nav.gjs b/frontend/discourse/app/components/user-nav.gjsindex 72d6eb56526..1caeb81c20a 100644--- a/frontend/discourse/app/components/user-nav.gjs+++ b/frontend/discourse/app/components/user-nav.gjs@@ -1,20 +1,20 @@-import DNavigationItem from "discourse/components/d-navigation-item";-import HorizontalOverflowNav from "discourse/components/horizontal-overflow-nav";import PluginOutlet from "discourse/components/plugin-outlet";-import icon from "discourse/helpers/d-icon";import lazyHash from "discourse/helpers/lazy-hash";import { and } from "discourse/truth-helpers";+import DHorizontalOverflowNav from "discourse/ui-kit/d-horizontal-overflow-nav";+import DNavigationItem from "discourse/ui-kit/d-navigation-item";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";const UserNav = <template><section class="user-navigation user-navigation-primary">- <HorizontalOverflowNav+ <DHorizontalOverflowNav@ariaLabel="User primary"class="main-nav nav user-nav">{{#unless @user.profile_hidden}}<DNavigationItem @route="user.summary" class="user-nav__summary">- {{icon "user"}}+ {{dIcon "user"}}<span>{{i18n "user.summary.title"}}</span></DNavigationItem>@@ -24,7 +24,7 @@ const UserNav = <template>@ariaCurrentContext="parentNav"class="user-nav__activity">- {{icon "bars-staggered"}}+ {{dIcon "bars-staggered"}}<span>{{i18n "user.activity_stream"}}</span></DNavigationItem>{{/if}}@@ -36,7 +36,7 @@ const UserNav = <template>@ariaCurrentContext="parentNav"class="user-nav__notifications">- {{icon "bell" class="glyph"}}+ {{dIcon "bell" class="glyph"}}<span>{{i18n "user.notifications"}}</span></DNavigationItem>{{/if}}@@ -47,7 +47,7 @@ const UserNav = <template>@ariaCurrentContext="parentNav"class="user-nav__personal-messages">- {{icon "envelope"}}+ {{dIcon "envelope"}}<span>{{i18n "user.private_messages"}}</span></DNavigationItem>{{/if}}@@ -58,14 +58,14 @@ const UserNav = <template>@ariaCurrentContext="parentNav"class="user-nav__invites">- {{icon "user-plus"}}+ {{dIcon "user-plus"}}<span>{{i18n "user.invited.title"}}</span></DNavigationItem>{{/if}}{{#if @showBadges}}<DNavigationItem @route="user.badges" class="user-nav__badges">- {{icon "certificate"}}+ {{dIcon "certificate"}}<span>{{i18n "badges.title"}}</span></DNavigationItem>{{/if}}@@ -82,19 +82,19 @@ const UserNav = <template>@ariaCurrentContext="parentNav"class="user-nav__preferences">- {{icon "gear"}}+ {{dIcon "gear"}}<span>{{i18n "user.preferences.title"}}</span></DNavigationItem>{{/if}}{{#if (and @isMobileView @isStaff)}}<li class="user-nav__admin"><a href={{@user.adminPath}}>- {{icon "wrench"}}+ {{dIcon "wrench"}}<span>{{i18n "admin.user.manage_user"}}</span></a></li>{{/if}}- </HorizontalOverflowNav>+ </DHorizontalOverflowNav></section></template>;diff --git a/frontend/discourse/app/components/user-nav/messages-dropdown.gjs b/frontend/discourse/app/components/user-nav/messages-dropdown.gjsindex 5089440b52d..77acafdf468 100644--- a/frontend/discourse/app/components/user-nav/messages-dropdown.gjs+++ b/frontend/discourse/app/components/user-nav/messages-dropdown.gjs@@ -1,11 +1,11 @@import Component from "@glimmer/component";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import DropdownMenu from "discourse/components/dropdown-menu";import DMenu from "discourse/float-kit/components/d-menu";-import icon from "discourse/helpers/d-icon";import { eq } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class MessagesDropdown extends Component {@@ -41,12 +41,12 @@ export default class MessagesDropdown extends Component {><:trigger>{{#if this.currentSelection.showUnreadIcon}}- {{icon "circle" class="d-icon-d-unread"}}+ {{dIcon "circle" class="d-icon-d-unread"}}{{/if}}- {{icon "angle-down"}}+ {{dIcon "angle-down"}}</:trigger><:content>- <DropdownMenu as |dropdown|>+ <DDropdownMenu as |dropdown|>{{#each @content as |item|}}<dropdown.item><DButton@@ -59,12 +59,12 @@ export default class MessagesDropdown extends Component {@action={{this.openInbox item.id}}>{{#if item.showUnreadIcon}}- {{icon "circle" class="d-icon-d-unread"}}+ {{dIcon "circle" class="d-icon-d-unread"}}{{/if}}</DButton></dropdown.item>{{/each}}- </DropdownMenu>+ </DDropdownMenu></:content></DMenu></template>diff --git a/frontend/discourse/app/components/user-preferences/categories.gjs b/frontend/discourse/app/components/user-preferences/categories.gjsindex 420dfa0b7a8..e8487a0af0c 100644--- a/frontend/discourse/app/components/user-preferences/categories.gjs+++ b/frontend/discourse/app/components/user-preferences/categories.gjs@@ -1,8 +1,8 @@import { fn } from "@ember/helper";import PluginOutlet from "discourse/components/plugin-outlet";-import icon from "discourse/helpers/d-icon";import lazyHash from "discourse/helpers/lazy-hash";import CategorySelector from "discourse/select-kit/components/category-selector";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";const Categories = <template>@@ -12,7 +12,7 @@ const Categories = <template><divclass="controls tracking-controls tracking-controls__watched-categories">- <label>{{icon "d-watching"}} {{i18n "user.watched_categories"}}</label>+ <label>{{dIcon "d-watching"}} {{i18n "user.watched_categories"}}</label>{{#if @canSee}}<a class="show-tracking" href={{@model.watchingTopicsPath}}>{{i18n"user.tracked_topics_link"@@ -31,7 +31,7 @@ const Categories = <template><divclass="controls tracking-controls tracking-controls__tracked-categories">- <label>{{icon "d-tracking"}} {{i18n "user.tracked_categories"}}</label>+ <label>{{dIcon "d-tracking"}} {{i18n "user.tracked_categories"}}</label>{{#if @canSee}}<a class="show-tracking" href={{@model.trackingTopicsPath}}>{{i18n"user.tracked_topics_link"@@ -50,7 +50,7 @@ const Categories = <template><divclass="controls tracking-controls tracking-controls__watched-first-categories">- <label>{{icon "d-watching-first"}}+ <label>{{dIcon "d-watching-first"}}{{i18n "user.watched_first_post_categories"}}</label><CategorySelector@categories={{@model.watchedFirstPostCategories}}@@ -66,7 +66,7 @@ const Categories = <template><divclass="controls tracking-controls tracking-controls__regular-categories">- <label>{{icon "d-regular"}} {{i18n "user.regular_categories"}}</label>+ <label>{{dIcon "d-regular"}} {{i18n "user.regular_categories"}}</label><CategorySelector@categories={{@model.regularCategories}}@blockedCategories={{@selectedCategories}}@@ -80,7 +80,7 @@ const Categories = <template><divclass="controls tracking-controls tracking-controls__muted-categories">- <label>{{icon "d-muted"}} {{i18n "user.muted_categories"}}</label>+ <label>{{dIcon "d-muted"}} {{i18n "user.muted_categories"}}</label>{{#if @canSee}}<a class="show-tracking" href={{@model.mutedTopicsPath}}>{{i18ndiff --git a/frontend/discourse/app/components/user-preferences/rename-passkey.gjs b/frontend/discourse/app/components/user-preferences/rename-passkey.gjsindex 6b0787be9bc..8cf1ba89120 100644--- a/frontend/discourse/app/components/user-preferences/rename-passkey.gjs+++ b/frontend/discourse/app/components/user-preferences/rename-passkey.gjs@@ -3,9 +3,9 @@ import { tracked } from "@glimmer/tracking";import { Input } from "@ember/component";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import { ajax } from "discourse/lib/ajax";import { extractError } from "discourse/lib/ajax-error";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";export default class RenamePasskey extends Component {diff --git a/frontend/discourse/app/components/user-preferences/tags.gjs b/frontend/discourse/app/components/user-preferences/tags.gjsindex 0fbe3599ae6..f2431557fba 100644--- a/frontend/discourse/app/components/user-preferences/tags.gjs+++ b/frontend/discourse/app/components/user-preferences/tags.gjs@@ -1,8 +1,8 @@import { hash } from "@ember/helper";import PluginOutlet from "discourse/components/plugin-outlet";-import icon from "discourse/helpers/d-icon";import lazyHash from "discourse/helpers/lazy-hash";import TagChooser from "discourse/select-kit/components/tag-chooser";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";const Tags = <template>@@ -11,7 +11,7 @@ const Tags = <template><label class="control-label">{{i18n "user.tag_settings"}}</label><div class="controls tracking-controls tracking-controls__watched-tags">- <label>{{icon "d-watching" class="icon watching"}}+ <label>{{dIcon "d-watching" class="icon watching"}}{{i18n "user.watched_tags"}}</label><TagChooser@tags={{@model.watched_tags}}@@ -25,7 +25,7 @@ const Tags = <template><div class="instructions">{{i18n "user.watched_tags_instructions"}}</div><div class="controls tracking-controls tracking-controls__tracked-tags">- <label>{{icon "d-tracking" class="icon tracking"}}+ <label>{{dIcon "d-tracking" class="icon tracking"}}{{i18n "user.tracked_tags"}}</label><TagChooser@tags={{@model.tracked_tags}}@@ -41,7 +41,7 @@ const Tags = <template><divclass="controls tracking-controls tracking-controls__watched-first-post-tags">- <label>{{icon "d-watching-first" class="icon watching-first-post"}}+ <label>{{dIcon "d-watching-first" class="icon watching-first-post"}}{{i18n "user.watched_first_post_tags"}}</label><TagChooser@tags={{@model.watching_first_post_tags}}@@ -57,7 +57,7 @@ const Tags = <template></div><div class="controls tracking-controls tracking-controls__muted-tags">- <label>{{icon "d-muted" class="icon muted"}}+ <label>{{dIcon "d-muted" class="icon muted"}}{{i18n "user.muted_tags"}}</label><TagChooser@tags={{@model.muted_tags}}diff --git a/frontend/discourse/app/components/user-preferences/user-api-keys.gjs b/frontend/discourse/app/components/user-preferences/user-api-keys.gjsindex e99c0b363b3..ee6dfae5b9e 100644--- a/frontend/discourse/app/components/user-preferences/user-api-keys.gjs+++ b/frontend/discourse/app/components/user-preferences/user-api-keys.gjs@@ -3,10 +3,10 @@ import { tracked } from "@glimmer/tracking";import { fn } from "@ember/helper";import { on } from "@ember/modifier";import { action } from "@ember/object";-import DButton from "discourse/components/d-button";-import ageWithTooltip from "discourse/helpers/age-with-tooltip";-import icon from "discourse/helpers/d-icon";import routeAction from "discourse/helpers/route-action";+import DButton from "discourse/ui-kit/d-button";+import dAgeWithTooltip from "discourse/ui-kit/helpers/d-age-with-tooltip";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";class UserApiKeyRow extends Component {@@ -25,11 +25,11 @@ class UserApiKeyRow extends Component {<div class="user-api-key__dates"><div class="user-api-key__date-approved"><span>{{i18n "user.api_approved"}}</span>- {{ageWithTooltip @apiKey.created_at format="medium"}}+ {{dAgeWithTooltip @apiKey.created_at format="medium"}}</div><div class="user-api-key__date-last-used"><span>{{i18n "user.api_last_used_at"}}</span>- {{ageWithTooltip @apiKey.last_used_at format="medium"}}+ {{dAgeWithTooltip @apiKey.last_used_at format="medium"}}</div></div></div>@@ -53,7 +53,7 @@ class UserApiKeyRow extends Component {{{#if @apiKey.scopes.length}}<div class="user-api-key__scopes-toggle"><a href {{on "click" this.toggleScopes}}>- {{icon "caret-down"}}+ {{dIcon "caret-down"}}<span>{{i18n"user.api_show_permissions"diff --git a/frontend/discourse/app/components/user-preferences/user-passkeys.gjs b/frontend/discourse/app/components/user-preferences/user-passkeys.gjsindex 4ea7fd56bb7..814c85e596e 100644--- a/frontend/discourse/app/components/user-preferences/user-passkeys.gjs+++ b/frontend/discourse/app/components/user-preferences/user-passkeys.gjs@@ -4,17 +4,17 @@ import { action } from "@ember/object";import { schedule } from "@ember/runloop";import { service } from "@ember/service";import { trustHTML } from "@ember/template";-import DButton from "discourse/components/d-button";import ConfirmSession from "discourse/components/dialog-messages/confirm-session";import PasskeyOptionsDropdown from "discourse/components/user-preferences/passkey-options-dropdown";import RenamePasskey from "discourse/components/user-preferences/rename-passkey";-import formatDate from "discourse/helpers/format-date";import { popupAjaxError } from "discourse/lib/ajax-error";import {bufferToBase64,stringToBuffer,WebauthnAbortHandler,} from "discourse/lib/webauthn";+import DButton from "discourse/ui-kit/d-button";+import dFormatDate from "discourse/ui-kit/helpers/d-format-date";import { i18n } from "discourse-i18n";export default class UserPasskeys extends Component {@@ -195,7 +195,7 @@ export default class UserPasskeys extends Component {{{trustHTML(i18n"user.passkeys.added_date"- date=(formatDate+ date=(dFormatDatepasskey.created_at format="medium" leaveAgo="true"))@@ -206,7 +206,7 @@ export default class UserPasskeys extends Component {{{trustHTML(i18n"user.passkeys.last_used_date"- date=(formatDate+ date=(dFormatDatepasskey.last_used format="medium" leaveAgo="true"))diff --git a/frontend/discourse/app/components/user-profile-avatar.gjs b/frontend/discourse/app/components/user-profile-avatar.gjsindex 17620c33556..9794257e47d 100644--- a/frontend/discourse/app/components/user-profile-avatar.gjs+++ b/frontend/discourse/app/components/user-profile-avatar.gjs@@ -2,9 +2,9 @@import Component from "@ember/component";import { tagName } from "@ember-decorators/component";import PluginOutlet from "discourse/components/plugin-outlet";-import UserAvatarFlair from "discourse/components/user-avatar-flair";-import boundAvatar from "discourse/helpers/bound-avatar";import lazyHash from "discourse/helpers/lazy-hash";+import DUserAvatarFlair from "discourse/ui-kit/d-user-avatar-flair";+import dBoundAvatar from "discourse/ui-kit/helpers/d-bound-avatar";@tagName("")export default class UserProfileAvatar extends Component {@@ -18,10 +18,10 @@ export default class UserProfileAvatar extends Component {@name="user-profile-avatar-img-wrapper"@outletArgs={{lazyHash user=@user}}>- {{boundAvatar @user "huge"}}+ {{dBoundAvatar @user "huge"}}</PluginOutlet>- <UserAvatarFlair @user={{@user}} />+ <DUserAvatarFlair @user={{@user}} /><div><PluginOutlet@name="user-profile-avatar-flair"diff --git a/frontend/discourse/app/components/user-status-picker.gjs b/frontend/discourse/app/components/user-status-picker.gjsindex 04cb8cb07de..4adbee25d6d 100644--- a/frontend/discourse/app/components/user-status-picker.gjs+++ b/frontend/discourse/app/components/user-status-picker.gjs@@ -3,10 +3,10 @@ import { tracked } from "@glimmer/tracking";import { on } from "@ember/modifier";import { action } from "@ember/object";import EmojiPicker from "discourse/components/emoji-picker";-import concatClass from "discourse/helpers/concat-class";import { emojiUnescape } from "discourse/lib/text";import { escapeExpression } from "discourse/lib/utilities";-import autoFocus from "discourse/modifiers/auto-focus";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dAutoFocus from "discourse/ui-kit/modifiers/d-auto-focus";import { i18n } from "discourse-i18n";export default class UserStatusPicker extends Component {@@ -40,7 +40,7 @@ export default class UserStatusPicker extends Component {<template><div class="user-status-picker-wrap"><div- class={{concatClass+ class={{dConcatClass"emoji-picker-anchor user-status-picker"(if this.isFocused "focused")}}@@ -58,7 +58,7 @@ export default class UserStatusPicker extends Component {{{on "input" this.updateDescription}}{{on "focus" this.focus}}{{on "blur" this.blur}}- {{autoFocus}}+ {{dAutoFocus}}value={{@status.description}}type="text"placeholder={{i18n "user_status.what_are_you_doing"}}diff --git a/frontend/discourse/app/components/user-stream.gjs b/frontend/discourse/app/components/user-stream.gjsindex 25972e5f6c7..ee358cf92ab 100644--- a/frontend/discourse/app/components/user-stream.gjs+++ b/frontend/discourse/app/components/user-stream.gjs@@ -7,9 +7,6 @@ import { service } from "@ember/service";import PluginOutlet from "discourse/components/plugin-outlet";import PostActionDescription from "discourse/components/post-action-description";import PostList from "discourse/components/post-list";-import avatar from "discourse/helpers/avatar";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import lazyHash from "discourse/helpers/lazy-hash";import { popupAjaxError } from "discourse/lib/ajax-error";import ClickTrack from "discourse/lib/click-track";@@ -17,6 +14,9 @@ import PostBulkSelectHelper from "discourse/lib/post-bulk-select-helper";import DiscourseURL from "discourse/lib/url";import Draft from "discourse/models/draft";import Post from "discourse/models/post";+import dAvatar from "discourse/ui-kit/helpers/d-avatar";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class UserStreamComponent extends Component {@@ -196,7 +196,7 @@ export default class UserStreamComponent extends Component {@bulkSelectEnabled={{this.bulkSelectEnabled}}@bulkSelectHelper={{this.showBulkSelectHelper}}@bulkActions={{this.bulkActions}}- class={{concatClass "user-stream" this.filterClassName}}+ class={{dConcatClass "user-stream" this.filterClassName}}{{on "click" this.handleClick}}{{didUpdate this.updateBulkSelectPosts @stream.content}}>@@ -224,7 +224,7 @@ export default class UserStreamComponent extends Component {{{#each post.children as |child|}}<div class="user-stream-item-actions">- {{icon child.icon class="icon"}}+ {{dIcon child.icon class="icon"}}{{#each child.items as |grandChild|}}<ahref={{grandChild.userUrl}}@@ -232,7 +232,7 @@ export default class UserStreamComponent extends Component {class="avatar-link"><div class="avatar-wrapper">- {{avatar+ {{dAvatargrandChildimageSize="tiny"extraClasses="actor"diff --git a/frontend/discourse/app/components/user-summary-topic.gjs b/frontend/discourse/app/components/user-summary-topic.gjsindex b4216502e1e..c883b85eb36 100644--- a/frontend/discourse/app/components/user-summary-topic.gjs+++ b/frontend/discourse/app/components/user-summary-topic.gjs@@ -3,10 +3,10 @@ import Component from "@ember/component";import { trustHTML } from "@ember/template";import { tagName } from "@ember-decorators/component";import PluginOutlet from "discourse/components/plugin-outlet";-import icon from "discourse/helpers/d-icon";-import formatDate from "discourse/helpers/format-date";import lazyHash from "discourse/helpers/lazy-hash";-import number from "discourse/helpers/number";+import dFormatDate from "discourse/ui-kit/helpers/d-format-date";+import dIcon from "discourse/ui-kit/helpers/d-icon";+import dNumber from "discourse/ui-kit/helpers/d-number";@tagName("")export default class UserSummaryTopic extends Component {@@ -22,10 +22,10 @@ export default class UserSummaryTopic extends Component {}}><span class="topic-info">- {{formatDate @createdAt format="tiny" noTitle="true"}}+ {{dFormatDate @createdAt format="tiny" noTitle="true"}}{{#if @likes}}·- {{icon "heart"}} <span class="like-count">{{number+ {{dIcon "heart"}} <span class="like-count">{{dNumber@likes}}</span>{{/if}}diff --git a/frontend/discourse/app/components/user-summary-user.gjs b/frontend/discourse/app/components/user-summary-user.gjsindex b6b591a3724..033c88cb487 100644--- a/frontend/discourse/app/components/user-summary-user.gjs+++ b/frontend/discourse/app/components/user-summary-user.gjs@@ -1,18 +1,18 @@/* eslint-disable ember/no-classic-components */import Component from "@ember/component";import { tagName } from "@ember-decorators/component";-import UserInfo from "discourse/components/user-info";-import icon from "discourse/helpers/d-icon";-import number from "discourse/helpers/number";+import DUserInfo from "discourse/ui-kit/d-user-info";+import dIcon from "discourse/ui-kit/helpers/d-icon";+import dNumber from "discourse/ui-kit/helpers/d-number";@tagName("")export default class UserSummaryUser extends Component {<template><li ...attributes>- <UserInfo @user={{@user}}>- {{icon @icon}}- <span class={{@countClass}}>{{number @user.count}}</span>- </UserInfo>+ <DUserInfo @user={{@user}}>+ {{dIcon @icon}}+ <span class={{@countClass}}>{{dNumber @user.count}}</span>+ </DUserInfo></li></template>}diff --git a/frontend/discourse/app/components/user-tip-container.gjs b/frontend/discourse/app/components/user-tip-container.gjsindex 2678b4e1965..0f3890c541f 100644--- a/frontend/discourse/app/components/user-tip-container.gjs+++ b/frontend/discourse/app/components/user-tip-container.gjs@@ -3,7 +3,7 @@ import { on } from "@ember/modifier";import { action } from "@ember/object";import { service } from "@ember/service";import { trustHTML } from "@ember/template";-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";export default class UserTipContainer extends Component {@service userTips;diff --git a/frontend/discourse/app/components/username-preference.gjs b/frontend/discourse/app/components/username-preference.gjsindex 39b8a0805b2..3b6dcfc27e2 100644--- a/frontend/discourse/app/components/username-preference.gjs+++ b/frontend/discourse/app/components/username-preference.gjs@@ -7,11 +7,11 @@ import { action, computed } from "@ember/object";import { service } from "@ember/service";import { trustHTML } from "@ember/template";import { isEmpty } from "@ember/utils";-import DButton from "discourse/components/d-button";-import DModalCancel from "discourse/components/d-modal-cancel";import { popupAjaxError } from "discourse/lib/ajax-error";import DiscourseURL, { userPath } from "discourse/lib/url";import User from "discourse/models/user";+import DButton from "discourse/ui-kit/d-button";+import DModalCancel from "discourse/ui-kit/d-modal-cancel";import { i18n } from "discourse-i18n";export default class UsernamePreference extends Component {diff --git a/frontend/discourse/app/components/welcome-banner.gjs b/frontend/discourse/app/components/welcome-banner.gjsindex d8ace240b60..5a1e40ce4d1 100644--- a/frontend/discourse/app/components/welcome-banner.gjs+++ b/frontend/discourse/app/components/welcome-banner.gjs@@ -3,15 +3,15 @@ import { service } from "@ember/service";import { dasherize } from "@ember/string";import { trustHTML } from "@ember/template";import { modifier } from "ember-modifier";-import DButton from "discourse/components/d-button";import PluginOutlet from "discourse/components/plugin-outlet";import SearchMenu from "discourse/components/search-menu";import bodyClass from "discourse/helpers/body-class";-import concatClass from "discourse/helpers/concat-class";import { prioritizeNameFallback } from "discourse/lib/settings";import { sanitize } from "discourse/lib/text";import { applyValueTransformer } from "discourse/lib/transformer";import { defaultHomepage, escapeExpression } from "discourse/lib/utilities";+import DButton from "discourse/ui-kit/d-button";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import I18n, { i18n } from "discourse-i18n";export const ALL_PAGES_EXCLUDED_ROUTES = [@@ -201,7 +201,7 @@ export default class WelcomeBanner extends Component {{{bodyClass this.bodyClasses}}{{#if this.shouldDisplay}}<div- class={{concatClass+ class={{dConcatClass"welcome-banner"this.locationClassthis.bgImgClassdiff --git a/frontend/discourse/app/components/wrap-attributes-modal.gjs b/frontend/discourse/app/components/wrap-attributes-modal.gjsindex c1d4d8a6418..3a125df5865 100644--- a/frontend/discourse/app/components/wrap-attributes-modal.gjs+++ b/frontend/discourse/app/components/wrap-attributes-modal.gjs@@ -2,13 +2,13 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { fn, hash } from "@ember/helper";import { action } from "@ember/object";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";import Form from "discourse/components/form";import {parseAttributesString,serializeFromForm,} from "discourse/lib/wrap-utils";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";/**diff --git a/frontend/discourse/app/controllers/topic.js b/frontend/discourse/app/controllers/topic.jsindex ee46edcc3ac..af76378001d 100644--- a/frontend/discourse/app/controllers/topic.js+++ b/frontend/discourse/app/controllers/topic.js@@ -17,7 +17,6 @@ import ConvertToPublicTopicModal from "discourse/components/modal/convert-to-pubimport DeleteTopicConfirmModal from "discourse/components/modal/delete-topic-confirm";import JumpToPost from "discourse/components/modal/jump-to-post";import { MIN_POSTS_COUNT } from "discourse/components/topic-map/topic-map-summary";-import { spinnerHTML } from "discourse/helpers/loading-spinner";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import {@@ -49,6 +48,7 @@ import Post from "discourse/models/post";import Topic from "discourse/models/topic";import TopicLocalization from "discourse/models/topic-localization";import TopicTimer from "discourse/models/topic-timer";+import { spinnerHTML } from "discourse/ui-kit/helpers/d-loading-spinner";import { i18n } from "discourse-i18n";let customPostMessageCallbacks = {};diff --git a/frontend/discourse/app/controllers/user-notifications.js b/frontend/discourse/app/controllers/user-notifications.jsindex 0fe75957581..45390209239 100644--- a/frontend/discourse/app/controllers/user-notifications.js+++ b/frontend/discourse/app/controllers/user-notifications.js@@ -6,11 +6,11 @@ import { service } from "@ember/service";import { trustHTML } from "@ember/template";import curryComponent from "ember-curry-component";import DismissNotificationConfirmationModal from "discourse/components/modal/dismiss-notification-confirmation";-import RelativeDate from "discourse/components/relative-date";import { ajax } from "discourse/lib/ajax";import getURL from "discourse/lib/get-url";import { iconHTML } from "discourse/lib/icon-library";import UserMenuNotificationItem from "discourse/lib/user-menu/notification-item";+import DRelativeDate from "discourse/ui-kit/d-relative-date";import { i18n } from "discourse-i18n";const _beforeLoadMoreCallbacks = [];@@ -42,7 +42,7 @@ export default class UserNotificationsController extends Controller {site: this.site,notification,endComponent: curryComponent(- RelativeDate,+ DRelativeDate,{ date: notification.created_at },getOwner(this)),diff --git a/frontend/discourse/app/discourse-common-loader-shims.js b/frontend/discourse/app/discourse-common-loader-shims.jsindex adbde999dc9..e32bbf36356 100644--- a/frontend/discourse/app/discourse-common-loader-shims.js+++ b/frontend/discourse/app/discourse-common-loader-shims.js@@ -3,7 +3,7 @@ import loaderShim from "discourse/lib/loader-shim";// Soon-to-be-deprecated discourse-common importsloaderShim("discourse-common/helpers/base-path", () =>- importSync("discourse/helpers/base-path")+ importSync("discourse/ui-kit/helpers/d-base-path"));loaderShim("discourse-common/helpers/base-url", () =>importSync("discourse/helpers/base-url")@@ -18,7 +18,7 @@ loaderShim("discourse-common/helpers/component-for-row", () =>importSync("discourse/helpers/component-for-row"));loaderShim("discourse-common/helpers/d-icon", () =>- importSync("discourse/helpers/d-icon")+ importSync("discourse/ui-kit/helpers/d-icon"));loaderShim("discourse-common/helpers/fa-icon", () =>importSync("discourse/helpers/fa-icon")diff --git a/frontend/discourse/app/form-kit/components/fk/alert.gjs b/frontend/discourse/app/form-kit/components/fk/alert.gjsindex 04d56fa7235..49ba9a67431 100644--- a/frontend/discourse/app/form-kit/components/fk/alert.gjs+++ b/frontend/discourse/app/form-kit/components/fk/alert.gjs@@ -1,5 +1,5 @@import Component from "@glimmer/component";-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";export default class FKAlert extends Component {get type() {@@ -9,7 +9,7 @@ export default class FKAlert extends Component {<template><div class="form-kit__alert alert alert-{{this.type}}" ...attributes>{{#if @icon}}- {{icon @icon}}+ {{dIcon @icon}}{{/if}}<span class="form-kit__alert-message">{{yield}}</span>diff --git a/frontend/discourse/app/form-kit/components/fk/char-counter.gjs b/frontend/discourse/app/form-kit/components/fk/char-counter.gjsindex 57da75b16b3..f82644c968c 100644--- a/frontend/discourse/app/form-kit/components/fk/char-counter.gjs+++ b/frontend/discourse/app/form-kit/components/fk/char-counter.gjs@@ -1,6 +1,6 @@import Component from "@glimmer/component";-import concatClass from "discourse/helpers/concat-class";import { gt, lt } from "discourse/truth-helpers";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";export default class FKCharCounter extends Component {get currentLength() {@@ -9,7 +9,7 @@ export default class FKCharCounter extends Component {<template><span- class={{concatClass+ class={{dConcatClass"form-kit__char-counter"(if (gt this.currentLength @maxLength) "--exceeded")(if (lt this.currentLength @minLength) "--insufficient")diff --git a/frontend/discourse/app/form-kit/components/fk/col.gjs b/frontend/discourse/app/form-kit/components/fk/col.gjsindex 0256c6f5054..5dc20b97917 100644--- a/frontend/discourse/app/form-kit/components/fk/col.gjs+++ b/frontend/discourse/app/form-kit/components/fk/col.gjs@@ -1,9 +1,9 @@import { concat } from "@ember/helper";-import concatClass from "discourse/helpers/concat-class";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";const FKCol = <template><div- class={{concatClass "form-kit__col" (if @size (concat "--col-" @size))}}+ class={{dConcatClass "form-kit__col" (if @size (concat "--col-" @size))}}...attributes>{{yield}}diff --git a/frontend/discourse/app/form-kit/components/fk/collection.gjs b/frontend/discourse/app/form-kit/components/fk/collection.gjsindex bdfaa516206..f4278bbd81b 100644--- a/frontend/discourse/app/form-kit/components/fk/collection.gjs+++ b/frontend/discourse/app/form-kit/components/fk/collection.gjs@@ -5,7 +5,7 @@ import { getOwner } from "@ember/owner";import curryComponent from "ember-curry-component";import FKField from "discourse/form-kit/components/fk/field";import FKObject from "discourse/form-kit/components/fk/object";-import element from "discourse/helpers/element";+import dElement from "discourse/ui-kit/helpers/d-element";export default class FKCollection extends Component {@action@@ -62,7 +62,7 @@ export default class FKCollection extends Component {<template>{{#if this.collectionData.length}}- {{#let (element this.tagName) as |Wrapper|}}+ {{#let (dElement this.tagName) as |Wrapper|}}<Wrapper class="form-kit__collection">{{#each this.collectionData key="identifier" as |data index|}}{{yielddiff --git a/frontend/discourse/app/form-kit/components/fk/container.gjs b/frontend/discourse/app/form-kit/components/fk/container.gjsindex b366824abef..22321ca306b 100644--- a/frontend/discourse/app/form-kit/components/fk/container.gjs+++ b/frontend/discourse/app/form-kit/components/fk/container.gjs@@ -1,11 +1,11 @@import { concat } from "@ember/helper";import FormText from "discourse/form-kit/components/fk/text";-import concatClass from "discourse/helpers/concat-class";import { eq } from "discourse/truth-helpers";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";const FKContainer = <template><div- class={{concatClass+ class={{dConcatClass"form-kit__container"@class(if @direction (concat "--" @direction))@@ -24,7 +24,7 @@ const FKContainer = <template>{{/if}}<div- class={{concatClass+ class={{dConcatClass"form-kit__container-content"(if @format (concat "--" @format))}}diff --git a/frontend/discourse/app/form-kit/components/fk/control/calendar.gjs b/frontend/discourse/app/form-kit/components/fk/control/calendar.gjsindex 4d6f942afec..05b795c9dda 100644--- a/frontend/discourse/app/form-kit/components/fk/control/calendar.gjs+++ b/frontend/discourse/app/form-kit/components/fk/control/calendar.gjs@@ -1,9 +1,9 @@import { on } from "@ember/modifier";import { action } from "@ember/object";import { service } from "@ember/service";-import DatePicker from "discourse/components/date-picker";import FKBaseControl from "discourse/form-kit/components/fk/control/base";import withEventValue from "discourse/helpers/with-event-value";+import DDatePicker from "discourse/ui-kit/d-date-picker";export default class FKControlCalendar extends FKBaseControl {static controlType = "calendar";@@ -71,7 +71,7 @@ export default class FKControlCalendar extends FKBaseControl {<template>{{#if this.expandedDatePicker}}- <DatePicker+ <DDatePicker@value={{readonly @field.value}}@onSelect={{this.setDate}}@containerId={{this.containerId}}diff --git a/frontend/discourse/app/form-kit/components/fk/control/checkbox.gjs b/frontend/discourse/app/form-kit/components/fk/control/checkbox.gjsindex 143fe00d9ea..8dacc215282 100644--- a/frontend/discourse/app/form-kit/components/fk/control/checkbox.gjs+++ b/frontend/discourse/app/form-kit/components/fk/control/checkbox.gjs@@ -5,8 +5,8 @@ import FKBaseControl from "discourse/form-kit/components/fk/control/base";import FKLabel from "discourse/form-kit/components/fk/label";import FKRequired from "discourse/form-kit/components/fk/required";import FKTooltip from "discourse/form-kit/components/fk/tooltip";-import icon from "discourse/helpers/d-icon";import { eq, or } from "discourse/truth-helpers";+import dIcon from "discourse/ui-kit/helpers/d-icon";export default class FKControlCheckbox extends FKBaseControl {static controlType = "checkbox";@@ -32,7 +32,7 @@ export default class FKControlCheckbox extends FKBaseControl {{{on "change" this.handleInput}}/>{{#if this.siteSettings.enable_new_checkbox_style}}- <span class="form-kit__control-checkbox-checkmark">{{icon+ <span class="form-kit__control-checkbox-checkmark">{{dIcon"check"}}</span>{{/if}}diff --git a/frontend/discourse/app/form-kit/components/fk/control/color.gjs b/frontend/discourse/app/form-kit/components/fk/control/color.gjsindex 162e7c57cef..227105e9efe 100644--- a/frontend/discourse/app/form-kit/components/fk/control/color.gjs+++ b/frontend/discourse/app/form-kit/components/fk/control/color.gjs@@ -5,8 +5,6 @@ import { service } from "@ember/service";import { trustHTML } from "@ember/template";import DMenu from "discourse/float-kit/components/d-menu";import FKBaseControl from "discourse/form-kit/components/fk/control/base";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import {isValidHex,normalizeHex,@@ -14,6 +12,8 @@ import {} from "discourse/lib/color-transformations";import getUrl from "discourse/lib/get-url";import { and } from "discourse/truth-helpers";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";function isColorUsed(usedColors, color) {@@ -197,7 +197,7 @@ export default class FKControlColor extends FKBaseControl {...attributes/><span- class={{concatClass+ class={{dConcatClass"form-kit__control-color-picker-wrapper"this.pickerIconClass}}@@ -209,7 +209,7 @@ export default class FKControlColor extends FKBaseControl {disabled={{@field.disabled}}{{on "input" this.handlePickerInput}}/>- {{icon "eye-dropper"}}+ {{dIcon "eye-dropper"}}</span>{{#if (and @colors @collapseSwatches)}}<DMenu@@ -258,7 +258,7 @@ export default class FKControlColor extends FKBaseControl {<buttontype="button"style={{colorStyle color}}- class={{concatClass+ class={{dConcatClass"form-kit__control-color-swatch""is-used"}}@@ -283,7 +283,7 @@ export default class FKControlColor extends FKBaseControl {<buttontype="button"style={{colorStyle color}}- class={{concatClass+ class={{dConcatClass"form-kit__control-color-swatch"(if (isColorUsed @usedColors color) "is-used")(colorLuminanceClass color)@@ -298,7 +298,7 @@ export default class FKControlColor extends FKBaseControl {{{on "click" (fn this.selectColor color)}}>{{#if (isColorUsed @usedColors color)}}- {{icon "check"}}+ {{dIcon "check"}}{{/if}}</button>{{/each}}diff --git a/frontend/discourse/app/form-kit/components/fk/control/composer.gjs b/frontend/discourse/app/form-kit/components/fk/control/composer.gjsindex cd0d965ae29..3774c0124c8 100644--- a/frontend/discourse/app/form-kit/components/fk/control/composer.gjs+++ b/frontend/discourse/app/form-kit/components/fk/control/composer.gjs@@ -1,9 +1,9 @@import { action } from "@ember/object";import { trustHTML } from "@ember/template";-import DEditor from "discourse/components/d-editor";import FKBaseControl from "discourse/form-kit/components/fk/control/base";-import concatClass from "discourse/helpers/concat-class";import { escapeExpression } from "discourse/lib/utilities";+import DEditor from "discourse/ui-kit/d-editor";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";export default class FKControlComposer extends FKBaseControl {static controlType = "composer";@@ -27,7 +27,7 @@ export default class FKControlComposer extends FKBaseControl {@change={{this.handleInput}}@disabled={{@field.disabled}}@forceEditorMode={{@forceEditorMode}}- class={{concatClass+ class={{dConcatClass"form-kit__control-composer"(if @preview "--preview")}}diff --git a/frontend/discourse/app/form-kit/components/fk/control/conditional-content/condition.gjs b/frontend/discourse/app/form-kit/components/fk/control/conditional-content/condition.gjsindex c579e384cf9..a28ee2138e9 100644--- a/frontend/discourse/app/form-kit/components/fk/control/conditional-content/condition.gjs+++ b/frontend/discourse/app/form-kit/components/fk/control/conditional-content/condition.gjs@@ -1,15 +1,15 @@import { fn } from "@ember/helper";import { on } from "@ember/modifier";import FKLabel from "discourse/form-kit/components/fk/label";-import concatClass from "discourse/helpers/concat-class";-import uniqueId from "discourse/helpers/unique-id";import { eq } from "discourse/truth-helpers";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dUniqueId from "discourse/ui-kit/helpers/d-unique-id";const FKControlConditionalContentOption = <template>- {{#let (uniqueId) as |uuid|}}+ {{#let (dUniqueId) as |uuid|}}<FKLabel@fieldId={{uuid}}- class={{concatClass+ class={{dConcatClass"form-kit__control-radio-label"(if @disabled "--disabled")}}diff --git a/frontend/discourse/app/form-kit/components/fk/control/conditional-content/content.gjs b/frontend/discourse/app/form-kit/components/fk/control/conditional-content/content.gjsindex 245e5c316e4..56ca5b6ceb6 100644--- a/frontend/discourse/app/form-kit/components/fk/control/conditional-content/content.gjs+++ b/frontend/discourse/app/form-kit/components/fk/control/conditional-content/content.gjs@@ -1,9 +1,9 @@-import concatClass from "discourse/helpers/concat-class";import { notEq } from "discourse/truth-helpers";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";const FKControlConditionalContentItem = <template><div- class={{concatClass+ class={{dConcatClass"form-kit__conditional-display-content"(if (notEq @name @activeName) "hidden")}}diff --git a/frontend/discourse/app/form-kit/components/fk/control/icon.gjs b/frontend/discourse/app/form-kit/components/fk/control/icon.gjsindex 4fcd5a373c6..d26e5ed3182 100644--- a/frontend/discourse/app/form-kit/components/fk/control/icon.gjs+++ b/frontend/discourse/app/form-kit/components/fk/control/icon.gjs@@ -1,6 +1,6 @@import { action } from "@ember/object";-import DIconGridPicker from "discourse/components/d-icon-grid-picker";import FKBaseControl from "discourse/form-kit/components/fk/control/base";+import DIconGridPicker from "discourse/ui-kit/d-icon-grid-picker";export default class FKControlIcon extends FKBaseControl {static controlType = "icon";diff --git a/frontend/discourse/app/form-kit/components/fk/control/input.gjs b/frontend/discourse/app/form-kit/components/fk/control/input.gjsindex 991a8ca0cda..4f44c4dae74 100644--- a/frontend/discourse/app/form-kit/components/fk/control/input.gjs+++ b/frontend/discourse/app/form-kit/components/fk/control/input.gjs@@ -1,7 +1,7 @@import { on } from "@ember/modifier";import { action } from "@ember/object";import FKBaseControl from "discourse/form-kit/components/fk/control/base";-import concatClass from "discourse/helpers/concat-class";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";const SUPPORTED_TYPES = ["color",@@ -99,7 +99,7 @@ export default class FKControlInput extends FKBaseControl {<inputtype={{this.type}}value={{this.displayValue}}- class={{concatClass+ class={{dConcatClass"form-kit__control-input"(if @before "has-prefix")(if @after "has-suffix")diff --git a/frontend/discourse/app/form-kit/components/fk/control/menu.gjs b/frontend/discourse/app/form-kit/components/fk/control/menu.gjsindex 6bcbb12df5f..b6b2d344f92 100644--- a/frontend/discourse/app/form-kit/components/fk/control/menu.gjs+++ b/frontend/discourse/app/form-kit/components/fk/control/menu.gjs@@ -1,13 +1,13 @@import { tracked } from "@glimmer/tracking";import { hash } from "@ember/helper";import { action } from "@ember/object";-import DropdownMenu from "discourse/components/dropdown-menu";import DMenu from "discourse/float-kit/components/d-menu";import FKBaseControl from "discourse/form-kit/components/fk/control/base";import FKControlMenuContainer from "discourse/form-kit/components/fk/control/menu/container";import FKControlMenuDivider from "discourse/form-kit/components/fk/control/menu/divider";import FKControlMenuItem from "discourse/form-kit/components/fk/control/menu/item";-import icon from "discourse/helpers/d-icon";+import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";+import dIcon from "discourse/ui-kit/helpers/d-icon";export default class FKControlMenu extends FKBaseControl {static controlType = "menu";@@ -35,10 +35,10 @@ export default class FKControlMenu extends FKBaseControl {<span class="d-button-label">{{@selection}}</span>- {{icon "angle-down"}}+ {{dIcon "angle-down"}}</:trigger><:content>- <DropdownMenu as |menu|>+ <DDropdownMenu as |menu|>{{yield(hashItem=(component@@ -51,7 +51,7 @@ export default class FKControlMenu extends FKBaseControl {Container=FKControlMenuContainer)}}- </DropdownMenu>+ </DDropdownMenu></:content></DMenu></template>diff --git a/frontend/discourse/app/form-kit/components/fk/control/menu/item.gjs b/frontend/discourse/app/form-kit/components/fk/control/menu/item.gjsindex 7fa175a7ddb..a1fcec57ecf 100644--- a/frontend/discourse/app/form-kit/components/fk/control/menu/item.gjs+++ b/frontend/discourse/app/form-kit/components/fk/control/menu/item.gjs@@ -1,6 +1,6 @@import Component from "@glimmer/component";import { action } from "@ember/object";-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";export default class FKControlMenuItem extends Component {@actiondiff --git a/frontend/discourse/app/form-kit/components/fk/control/password.gjs b/frontend/discourse/app/form-kit/components/fk/control/password.gjsindex 0ee22f54c64..6c151243f8c 100644--- a/frontend/discourse/app/form-kit/components/fk/control/password.gjs+++ b/frontend/discourse/app/form-kit/components/fk/control/password.gjs@@ -2,10 +2,10 @@ import { tracked } from "@glimmer/tracking";import { on } from "@ember/modifier";import { action } from "@ember/object";import { modifier as modifierFn } from "ember-modifier";-import DButton from "discourse/components/d-button";import FKBaseControl from "discourse/form-kit/components/fk/control/base";-import concatClass from "discourse/helpers/concat-class";import { eq } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";const TYPES = {text: "text",@@ -52,7 +52,7 @@ export default class FKControlPassword extends FKBaseControl {<template><div- class={{concatClass+ class={{dConcatClass"form-kit__control-password-wrapper"(if this.isFocused "is-focused")}}diff --git a/frontend/discourse/app/form-kit/components/fk/control/question.gjs b/frontend/discourse/app/form-kit/components/fk/control/question.gjsindex 5e1db060879..da0e861d292 100644--- a/frontend/discourse/app/form-kit/components/fk/control/question.gjs+++ b/frontend/discourse/app/form-kit/components/fk/control/question.gjs@@ -2,8 +2,8 @@ import { on } from "@ember/modifier";import { action } from "@ember/object";import FKBaseControl from "discourse/form-kit/components/fk/control/base";import FKLabel from "discourse/form-kit/components/fk/label";-import uniqueId from "discourse/helpers/unique-id";import { eq } from "discourse/truth-helpers";+import dUniqueId from "discourse/ui-kit/helpers/d-unique-id";import { i18n } from "discourse-i18n";export default class FKControlQuestion extends FKBaseControl {@@ -16,7 +16,7 @@ export default class FKControlQuestion extends FKBaseControl {<template><div class="form-kit__inline-radio">- {{#let (uniqueId) as |uuid|}}+ {{#let (dUniqueId) as |uuid|}}<FKLabel @fieldId={{uuid}} class="form-kit__control-radio-label --yes"><inputname={{@field.name}}@@ -39,7 +39,7 @@ export default class FKControlQuestion extends FKBaseControl {</FKLabel>{{/let}}- {{#let (uniqueId) as |uuid|}}+ {{#let (dUniqueId) as |uuid|}}<FKLabel @fieldId={{uuid}} class="form-kit__control-radio-label --no"><inputname={{@field.name}}diff --git a/frontend/discourse/app/form-kit/components/fk/control/radio-group/radio.gjs b/frontend/discourse/app/form-kit/components/fk/control/radio-group/radio.gjsindex acfe9f716b8..1dc74b582c6 100644--- a/frontend/discourse/app/form-kit/components/fk/control/radio-group/radio.gjs+++ b/frontend/discourse/app/form-kit/components/fk/control/radio-group/radio.gjs@@ -1,9 +1,9 @@import { hash } from "@ember/helper";import { on } from "@ember/modifier";import FKLabel from "discourse/form-kit/components/fk/label";-import uniqueId from "discourse/helpers/unique-id";import withEventValue from "discourse/helpers/with-event-value";import { eq } from "discourse/truth-helpers";+import dUniqueId from "discourse/ui-kit/helpers/d-unique-id";const radioTitle = <template><span class="form-kit__control-radio-title">{{yield}}</span>@@ -14,7 +14,7 @@ const radioDescription = <template></template>;const FKControlRadioGroupRadio = <template>- {{#let (uniqueId) as |uuid|}}+ {{#let (dUniqueId) as |uuid|}}<div class="form-kit__field form-kit__field-radio"><FKLabel @fieldId={{uuid}} class="form-kit__control-radio-label"><inputdiff --git a/frontend/discourse/app/form-kit/components/fk/control/select.gjs b/frontend/discourse/app/form-kit/components/fk/control/select.gjsindex 25b7f8f6a69..1d470528a04 100644--- a/frontend/discourse/app/form-kit/components/fk/control/select.gjs+++ b/frontend/discourse/app/form-kit/components/fk/control/select.gjs@@ -1,7 +1,7 @@import { hash } from "@ember/helper";import { isBlank } from "@ember/utils";-import DSelect, { DSelectOption } from "discourse/components/d-select";import FKBaseControl from "discourse/form-kit/components/fk/control/base";+import DSelect, { DSelectOption } from "discourse/ui-kit/d-select";const SelectOption = <template><DSelectOptiondiff --git a/frontend/discourse/app/form-kit/components/fk/control/textarea.gjs b/frontend/discourse/app/form-kit/components/fk/control/textarea.gjsindex be494ca4575..4654fd55387 100644--- a/frontend/discourse/app/form-kit/components/fk/control/textarea.gjs+++ b/frontend/discourse/app/form-kit/components/fk/control/textarea.gjs@@ -1,10 +1,10 @@import { on } from "@ember/modifier";import { action } from "@ember/object";import { trustHTML } from "@ember/template";-import ExpandingTextArea from "discourse/components/expanding-text-area";import FKBaseControl from "discourse/form-kit/components/fk/control/base";-import element from "discourse/helpers/element";import { escapeExpression } from "discourse/lib/utilities";+import DExpandingTextArea from "discourse/ui-kit/d-expanding-text-area";+import dElement from "discourse/ui-kit/helpers/d-element";export default class FKControlTextarea extends FKBaseControl {static controlType = "textarea";@@ -43,7 +43,7 @@ export default class FKControlTextarea extends FKBaseControl {}get textareaElement() {- return this.args.autoResize ? ExpandingTextArea : element("textarea");+ return this.args.autoResize ? DExpandingTextArea : dElement("textarea");}<template>diff --git a/frontend/discourse/app/form-kit/components/fk/control/toggle.gjs b/frontend/discourse/app/form-kit/components/fk/control/toggle.gjsindex 74a1ca3914b..60d7977186b 100644--- a/frontend/discourse/app/form-kit/components/fk/control/toggle.gjs+++ b/frontend/discourse/app/form-kit/components/fk/control/toggle.gjs@@ -1,7 +1,7 @@import { on } from "@ember/modifier";import { action } from "@ember/object";-import DToggleSwitch from "discourse/components/d-toggle-switch";import FKBaseControl from "discourse/form-kit/components/fk/control/base";+import DToggleSwitch from "discourse/ui-kit/d-toggle-switch";export default class FKControlToggle extends FKBaseControl {static controlType = "toggle";diff --git a/frontend/discourse/app/form-kit/components/fk/emphasis.gjs b/frontend/discourse/app/form-kit/components/fk/emphasis.gjsindex 481c41e5581..9408dbe69fe 100644--- a/frontend/discourse/app/form-kit/components/fk/emphasis.gjs+++ b/frontend/discourse/app/form-kit/components/fk/emphasis.gjs@@ -1,7 +1,7 @@import Component from "@glimmer/component";import { concat } from "@ember/helper";-import concatClass from "discourse/helpers/concat-class";import { or } from "discourse/truth-helpers/index";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";export default class FKEmphasis extends Component {get type() {@@ -10,7 +10,7 @@ export default class FKEmphasis extends Component {<template><div- class={{concatClass+ class={{dConcatClass"form-kit__section""emphasis"(if this.type (concat "emphasis-" this.type))diff --git a/frontend/discourse/app/form-kit/components/fk/errors-summary.gjs b/frontend/discourse/app/form-kit/components/fk/errors-summary.gjsindex 9d8cb1352da..6ae97fe0dcc 100644--- a/frontend/discourse/app/form-kit/components/fk/errors-summary.gjs+++ b/frontend/discourse/app/form-kit/components/fk/errors-summary.gjs@@ -1,6 +1,6 @@import Component from "@glimmer/component";import { on } from "@ember/modifier";-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class FKErrorsSummary extends Component {@@ -42,7 +42,7 @@ export default class FKErrorsSummary extends Component {{{#if this.hasErrors}}<div class="form-kit__errors-summary" aria-live="assertive" ...attributes><h2 class="form-kit__errors-summary-title">- {{icon "triangle-exclamation"}}+ {{dIcon "triangle-exclamation"}}{{i18n "form_kit.errors_summary_title" count=this.errorCount}}</h2>diff --git a/frontend/discourse/app/form-kit/components/fk/errors.gjs b/frontend/discourse/app/form-kit/components/fk/errors.gjsindex a2f3a3194b8..815693bfdea 100644--- a/frontend/discourse/app/form-kit/components/fk/errors.gjs+++ b/frontend/discourse/app/form-kit/components/fk/errors.gjs@@ -1,5 +1,5 @@import Component from "@glimmer/component";-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";export default class FKErrors extends Component {concatErrors(errors) {@@ -9,7 +9,7 @@ export default class FKErrors extends Component {<template><p class="form-kit__errors" id={{@id}} aria-live="assertive" ...attributes><span>- {{icon "triangle-exclamation"}}+ {{dIcon "triangle-exclamation"}}{{this.concatErrors @error.messages}}</span></p>diff --git a/frontend/discourse/app/form-kit/components/fk/field-data.gjs b/frontend/discourse/app/form-kit/components/fk/field-data.gjsindex 75f873ff289..2d59ec00a98 100644--- a/frontend/discourse/app/form-kit/components/fk/field-data.gjs+++ b/frontend/discourse/app/form-kit/components/fk/field-data.gjs@@ -6,7 +6,7 @@ import curryComponent from "ember-curry-component";import { resolveFieldControl } from "discourse/form-kit/lib/field-control";import ValidationParser from "discourse/form-kit/lib/validation-parser";import Validator from "discourse/form-kit/lib/validator";-import uniqueId from "discourse/helpers/unique-id";+import dUniqueId from "discourse/ui-kit/helpers/d-unique-id";/*** Represents a field in a form with validation, registration, and field data management capabilities.@@ -16,13 +16,13 @@ export default class FKFieldData extends Component {* Unique identifier for the field.* @type {string}*/- id = uniqueId();+ id = dUniqueId();/*** Unique identifier for the field's error element.* @type {string}*/- errorId = uniqueId();+ errorId = dUniqueId();#controlArgs = { field: this };diff --git a/frontend/discourse/app/form-kit/components/fk/field.gjs b/frontend/discourse/app/form-kit/components/fk/field.gjsindex c5968c0cef6..ef164ce0153 100644--- a/frontend/discourse/app/form-kit/components/fk/field.gjs+++ b/frontend/discourse/app/form-kit/components/fk/field.gjs@@ -31,9 +31,9 @@ import FKOptional from "discourse/form-kit/components/fk/optional";import FKRow from "discourse/form-kit/components/fk/row";import FKText from "discourse/form-kit/components/fk/text";import FKTooltip from "discourse/form-kit/components/fk/tooltip";-import concatClass from "discourse/helpers/concat-class";import deprecated from "discourse/lib/deprecated";import { and, eq, not } from "discourse/truth-helpers";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";const RowColWrapper = <template><FKRow as |row|>@@ -126,7 +126,7 @@ export default class FKField extends Component {{{#if (has-block-params)}}<divid={{concat "control-" field.normalizedName}}- class={{concatClass+ class={{dConcatClass"form-kit__container""form-kit__field"(if field.type (concat "form-kit__field-" field.type))@@ -142,7 +142,7 @@ export default class FKField extends Component {>{{#if (and field.showTitle (not (eq field.type "checkbox")))}}<FKLabel- class={{concatClass+ class={{dConcatClass"form-kit__container-title"(if field.labelFormat (concat "--" field.labelFormat))}}@@ -159,7 +159,7 @@ export default class FKField extends Component {{{#if field.description}}<FKText- class={{concatClass+ class={{dConcatClass"form-kit__container-description"(if field.labelFormat (concat "--" field.labelFormat))}}diff --git a/frontend/discourse/app/form-kit/components/fk/form.gjs b/frontend/discourse/app/form-kit/components/fk/form.gjsindex 62ae22ffaad..adce6dbe8c4 100644--- a/frontend/discourse/app/form-kit/components/fk/form.gjs+++ b/frontend/discourse/app/form-kit/components/fk/form.gjs@@ -7,7 +7,6 @@ import { getOwner } from "@ember/owner";import didInsert from "@ember/render-modifiers/modifiers/did-insert";import { service } from "@ember/service";import curryComponent from "ember-curry-component";-import DButton from "discourse/components/d-button";import { getScrollParent } from "discourse/float-kit/lib/get-scroll-parent";import FKAlert from "discourse/form-kit/components/fk/alert";import FKCheckboxGroup from "discourse/form-kit/components/fk/checkbox-group";@@ -26,6 +25,7 @@ import FKSubmit from "discourse/form-kit/components/fk/submit";import { VALIDATION_TYPES } from "discourse/form-kit/lib/constants";import FKFormData from "discourse/form-kit/lib/fk-form-data";import { headerOffset } from "discourse/lib/offset-calculator";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";class FKForm extends Component {diff --git a/frontend/discourse/app/form-kit/components/fk/section.gjs b/frontend/discourse/app/form-kit/components/fk/section.gjsindex e20913f8bf0..37a33460739 100644--- a/frontend/discourse/app/form-kit/components/fk/section.gjs+++ b/frontend/discourse/app/form-kit/components/fk/section.gjs@@ -1,8 +1,8 @@-import concatClass from "discourse/helpers/concat-class";import { or } from "discourse/truth-helpers/index";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";const FKSection = <template>- <div class={{concatClass "form-kit__section" @class}} ...attributes>+ <div class={{dConcatClass "form-kit__section" @class}} ...attributes>{{#if (or @title @subtitle (has-block "header"))}}<div class="form-kit__section-header">diff --git a/frontend/discourse/app/form-kit/components/fk/submit.gjs b/frontend/discourse/app/form-kit/components/fk/submit.gjsindex d9f9b58f005..55cd1f982f9 100644--- a/frontend/discourse/app/form-kit/components/fk/submit.gjs+++ b/frontend/discourse/app/form-kit/components/fk/submit.gjs@@ -1,5 +1,5 @@import Component from "@glimmer/component";-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";export default class FKSubmit extends Component {get label() {diff --git a/frontend/discourse/app/helpers/bound-category-link.js b/frontend/discourse/app/helpers/bound-category-link.jsdeleted file mode 100644index 84f4f81dbd7..00000000000--- a/frontend/discourse/app/helpers/bound-category-link.js+++ /dev/null@@ -1 +0,0 @@-export { categoryLinkHTML as default } from "discourse/helpers/category-link";diff --git a/frontend/discourse/app/helpers/css-identifier.js b/frontend/discourse/app/helpers/css-identifier.jsindex 2e555be6753..574c4b08555 100644--- a/frontend/discourse/app/helpers/css-identifier.js+++ b/frontend/discourse/app/helpers/css-identifier.js@@ -1,4 +1,4 @@-import dasherize from "discourse/helpers/dasherize";+import dDasherize from "discourse/ui-kit/helpers/d-dasherize";/*** Converts a string to a valid CSS identifier (class name, ID, etc.).@@ -8,5 +8,5 @@ import dasherize from "discourse/helpers/dasherize";* @returns {string} A CSS-safe kebab-case identifier.*/export default function cssIdentifier(name = "") {- return dasherize(name.replace(/:/g, "-"));+ return dDasherize(name.replace(/:/g, "-"));}diff --git a/frontend/discourse/app/helpers/user-avatar.js b/frontend/discourse/app/helpers/user-avatar.jsdeleted file mode 100644index 90fdb226bcb..00000000000--- a/frontend/discourse/app/helpers/user-avatar.js+++ /dev/null@@ -1 +0,0 @@-export * from "./avatar";diff --git a/frontend/discourse/app/instance-initializers/video-placeholder.js b/frontend/discourse/app/instance-initializers/video-placeholder.jsindex 5af1ac9fd8e..52998acc6a4 100644--- a/frontend/discourse/app/instance-initializers/video-placeholder.js+++ b/frontend/discourse/app/instance-initializers/video-placeholder.js@@ -1,8 +1,8 @@-import { spinnerHTML } from "discourse/helpers/loading-spinner";import { iconHTML } from "discourse/lib/icon-library";import discourseLater from "discourse/lib/later";import { withPluginApi } from "discourse/lib/plugin-api";import { sanitize } from "discourse/lib/text";+import { spinnerHTML } from "discourse/ui-kit/helpers/d-loading-spinner";import { i18n } from "discourse-i18n";export default {diff --git a/frontend/discourse/app/lib/blocks/-internals/components/block-layout-wrapper.gjs b/frontend/discourse/app/lib/blocks/-internals/components/block-layout-wrapper.gjsindex cec4fa1470f..82896e63976 100644--- a/frontend/discourse/app/lib/blocks/-internals/components/block-layout-wrapper.gjs+++ b/frontend/discourse/app/lib/blocks/-internals/components/block-layout-wrapper.gjs@@ -11,8 +11,8 @@*/import Component from "@glimmer/component";import curryComponent from "ember-curry-component";-import concatClass from "discourse/helpers/concat-class";import cssIdentifier from "discourse/helpers/css-identifier";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";/*** @typedef {import("ember-curry-component").CurriedComponent} CurriedComponent@@ -92,7 +92,7 @@ class WrappedBlockLayout extends Component {<template><div- class={{concatClass+ class={{dConcatClassthis.blockClassNames@decoratorClassNames@classNamesdiff --git a/frontend/discourse/app/lib/blocks/-internals/components/block-outlet-inline-error.gjs b/frontend/discourse/app/lib/blocks/-internals/components/block-outlet-inline-error.gjsindex 5f5608f8dc3..a7d966ed826 100644--- a/frontend/discourse/app/lib/blocks/-internals/components/block-outlet-inline-error.gjs+++ b/frontend/discourse/app/lib/blocks/-internals/components/block-outlet-inline-error.gjs@@ -1,7 +1,7 @@import Component from "@glimmer/component";import { trustHTML } from "@ember/template";-import FlashMessage from "discourse/components/flash-message";import { extractErrorInfo } from "discourse/lib/ajax-error";+import DFlashMessage from "discourse/ui-kit/d-flash-message";/*** Displays an error inline within a block outlet.@@ -19,6 +19,6 @@ export default class BlockOutletInlineError extends Component {}<template>- <FlashMessage role="alert" @flash={{this.errorMessage}} @type="error" />+ <DFlashMessage role="alert" @flash={{this.errorMessage}} @type="error" /></template>}diff --git a/frontend/discourse/app/lib/category-tag-search.js b/frontend/discourse/app/lib/category-tag-search.jsindex 29e94149fb4..27ac07c21bd 100644--- a/frontend/discourse/app/lib/category-tag-search.js+++ b/frontend/discourse/app/lib/category-tag-search.js@@ -7,7 +7,7 @@ import { isTesting } from "discourse/lib/environment";import discourseLater from "discourse/lib/later";import { TAG_HASHTAG_POSTFIX } from "discourse/lib/tag-hashtags";import Category from "discourse/models/category";-import { CANCELLED_STATUS } from "discourse/modifiers/d-autocomplete";+import { CANCELLED_STATUS } from "discourse/ui-kit/modifiers/d-autocomplete";let cache = {};let cacheTime;diff --git a/frontend/discourse/app/lib/hashtag-autocomplete.js b/frontend/discourse/app/lib/hashtag-autocomplete.jsindex d007fe37d6e..3c63b8978fc 100644--- a/frontend/discourse/app/lib/hashtag-autocomplete.js+++ b/frontend/discourse/app/lib/hashtag-autocomplete.js@@ -8,7 +8,7 @@ import { getHashtagTypeClasses as getHashtagTypeClassesNew } from "discourse/libimport discourseLater from "discourse/lib/later";import { emojiUnescape } from "discourse/lib/text";import { escapeExpression } from "discourse/lib/utilities";-import { CANCELLED_STATUS } from "discourse/modifiers/d-autocomplete";+import { CANCELLED_STATUS } from "discourse/ui-kit/modifiers/d-autocomplete";/*** Sets up a textarea using the jQuery autocomplete plugin, specificallydiff --git a/frontend/discourse/app/lib/hashtag-types/category.js b/frontend/discourse/app/lib/hashtag-types/category.jsindex b5504bd0c67..15eaa17d09b 100644--- a/frontend/discourse/app/lib/hashtag-types/category.js+++ b/frontend/discourse/app/lib/hashtag-types/category.js@@ -1,6 +1,6 @@import { service } from "@ember/service";-import replaceEmoji from "discourse/helpers/replace-emoji";import { iconHTML } from "discourse/lib/icon-library";+import dReplaceEmoji from "discourse/ui-kit/helpers/d-replace-emoji";import HashtagTypeBase from "./base";export default class CategoryHashtagType extends HashtagTypeBase {@@ -67,7 +67,7 @@ export default class CategoryHashtagType extends HashtagTypeBase {style = iconHTML(hashtag.icon);}if (hashtag.style_type === "emoji" && hashtag.emoji) {- style = replaceEmoji(`:${hashtag.emoji}:`);+ style = dReplaceEmoji(`:${hashtag.emoji}:`);}const colorCssClass = `hashtag-color--${this.type}-${hashtag.id}`;diff --git a/frontend/discourse/app/lib/plugin-api.gjs b/frontend/discourse/app/lib/plugin-api.gjsindex 4883fc3cb10..665353a659f 100644--- a/frontend/discourse/app/lib/plugin-api.gjs+++ b/frontend/discourse/app/lib/plugin-api.gjs@@ -11,11 +11,6 @@ import {addComposerUploadPreProcessor,} from "discourse/components/composer-editor";import { addPluginDocumentTitleCounter } from "discourse/components/d-document";-import { addToolbarCallback } from "discourse/components/d-editor";-import {- NON_STREAM_HTML_DECORATOR,- registerHtmlDecorator,-} from "discourse/components/decorated-html";import { forceDropdownForMenuPanels as glimmerForceDropdownForMenuPanels } from "discourse/components/glimmer-site-header";import { addGlobalNotice } from "discourse/components/global-notice";import { headerButtonsDAG } from "discourse/components/header";@@ -46,13 +41,8 @@ import { registerFullPageSearchType } from "discourse/controllers/full-page-searimport { registerCustomPostMessageCallback as registerCustomPostMessageCallback1 } from "discourse/controllers/topic";import { addBeforeLoadMoreCallback as addBeforeLoadMoreNotificationsCallback } from "discourse/controllers/user-notifications";import { registerCustomUserNavMessagesDropdownRow } from "discourse/controllers/user-private-messages";-import {- addExtraIconRenderer,- replaceCategoryLinkRenderer,-} from "discourse/helpers/category-link";import { addUsernameSelectorDecorator } from "discourse/helpers/decorate-username-selector";import { registerReviewableStatusName } from "discourse/helpers/reviewable-status";-import { registerCustomAvatarHelper } from "discourse/helpers/user-avatar";import { addBeforeAuthCompleteCallback } from "discourse/instance-initializers/auth-complete";import { registerAdminPluginConfigNav } from "discourse/lib/admin-plugin-config-nav";import { registerPluginHeaderActionComponent } from "discourse/lib/admin-plugin-header-actions";@@ -141,6 +131,16 @@ import { CUSTOM_USER_SEARCH_OPTIONS } from "discourse/select-kit/components/userimport { modifySelectKit } from "discourse/select-kit/lib/plugin-api";import { addComposerSaveErrorCallback } from "discourse/services/composer";import { disableDefaultKeyboardShortcuts } from "discourse/services/keyboard-shortcuts";+import {+ NON_STREAM_HTML_DECORATOR,+ registerHtmlDecorator,+} from "discourse/ui-kit/d-decorated-html";+import { addToolbarCallback } from "discourse/ui-kit/d-editor";+import {+ addExtraIconRenderer,+ replaceCategoryLinkRenderer,+} from "discourse/ui-kit/helpers/d-category-link";+import { registerCustomAvatarHelper } from "discourse/ui-kit/helpers/d-user-avatar";import { addImageWrapperButton } from "discourse-markdown-it/features/image-controls";const blockedModifications = ["component:topic-list"];diff --git a/frontend/discourse/app/lib/post-cooked-html-decorators/mentions.gjs b/frontend/discourse/app/lib/post-cooked-html-decorators/mentions.gjsindex 98fe85401b3..7f26fd8e5d3 100644--- a/frontend/discourse/app/lib/post-cooked-html-decorators/mentions.gjs+++ b/frontend/discourse/app/lib/post-cooked-html-decorators/mentions.gjs@@ -1,10 +1,10 @@-import UserStatusMessage from "discourse/components/user-status-message";import getURL from "discourse/lib/get-url";import { applyValueTransformer } from "discourse/lib/transformer";+import DUserStatusMessage from "discourse/ui-kit/d-user-status-message";const CookedUserStatusMessage = <template>{{#in-element @data.wrapper}}- <UserStatusMessage @status={{@data.status}} />+ <DUserStatusMessage @status={{@data.status}} />{{/in-element}}</template>;diff --git a/frontend/discourse/app/lib/search.js b/frontend/discourse/app/lib/search.jsindex d832077ca79..a15b5dbc2b1 100644--- a/frontend/discourse/app/lib/search.js+++ b/frontend/discourse/app/lib/search.js@@ -16,7 +16,7 @@ import Post from "discourse/models/post";import Site from "discourse/models/site";import Topic from "discourse/models/topic";import User from "discourse/models/user";-import DAutocompleteModifier from "discourse/modifiers/d-autocomplete";+import dAutocomplete from "discourse/ui-kit/modifiers/d-autocomplete";import { i18n } from "discourse-i18n";const translateResultsCallbacks = [];@@ -247,25 +247,20 @@ export function applySearchAutocomplete(inputElement, siteSettings, owner) {const modifiers = [];modifiers.push(- DAutocompleteModifier.setupAutocomplete(- owner,- inputElement,- autocompleteHandler,- {- component: HashtagAutocompleteResults,- key: HashtagAutocompleteResults.TRIGGER_KEY,- autoSelectFirstSuggestion: false,- transformComplete: (obj) => obj.text,- dataSource: (term) => searchCategoryTag(term, siteSettings),- fixedTextareaPosition: true,- offset: 2,- }- )+ dAutocomplete.setupAutocomplete(owner, inputElement, autocompleteHandler, {+ component: HashtagAutocompleteResults,+ key: HashtagAutocompleteResults.TRIGGER_KEY,+ autoSelectFirstSuggestion: false,+ transformComplete: (obj) => obj.text,+ dataSource: (term) => searchCategoryTag(term, siteSettings),+ fixedTextareaPosition: true,+ offset: 2,+ }));if (siteSettings.enable_mentions) {modifiers.push(- DAutocompleteModifier.setupAutocomplete(+ dAutocomplete.setupAutocomplete(owner,inputElement,autocompleteHandler,diff --git a/frontend/discourse/app/lib/textarea-text-manipulation.js b/frontend/discourse/app/lib/textarea-text-manipulation.jsindex 79943a417ba..37406e482d4 100644--- a/frontend/discourse/app/lib/textarea-text-manipulation.js+++ b/frontend/discourse/app/lib/textarea-text-manipulation.js@@ -20,7 +20,7 @@ import {inCodeBlock,setCaretPosition,} from "discourse/lib/utilities";-import DAutocompleteModifier from "discourse/modifiers/d-autocomplete";+import dAutocomplete from "discourse/ui-kit/modifiers/d-autocomplete";import { i18n } from "discourse-i18n";/**@@ -990,7 +990,7 @@ export default class TextareaTextManipulation {}autocomplete(options) {- return DAutocompleteModifier.setupAutocomplete(+ return dAutocomplete.setupAutocomplete(getOwner(this),this.textarea,this.autocompleteHandler,diff --git a/frontend/discourse/app/lib/user-search.js b/frontend/discourse/app/lib/user-search.jsindex 41dc7014489..a79955690de 100644--- a/frontend/discourse/app/lib/user-search.js+++ b/frontend/discourse/app/lib/user-search.js@@ -8,7 +8,7 @@ import discourseLater from "discourse/lib/later";import { cloneJSON } from "discourse/lib/object";import { userPath } from "discourse/lib/url";import { emailValid } from "discourse/lib/utilities";-import { CANCELLED_STATUS } from "discourse/modifiers/d-autocomplete";+import { CANCELLED_STATUS } from "discourse/ui-kit/modifiers/d-autocomplete";import { i18n } from "discourse-i18n";let cache = {},diff --git a/frontend/discourse/app/models/user-draft.js b/frontend/discourse/app/models/user-draft.jsindex dd0d96b3e4f..c6008c38a5e 100644--- a/frontend/discourse/app/models/user-draft.js+++ b/frontend/discourse/app/models/user-draft.js@@ -1,6 +1,5 @@import { computed } from "@ember/object";import { service } from "@ember/service";-import replaceEmoji from "discourse/helpers/replace-emoji";import { userPath } from "discourse/lib/url";import { postUrl } from "discourse/lib/utilities";import {@@ -9,13 +8,14 @@ import {NEW_TOPIC_KEY,} from "discourse/models/composer";import RestModel from "discourse/models/rest";+import dReplaceEmoji from "discourse/ui-kit/helpers/d-replace-emoji";import { i18n } from "discourse-i18n";export default class UserDraft extends RestModel {@service currentUser;get titleHtml() {- return replaceEmoji(this.get("title"));+ return dReplaceEmoji(this.get("title"));}@computed("draft_username")diff --git a/frontend/discourse/app/services/deprecation-warning-handler.js b/frontend/discourse/app/services/deprecation-warning-handler.jsindex bb928a9ddc1..7baffb16bcb 100644--- a/frontend/discourse/app/services/deprecation-warning-handler.js+++ b/frontend/discourse/app/services/deprecation-warning-handler.js@@ -2,11 +2,11 @@ import { registerDeprecationHandler } from "@ember/debug";import Service, { service } from "@ember/service";import { addGlobalNotice } from "discourse/components/global-notice";import DeprecationWorkflow from "discourse/deprecation-workflow";-import dasherize from "discourse/helpers/dasherize";import { bind } from "discourse/lib/decorators";import { registerDeprecationHandler as registerDiscourseDeprecationHandler } from "discourse/lib/deprecated";import identifySource from "discourse/lib/source-identifier";import { escapeExpression } from "discourse/lib/utilities";+import dDasherize from "discourse/ui-kit/helpers/d-dasherize";import { i18n } from "discourse-i18n";const REPLACEMENT_URLS = {};@@ -106,7 +106,7 @@ export default class DeprecationWarningHandler extends Service {notice += " " + this.siteSettings.warn_critical_js_deprecations_message;}- addGlobalNotice(notice, `critical-deprecation--${dasherize(id)}`, {+ addGlobalNotice(notice, `critical-deprecation--${dDasherize(id)}`, {dismissable: true,dismissDuration: moment.duration(1, "day"),level: "warn",diff --git a/frontend/discourse/app/services/modal.js b/frontend/discourse/app/services/modal.jsindex 8b4fb83dc90..3f3b915ac49 100644--- a/frontend/discourse/app/services/modal.js+++ b/frontend/discourse/app/services/modal.js@@ -1,9 +1,9 @@import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";import Service, { service } from "@ember/service";-import { CLOSE_INITIATED_BY_MODAL_SHOW } from "discourse/components/d-modal";import { disableImplicitInjections } from "discourse/lib/implicit-injections";import { waitForClosedKeyboard } from "discourse/lib/wait-for-keyboard";+import { CLOSE_INITIATED_BY_MODAL_SHOW } from "discourse/ui-kit/d-modal";const LEGACY_OPTS = new Set(["admin",diff --git a/frontend/discourse/app/static/dev-tools/block-debug/block-info.gjs b/frontend/discourse/app/static/dev-tools/block-debug/block-info.gjsindex 9a9ca0dfb51..cb55555c40a 100644--- a/frontend/discourse/app/static/dev-tools/block-debug/block-info.gjs+++ b/frontend/discourse/app/static/dev-tools/block-debug/block-info.gjs@@ -3,7 +3,7 @@ import Component from "@glimmer/component";import { array, hash } from "@ember/helper";/** @type {import("discourse/float-kit/components/d-tooltip.gjs").default} */import DTooltip from "discourse/float-kit/components/d-tooltip";-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";/** @type {import("../shared/args-table.gjs").default} */import ArgsTable from "../shared/args-table";/** @type {import("./conditions-tree.gjs").default} */@@ -115,7 +115,7 @@ export default class BlockInfo extends Component {><:trigger><span class="block-debug-badge">- {{icon "cube"}}+ {{dIcon "cube"}}<span class="block-debug-badge__name">{{this.displayName}}</span></span></:trigger>@@ -123,7 +123,7 @@ export default class BlockInfo extends Component {<div class="block-debug-tooltip"><div class="block-debug-tooltip__header"><div class="block-debug-tooltip__row">- {{icon "cube"}}+ {{dIcon "cube"}}<span class="block-debug-tooltip__title">{{this.displayName}}</span>diff --git a/frontend/discourse/app/static/dev-tools/block-debug/button.gjs b/frontend/discourse/app/static/dev-tools/block-debug/button.gjsindex a2ec5742809..01314e615b3 100644--- a/frontend/discourse/app/static/dev-tools/block-debug/button.gjs+++ b/frontend/discourse/app/static/dev-tools/block-debug/button.gjs@@ -4,10 +4,10 @@ import { on } from "@ember/modifier";import { action } from "@ember/object";/** @type {import("discourse/float-kit/components/d-menu.gjs").default} */import DMenu from "discourse/float-kit/components/d-menu";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";-/** @type {import("discourse/helpers/element.gjs").default} */-import element from "discourse/helpers/element";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+/** @type {import("discourse/ui-kit/helpers/d-element.gjs").default} */+import dElement from "discourse/ui-kit/helpers/d-element";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";import devToolsState from "../state";@@ -88,16 +88,16 @@ export default class BlockDebugButton extends Component {<template><DMenu@identifier="block-debug-menu"- @triggerClass={{concatClass+ @triggerClass={{dConcatClass"toggle-blocks"(if this.isActive "--active")}}- @triggerComponent={{element "button"}}+ @triggerComponent={{dElement "button"}}@modalForMobile={{false}}@title={{i18n "dev_tools.toggle_block_debug"}}><:trigger>- {{icon "cubes"}}+ {{dIcon "cubes"}}</:trigger><:content><div class="block-debug-menu">diff --git a/frontend/discourse/app/static/dev-tools/block-debug/conditions-tree.gjs b/frontend/discourse/app/static/dev-tools/block-debug/conditions-tree.gjsindex 16a992c6d08..2249512ff87 100644--- a/frontend/discourse/app/static/dev-tools/block-debug/conditions-tree.gjs+++ b/frontend/discourse/app/static/dev-tools/block-debug/conditions-tree.gjs@@ -1,7 +1,7 @@// @ts-checkimport Component from "@glimmer/component";import { trustHTML } from "@ember/template";-import concatClass from "discourse/helpers/concat-class";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { formatValue } from "../lib/value-formatter";/**@@ -88,7 +88,7 @@ export default class ConditionsTree extends Component {<template><div- class={{concatClass+ class={{dConcatClass"block-debug-conditions"(if @passed "--passed" "--failed")}}@@ -158,7 +158,7 @@ class ConditionNode extends Component {<template><div- class={{concatClass+ class={{dConcatClass"block-debug-condition"(if this.isCombinator "--combinator" "--leaf")}}diff --git a/frontend/discourse/app/static/dev-tools/block-debug/ghost-block.gjs b/frontend/discourse/app/static/dev-tools/block-debug/ghost-block.gjsindex b2cc8f4f477..d7e0e607bd5 100644--- a/frontend/discourse/app/static/dev-tools/block-debug/ghost-block.gjs+++ b/frontend/discourse/app/static/dev-tools/block-debug/ghost-block.gjs@@ -3,8 +3,8 @@ import Component from "@glimmer/component";import { array, hash } from "@ember/helper";/** @type {import("discourse/float-kit/components/d-tooltip.gjs").default} */import DTooltip from "discourse/float-kit/components/d-tooltip";-import icon from "discourse/helpers/d-icon";import { FAILURE_TYPE } from "discourse/lib/blocks/-internals/patterns";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";/** @type {import("../shared/args-table.gjs").default} */import ArgsTable from "../shared/args-table";@@ -150,7 +150,7 @@ export default class GhostBlock extends Component {><:trigger><span class="block-debug-ghost__badge">- {{icon "cube"}}+ {{dIcon "cube"}}<span class="block-debug-ghost__name">{{this.displayName}}</span>@@ -163,7 +163,7 @@ export default class GhostBlock extends Component {<div class="block-debug-tooltip --ghost"><div class="block-debug-tooltip__header --failed"><div class="block-debug-tooltip__row">- {{icon "cube"}}+ {{dIcon "cube"}}<span class="block-debug-tooltip__title">{{this.displayName}}</span>diff --git a/frontend/discourse/app/static/dev-tools/block-debug/outlet-info.gjs b/frontend/discourse/app/static/dev-tools/block-debug/outlet-info.gjsindex d0a8e17620b..a5f3f831fc4 100644--- a/frontend/discourse/app/static/dev-tools/block-debug/outlet-info.gjs+++ b/frontend/discourse/app/static/dev-tools/block-debug/outlet-info.gjs@@ -3,9 +3,9 @@ import Component from "@glimmer/component";import { array, hash } from "@ember/helper";/** @type {import("discourse/float-kit/components/d-tooltip.gjs").default} */import DTooltip from "discourse/float-kit/components/d-tooltip";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import { DEPRECATED_ARGS_KEY } from "discourse/lib/outlet-args";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";/** @type {import("../shared/args-table.gjs").default} */import ArgsTable from "../shared/args-table";@@ -71,7 +71,7 @@ export default class OutletInfo extends Component {<template><div- class={{concatClass+ class={{dConcatClass"block-outlet-debug"(if @error "--validation-failed")}}@@ -90,7 +90,7 @@ export default class OutletInfo extends Component {><:trigger><span class="block-outlet-debug__badge {{if @error '--error'}}">- {{icon "cubes"}}+ {{dIcon "cubes"}}{{@outletName}}</span></:trigger>@@ -101,7 +101,7 @@ export default class OutletInfo extends Component {{{if @error '--error' '--block-outlet'}}"><span class="title">- {{icon "cubes"}}+ {{dIcon "cubes"}}{{@outletName}}</span>{{#if @error}}@@ -113,7 +113,7 @@ export default class OutletInfo extends Component {target="_blank"rel="noopener noreferrer"title="Find on GitHub"- >{{icon "fab-github"}}</a>+ >{{dIcon "fab-github"}}</a></div><div class="outlet-info__content">{{#if @error}}@@ -127,7 +127,7 @@ export default class OutletInfo extends Component {<div class="outlet-info__section"><div class="outlet-info__section-title">Blocks Registered</div><div class="outlet-info__stat">- {{icon "cube"}}+ {{dIcon "cube"}}<span>{{this.blockLabel}}</span></div></div>diff --git a/frontend/discourse/app/static/dev-tools/mobile-view/button.gjs b/frontend/discourse/app/static/dev-tools/mobile-view/button.gjsindex 67543656dad..89057791bfb 100644--- a/frontend/discourse/app/static/dev-tools/mobile-view/button.gjs+++ b/frontend/discourse/app/static/dev-tools/mobile-view/button.gjs@@ -1,9 +1,9 @@import Component from "@glimmer/component";import { on } from "@ember/modifier";import { action } from "@ember/object";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import mobile from "discourse/lib/mobile";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class MobileViewButton extends Component {@@ -19,13 +19,13 @@ export default class MobileViewButton extends Component {<template><buttontitle={{i18n "dev_tools.toggle_mobile_view"}}- class={{concatClass+ class={{dConcatClass"toggle-mobile-view"(if this.mobileViewActive "--active")}}{{on "click" this.toggleMobileView}}>- {{icon "mobile-screen-button"}}+ {{dIcon "mobile-screen-button"}}</button></template>}diff --git a/frontend/discourse/app/static/dev-tools/plugin-outlet-debug/button.gjs b/frontend/discourse/app/static/dev-tools/plugin-outlet-debug/button.gjsindex 5ffcc9671ff..73828df8491 100644--- a/frontend/discourse/app/static/dev-tools/plugin-outlet-debug/button.gjs+++ b/frontend/discourse/app/static/dev-tools/plugin-outlet-debug/button.gjs@@ -1,8 +1,8 @@import Component from "@glimmer/component";import { on } from "@ember/modifier";import { action } from "@ember/object";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";import devToolsState from "../state";@@ -19,13 +19,13 @@ export default class PluginOutletDebugButton extends Component {<template><buttontitle={{i18n "dev_tools.toggle_plugin_outlet_debug"}}- class={{concatClass+ class={{dConcatClass"toggle-plugin-outlets"(if devToolsState.pluginOutletDebug "--active")}}{{on "click" this.togglePluginOutlets}}>- {{icon "plug"}}+ {{dIcon "plug"}}</button></template>}diff --git a/frontend/discourse/app/static/dev-tools/plugin-outlet-debug/outlet-info.gjs b/frontend/discourse/app/static/dev-tools/plugin-outlet-debug/outlet-info.gjsindex 7ea3b21a5fe..e165545a67d 100644--- a/frontend/discourse/app/static/dev-tools/plugin-outlet-debug/outlet-info.gjs+++ b/frontend/discourse/app/static/dev-tools/plugin-outlet-debug/outlet-info.gjs@@ -4,10 +4,10 @@ import { array, hash } from "@ember/helper";import { action } from "@ember/object";import didInsert from "@ember/render-modifiers/modifiers/did-insert";import DTooltip from "discourse/float-kit/components/d-tooltip";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import { DEPRECATED_ARGS_KEY } from "discourse/lib/outlet-args";import { or } from "discourse/truth-helpers";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";import ArgsTable from "../shared/args-table";import devToolsState from "../state";@@ -133,7 +133,7 @@ export default class OutletInfoComponent extends Component {<template><div- class={{concatClass+ class={{dConcatClass"plugin-outlet-debug"(if this.partOfWrapper "--wrapper")(if this.isHidden "hidden")@@ -157,7 +157,7 @@ export default class OutletInfoComponent extends Component {this.displayName}}>{{else}}- {{icon "plug"}}+ {{dIcon "plug"}}{{if this.showName this.displayName}}{{/if}}</span>@@ -165,10 +165,10 @@ export default class OutletInfoComponent extends Component {<:content><div class="outlet-info__wrapper"><div- class={{concatClass "outlet-info__heading" this.headingModifier}}+ class={{dConcatClass "outlet-info__heading" this.headingModifier}}><span class="title">- {{icon "plug"}}+ {{dIcon "plug"}}{{this.displayName}}{{#if this.partOfWrapper}}{{i18n "js.dev_tools.plugin_outlet_debug.wrapper"}}@@ -180,12 +180,12 @@ export default class OutletInfoComponent extends Component {target="_blank"rel="noopener noreferrer"title={{i18n "js.dev_tools.plugin_outlet_debug.find_on_github"}}- >{{icon "fab-github"}}</a>+ >{{dIcon "fab-github"}}</a></div><div class="outlet-info__content">{{#if this.isDeprecated}}<div class="outlet-info__deprecation-banner">- {{icon "triangle-exclamation"}}+ {{dIcon "triangle-exclamation"}}<span>{{or@deprecated.message@@ -216,7 +216,7 @@ export default class OutletInfoComponent extends Component {<code>{{alias.name}}</code>{{#if alias.deprecated}}<span class="outlet-info__alias-deprecated">- {{icon "triangle-exclamation"}}+ {{dIcon "triangle-exclamation"}}{{i18n"js.dev_tools.plugin_outlet_debug.deprecated"}}diff --git a/frontend/discourse/app/static/dev-tools/safe-mode/button.gjs b/frontend/discourse/app/static/dev-tools/safe-mode/button.gjsindex 61a18f1d72f..f2e30050db3 100644--- a/frontend/discourse/app/static/dev-tools/safe-mode/button.gjs+++ b/frontend/discourse/app/static/dev-tools/safe-mode/button.gjs@@ -1,8 +1,8 @@import Component from "@glimmer/component";import { on } from "@ember/modifier";import { action } from "@ember/object";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class SafeModeButton extends Component {@@ -24,13 +24,13 @@ export default class SafeModeButton extends Component {<template><buttontitle={{i18n "dev_tools.toggle_safe_mode"}}- class={{concatClass+ class={{dConcatClass"toggle-safe-mode"(if this.safeModeActive "--active")}}{{on "click" this.toggleSafeMode}}>- {{icon "truck-medical"}}+ {{dIcon "truck-medical"}}</button></template>}diff --git a/frontend/discourse/app/static/dev-tools/shared/args-table.gjs b/frontend/discourse/app/static/dev-tools/shared/args-table.gjsindex b4aa71f6356..3d1e99ca2d5 100644--- a/frontend/discourse/app/static/dev-tools/shared/args-table.gjs+++ b/frontend/discourse/app/static/dev-tools/shared/args-table.gjs@@ -2,10 +2,10 @@ import Component from "@glimmer/component";import { fn } from "@ember/helper";import { on } from "@ember/modifier";import { action } from "@ember/object";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import { isDeprecatedOutletArgument } from "discourse/helpers/deprecated-outlet-argument";import { DEPRECATED_ARGS_KEY } from "discourse/lib/outlet-args";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { logArgToConsole } from "../lib/console-logger";import { formatValue, getTypeInfo } from "../lib/value-formatter";@@ -128,7 +128,7 @@ export default class ArgsTable extends Component {{{#each this.entries as |entry|}}<buttontype="button"- class={{concatClass+ class={{dConcatClass"outlet-args-table__row"(if entry.isDeprecated "--deprecated")}}@@ -143,7 +143,7 @@ export default class ArgsTable extends Component {@{{entry.key}}{{#if entry.isDeprecated}}<span class="outlet-args-table__deprecated-badge">- {{icon "triangle-exclamation"}}+ {{dIcon "triangle-exclamation"}}</span>{{/if}}</span>diff --git a/frontend/discourse/app/static/dev-tools/toolbar.gjs b/frontend/discourse/app/static/dev-tools/toolbar.gjsindex 91ea3b8adcc..6ed230ff02e 100644--- a/frontend/discourse/app/static/dev-tools/toolbar.gjs+++ b/frontend/discourse/app/static/dev-tools/toolbar.gjs@@ -4,10 +4,10 @@ import { on } from "@ember/modifier";import { action } from "@ember/object";import { service } from "@ember/service";import { trustHTML } from "@ember/template";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";-import draggable from "discourse/modifiers/draggable";-import onResize from "discourse/modifiers/on-resize";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";+import dDraggable from "discourse/ui-kit/modifiers/d-draggable";+import dOnResize from "discourse/ui-kit/modifiers/d-on-resize";import I18n, { i18n } from "discourse-i18n";import BlockDebugButton from "./block-debug/button";import MobileViewButton from "./mobile-view/button";@@ -61,24 +61,24 @@ export default class Toolbar extends Component {<template><div- class={{concatClass+ class={{dConcatClass"dev-tools-toolbar"(if this.activeDragOffset "--dragging")}}style={{this.style}}- {{onResize this.onResize}}+ {{dOnResize this.onResize}}><buttontype="button"title={{i18n "dev_tools.drag_to_move"}}class="gripper"- {{draggable+ {{dDraggabledidStartDrag=this.didStartDragdidEndDrag=this.didEndDragdragMove=this.dragMove}}>- {{icon "grip-lines"}}+ {{dIcon "grip-lines"}}</button><PluginOutletDebugButton /><BlockDebugButton />@@ -94,7 +94,7 @@ export default class Toolbar extends Component {class="disable-dev-tools"{{on "click" this.disableDevTools}}>- {{icon "xmark"}}+ {{dIcon "xmark"}}</button></div></template>diff --git a/frontend/discourse/app/static/dev-tools/upcoming-changes-debug/button.gjs b/frontend/discourse/app/static/dev-tools/upcoming-changes-debug/button.gjsindex 1efbe255705..f1910d01c83 100644--- a/frontend/discourse/app/static/dev-tools/upcoming-changes-debug/button.gjs+++ b/frontend/discourse/app/static/dev-tools/upcoming-changes-debug/button.gjs@@ -4,10 +4,10 @@ import { on } from "@ember/modifier";import { action } from "@ember/object";import { service } from "@ember/service";import DMenu from "discourse/float-kit/components/d-menu";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";-import element from "discourse/helpers/element";import { bind } from "discourse/lib/decorators";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dElement from "discourse/ui-kit/helpers/d-element";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";/**@@ -41,16 +41,16 @@ export default class UpcomingChangesDebugButton extends Component {<template><DMenu@identifier="upcoming-changes-debug-menu"- @triggerClass={{concatClass+ @triggerClass={{dConcatClass"toggle-upcoming-changes-menu"(if this.isActive "--active")}}- @triggerComponent={{element "button"}}+ @triggerComponent={{dElement "button"}}@modalForMobile={{false}}@title={{i18n "dev_tools.toggle_upcoming_changes_debug"}}><:trigger>- {{icon "flask"}}+ {{dIcon "flask"}}</:trigger><:content><div class="upcoming-changes-debug-menu">diff --git a/frontend/discourse/app/static/dev-tools/verbose-localization/button.gjs b/frontend/discourse/app/static/dev-tools/verbose-localization/button.gjsindex 74651b7b6f5..ada34763d0e 100644--- a/frontend/discourse/app/static/dev-tools/verbose-localization/button.gjs+++ b/frontend/discourse/app/static/dev-tools/verbose-localization/button.gjs@@ -1,8 +1,8 @@import Component from "@glimmer/component";import { on } from "@ember/modifier";import { action } from "@ember/object";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import I18n, { i18n } from "discourse-i18n";export default class VerboseLocalizationButton extends Component {@@ -19,13 +19,13 @@ export default class VerboseLocalizationButton extends Component {<template><buttontitle={{i18n "dev_tools.toggle_verbose_localization"}}- class={{concatClass+ class={{dConcatClass"toggle-verbose-localization"(if I18n.verbose "--active")}}{{on "click" this.toggleVerboseLocalization}}>- {{icon "scroll"}}+ {{dIcon "scroll"}}</button></template>}diff --git a/frontend/discourse/app/static/prosemirror/components/grid-node-view.gjs b/frontend/discourse/app/static/prosemirror/components/grid-node-view.gjsindex 277485e44f9..22bf7918437 100644--- a/frontend/discourse/app/static/prosemirror/components/grid-node-view.gjs+++ b/frontend/discourse/app/static/prosemirror/components/grid-node-view.gjs@@ -2,9 +2,9 @@ import Component from "@glimmer/component";import { fn } from "@ember/helper";import { on } from "@ember/modifier";import { action } from "@ember/object";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import { eq } from "discourse/truth-helpers";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class GridNodeView extends Component {@@ -60,7 +60,7 @@ export default class GridNodeView extends Component {><buttontype="button"- class={{concatClass+ class={{dConcatClass"composer-image-gallery__mode-btn"(if (eq this.currentMode "grid") "is-active")}}@@ -72,12 +72,12 @@ export default class GridNodeView extends Component {}}aria-pressed={{if (eq this.currentMode "grid") "true" "false"}}{{on "click" (fn this.setMode "grid")}}- >{{icon "table-cells"}}<span>{{i18n+ >{{dIcon "table-cells"}}<span>{{i18n"composer.grid_mode_grid"}}</span></button><buttontype="button"- class={{concatClass+ class={{dConcatClass"composer-image-gallery__mode-btn"(if (eq this.currentMode "carousel") "is-active")}}@@ -89,7 +89,7 @@ export default class GridNodeView extends Component {}}aria-pressed={{if (eq this.currentMode "carousel") "true" "false"}}{{on "click" (fn this.setMode "carousel")}}- >{{icon "image"}}<span>{{i18n+ >{{dIcon "image"}}<span>{{i18n"composer.grid_mode_carousel"}}</span></button></div><buttondiff --git a/frontend/discourse/app/static/prosemirror/components/image-alt-text-input.gjs b/frontend/discourse/app/static/prosemirror/components/image-alt-text-input.gjsindex 13e6815b8bf..d99068e2a1e 100644--- a/frontend/discourse/app/static/prosemirror/components/image-alt-text-input.gjs+++ b/frontend/discourse/app/static/prosemirror/components/image-alt-text-input.gjs@@ -4,8 +4,8 @@ import { on } from "@ember/modifier";import { action } from "@ember/object";import didInsert from "@ember/render-modifiers/modifiers/did-insert";import { next } from "@ember/runloop";-import concatClass from "discourse/helpers/concat-class";import { or } from "discourse/truth-helpers";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";export default class ImageAltTextInput extends Component {@@ -56,7 +56,7 @@ export default class ImageAltTextInput extends Component {<template><div- class={{concatClass+ class={{dConcatClass"image-alt-text-input"(if this.isExpanded "--expanded")}}diff --git a/frontend/discourse/app/static/prosemirror/lib/text-manipulation.js b/frontend/discourse/app/static/prosemirror/lib/text-manipulation.jsindex 6ad08aa8179..21c8177a3a5 100644--- a/frontend/discourse/app/static/prosemirror/lib/text-manipulation.js+++ b/frontend/discourse/app/static/prosemirror/lib/text-manipulation.js@@ -13,7 +13,7 @@ import {import { Selection, TextSelection } from "prosemirror-state";import { bind } from "discourse/lib/decorators";import escapeRegExp from "discourse/lib/escape-regexp";-import DAutocompleteModifier from "discourse/modifiers/d-autocomplete";+import dAutocomplete from "discourse/ui-kit/modifiers/d-autocomplete";import { i18n } from "discourse-i18n";import { hasMark, inNode, isNodeActive } from "./plugin-utils";@@ -135,7 +135,7 @@ export default class ProsemirrorTextManipulation {}autocomplete(options) {- return DAutocompleteModifier.setupAutocomplete(+ return dAutocomplete.setupAutocomplete(getOwner(this),this.view.dom,this.autocompleteHandler,diff --git a/frontend/discourse/app/static/wizard/components/fields/radio.gjs b/frontend/discourse/app/static/wizard/components/fields/radio.gjsindex 34cd6745184..772f30f9fab 100644--- a/frontend/discourse/app/static/wizard/components/fields/radio.gjs+++ b/frontend/discourse/app/static/wizard/components/fields/radio.gjs@@ -2,9 +2,9 @@ import Component from "@glimmer/component";import { on } from "@ember/modifier";import { action, set } from "@ember/object";import PluginOutlet from "discourse/components/plugin-outlet";-import concatClass from "discourse/helpers/concat-class";import lazyHash from "discourse/helpers/lazy-hash";import withEventValue from "discourse/helpers/with-event-value";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";export default class Radio extends Component {constructor() {@@ -33,7 +33,7 @@ export default class Radio extends Component {<div class="wizard-container__radio-choices">{{#each @field.choices as |choice|}}<div- class={{concatClass+ class={{dConcatClass"wizard-container__radio-choice"(if choice.selected "--selected")}}diff --git a/frontend/discourse/app/static/wizard/components/wizard-step.gjs b/frontend/discourse/app/static/wizard/components/wizard-step.gjsindex 3268eca19bd..96270cb3f71 100644--- a/frontend/discourse/app/static/wizard/components/wizard-step.gjs+++ b/frontend/discourse/app/static/wizard/components/wizard-step.gjs@@ -2,8 +2,8 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { on } from "@ember/modifier";import { action } from "@ember/object";-import concatClass from "discourse/helpers/concat-class";import getUrl from "discourse/lib/get-url";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";import WizardField from "./wizard-field";@@ -54,7 +54,7 @@ export default class WizardStepComponent extends Component {<template><div class="wizard-container__step {{@step.id}}">- <div class={{concatClass "wizard-container" this.containerFontClasses}}>+ <div class={{dConcatClass "wizard-container" this.containerFontClasses}}><div class="wizard-container__step-contents"><div class="wizard-container__step-header"><h1 class="wizard-container__step-title">{{@step.title}}</h1>diff --git a/frontend/discourse/app/templates/account-created/edit-email.gjs b/frontend/discourse/app/templates/account-created/edit-email.gjsindex a5b9bdc7c3f..db96e0cd683 100644--- a/frontend/discourse/app/templates/account-created/edit-email.gjs+++ b/frontend/discourse/app/templates/account-created/edit-email.gjs@@ -1,6 +1,6 @@import ActivationEmailForm from "discourse/components/activation-email-form";-import DButton from "discourse/components/d-button";import SignupProgressBar from "discourse/components/signup-progress-bar";+import DButton from "discourse/ui-kit/d-button";export default <template><SignupProgressBar @step="activate" />diff --git a/frontend/discourse/app/templates/activate-account.gjs b/frontend/discourse/app/templates/activate-account.gjsindex 5cf2eaeeaca..e67783de987 100644--- a/frontend/discourse/app/templates/activate-account.gjs+++ b/frontend/discourse/app/templates/activate-account.gjs@@ -2,7 +2,6 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import SignupProgressBar from "discourse/components/signup-progress-bar";import WelcomeHeader from "discourse/components/welcome-header";import bodyClass from "discourse/helpers/body-class";@@ -11,6 +10,7 @@ import hideApplicationSidebar from "discourse/helpers/hide-application-sidebar";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import getURL from "discourse/lib/get-url";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";export default class extends Component {diff --git a/frontend/discourse/app/templates/application.gjs b/frontend/discourse/app/templates/application.gjsindex bb88cc00340..e5ad1e0bf53 100644--- a/frontend/discourse/app/templates/application.gjs+++ b/frontend/discourse/app/templates/application.gjs@@ -5,7 +5,6 @@ import A11ySkipLinks from "discourse/components/a11y/skip-links";import AdminOnboardingBanner from "discourse/components/admin-onboarding/banner";import CardContainer from "discourse/components/card-container";import ComposerContainer from "discourse/components/composer-container";-import CustomHtml from "discourse/components/custom-html";import DDocument from "discourse/components/d-document";import DStyles from "discourse/components/d-styles";import DVirtualHeight from "discourse/components/d-virtual-height";@@ -34,6 +33,7 @@ import bodyClass from "discourse/helpers/body-class";import lazyHash from "discourse/helpers/lazy-hash";import routeAction from "discourse/helpers/route-action";import { eq } from "discourse/truth-helpers";+import DCustomHtml from "discourse/ui-kit/d-custom-html";export default <template><DStyles />@@ -123,7 +123,7 @@ export default <template><div class="container" id="main-container">{{#if @controller.showTop}}- <CustomHtml @name="top" />+ <DCustomHtml @name="top" />{{/if}}<NotificationConsentBanner /><PwaInstallBanner />@@ -162,7 +162,7 @@ export default <template>@outletArgs={{lazyHash [email protected]}}/>{{#if @controller.showFooter}}- <CustomHtml+ <DCustomHtml@name="footer"@triggerAppEvent={{true}}class="custom-footer-content"diff --git a/frontend/discourse/app/templates/badges/index.gjs b/frontend/discourse/app/templates/badges/index.gjsindex 20028e14383..2e9b5e64cf4 100644--- a/frontend/discourse/app/templates/badges/index.gjs+++ b/frontend/discourse/app/templates/badges/index.gjs@@ -1,7 +1,7 @@-import BadgeCard from "discourse/components/badge-card";import PluginOutlet from "discourse/components/plugin-outlet";import bodyClass from "discourse/helpers/body-class";import { slugify } from "discourse/lib/utilities";+import DBadgeCard from "discourse/ui-kit/d-badge-card";import { i18n } from "discourse-i18n";export default <template>@@ -25,7 +25,7 @@ export default <template></div><div class="badge-group-list">{{#each bg.badges as |b|}}- <BadgeCard+ <DBadgeCard@badge={{b}}@username={{@controller.currentUser.username}}/>diff --git a/frontend/discourse/app/templates/badges/show.gjs b/frontend/discourse/app/templates/badges/show.gjsindex 205e2331f8e..f25cf50e6a3 100644--- a/frontend/discourse/app/templates/badges/show.gjs+++ b/frontend/discourse/app/templates/badges/show.gjs@@ -1,15 +1,15 @@import { LinkTo } from "@ember/routing";import { trustHTML } from "@ember/template";-import BadgeCard from "discourse/components/badge-card";import BadgeTitle from "discourse/components/badge-title";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DButton from "discourse/components/d-button";-import LoadMore from "discourse/components/load-more";import PluginOutlet from "discourse/components/plugin-outlet";-import UserInfo from "discourse/components/user-info";-import formatDate from "discourse/helpers/format-date";import hideApplicationFooter from "discourse/helpers/hide-application-footer";import lazyHash from "discourse/helpers/lazy-hash";+import DBadgeCard from "discourse/ui-kit/d-badge-card";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DLoadMore from "discourse/ui-kit/d-load-more";+import DUserInfo from "discourse/ui-kit/d-user-info";+import dFormatDate from "discourse/ui-kit/helpers/d-format-date";import { i18n } from "discourse-i18n";export default <template>@@ -25,7 +25,7 @@ export default <template></h1><div class="show-badge-details">- <BadgeCard+ <DBadgeCard@badge={{@controller.model}}@size="large"@count={{@controller.userBadgesGrantCount}}@@ -74,10 +74,10 @@ export default <template>{{#if @controller.userBadges}}<div class="user-badges {{@controller.model.slug}}">- <LoadMore @action={{@controller.loadMore}}>+ <DLoadMore @action={{@controller.loadMore}}><div class="badges-granted">{{#each @controller.userBadges as |ub|}}- <UserInfo+ <DUserInfo@user={{ub.user}}@size="medium"@date={{ub.granted_at}}@@ -85,7 +85,7 @@ export default <template>><div class="granted-on">{{trustHTML- (i18n "badges.granted_on" date=(formatDate ub.granted_at))+ (i18n "badges.granted_on" date=(dFormatDate ub.granted_at))}}</div>@@ -95,10 +95,10 @@ export default <template>href="{{ub.topic.url}}/{{ub.post_number}}">{{trustHTML ub.topic.fancyTitle}}</a>{{/if}}- </UserInfo>+ </DUserInfo>{{/each}}</div>- </LoadMore>+ </DLoadMore>{{#unless @controller.canLoadMore}}{{#if @controller.canShowOthers}}@@ -113,7 +113,7 @@ export default <template>{{/unless}}</div>- <ConditionalLoadingSpinner @condition={{@controller.canLoadMore}} />+ <DConditionalLoadingSpinner @condition={{@controller.canLoadMore}} />{{/if}}</div></template>diff --git a/frontend/discourse/app/templates/confirm-new-email.gjs b/frontend/discourse/app/templates/confirm-new-email.gjsindex 04386b008d7..d6003a8bd5f 100644--- a/frontend/discourse/app/templates/confirm-new-email.gjs+++ b/frontend/discourse/app/templates/confirm-new-email.gjs@@ -1,4 +1,4 @@-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";export default <template>diff --git a/frontend/discourse/app/templates/confirm-old-email.gjs b/frontend/discourse/app/templates/confirm-old-email.gjsindex 141858b7ac5..11048f49824 100644--- a/frontend/discourse/app/templates/confirm-old-email.gjs+++ b/frontend/discourse/app/templates/confirm-old-email.gjs@@ -1,4 +1,4 @@-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";export default <template>diff --git a/frontend/discourse/app/templates/discovery/categories.gjs b/frontend/discourse/app/templates/discovery/categories.gjsindex 1cbbac615a5..986d545f559 100644--- a/frontend/discourse/app/templates/discovery/categories.gjs+++ b/frontend/discourse/app/templates/discovery/categories.gjs@@ -1,13 +1,13 @@import { on } from "@ember/modifier";-import CountI18n from "discourse/components/count-i18n";import CategoriesDisplay from "discourse/components/discovery/categories-display";import Layout from "discourse/components/discovery/layout";import Navigation from "discourse/components/discovery/navigation";import PluginOutlet from "discourse/components/plugin-outlet";import bodyClass from "discourse/helpers/body-class";-import concatClass from "discourse/helpers/concat-class";import lazyHash from "discourse/helpers/lazy-hash";import { and } from "discourse/truth-helpers";+import DCountI18n from "discourse/ui-kit/d-count-i18n";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";export default <template><Layout @model={{@controller.model}} @listClass="--categories">@@ -32,7 +32,7 @@ export default <template>)}}<div- class={{concatClass+ class={{dConcatClass"show-more"(if @controller.hasTopics "has-topics")}}@@ -42,7 +42,7 @@ export default <template>class="alert alert-info clickable"{{on "click" @controller.showInserted}}>- <CountI18n+ <DCountI18n@key="topic_count_"@suffix={{@controller.topicTrackingState.filter}}@count={{@controller.topicTrackingState.incomingCount}}diff --git a/frontend/discourse/app/templates/discovery/login-required.gjs b/frontend/discourse/app/templates/discovery/login-required.gjsindex 7364a2b1bbe..7935c42518d 100644--- a/frontend/discourse/app/templates/discovery/login-required.gjs+++ b/frontend/discourse/app/templates/discovery/login-required.gjs@@ -1,11 +1,11 @@import { trustHTML } from "@ember/template";-import DButton from "discourse/components/d-button";import PluginOutlet from "discourse/components/plugin-outlet";import bodyClass from "discourse/helpers/body-class";import hideApplicationHeaderButtons from "discourse/helpers/hide-application-header-buttons";import hideApplicationSidebar from "discourse/helpers/hide-application-sidebar";import lazyHash from "discourse/helpers/lazy-hash";import routeAction from "discourse/helpers/route-action";+import DButton from "discourse/ui-kit/d-button";export default <template><PluginOutlet @name="login-required">diff --git a/frontend/discourse/app/templates/email-login.gjs b/frontend/discourse/app/templates/email-login.gjsindex fb4848caab1..44714478e14 100644--- a/frontend/discourse/app/templates/email-login.gjs+++ b/frontend/discourse/app/templates/email-login.gjs@@ -1,9 +1,9 @@import { fn } from "@ember/helper";import { trustHTML } from "@ember/template";-import DButton from "discourse/components/d-button";import SecondFactorForm from "discourse/components/second-factor-form";-import SecondFactorInput from "discourse/components/second-factor-input";import SecurityKeyForm from "discourse/components/security-key-form";+import DButton from "discourse/ui-kit/d-button";+import DSecondFactorInput from "discourse/ui-kit/d-second-factor-input";import { i18n } from "discourse-i18n";export default <template>@@ -44,7 +44,7 @@ export default <template>@totpEnabled={{@controller.model.totp_enabled}}@isLogin={{true}}>- <SecondFactorInput+ <DSecondFactorInput@onChange={{fn (mut @controller.secondFactorToken)}}@secondFactorMethod={{@controller.secondFactorMethod}}value={{@controller.secondFactorToken}}diff --git a/frontend/discourse/app/templates/exception.gjs b/frontend/discourse/app/templates/exception.gjsindex 89098e59c99..954210f4c16 100644--- a/frontend/discourse/app/templates/exception.gjs+++ b/frontend/discourse/app/templates/exception.gjs@@ -1,10 +1,10 @@import { trustHTML } from "@ember/template";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DButton from "discourse/components/d-button";import PluginOutlet from "discourse/components/plugin-outlet";-import icon from "discourse/helpers/d-icon";import lazyHash from "discourse/helpers/lazy-hash";import { and } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default <template>@@ -30,7 +30,7 @@ export default <template>{{/if}}<div class="desc">{{#if @controller.networkFixed}}- {{icon "circle-check"}}+ {{dIcon "circle-check"}}{{/if}}{{@controller.desc}}@@ -44,7 +44,7 @@ export default <template>class={{buttonData.classes}}/>{{/each}}- <ConditionalLoadingSpinner @condition={{@controller.loading}} />+ <DConditionalLoadingSpinner @condition={{@controller.loading}} /></div></div>{{/if}}diff --git a/frontend/discourse/app/templates/full-page-search.gjs b/frontend/discourse/app/templates/full-page-search.gjsindex dda9898a9f9..9acc7b8895a 100644--- a/frontend/discourse/app/templates/full-page-search.gjs+++ b/frontend/discourse/app/templates/full-page-search.gjs@@ -2,24 +2,24 @@ import { Input } from "@ember/component";import { fn, hash } from "@ember/helper";import { on } from "@ember/modifier";import { trustHTML } from "@ember/template";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DButton from "discourse/components/d-button";import GoogleSearch from "discourse/components/google-search";-import LoadMore from "discourse/components/load-more";import PluginOutlet from "discourse/components/plugin-outlet";import SearchAdvancedOptions from "discourse/components/search-advanced-options";import SearchBulkSelectDropdown from "discourse/components/search-bulk-select-dropdown";import SearchResultEntries from "discourse/components/search-result-entries";import SearchTextField from "discourse/components/search-text-field";-import UserLink from "discourse/components/user-link";-import avatar from "discourse/helpers/avatar";import bodyClass from "discourse/helpers/body-class";-import categoryLink from "discourse/helpers/category-link";import hideApplicationFooter from "discourse/helpers/hide-application-footer";import lazyHash from "discourse/helpers/lazy-hash";-import loadingSpinner from "discourse/helpers/loading-spinner";import ComboBox from "discourse/select-kit/components/combo-box";import { or } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DLoadMore from "discourse/ui-kit/d-load-more";+import DUserLink from "discourse/ui-kit/d-user-link";+import dAvatar from "discourse/ui-kit/helpers/d-avatar";+import dCategoryLink from "discourse/ui-kit/helpers/d-category-link";+import dLoadingSpinner from "discourse/ui-kit/helpers/d-loading-spinner";import { i18n } from "discourse-i18n";export default <template>@@ -209,7 +209,7 @@ export default <template>/>{{#if @controller.searching}}- {{loadingSpinner size="medium"}}+ {{dLoadingSpinner size="medium"}}{{else}}<divclass="search-results"@@ -220,7 +220,7 @@ export default <template>(i18n "search.results")}}>- <LoadMore @action={{@controller.loadMore}}>+ <DLoadMore @action={{@controller.loadMore}}>{{#if(or@controller.usingDefaultSearchType @controller.customSearchType@@ -243,7 +243,7 @@ export default <template>@isPMOnly={{@controller.isPMOnly}}/>- <ConditionalLoadingSpinner @condition={{@controller.loading}}>+ <DConditionalLoadingSpinner @condition={{@controller.loading}}>{{#if @controller.error}}<div class="warning">{{@controller.error}}@@ -295,9 +295,9 @@ export default <template>{{/if}}</h3>{{/if}}- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner>{{else}}- <ConditionalLoadingSpinner @condition={{@controller.loading}}>+ <DConditionalLoadingSpinner @condition={{@controller.loading}}>{{#if @controller.hasResults}}{{#if @controller.model.categories.length}}<h4 class="category-heading">@@ -305,7 +305,7 @@ export default <template></h4><div class="category-items">{{#each @controller.model.categories as |category|}}- {{categoryLink+ {{dCategoryLinkcategoryextraClasses="fps-category-item"}}@@ -332,8 +332,8 @@ export default <template>{{#if @controller.model.users}}<div class="user-items">{{#each @controller.model.users as |user|}}- <UserLink @user={{user}} class="fps-user-item">- {{avatar user imageSize="large"}}+ <DUserLink @user={{user}} class="fps-user-item">+ {{dAvatar user imageSize="large"}}<div class="user-titles">{{#if user.name}}@@ -346,7 +346,7 @@ export default <template>{{user.username}}</span></div>- </UserLink>+ </DUserLink>{{/each}}</div>{{/if}}@@ -355,13 +355,13 @@ export default <template><h3>{{i18n "search.no_results"}}</h3>{{/if}}{{/if}}- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner>{{/if}}<PluginOutlet@name="full-page-search-below-results"@outletArgs={{lazyHash [email protected]}}/>- </LoadMore>+ </DLoadMore></div>{{/if}}</div>diff --git a/frontend/discourse/app/templates/group.gjs b/frontend/discourse/app/templates/group.gjsindex 912b7c10ea9..a2b2885a188 100644--- a/frontend/discourse/app/templates/group.gjs+++ b/frontend/discourse/app/templates/group.gjs@@ -1,15 +1,15 @@import { trustHTML } from "@ember/template";-import AvatarFlair from "discourse/components/avatar-flair";-import DButton from "discourse/components/d-button";import GroupInfo from "discourse/components/group-info";import GroupMembershipButton from "discourse/components/group-membership-button";import GroupNavigation from "discourse/components/group-navigation";import PluginOutlet from "discourse/components/plugin-outlet";import DTooltip from "discourse/float-kit/components/d-tooltip";-import icon from "discourse/helpers/d-icon";import lazyHash from "discourse/helpers/lazy-hash";import routeAction from "discourse/helpers/route-action";import { and, or } from "discourse/truth-helpers";+import DAvatarFlair from "discourse/ui-kit/d-avatar-flair";+import DButton from "discourse/ui-kit/d-button";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default <template>@@ -38,7 +38,7 @@ export default <template>)}}<div class="group-avatar-flair">- <AvatarFlair+ <DAvatarFlair@flairName={{@controller.model.name}}@flairUrl={{or@controller.model.flair_icon@@ -56,7 +56,7 @@ export default <template>{{#if (and @controller.canManageGroup @controller.model.automatic)}}<DTooltip class="group-automatic-tooltip"><:trigger>- {{icon "gear"}}+ {{dIcon "gear"}}{{i18n "admin.groups.manage.membership.automatic"}}</:trigger><:content>diff --git a/frontend/discourse/app/templates/group/activity.gjs b/frontend/discourse/app/templates/group/activity.gjsindex f158309aaf6..2cc45ac266d 100644--- a/frontend/discourse/app/templates/group/activity.gjs+++ b/frontend/discourse/app/templates/group/activity.gjs@@ -1,10 +1,10 @@import GroupActivityFilter from "discourse/components/group-activity-filter";-import HorizontalOverflowNav from "discourse/components/horizontal-overflow-nav";import PluginOutlet from "discourse/components/plugin-outlet";+import DHorizontalOverflowNav from "discourse/ui-kit/d-horizontal-overflow-nav";export default <template><section class="user-secondary-navigation">- <HorizontalOverflowNav class="activity-nav">+ <DHorizontalOverflowNav class="activity-nav">{{#if @controller.model.can_see_members}}<GroupActivityFilter@filter="posts"@@ -22,7 +22,7 @@ export default <template>/>{{/if}}<PluginOutlet @name="group-activity-bottom" @connectorTagName="li" />- </HorizontalOverflowNav>+ </DHorizontalOverflowNav></section><section class="user-content" id="user-content">{{outlet}}diff --git a/frontend/discourse/app/templates/group/activity/topics.gjs b/frontend/discourse/app/templates/group/activity/topics.gjsindex b269e112b02..32a7c81203c 100644--- a/frontend/discourse/app/templates/group/activity/topics.gjs+++ b/frontend/discourse/app/templates/group/activity/topics.gjs@@ -1,14 +1,14 @@import BasicTopicList from "discourse/components/basic-topic-list";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import LoadMore from "discourse/components/load-more";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DLoadMore from "discourse/ui-kit/d-load-more";export default <template>- <LoadMore @action={{@controller.loadMore}} class="paginated-topics-list">+ <DLoadMore @action={{@controller.loadMore}} class="paginated-topics-list"><BasicTopicList@topicList={{@controller.model}}@showPosters={{true}}@listContext="group-activity"/>- <ConditionalLoadingSpinner @condition={{@controller.model.loadingMore}} />- </LoadMore>+ <DConditionalLoadingSpinner @condition={{@controller.model.loadingMore}} />+ </DLoadMore></template>diff --git a/frontend/discourse/app/templates/group/index.gjs b/frontend/discourse/app/templates/group/index.gjsindex 132803d15a5..ba292a98fa7 100644--- a/frontend/discourse/app/templates/group/index.gjs+++ b/frontend/discourse/app/templates/group/index.gjs@@ -2,21 +2,21 @@ import { Input } from "@ember/component";import { fn } from "@ember/helper";import { on } from "@ember/modifier";import BulkGroupMemberDropdown from "discourse/components/bulk-group-member-dropdown";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DButton from "discourse/components/d-button";import GroupMemberDropdown from "discourse/components/group-member-dropdown";-import LoadMore from "discourse/components/load-more";import PluginOutlet from "discourse/components/plugin-outlet";-import ResponsiveTable from "discourse/components/responsive-table";-import TableHeaderToggle from "discourse/components/table-header-toggle";-import TextField from "discourse/components/text-field";-import UserInfo from "discourse/components/user-info";-import ageWithTooltip from "discourse/helpers/age-with-tooltip";-import icon from "discourse/helpers/d-icon";import hideApplicationFooter from "discourse/helpers/hide-application-footer";import lazyHash from "discourse/helpers/lazy-hash";import routeAction from "discourse/helpers/route-action";import { or } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DLoadMore from "discourse/ui-kit/d-load-more";+import DResponsiveTable from "discourse/ui-kit/d-responsive-table";+import DTableHeaderToggle from "discourse/ui-kit/d-table-header-toggle";+import DTextField from "discourse/ui-kit/d-text-field";+import DUserInfo from "discourse/ui-kit/d-user-info";+import dAgeWithTooltip from "discourse/ui-kit/helpers/d-age-with-tooltip";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default <template>@@ -36,7 +36,7 @@ export default <template>{{/if}}{{#if @controller.model.can_see_members}}- <TextField+ <DTextField@value={{@controller.filterInput}}@placeholderKey={{@controller.filterPlaceholder}}@autocomplete="off"@@ -96,14 +96,14 @@ export default <template></div>{{#if @controller.hasMembers}}- <LoadMore @action={{@controller.loadMore}}>- <ResponsiveTable+ <DLoadMore @action={{@controller.loadMore}}>+ <DResponsiveTable@className="group-members{{if @controller.isBulk 'sticky-header' ''}}{{if @controller.canManageGroup 'group-members--can-manage' ''}}"><:header>- <TableHeaderToggle+ <DTableHeaderToggle@onToggle={{@controller.updateOrder}}@order={{@controller.order}}@asc={{@controller.asc}}@@ -129,7 +129,7 @@ export default <template>}}/>- <TableHeaderToggle+ <DTableHeaderToggle@onToggle={{@controller.updateOrder}}@order={{@controller.order}}@asc={{@controller.asc}}@@ -138,7 +138,7 @@ export default <template>@automatic={{true}}class="directory-table__column-header--added"/>- <TableHeaderToggle+ <DTableHeaderToggle@onToggle={{@controller.updateOrder}}@order={{@controller.order}}@asc={{@controller.asc}}@@ -147,7 +147,7 @@ export default <template>@automatic={{true}}class="directory-table__column-header--last-posted"/>- <TableHeaderToggle+ <DTableHeaderToggle@onToggle={{@controller.updateOrder}}@order={{@controller.order}}@asc={{@controller.asc}}@@ -180,7 +180,7 @@ export default <template>/>{{/if}}{{/if}}- <UserInfo+ <DUserInfo@user={{m}}@skipName={{@controller.skipName}}@showStatus={{true}}@@ -199,7 +199,7 @@ export default <template>{{/if}}<span class="directory-table__value">{{#if m.owner}}- {{icon "shield-halved"}}+ {{dIcon "shield-halved"}}{{i18n "groups.members.owner"}}<br />{{/if}}{{#if m.primary}}@@ -220,7 +220,7 @@ export default <template><span>{{i18n "groups.member_added"}}</span></span><span class="directory-table__value">- {{ageWithTooltip m.added_at format="medium"}}+ {{dAgeWithTooltip m.added_at format="medium"}}</span></div><div@@ -236,7 +236,7 @@ export default <template></span>{{/if}}<span class="directory-table__value">- {{ageWithTooltip m.last_posted_at format="medium"}}+ {{dAgeWithTooltip m.last_posted_at format="medium"}}</span></div><div@@ -252,7 +252,7 @@ export default <template></span>{{/if}}<span class="directory-table__value">- {{ageWithTooltip m.last_seen_at format="medium"}}+ {{dAgeWithTooltip m.last_seen_at format="medium"}}</span></div>{{#if @controller.canManageGroup}}@@ -271,10 +271,10 @@ export default <template></div>{{/each}}</:body>- </ResponsiveTable>- </LoadMore>+ </DResponsiveTable>+ </DLoadMore>- <ConditionalLoadingSpinner @condition={{@controller.loading}} />+ <DConditionalLoadingSpinner @condition={{@controller.loading}} />{{else}}<br /><div>{{i18n @controller.emptyMessageKey}}</div>diff --git a/frontend/discourse/app/templates/group/manage.gjs b/frontend/discourse/app/templates/group/manage.gjsindex 32ebe098f95..af29bd27108 100644--- a/frontend/discourse/app/templates/group/manage.gjs+++ b/frontend/discourse/app/templates/group/manage.gjs@@ -1,10 +1,10 @@import { LinkTo } from "@ember/routing";-import HorizontalOverflowNav from "discourse/components/horizontal-overflow-nav";+import DHorizontalOverflowNav from "discourse/ui-kit/d-horizontal-overflow-nav";import { i18n } from "discourse-i18n";export default <template><section class="user-secondary-navigation">- <HorizontalOverflowNav class="activity-nav">+ <DHorizontalOverflowNav class="activity-nav">{{#each @controller.tabs as |tab|}}<li><LinkTo @route={{tab.route}} @model={{@controller.model.name}}>@@ -12,7 +12,7 @@ export default <template></LinkTo></li>{{/each}}- </HorizontalOverflowNav>+ </DHorizontalOverflowNav></section><section class="user-content" id="user-content">{{outlet}}diff --git a/frontend/discourse/app/templates/group/manage/categories.gjs b/frontend/discourse/app/templates/group/manage/categories.gjsindex 0cf7e905f75..338973ab99d 100644--- a/frontend/discourse/app/templates/group/manage/categories.gjs+++ b/frontend/discourse/app/templates/group/manage/categories.gjs@@ -1,7 +1,7 @@import { fn } from "@ember/helper";import GroupManageSaveButton from "discourse/components/group-manage-save-button";-import icon from "discourse/helpers/d-icon";import CategorySelector from "discourse/select-kit/components/category-selector";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default <template>@@ -14,7 +14,7 @@ export default <template></div><div class="control-group">- <label>{{icon "d-watching"}}+ <label>{{dIcon "d-watching"}}{{i18n "groups.notifications.watching.title"}}</label><CategorySelector@@ -29,7 +29,7 @@ export default <template></div><div class="control-group">- <label>{{icon "d-tracking"}}+ <label>{{dIcon "d-tracking"}}{{i18n "groups.notifications.tracking.title"}}</label><CategorySelector@@ -44,7 +44,7 @@ export default <template></div><div class="control-group">- <label>{{icon "d-watching-first"}}+ <label>{{dIcon "d-watching-first"}}{{i18n "groups.notifications.watching_first_post.title"}}</label><CategorySelector@@ -61,7 +61,7 @@ export default <template></div><div class="control-group">- <label>{{icon "d-regular"}}+ <label>{{dIcon "d-regular"}}{{i18n "groups.notifications.regular.title"}}</label><CategorySelector@@ -76,7 +76,7 @@ export default <template></div><div class="control-group">- <label>{{icon "d-muted"}}+ <label>{{dIcon "d-muted"}}{{i18n "groups.notifications.muted.title"}}</label><CategorySelectordiff --git a/frontend/discourse/app/templates/group/manage/logs.gjs b/frontend/discourse/app/templates/group/manage/logs.gjsindex 52d2da8ac7e..85b8a9e5c80 100644--- a/frontend/discourse/app/templates/group/manage/logs.gjs+++ b/frontend/discourse/app/templates/group/manage/logs.gjs@@ -1,8 +1,8 @@-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";import GroupManageLogsFilter from "discourse/components/group-manage-logs-filter";import GroupManageLogsRow from "discourse/components/group-manage-logs-row";-import LoadMore from "discourse/components/load-more";import hideApplicationFooter from "discourse/helpers/hide-application-footer";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DLoadMore from "discourse/ui-kit/d-load-more";import { i18n } from "discourse-i18n";export default <template>@@ -34,7 +34,7 @@ export default <template>/></div>- <LoadMore @action={{@controller.loadMore}}>+ <DLoadMore @action={{@controller.loadMore}}><table class="group-manage-logs"><thead><th>{{i18n "groups.manage.logs.action"}}</th>@@ -54,9 +54,9 @@ export default <template>{{/each}}</tbody></table>- </LoadMore>+ </DLoadMore>- <ConditionalLoadingSpinner @condition={{@controller.loading}} />+ <DConditionalLoadingSpinner @condition={{@controller.loading}} />{{else}}<div>{{i18n "groups.empty.logs"}}</div>{{/if}}diff --git a/frontend/discourse/app/templates/group/manage/tags.gjs b/frontend/discourse/app/templates/group/manage/tags.gjsindex 2640f530cbe..ad78d0d6216 100644--- a/frontend/discourse/app/templates/group/manage/tags.gjs+++ b/frontend/discourse/app/templates/group/manage/tags.gjs@@ -1,9 +1,9 @@import { hash } from "@ember/helper";import GroupManageSaveButton from "discourse/components/group-manage-save-button";import PluginOutlet from "discourse/components/plugin-outlet";-import icon from "discourse/helpers/d-icon";import lazyHash from "discourse/helpers/lazy-hash";import TagChooser from "discourse/select-kit/components/tag-chooser";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default <template>@@ -23,7 +23,7 @@ export default <template></div><div class="control-group">- <label>{{icon "d-watching"}}+ <label>{{dIcon "d-watching"}}{{i18n "groups.notifications.watching.title"}}</label><TagChooser@@ -40,7 +40,7 @@ export default <template></div><div class="control-group">- <label>{{icon "d-tracking"}}+ <label>{{dIcon "d-tracking"}}{{i18n "groups.notifications.tracking.title"}}</label><TagChooser@@ -57,7 +57,7 @@ export default <template></div><div class="control-group">- <label>{{icon "d-watching-first"}}+ <label>{{dIcon "d-watching-first"}}{{i18n "groups.notifications.watching_first_post.title"}}</label><TagChooser@@ -74,7 +74,7 @@ export default <template></div><div class="control-group">- <label>{{icon "d-regular"}}+ <label>{{dIcon "d-regular"}}{{i18n "groups.notifications.regular.title"}}</label><TagChooser@@ -91,7 +91,7 @@ export default <template></div><div class="control-group">- <label>{{icon "d-muted"}}+ <label>{{dIcon "d-muted"}}{{i18n "groups.notifications.muted.title"}}</label><TagChooserdiff --git a/frontend/discourse/app/templates/group/messages.gjs b/frontend/discourse/app/templates/group/messages.gjsindex 67c676bd6bd..40da99e750d 100644--- a/frontend/discourse/app/templates/group/messages.gjs+++ b/frontend/discourse/app/templates/group/messages.gjs@@ -1,10 +1,10 @@import { LinkTo } from "@ember/routing";-import HorizontalOverflowNav from "discourse/components/horizontal-overflow-nav";+import DHorizontalOverflowNav from "discourse/ui-kit/d-horizontal-overflow-nav";import { i18n } from "discourse-i18n";export default <template><section class="user-secondary-navigation">- <HorizontalOverflowNav class="messages-nav">+ <DHorizontalOverflowNav class="messages-nav"><li><LinkTo @route="group.messages.inbox" @model={{@controller.model.name}}>{{i18n "user.messages.inbox"}}@@ -18,7 +18,7 @@ export default <template>{{i18n "user.messages.archive"}}</LinkTo></li>- </HorizontalOverflowNav>+ </DHorizontalOverflowNav></section><section class="user-content" id="user-content">{{outlet}}diff --git a/frontend/discourse/app/templates/group/permissions.gjs b/frontend/discourse/app/templates/group/permissions.gjsindex 7ecc194796e..e21b92406e2 100644--- a/frontend/discourse/app/templates/group/permissions.gjs+++ b/frontend/discourse/app/templates/group/permissions.gjs@@ -1,4 +1,4 @@-import categoryLink from "discourse/helpers/category-link";+import dCategoryLink from "discourse/ui-kit/helpers/d-category-link";import { i18n } from "discourse-i18n";export default <template>@@ -11,7 +11,7 @@ export default <template><tbody>{{#each @controller.model.permissions as |permission|}}<tr>- <td>{{categoryLink permission.category}}</td>+ <td>{{dCategoryLink permission.category}}</td><td>{{permission.description}}</td></tr>{{/each}}diff --git a/frontend/discourse/app/templates/group/requests.gjs b/frontend/discourse/app/templates/group/requests.gjsindex 2c52955eb35..fca006a0a74 100644--- a/frontend/discourse/app/templates/group/requests.gjs+++ b/frontend/discourse/app/templates/group/requests.gjs@@ -1,14 +1,14 @@import { fn } from "@ember/helper";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DButton from "discourse/components/d-button";-import LoadMore from "discourse/components/load-more";-import ResponsiveTable from "discourse/components/responsive-table";-import TableHeaderToggle from "discourse/components/table-header-toggle";-import TextField from "discourse/components/text-field";-import UserInfo from "discourse/components/user-info";-import ageWithTooltip from "discourse/helpers/age-with-tooltip";import hideApplicationFooter from "discourse/helpers/hide-application-footer";import { or } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DLoadMore from "discourse/ui-kit/d-load-more";+import DResponsiveTable from "discourse/ui-kit/d-responsive-table";+import DTableHeaderToggle from "discourse/ui-kit/d-table-header-toggle";+import DTextField from "discourse/ui-kit/d-text-field";+import DUserInfo from "discourse/ui-kit/d-user-info";+import dAgeWithTooltip from "discourse/ui-kit/helpers/d-age-with-tooltip";import { i18n } from "discourse-i18n";export default <template>@@ -18,7 +18,7 @@ export default <template><section class="user-content"><div class="group-members-actions">- <TextField+ <DTextField@value={{@controller.filterInput}}@placeholderKey={{@controller.filterPlaceholder}}class="group-username-filter no-blur"@@ -26,10 +26,10 @@ export default <template></div>{{#if @controller.hasRequesters}}- <LoadMore @action={{@controller.loadMore}}>- <ResponsiveTable @className="group-members group-members__requests">+ <DLoadMore @action={{@controller.loadMore}}>+ <DResponsiveTable @className="group-members group-members__requests"><:header>- <TableHeaderToggle+ <DTableHeaderToggle@onToggle={{@controller.updateOrder}}@order={{@controller.order}}@asc={{@controller.asc}}@@ -38,7 +38,7 @@ export default <template>@automatic={{true}}class="username"/>- <TableHeaderToggle+ <DTableHeaderToggle@onToggle={{@controller.updateOrder}}@order={{@controller.order}}@asc={{@controller.asc}}@@ -55,14 +55,14 @@ export default <template>{{#each @controller.model.requesters as |m|}}<div class="directory-table__row"><div class="directory-table__cell group-member">- <UserInfo @user={{m}} @skipName={{@controller.skipName}} />+ <DUserInfo @user={{m}} @skipName={{@controller.skipName}} /></div><div class="directory-table__cell"><span class="directory-table__label"><span>{{i18n "groups.member_requested"}}</span></span><span class="directory-table__value">- {{ageWithTooltip m.requested_at format="medium"}}+ {{dAgeWithTooltip m.requested_at format="medium"}}</span></div><div@@ -102,9 +102,9 @@ export default <template></div>{{/each}}</:body>- </ResponsiveTable>- </LoadMore>- <ConditionalLoadingSpinner @condition={{@controller.loading}} />+ </DResponsiveTable>+ </DLoadMore>+ <DConditionalLoadingSpinner @condition={{@controller.loading}} />{{else}}<div>{{i18n "groups.empty.requests"}}</div>{{/if}}diff --git a/frontend/discourse/app/templates/groups/new.gjs b/frontend/discourse/app/templates/groups/new.gjsindex 79765f5c438..87456ecf4dc 100644--- a/frontend/discourse/app/templates/groups/new.gjs+++ b/frontend/discourse/app/templates/groups/new.gjs@@ -1,12 +1,12 @@import { hash } from "@ember/helper";import { LinkTo } from "@ember/routing";-import DButton from "discourse/components/d-button";import GroupFlairVisibilityWarning from "discourse/components/group-flair-visibility-warning";import GroupsFormInteractionFields from "discourse/components/groups-form-interaction-fields";import GroupsFormMembershipFields from "discourse/components/groups-form-membership-fields";import GroupsFormProfileFields from "discourse/components/groups-form-profile-fields";import bodyClass from "discourse/helpers/body-class";import EmailGroupUserChooser from "discourse/select-kit/components/email-group-user-chooser";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";export default <template>diff --git a/frontend/discourse/app/templates/invites/show.gjs b/frontend/discourse/app/templates/invites/show.gjsindex 5a733057797..3b204d38e2c 100644--- a/frontend/discourse/app/templates/invites/show.gjs+++ b/frontend/discourse/app/templates/invites/show.gjs@@ -1,25 +1,25 @@import { Input } from "@ember/component";import { on } from "@ember/modifier";import { trustHTML } from "@ember/template";-import DButton from "discourse/components/d-button";import FullnameInput from "discourse/components/fullname-input";-import InputTip from "discourse/components/input-tip";import LoginButtons from "discourse/components/login-buttons";-import PasswordField from "discourse/components/password-field";import PluginOutlet from "discourse/components/plugin-outlet";import SignupProgressBar from "discourse/components/signup-progress-bar";-import TogglePasswordMask from "discourse/components/toggle-password-mask";import UserField from "discourse/components/user-field";-import UserInfo from "discourse/components/user-info";import WelcomeHeader from "discourse/components/welcome-header";import bodyClass from "discourse/helpers/body-class";-import icon from "discourse/helpers/d-icon";import hideApplicationHeaderButtons from "discourse/helpers/hide-application-header-buttons";import hideApplicationSidebar from "discourse/helpers/hide-application-sidebar";import lazyHash from "discourse/helpers/lazy-hash";import routeAction from "discourse/helpers/route-action";import valueEntered from "discourse/helpers/value-entered";import { and, not } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DInputTip from "discourse/ui-kit/d-input-tip";+import DPasswordField from "discourse/ui-kit/d-password-field";+import DTogglePasswordMask from "discourse/ui-kit/d-toggle-password-mask";+import DUserInfo from "discourse/ui-kit/d-user-info";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default <template>@@ -49,7 +49,7 @@ export default <template><div class="invited-by"><p>{{i18n "invites.invited_by"}}</p><p>- <UserInfo @user={{@controller.invitedBy}} />+ <DUserInfo @user={{@controller.invitedBy}} /></p></div>@@ -72,7 +72,7 @@ export default <template>{{! authOptions are present once the user has followed the OmniAuth flow (e.g. twitter/google/etc) }}{{#if @controller.authOptions}}{{#unless @controller.isInviteLink}}- <InputTip+ <DInputTip@validation={{@controller.emailValidation}}id="account-email-validation"/>@@ -111,7 +111,7 @@ export default <template><label class="alt-placeholder" for="new-account-email">{{i18n "user.email.title"}}</label>- <InputTip+ <DInputTip@validation={{@controller.emailValidation}}id="account-email-validation"/>@@ -149,7 +149,7 @@ export default <template><label class="alt-placeholder" for="new-account-username">{{i18n "user.username.title"}}</label>- <InputTip+ <DInputTip@validation={{@controller.usernameValidation}}id="username-validation"/>@@ -171,7 +171,7 @@ export default <template>{{#unless @controller.externalAuthsOnly}}<div class="input password-input input-group">- <PasswordField+ <DPasswordField{{on "focusin" @controller.scrollInputIntoView}}@value={{@controller.accountPassword}}@capsLockOn={{@controller.capsLockOn}}@@ -183,14 +183,14 @@ export default <template><label class="alt-placeholder" for="new-account-password">{{i18n "invites.password_label"}}</label>- <TogglePasswordMask+ <DTogglePasswordMask@maskPassword={{@controller.maskPassword}}@togglePasswordMask={{@controller.togglePasswordMask}}@parentController="invites-show"/><div class="create-account__password-info"><div class="create-account__password-tip-validation">- <InputTip+ <DInputTip@validation={{@controller.passwordValidation}}id="password-validation"/>@@ -198,7 +198,7 @@ export default <template>class="caps-lock-warning{{unless @controller.capsLockOn 'hidden'}}">- {{icon "triangle-exclamation"}}+ {{dIcon "triangle-exclamation"}}{{i18n "login.caps_lock_warning"}}</div></div>diff --git a/frontend/discourse/app/templates/loading.gjs b/frontend/discourse/app/templates/loading.gjsindex a897c9a3a30..581ec564946 100644--- a/frontend/discourse/app/templates/loading.gjs+++ b/frontend/discourse/app/templates/loading.gjs@@ -1,7 +1,7 @@import hideApplicationFooter from "discourse/helpers/hide-application-footer";-import loadingSpinner from "discourse/helpers/loading-spinner";+import dLoadingSpinner from "discourse/ui-kit/helpers/d-loading-spinner";export default <template>- {{loadingSpinner}}+ {{dLoadingSpinner}}{{hideApplicationFooter}}</template>diff --git a/frontend/discourse/app/templates/login-preferences.gjs b/frontend/discourse/app/templates/login-preferences.gjsindex f263d57d758..0d46dbc4b81 100644--- a/frontend/discourse/app/templates/login-preferences.gjs+++ b/frontend/discourse/app/templates/login-preferences.gjs@@ -1,5 +1,5 @@-import DButton from "discourse/components/d-button";import routeAction from "discourse/helpers/route-action";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";export default <template>diff --git a/frontend/discourse/app/templates/login.gjs b/frontend/discourse/app/templates/login.gjsindex e3b78793f57..6939d229550 100644--- a/frontend/discourse/app/templates/login.gjs+++ b/frontend/discourse/app/templates/login.gjs@@ -1,17 +1,17 @@import { hash } from "@ember/helper";import { trustHTML } from "@ember/template";-import FlashMessage from "discourse/components/flash-message";import LocalLoginForm from "discourse/components/local-login-form";import LoginButtons from "discourse/components/login-buttons";import LoginPageCta from "discourse/components/login-page-cta";import PluginOutlet from "discourse/components/plugin-outlet";import WelcomeHeader from "discourse/components/welcome-header";import bodyClass from "discourse/helpers/body-class";-import concatClass from "discourse/helpers/concat-class";import hideApplicationHeaderButtons from "discourse/helpers/hide-application-header-buttons";import hideApplicationSidebar from "discourse/helpers/hide-application-sidebar";import lazyHash from "discourse/helpers/lazy-hash";import { and } from "discourse/truth-helpers";+import DFlashMessage from "discourse/ui-kit/d-flash-message";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";export default <template>@@ -20,12 +20,12 @@ export default <template>{{bodyClass "login-page"}}<div class="login-fullpage">- <FlashMessage+ <DFlashMessage@flash={{@controller.flash}}@type={{@controller.flashType}}/>- <div class={{concatClass "login-body" @controller.bodyClasses}}>+ <div class={{dConcatClass "login-body" @controller.bodyClasses}}><PluginOutlet@name="login-before-modal-body"@connectorTagName="div"diff --git a/frontend/discourse/app/templates/nested-loading.gjs b/frontend/discourse/app/templates/nested-loading.gjsindex a897c9a3a30..581ec564946 100644--- a/frontend/discourse/app/templates/nested-loading.gjs+++ b/frontend/discourse/app/templates/nested-loading.gjs@@ -1,7 +1,7 @@import hideApplicationFooter from "discourse/helpers/hide-application-footer";-import loadingSpinner from "discourse/helpers/loading-spinner";+import dLoadingSpinner from "discourse/ui-kit/helpers/d-loading-spinner";export default <template>- {{loadingSpinner}}+ {{dLoadingSpinner}}{{hideApplicationFooter}}</template>diff --git a/frontend/discourse/app/templates/password-reset.gjs b/frontend/discourse/app/templates/password-reset.gjsindex 2768d620f76..d93cf72b01d 100644--- a/frontend/discourse/app/templates/password-reset.gjs+++ b/frontend/discourse/app/templates/password-reset.gjs@@ -1,16 +1,16 @@import { fn } from "@ember/helper";import { on } from "@ember/modifier";-import DButton from "discourse/components/d-button";-import InputTip from "discourse/components/input-tip";-import PasswordField from "discourse/components/password-field";import SecondFactorForm from "discourse/components/second-factor-form";-import SecondFactorInput from "discourse/components/second-factor-input";import SecurityKeyForm from "discourse/components/security-key-form";-import TogglePasswordMask from "discourse/components/toggle-password-mask";import bodyClass from "discourse/helpers/body-class";-import icon from "discourse/helpers/d-icon";import hideApplicationHeaderButtons from "discourse/helpers/hide-application-header-buttons";import hideApplicationSidebar from "discourse/helpers/hide-application-sidebar";+import DButton from "discourse/ui-kit/d-button";+import DInputTip from "discourse/ui-kit/d-input-tip";+import DPasswordField from "discourse/ui-kit/d-password-field";+import DSecondFactorInput from "discourse/ui-kit/d-second-factor-input";+import DTogglePasswordMask from "discourse/ui-kit/d-toggle-password-mask";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default <template>@@ -62,7 +62,7 @@ export default <template>@totpEnabled={{@controller.secondFactorRequired}}@isLogin={{false}}>- <SecondFactorInput+ <DSecondFactorInput@onChange={{fn (mut @controller.secondFactorToken)}}@secondFactorMethod={{@controller.selectedSecondFactorMethod}}value={{@controller.secondFactorToken}}@@ -88,7 +88,7 @@ export default <template>{{/if}}<div class="input">- <PasswordField+ <DPasswordField@value={{@controller.accountPassword}}@capsLockOn={{@controller.capsLockOn}}type={{if @controller.maskPassword "password" "text"}}@@ -99,17 +99,17 @@ export default <template><div class="change-password__password-info"><div class="change-password_tip-validation">{{#if @controller.showPasswordValidation}}- <InputTip @validation={{@controller.passwordValidation}} />+ <DInputTip @validation={{@controller.passwordValidation}} />{{/if}}<divclass="caps-lock-warning{{unless @controller.capsLockOn 'hidden'}}">- {{icon "triangle-exclamation"}}+ {{dIcon "triangle-exclamation"}}{{i18n "login.caps_lock_warning"}}</div></div>- <TogglePasswordMask+ <DTogglePasswordMask@maskPassword={{@controller.maskPassword}}@togglePasswordMask={{@controller.togglePasswordMask}}/>diff --git a/frontend/discourse/app/templates/preferences.gjs b/frontend/discourse/app/templates/preferences.gjsindex f5fc3445904..ba95b882169 100644--- a/frontend/discourse/app/templates/preferences.gjs+++ b/frontend/discourse/app/templates/preferences.gjs@@ -1,22 +1,22 @@-import DNavigationItem from "discourse/components/d-navigation-item";-import HorizontalOverflowNav from "discourse/components/horizontal-overflow-nav";import PluginOutlet from "discourse/components/plugin-outlet";import bodyClass from "discourse/helpers/body-class";-import icon from "discourse/helpers/d-icon";import lazyHash from "discourse/helpers/lazy-hash";+import DHorizontalOverflowNav from "discourse/ui-kit/d-horizontal-overflow-nav";+import DNavigationItem from "discourse/ui-kit/d-navigation-item";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default <template>{{bodyClass "user-preferences-page"}}<div class="user-navigation user-navigation-secondary">- <HorizontalOverflowNav @ariaLabel="User secondary - preferences">+ <DHorizontalOverflowNav @ariaLabel="User secondary - preferences"><DNavigationItem@route="preferences.account"@ariaCurrentContext="subNav"class="user-nav__preferences-account">- {{icon "circle-user"}}+ {{dIcon "circle-user"}}<span>{{i18n "user.preferences_nav.account"}}</span></DNavigationItem>@@ -25,7 +25,7 @@ export default <template>@ariaCurrentContext="subNav"class="user-nav__preferences-security">- {{icon "lock"}}+ {{dIcon "lock"}}<span>{{i18n "user.preferences_nav.security"}}</span></DNavigationItem>@@ -34,7 +34,7 @@ export default <template>@ariaCurrentContext="subNav"class="user-nav__preferences-profile">- {{icon "address-card"}}+ {{dIcon "address-card"}}<span>{{i18n "user.preferences_nav.profile"}}</span></DNavigationItem>@@ -43,7 +43,7 @@ export default <template>@ariaCurrentContext="subNav"class="user-nav__preferences-emails">- {{icon "envelope"}}+ {{dIcon "envelope"}}<span>{{i18n "user.preferences_nav.emails"}}</span></DNavigationItem>@@ -52,7 +52,7 @@ export default <template>@ariaCurrentContext="subNav"class="user-nav__preferences-notifications">- {{icon "bell"}}+ {{dIcon "bell"}}<span>{{i18n "user.preferences_nav.notifications"}}</span></DNavigationItem>@@ -62,7 +62,7 @@ export default <template>@ariaCurrentContext="subNav"class="user-nav__preferences-tracking">- {{icon "plus"}}+ {{dIcon "plus"}}<span>{{i18n "user.preferences_nav.tracking"}}</span></DNavigationItem>{{/if}}@@ -72,7 +72,7 @@ export default <template>@ariaCurrentContext="subNav"class="user-nav__preferences-users">- {{icon "users"}}+ {{dIcon "users"}}<span>{{i18n "user.preferences_nav.users"}}</span></DNavigationItem>@@ -81,7 +81,7 @@ export default <template>@ariaCurrentContext="subNav"class="user-nav__preferences-interface">- {{icon "desktop"}}+ {{dIcon "desktop"}}<span>{{i18n "user.preferences_nav.interface"}}</span></DNavigationItem>@@ -90,7 +90,7 @@ export default <template>@ariaCurrentContext="subNav"class="user-nav__preferences-navigation-menu">- {{icon "bars"}}+ {{dIcon "bars"}}<span>{{i18n "user.preferences_nav.navigation_menu"}}</span></DNavigationItem>@@ -99,7 +99,7 @@ export default <template>@ariaCurrentContext="subNav"class="user-nav__preferences-calendar-subscriptions">- {{icon "calendar-days"}}+ {{dIcon "calendar-days"}}<span>{{i18n "user.preferences_nav.calendar_subscriptions"}}</span></DNavigationItem>@@ -113,7 +113,7 @@ export default <template>@connectorTagName="li"@outletArgs={{lazyHash [email protected]}}/>- </HorizontalOverflowNav>+ </DHorizontalOverflowNav></div><section class="user-content user-preferences" id="user-content">diff --git a/frontend/discourse/app/templates/preferences/account.gjs b/frontend/discourse/app/templates/preferences/account.gjsindex d2432a791e5..bc19f197551 100644--- a/frontend/discourse/app/templates/preferences/account.gjs+++ b/frontend/discourse/app/templates/preferences/account.gjs@@ -1,22 +1,22 @@import { fn, get, hash } from "@ember/helper";import { on } from "@ember/modifier";import { LinkTo } from "@ember/routing";-import DButton from "discourse/components/d-button";import EmailDropdown from "discourse/components/email-dropdown";import GoogleIcon from "discourse/components/google-icon";import PluginOutlet from "discourse/components/plugin-outlet";-import SaveControls from "discourse/components/save-controls";-import TextField from "discourse/components/text-field";-import UserStatusMessage from "discourse/components/user-status-message";import UsernamePreference from "discourse/components/username-preference";-import boundAvatar from "discourse/helpers/bound-avatar";-import icon from "discourse/helpers/d-icon";-import dasherize from "discourse/helpers/dasherize";import lazyHash from "discourse/helpers/lazy-hash";import routeAction from "discourse/helpers/route-action";import ComboBox from "discourse/select-kit/components/combo-box";import FlairChooser from "discourse/select-kit/components/flair-chooser";import { or } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DSaveControls from "discourse/ui-kit/d-save-controls";+import DTextField from "discourse/ui-kit/d-text-field";+import DUserStatusMessage from "discourse/ui-kit/d-user-status-message";+import dBoundAvatar from "discourse/ui-kit/helpers/d-bound-avatar";+import dDasherize from "discourse/ui-kit/helpers/d-dasherize";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default <template>@@ -43,7 +43,7 @@ export default <template>/><div class="controls">{{! we want the "huge" version even though we're downsizing it in CSS }}- {{boundAvatar @controller.model "huge"}}+ {{dBoundAvatar @controller.model "huge"}}<DButton@action={{fn (routeAction "showAvatarSelector") @controller.model}}@icon="pencil"@@ -106,7 +106,7 @@ export default <template>{{#if @controller.canAddEmail}}<div class="controls"><LinkTo @route="preferences.email" @query={{hash new=1}}>- {{icon "plus"}}+ {{dIcon "plus"}}{{i18n "user.email.add_email"}}</LinkTo></div>@@ -119,7 +119,7 @@ export default <template>@route="preferences.email"class="btn btn-default btn-small btn-icon pad-left no-text">- {{icon "pencil"}}+ {{dIcon "pencil"}}</LinkTo>{{/if}}</div>@@ -166,14 +166,14 @@ export default <template>{{#each @controller.authProviders as |authProvider|}}{{#if authProvider.account}}<tr- class="{{dasherize authProvider.method.name}}+ class="{{dDasherize authProvider.method.name}}account-connected"><td class="associated-account__icon">{{#if authProvider.method.isGoogle}}<GoogleIcon />{{else}}- {{icon (or authProvider.method.icon "user")}}+ {{dIcon (or authProvider.method.icon "user")}}{{/if}}</td><td>@@ -213,15 +213,15 @@ export default <template></td></tr>{{else}}- <tr class={{dasherize authProvider.method.name}}>+ <tr class={{dDasherize authProvider.method.name}}><tdclass="associated-account__icon- {{dasherize authProvider.method.name}}"+ {{dDasherize authProvider.method.name}}">{{#if authProvider.method.isGoogle}}<GoogleIcon />{{else}}- {{icon (or authProvider.method.icon "user")}}+ {{dIcon (or authProvider.method.icon "user")}}{{/if}}</td><td>@@ -281,7 +281,7 @@ export default <template><label class="control-label">{{i18n "user.name.title"}}</label><div class="controls">{{#if @controller.model.can_edit_name}}- <TextField+ <DTextField@value={{@controller.newNameInput}}@classNames="input-xxlarge"@maxlength="255"@@ -340,7 +340,7 @@ export default <template><label class="control-label">{{i18n "user.status.title"}}</label><div class="controls">{{#if @controller.newStatus}}- <UserStatusMessage+ <DUserStatusMessage@status={{@controller.newStatus}}@showDescription={{true}}/>@@ -413,7 +413,7 @@ export default <template></span>{{#if @controller.canSaveUser}}- <SaveControls+ <DSaveControls@model={{@controller.model}}@action={{@controller.save}}@saved={{@controller.saved}}diff --git a/frontend/discourse/app/templates/preferences/calendar-subscriptions.gjs b/frontend/discourse/app/templates/preferences/calendar-subscriptions.gjsindex d64b84b21e4..bcbdb202641 100644--- a/frontend/discourse/app/templates/preferences/calendar-subscriptions.gjs+++ b/frontend/discourse/app/templates/preferences/calendar-subscriptions.gjs@@ -3,13 +3,13 @@ import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";import { service } from "@ember/service";import CalendarSubscriptionUrl from "discourse/components/calendar-subscription-url";-import DButton from "discourse/components/d-button";import PluginOutlet from "discourse/components/plugin-outlet";-import icon from "discourse/helpers/d-icon";import lazyHash from "discourse/helpers/lazy-hash";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import { eq } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class CalendarSubscriptions extends Component {@@ -84,7 +84,7 @@ export default class CalendarSubscriptions extends Component {{{#if this.urls}}<div class="calendar-subscriptions__urls"><div class="alert alert-info calendar-subscriptions__warning">- {{icon "triangle-exclamation"}}+ {{dIcon "triangle-exclamation"}}{{i18n "user.calendar_subscriptions.urls_warning"}}</div>@@ -112,7 +112,7 @@ export default class CalendarSubscriptions extends Component {{{else if this.hasSubscription}}<div class="calendar-subscriptions__active"><p class="calendar-subscriptions__active-status">- {{icon "check"}}+ {{dIcon "check"}}{{i18n "user.calendar_subscriptions.active_subscription"}}</p><div class="calendar-subscriptions__actions">diff --git a/frontend/discourse/app/templates/preferences/categories.gjs b/frontend/discourse/app/templates/preferences/categories.gjsindex 03176637187..d5523558a82 100644--- a/frontend/discourse/app/templates/preferences/categories.gjs+++ b/frontend/discourse/app/templates/preferences/categories.gjs@@ -1,5 +1,5 @@-import SaveControls from "discourse/components/save-controls";import Categories from "discourse/components/user-preferences/categories";+import DSaveControls from "discourse/ui-kit/d-save-controls";import { i18n } from "discourse-i18n";export default <template>@@ -13,7 +13,7 @@ export default <template>/>{{#if @controller.canSave}}- <SaveControls+ <DSaveControls@model={{@controller.model}}@action={{@controller.save}}@saved={{@controller.saved}}diff --git a/frontend/discourse/app/templates/preferences/email.gjs b/frontend/discourse/app/templates/preferences/email.gjsindex 91a48e1312a..2995ac5ab85 100644--- a/frontend/discourse/app/templates/preferences/email.gjs+++ b/frontend/discourse/app/templates/preferences/email.gjs@@ -1,11 +1,11 @@import { LinkTo } from "@ember/routing";-import DButton from "discourse/components/d-button";-import InputTip from "discourse/components/input-tip";import PluginOutlet from "discourse/components/plugin-outlet";-import TextField from "discourse/components/text-field";import bodyClass from "discourse/helpers/body-class";-import icon from "discourse/helpers/d-icon";import lazyHash from "discourse/helpers/lazy-hash";+import DButton from "discourse/ui-kit/d-button";+import DInputTip from "discourse/ui-kit/d-input-tip";+import DTextField from "discourse/ui-kit/d-text-field";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default <template>@@ -19,7 +19,7 @@ export default <template>{{#if @controller.success}}<div class="alert alert-success">{{@controller.successMessage}}</div><LinkTo @route="preferences.account" class="success-back">- {{icon "arrow-left"}}+ {{dIcon "arrow-left"}}{{i18n "user.change_email.back_to_preferences"}}</LinkTo>{{else}}@@ -37,7 +37,7 @@ export default <template>}}</label><div class="controls">- <TextField+ <DTextField@value={{@controller.newEmail}}@id="change-email"@classNames="input-xxlarge"@@ -50,7 +50,7 @@ export default <template>{{i18n "user.email.instructions"}}{{/if}}</div>- <InputTip @validation={{@controller.emailValidation}} />+ <DInputTip @validation={{@controller.emailValidation}} /></div></div><div class="controls save-button">diff --git a/frontend/discourse/app/templates/preferences/emails.gjs b/frontend/discourse/app/templates/preferences/emails.gjsindex 68cc71aba36..247f42640b9 100644--- a/frontend/discourse/app/templates/preferences/emails.gjs+++ b/frontend/discourse/app/templates/preferences/emails.gjs@@ -2,9 +2,9 @@ import { fn, hash } from "@ember/helper";import { trustHTML } from "@ember/template";import PluginOutlet from "discourse/components/plugin-outlet";import PreferenceCheckbox from "discourse/components/preference-checkbox";-import SaveControls from "discourse/components/save-controls";import lazyHash from "discourse/helpers/lazy-hash";import ComboBox from "discourse/select-kit/components/combo-box";+import DSaveControls from "discourse/ui-kit/d-save-controls";import { i18n } from "discourse-i18n";export default <template>@@ -178,7 +178,7 @@ export default <template>/></span>- <SaveControls+ <DSaveControls@model={{@controller.model}}@action={{@controller.save}}@saved={{@controller.saved}}diff --git a/frontend/discourse/app/templates/preferences/interface.gjs b/frontend/discourse/app/templates/preferences/interface.gjsindex fcc529112f6..67fb4815135 100644--- a/frontend/discourse/app/templates/preferences/interface.gjs+++ b/frontend/discourse/app/templates/preferences/interface.gjs@@ -1,11 +1,11 @@import { fn, hash } from "@ember/helper";-import DButton from "discourse/components/d-button";import PluginOutlet from "discourse/components/plugin-outlet";import PreferenceCheckbox from "discourse/components/preference-checkbox";-import SaveControls from "discourse/components/save-controls";import lazyHash from "discourse/helpers/lazy-hash";import ColorPalettePicker from "discourse/select-kit/components/color-palette-picker";import ComboBox from "discourse/select-kit/components/combo-box";+import DButton from "discourse/ui-kit/d-button";+import DSaveControls from "discourse/ui-kit/d-save-controls";import { i18n } from "discourse-i18n";export default <template>@@ -295,7 +295,7 @@ export default <template>/></span>- <SaveControls+ <DSaveControls@model={{@controller.model}}@action={{@controller.save}}@saved={{@controller.saved}}diff --git a/frontend/discourse/app/templates/preferences/navigation-menu.gjs b/frontend/discourse/app/templates/preferences/navigation-menu.gjsindex a5adf855169..aa889cb9dce 100644--- a/frontend/discourse/app/templates/preferences/navigation-menu.gjs+++ b/frontend/discourse/app/templates/preferences/navigation-menu.gjs@@ -1,5 +1,5 @@import PreferenceCheckbox from "discourse/components/preference-checkbox";-import SaveControls from "discourse/components/save-controls";+import DSaveControls from "discourse/ui-kit/d-save-controls";import { i18n } from "discourse-i18n";export default <template>@@ -29,7 +29,7 @@ export default <template></div></div>- <SaveControls+ <DSaveControls@model={{@controller.model}}@action={{@controller.save}}@saved={{@controller.saved}}diff --git a/frontend/discourse/app/templates/preferences/notifications.gjs b/frontend/discourse/app/templates/preferences/notifications.gjsindex 1f454b6e4fe..186fbb0c0f8 100644--- a/frontend/discourse/app/templates/preferences/notifications.gjs+++ b/frontend/discourse/app/templates/preferences/notifications.gjs@@ -2,10 +2,10 @@ import { fn } from "@ember/helper";import DesktopNotificationConfig from "discourse/components/desktop-notification-config";import PluginOutlet from "discourse/components/plugin-outlet";import PreferenceCheckbox from "discourse/components/preference-checkbox";-import SaveControls from "discourse/components/save-controls";import UserNotificationSchedule from "discourse/components/user-notification-schedule";import lazyHash from "discourse/helpers/lazy-hash";import ComboBox from "discourse/select-kit/components/combo-box";+import DSaveControls from "discourse/ui-kit/d-save-controls";import { i18n } from "discourse-i18n";export default <template>@@ -77,7 +77,7 @@ export default <template>/></span>- <SaveControls+ <DSaveControls@model={{@controller.model}}@action={{@controller.save}}@saved={{@controller.saved}}diff --git a/frontend/discourse/app/templates/preferences/profile.gjs b/frontend/discourse/app/templates/preferences/profile.gjsindex 100f085be59..998d523f108 100644--- a/frontend/discourse/app/templates/preferences/profile.gjs+++ b/frontend/discourse/app/templates/preferences/profile.gjs@@ -2,17 +2,17 @@ import { Input } from "@ember/component";import { array, fn } from "@ember/helper";import { LinkTo } from "@ember/routing";import { trustHTML } from "@ember/template";-import DButton from "discourse/components/d-button";-import DEditor from "discourse/components/d-editor";import PluginOutlet from "discourse/components/plugin-outlet";import PreferenceCheckbox from "discourse/components/preference-checkbox";-import SaveControls from "discourse/components/save-controls";import UppyImageUploader from "discourse/components/uppy-image-uploader";import UserField from "discourse/components/user-field";import lazyHash from "discourse/helpers/lazy-hash";-import replaceEmoji from "discourse/helpers/replace-emoji";import ComboBox from "discourse/select-kit/components/combo-box";import TimezoneInput from "discourse/select-kit/components/timezone-input";+import DButton from "discourse/ui-kit/d-button";+import DEditor from "discourse/ui-kit/d-editor";+import DSaveControls from "discourse/ui-kit/d-save-controls";+import dReplaceEmoji from "discourse/ui-kit/helpers/d-replace-emoji";import { i18n } from "discourse-i18n";export default <template>@@ -170,7 +170,7 @@ export default <template>@controller.model.featured_topic.id}}>- {{replaceEmoji+ {{dReplaceEmoji(trustHTML @controller.model.featured_topic.fancy_title)}}</LinkTo>@@ -238,7 +238,7 @@ export default <template>/>{{/unless}}- <SaveControls+ <DSaveControls@model={{@controller.model}}@action={{@controller.save}}@saved={{@controller.saved}}diff --git a/frontend/discourse/app/templates/preferences/second-factor.gjs b/frontend/discourse/app/templates/preferences/second-factor.gjsindex 4a64b954794..dab996e28e4 100644--- a/frontend/discourse/app/templates/preferences/second-factor.gjs+++ b/frontend/discourse/app/templates/preferences/second-factor.gjs@@ -1,13 +1,13 @@import { LinkTo } from "@ember/routing";import { trustHTML } from "@ember/template";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DButton from "discourse/components/d-button";import PluginOutlet from "discourse/components/plugin-outlet";import SecurityKeyDropdown from "discourse/components/security-key-dropdown";import TokenBasedAuthDropdown from "discourse/components/token-based-auth-dropdown";import TwoFactorBackupDropdown from "discourse/components/two-factor-backup-dropdown";import bodyClass from "discourse/helpers/body-class";import { and } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";import { i18n } from "discourse-i18n";export default <template>@@ -17,7 +17,7 @@ export default <template><sectionclass="user-content user-preferences solo-preference second-factor">- <ConditionalLoadingSpinner @condition={{@controller.loading}}>+ <DConditionalLoadingSpinner @condition={{@controller.loading}}><form class="form-vertical">{{#if @controller.showEnforcedNotice}}<div class="alert alert-error">@@ -181,7 +181,7 @@ export default <template>{{/unless}}{{/if}}</form>- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner></section></PluginOutlet></template>diff --git a/frontend/discourse/app/templates/preferences/security.gjs b/frontend/discourse/app/templates/preferences/security.gjsindex 02ac4680339..3d626e4a2eb 100644--- a/frontend/discourse/app/templates/preferences/security.gjs+++ b/frontend/discourse/app/templates/preferences/security.gjs@@ -2,14 +2,14 @@ import { fn } from "@ember/helper";import { on } from "@ember/modifier";import { trustHTML } from "@ember/template";import AuthTokenDropdown from "discourse/components/auth-token-dropdown";-import DButton from "discourse/components/d-button";import PluginOutlet from "discourse/components/plugin-outlet";import UserApiKeys from "discourse/components/user-preferences/user-api-keys";import UserPasskeys from "discourse/components/user-preferences/user-passkeys";-import icon from "discourse/helpers/d-icon";-import formatDate from "discourse/helpers/format-date";import lazyHash from "discourse/helpers/lazy-hash";import { not } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import dFormatDate from "discourse/ui-kit/helpers/d-format-date";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default <template>@@ -23,7 +23,7 @@ export default <template>class="btn btn-default"id="change-password-button">- {{icon "envelope"}}+ {{dIcon "envelope"}}{{#if @controller.model.no_password}}{{i18n "user.change_password.set_password"}}{{else}}@@ -49,7 +49,7 @@ export default <template>class="btn btn-danger"id="remove-password-link">- {{icon "trash-can"}}+ {{dIcon "trash-can"}}{{i18n "user.change_password.remove"}}</button></div>@@ -102,7 +102,7 @@ export default <template><div class="auth-tokens">{{#each @controller.authTokens as |token|}}<div class="row auth-token">- <div class="auth-token-icon">{{icon token.icon}}</div>+ <div class="auth-token-icon">{{dIcon token.icon}}</div>{{#unless token.is_active}}<AuthTokenDropdown@token={{token}}@@ -130,7 +130,7 @@ export default <template>(i18n"user.auth_tokens.browser_last_seen"browser=token.browser- date=(formatDate token.seen_at)+ date=(dFormatDate token.seen_at))}}{{/if}}@@ -142,10 +142,10 @@ export default <template>{{#if @controller.canShowAllAuthTokens}}<a href {{on "click" @controller.toggleShowAllAuthTokens}}>{{#if @controller.showAllAuthTokens}}- {{icon "angle-up"}}+ {{dIcon "angle-up"}}<span>{{i18n "user.auth_tokens.show_few"}}</span>{{else}}- {{icon "angle-down"}}+ {{dIcon "angle-down"}}<span>{{i18n"user.auth_tokens.show_all"@@ -161,7 +161,7 @@ export default <template>{{on "click" (fn @controller.revokeAuthToken null)}}class="pull-right text-danger">- {{icon "right-from-bracket"}}+ {{dIcon "right-from-bracket"}}<span>{{i18n "user.auth_tokens.log_out_all"}}</span>diff --git a/frontend/discourse/app/templates/preferences/tags.gjs b/frontend/discourse/app/templates/preferences/tags.gjsindex 333d2b22fde..0805ae36ccc 100644--- a/frontend/discourse/app/templates/preferences/tags.gjs+++ b/frontend/discourse/app/templates/preferences/tags.gjs@@ -1,5 +1,5 @@-import SaveControls from "discourse/components/save-controls";import Tags from "discourse/components/user-preferences/tags";+import DSaveControls from "discourse/ui-kit/d-save-controls";export default <template><Tags@@ -9,7 +9,7 @@ export default <template>@siteSettings={{@controller.siteSettings}}/>- <SaveControls+ <DSaveControls@model={{@controller.model}}@action={{@controller.save}}@saved={{@controller.saved}}diff --git a/frontend/discourse/app/templates/preferences/tracking.gjs b/frontend/discourse/app/templates/preferences/tracking.gjsindex 35c84341cbf..0836d35aaf8 100644--- a/frontend/discourse/app/templates/preferences/tracking.gjs+++ b/frontend/discourse/app/templates/preferences/tracking.gjs@@ -1,12 +1,12 @@import { fn } from "@ember/helper";import PluginOutlet from "discourse/components/plugin-outlet";import PreferenceCheckbox from "discourse/components/preference-checkbox";-import SaveControls from "discourse/components/save-controls";import Categories from "discourse/components/user-preferences/categories";import Tags from "discourse/components/user-preferences/tags";import bodyClass from "discourse/helpers/body-class";import lazyHash from "discourse/helpers/lazy-hash";import ComboBox from "discourse/select-kit/components/combo-box";+import DSaveControls from "discourse/ui-kit/d-save-controls";import { i18n } from "discourse-i18n";export default <template>@@ -108,7 +108,7 @@ export default <template>{{/if}}{{#if @controller.canSave}}- <SaveControls+ <DSaveControls@model={{@controller.model}}@action={{@controller.save}}@saved={{@controller.saved}}diff --git a/frontend/discourse/app/templates/preferences/users.gjs b/frontend/discourse/app/templates/preferences/users.gjsindex f365a97e708..ba1db4e459c 100644--- a/frontend/discourse/app/templates/preferences/users.gjs+++ b/frontend/discourse/app/templates/preferences/users.gjs@@ -2,10 +2,10 @@ import { hash } from "@ember/helper";import IgnoredUserList from "discourse/components/ignored-user-list";import PluginOutlet from "discourse/components/plugin-outlet";import PreferenceCheckbox from "discourse/components/preference-checkbox";-import SaveControls from "discourse/components/save-controls";-import icon from "discourse/helpers/d-icon";import lazyHash from "discourse/helpers/lazy-hash";import UserChooser from "discourse/select-kit/components/user-chooser";+import DSaveControls from "discourse/ui-kit/d-save-controls";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default <template>@@ -17,7 +17,7 @@ export default <template>data-setting-name="user-ignored-users"><div class="controls tracking-controls user-notifications">- <label>{{icon "far-eye-slash" class="icon"}}+ <label>{{dIcon "far-eye-slash" class="icon"}}{{i18n "user.ignored_users"}}</label><IgnoredUserList@model={{@controller.model}}@@ -31,7 +31,7 @@ export default <template><div class="control-group user-mute" data-setting-name="user-muted-users"><div class="controls tracking-controls"><label>- {{icon "d-muted" class="icon"}}+ {{dIcon "d-muted" class="icon"}}<span>{{i18n "user.muted_users"}}</span></label><UserChooser@@ -94,7 +94,7 @@ export default <template>/></span>- <SaveControls+ <DSaveControls@model={{@controller.model}}@action={{@controller.save}}@saved={{@controller.saved}}diff --git a/frontend/discourse/app/templates/review/index.gjs b/frontend/discourse/app/templates/review/index.gjsindex 0e49388c487..cc040912540 100644--- a/frontend/discourse/app/templates/review/index.gjs+++ b/frontend/discourse/app/templates/review/index.gjs@@ -1,25 +1,25 @@import { LinkTo } from "@ember/routing";import { trustHTML } from "@ember/template";-import DButton from "discourse/components/d-button";-import HorizontalOverflowNav from "discourse/components/horizontal-overflow-nav";-import NavItem from "discourse/components/nav-item";import ReviewIndex from "discourse/components/reviewable/index";-import icon from "discourse/helpers/d-icon";import { eq } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DHorizontalOverflowNav from "discourse/ui-kit/d-horizontal-overflow-nav";+import DNavItem from "discourse/ui-kit/d-nav-item";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";<template>- <HorizontalOverflowNav @ariaLabel="Review" class="reviewable-title">- <NavItem @route="review.index" @label="review.view_all" />- <NavItem @route="review.topics" @label="review.grouped_by_topic" />+ <DHorizontalOverflowNav @ariaLabel="Review" class="reviewable-title">+ <DNavItem @route="review.index" @label="review.view_all" />+ <DNavItem @route="review.topics" @label="review.grouped_by_topic" />{{#if @controller.currentUser.admin}}- <NavItem+ <DNavItem@route="review.settings"@label="review.settings.title"@icon="wrench"/>{{/if}}- </HorizontalOverflowNav>+ </DHorizontalOverflowNav>{{#if @controller.displayUnknownReviewableTypesWarning}}<div class="alert alert-info unknown-reviewables"><span class="text">{{i18n@@ -51,7 +51,7 @@ import { i18n } from "discourse-i18n";}}</span><div class="unknown-reviewables__options"><LinkTo @route="adminPlugins.index" class="btn">- {{icon "puzzle-piece"}}+ {{dIcon "puzzle-piece"}}<span>{{i18n "review.unknown.enable_plugins"}}</span></LinkTo><DButtondiff --git a/frontend/discourse/app/templates/review/settings.gjs b/frontend/discourse/app/templates/review/settings.gjsindex 560d1b1c349..5a8f31860d2 100644--- a/frontend/discourse/app/templates/review/settings.gjs+++ b/frontend/discourse/app/templates/review/settings.gjs@@ -1,22 +1,22 @@import { fn } from "@ember/helper";-import DButton from "discourse/components/d-button";-import HorizontalOverflowNav from "discourse/components/horizontal-overflow-nav";-import NavItem from "discourse/components/nav-item";import ComboBox from "discourse/select-kit/components/combo-box";+import DButton from "discourse/ui-kit/d-button";+import DHorizontalOverflowNav from "discourse/ui-kit/d-horizontal-overflow-nav";+import DNavItem from "discourse/ui-kit/d-nav-item";import { i18n } from "discourse-i18n";export default <template>- <HorizontalOverflowNav @ariaLabel="Review" class="reviewable-title">- <NavItem @route="review.index" @label="review.view_all" />- <NavItem @route="review.topics" @label="review.grouped_by_topic" />+ <DHorizontalOverflowNav @ariaLabel="Review" class="reviewable-title">+ <DNavItem @route="review.index" @label="review.view_all" />+ <DNavItem @route="review.topics" @label="review.grouped_by_topic" />{{#if @controller.currentUser.admin}}- <NavItem+ <DNavItem@route="review.settings"@label="review.settings.title"@icon="wrench"/>{{/if}}- </HorizontalOverflowNav>+ </DHorizontalOverflowNav><div class="reviewable-settings"><h4>{{i18n "review.settings.priorities.title"}}</h4>diff --git a/frontend/discourse/app/templates/review/show.gjs b/frontend/discourse/app/templates/review/show.gjsindex 3c259b8c82a..58cc68017ac 100644--- a/frontend/discourse/app/templates/review/show.gjs+++ b/frontend/discourse/app/templates/review/show.gjs@@ -3,7 +3,7 @@ import { getOwner } from "@ember/owner";import { LinkTo } from "@ember/routing";import { dasherize } from "@ember/string";import ReviewableItem from "discourse/components/reviewable/item";-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class extends Component {@@ -29,7 +29,7 @@ export default class extends Component {{{#if this.reviewableComponentExists}}<div class="reviewable-top-nav"><LinkTo @route="review.index">- {{icon "arrow-left"}}+ {{dIcon "arrow-left"}}{{i18n "review.back_to_queue"}}</LinkTo></div>diff --git a/frontend/discourse/app/templates/review/topics.gjs b/frontend/discourse/app/templates/review/topics.gjsindex a08af3285da..255da515f82 100644--- a/frontend/discourse/app/templates/review/topics.gjs+++ b/frontend/discourse/app/templates/review/topics.gjs@@ -1,25 +1,25 @@import { fn, hash } from "@ember/helper";import { LinkTo } from "@ember/routing";-import HorizontalOverflowNav from "discourse/components/horizontal-overflow-nav";-import NavItem from "discourse/components/nav-item";import ReviewableClaimedTopic from "discourse/components/reviewable-claimed-topic";import TopicStatus from "discourse/components/topic-status";-import icon from "discourse/helpers/d-icon";-import replaceEmoji from "discourse/helpers/replace-emoji";+import DHorizontalOverflowNav from "discourse/ui-kit/d-horizontal-overflow-nav";+import DNavItem from "discourse/ui-kit/d-nav-item";+import dIcon from "discourse/ui-kit/helpers/d-icon";+import dReplaceEmoji from "discourse/ui-kit/helpers/d-replace-emoji";import { i18n } from "discourse-i18n";export default <template>- <HorizontalOverflowNav @ariaLabel="Review" class="reviewable-title">- <NavItem @route="review.index" @label="review.view_all" />- <NavItem @route="review.topics" @label="review.grouped_by_topic" />+ <DHorizontalOverflowNav @ariaLabel="Review" class="reviewable-title">+ <DNavItem @route="review.index" @label="review.view_all" />+ <DNavItem @route="review.topics" @label="review.grouped_by_topic" />{{#if @controller.currentUser.admin}}- <NavItem+ <DNavItem@route="review.settings"@label="review.settings.title"@icon="wrench"/>{{/if}}- </HorizontalOverflowNav>+ </DHorizontalOverflowNav>{{#if @controller.reviewableTopics.content}}<table class="reviewable-topics">@@ -39,7 +39,7 @@ export default <template>href={{rt.relative_url}}rel="noopener noreferrer"target="_blank"- >{{replaceEmoji rt.title}}</a>+ >{{dReplaceEmoji rt.title}}</a></div></td><td class="reviewable-count">@@ -59,7 +59,7 @@ export default <template>@query={{hash topic_id=rt.id}}class="btn btn-primary btn-small">- {{icon "list"}}+ {{dIcon "list"}}<span>{{i18n "review.topics.details"}}</span></LinkTo></td>diff --git a/frontend/discourse/app/templates/second-factor-auth.gjs b/frontend/discourse/app/templates/second-factor-auth.gjsindex b14aeb06fa6..7961b488580 100644--- a/frontend/discourse/app/templates/second-factor-auth.gjs+++ b/frontend/discourse/app/templates/second-factor-auth.gjs@@ -1,9 +1,9 @@import { fn } from "@ember/helper";import { on } from "@ember/modifier";-import DButton from "discourse/components/d-button";-import SecondFactorInput from "discourse/components/second-factor-input";import hideApplicationSidebar from "discourse/helpers/hide-application-sidebar";import { gt, not, or } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DSecondFactorInput from "discourse/ui-kit/d-second-factor-input";import { i18n } from "discourse-i18n";export default <template>@@ -30,7 +30,7 @@ export default <template></div>{{else if (or @controller.showTotpForm @controller.showBackupCodesForm)}}<form class={{@controller.inputFormClass}}>- <SecondFactorInput+ <DSecondFactorInput@onChange={{fn (mut @controller.secondFactorToken)}}@secondFactorMethod={{@controller.shownSecondFactorMethod}}value={{@controller.secondFactorToken}}diff --git a/frontend/discourse/app/templates/signup.gjs b/frontend/discourse/app/templates/signup.gjsindex 9772d5e8155..7edfc07a128 100644--- a/frontend/discourse/app/templates/signup.gjs+++ b/frontend/discourse/app/templates/signup.gjs@@ -1,28 +1,28 @@import { Input } from "@ember/component";import { on } from "@ember/modifier";import { trustHTML } from "@ember/template";-import FlashMessage from "discourse/components/flash-message";import FullnameInput from "discourse/components/fullname-input";import HoneypotInput from "discourse/components/honeypot-input";-import InputTip from "discourse/components/input-tip";import LoginButtons from "discourse/components/login-buttons";-import PasswordField from "discourse/components/password-field";import PluginOutlet from "discourse/components/plugin-outlet";import SignupPageCta from "discourse/components/signup-page-cta";import SignupProgressBar from "discourse/components/signup-progress-bar";-import TogglePasswordMask from "discourse/components/toggle-password-mask";import UserField from "discourse/components/user-field";import WelcomeHeader from "discourse/components/welcome-header";import bodyClass from "discourse/helpers/body-class";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import hideApplicationHeaderButtons from "discourse/helpers/hide-application-header-buttons";import hideApplicationSidebar from "discourse/helpers/hide-application-sidebar";import lazyHash from "discourse/helpers/lazy-hash";-import loadingSpinner from "discourse/helpers/loading-spinner";import routeAction from "discourse/helpers/route-action";import valueEntered from "discourse/helpers/value-entered";import { and, not } from "discourse/truth-helpers";+import DFlashMessage from "discourse/ui-kit/d-flash-message";+import DInputTip from "discourse/ui-kit/d-input-tip";+import DPasswordField from "discourse/ui-kit/d-password-field";+import DTogglePasswordMask from "discourse/ui-kit/d-toggle-password-mask";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";+import dLoadingSpinner from "discourse/ui-kit/helpers/d-loading-spinner";import { i18n } from "discourse-i18n";export default <template>@@ -32,19 +32,19 @@ export default <template>{{bodyClass "signup-page"}}<div class="signup-fullpage">- <FlashMessage+ <DFlashMessage@flash={{@controller.flash}}@type={{@controller.flashType}}/>- <div class={{concatClass "signup-body" @controller.bodyClasses}}>+ <div class={{dConcatClass "signup-body" @controller.bodyClasses}}><PluginOutlet@name="create-account-before-modal-body"@connectorTagName="div"/><div- class={{concatClass+ class={{dConcatClass(if @controller.site.desktopView "login-left-side")@controller.authOptions.auth_provider}}@@ -86,7 +86,7 @@ export default <template>{{i18n "user.email.title"}}</label>{{#if @controller.showEmailValidation}}- <InputTip+ <DInputTip@validation={{@controller.emailValidation}}id="account-email-validation"/>@@ -131,7 +131,7 @@ export default <template></span>{{else}}- <InputTip+ <DInputTip@validation={{@controller.usernameValidation}}id="username-validation"/>@@ -169,7 +169,7 @@ export default <template><div class="input-group create-account__password">{{#if @controller.passwordRequired}}- <PasswordField+ <DPasswordField{{on "focusin" @controller.scrollInputIntoView}}@value={{@controller.accountPassword}}@capsLockOn={{@controller.capsLockOn}}@@ -183,14 +183,14 @@ export default <template><label class="alt-placeholder" for="new-account-password">{{i18n "user.password.title"}}</label>- <TogglePasswordMask+ <DTogglePasswordMask@maskPassword={{@controller.maskPassword}}@togglePasswordMask={{@controller.togglePasswordMask}}/><div class="create-account__password-info"><div class="create-account__password-tip-validation">{{#if @controller.showPasswordValidation}}- <InputTip+ <DInputTip@validation={{@controller.passwordValidation}}id="password-validation"/>@@ -205,12 +205,12 @@ export default <template></span>{{/if}}<div- class={{concatClass+ class={{dConcatClass"caps-lock-warning"(unless @controller.capsLockOn "hidden")}}>- {{icon "triangle-exclamation"}}+ {{dIcon "triangle-exclamation"}}{{i18n "login.caps_lock_warning"}}</div></div>@@ -315,7 +315,7 @@ export default <template>{{/if}}{{#if @controller.skipConfirmation}}- {{loadingSpinner size="large"}}+ {{dLoadingSpinner size="large"}}{{/if}}</div>diff --git a/frontend/discourse/app/templates/tag-groups.gjs b/frontend/discourse/app/templates/tag-groups.gjsindex 9bbb6ef3c27..f705f0fd8ff 100644--- a/frontend/discourse/app/templates/tag-groups.gjs+++ b/frontend/discourse/app/templates/tag-groups.gjs@@ -1,12 +1,12 @@import { LinkTo } from "@ember/routing";-import DButton from "discourse/components/d-button";-import icon from "discourse/helpers/d-icon";import getUrl from "discourse/lib/get-url";+import DButton from "discourse/ui-kit/d-button";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default <template><a class="tag-groups--back" href={{getUrl "/tags"}}>- {{icon "chevron-left"}}+ {{dIcon "chevron-left"}}<span>{{i18n "tagging.groups.back_btn"}}</span></a>diff --git a/frontend/discourse/app/templates/tag-groups/index.gjs b/frontend/discourse/app/templates/tag-groups/index.gjsindex b8cc53e7caf..9247bb84286 100644--- a/frontend/discourse/app/templates/tag-groups/index.gjs+++ b/frontend/discourse/app/templates/tag-groups/index.gjs@@ -1,5 +1,5 @@import { LinkTo } from "@ember/routing";-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default <template>@@ -17,7 +17,7 @@ export default <template><section>{{#unless @controller.model.content}}<LinkTo @route="tagGroups.new" class="btn btn-primary">- {{icon "plus"}}+ {{dIcon "plus"}}{{i18n "tagging.groups.new"}}</LinkTo>{{/unless}}diff --git a/frontend/discourse/app/templates/tags/index.gjs b/frontend/discourse/app/templates/tags/index.gjsindex b00cfe889be..104630c60b2 100644--- a/frontend/discourse/app/templates/tags/index.gjs+++ b/frontend/discourse/app/templates/tags/index.gjs@@ -1,15 +1,15 @@import { fn } from "@ember/helper";import { on } from "@ember/modifier";import didInsert from "@ember/render-modifiers/modifiers/did-insert";-import DButton from "discourse/components/d-button";import DiscourseBanner from "discourse/components/discourse-banner";-import ExpandingTextArea from "discourse/components/expanding-text-area";import PluginOutlet from "discourse/components/plugin-outlet";import TagList from "discourse/components/tag-list";-import discourseTags from "discourse/helpers/discourse-tags";import lazyHash from "discourse/helpers/lazy-hash";import withEventValue from "discourse/helpers/with-event-value";import { not, or } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DExpandingTextArea from "discourse/ui-kit/d-expanding-text-area";+import dDiscourseTags from "discourse/ui-kit/helpers/d-discourse-tags";import { i18n } from "discourse-i18n";export default <template>@@ -35,7 +35,7 @@ export default <template>}}</h4>- {{discourseTags null [email protected]}}+ {{dDiscourseTags null [email protected]}}</div>{{/if}}@@ -47,7 +47,7 @@ export default <template>}}</h4>- {{discourseTags null [email protected]}}+ {{dDiscourseTags null [email protected]}}</div>{{/if}}@@ -75,7 +75,7 @@ export default <template><label for="bulk-tags-input" class="sr-only">{{i18n "tagging.bulk_create_inline_placeholder"}}</label>- <ExpandingTextArea+ <DExpandingTextArea{{didInsert @controller.registerTextarea}}{{on "input" (withEventValue (fn (mut @controller.bulkTagInput)))}}value={{@controller.bulkTagInput}}diff --git a/frontend/discourse/app/templates/topic.gjs b/frontend/discourse/app/templates/topic.gjsindex 647efeb8c0f..e03c1b6dec4 100644--- a/frontend/discourse/app/templates/topic.gjs+++ b/frontend/discourse/app/templates/topic.gjs@@ -6,9 +6,6 @@ import { trustHTML } from "@ember/template";import AddCategoryTagClasses from "discourse/components/add-category-tag-classes";import AddTopicStatusClasses from "discourse/components/add-topic-status-classes";import AnonymousTopicFooterButtons from "discourse/components/anonymous-topic-footer-buttons";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import CookText from "discourse/components/cook-text";-import DButton from "discourse/components/d-button";import DiscourseBanner from "discourse/components/discourse-banner";import DiscourseTopic from "discourse/components/discourse-topic";import EmbedModeComposer from "discourse/components/embed-mode-composer";@@ -38,14 +35,17 @@ import TopicTimeline from "discourse/components/topic-timeline";import TopicTimerInfo from "discourse/components/topic-timer-info";import TopicTitle from "discourse/components/topic-title";import TopicTitleEditor from "discourse/components/topic-title-editor";-import ageWithTooltip from "discourse/helpers/age-with-tooltip";import bodyClass from "discourse/helpers/body-class";-import icon from "discourse/helpers/d-icon";import hideApplicationFooter from "discourse/helpers/hide-application-footer";import hideScrollableContent from "discourse/helpers/hide-scrollable-content";import lazyHash from "discourse/helpers/lazy-hash";import routeAction from "discourse/helpers/route-action";import { and, eq } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DCookText from "discourse/ui-kit/d-cook-text";+import dAgeWithTooltip from "discourse/ui-kit/helpers/d-age-with-tooltip";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";import booleanString from "../helpers/boolean-string";@@ -140,7 +140,7 @@ export default <template>class="remove-featured-link"title={{i18n "composer.remove_featured_link"}}>- {{icon "circle-xmark"}}+ {{dIcon "circle-xmark"}}{{@controller.featuredLinkDomain}}</a>{{/if}}@@ -179,7 +179,7 @@ export default <template>{{trustHTML @controller.model.fancyTitle~}}{{~#if @controller.model.details.can_edit~}}<span class="edit-topic__wrapper">- {{icon "pencil" class="edit-topic"}}+ {{dIcon "pencil" class="edit-topic"}}</span>{{~/if}}</a>@@ -442,7 +442,7 @@ export default <template></div><div id="topic-bottom"></div>- <ConditionalLoadingSpinner+ <DConditionalLoadingSpinner@condition={{@controller.model.postStream.loadingFilter}}>{{#if @controller.loadedAllPosts}}@@ -459,7 +459,7 @@ export default <template>{{i18n "review.awaiting_approval"}}</span><span class="created-at">- {{ageWithTooltip pending.created_at}}+ {{dAgeWithTooltip pending.created_at}}</span></div><div class="post-contents-wrapper">@@ -471,7 +471,7 @@ export default <template>@user={{@controller.currentUser}}/><div class="post-body">- <CookText @rawText={{pending.raw}} />+ <DCookText @rawText={{pending.raw}} /></div></div></div>@@ -561,7 +561,7 @@ export default <template>{{/if}}{{/if}}- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner><PluginOutlet@name="topic-area-bottom"@@ -633,7 +633,7 @@ export default <template><EmbedModeComposer @topic={{@controller.model}} />{{else}}<div class="container">- <ConditionalLoadingSpinner @condition={{@controller.noErrorYet}}>+ <DConditionalLoadingSpinner @condition={{@controller.noErrorYet}}>{{#if @controller.model.errorHtml}}<div class="not-found">{{trustHTML@controller.model.errorHtml@@ -659,9 +659,9 @@ export default <template>/>{{/if}}</div>- <ConditionalLoadingSpinner @condition={{@controller.retrying}} />+ <DConditionalLoadingSpinner @condition={{@controller.retrying}} />{{/if}}- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner></div>{{/if}}diff --git a/frontend/discourse/app/templates/user-activity.gjs b/frontend/discourse/app/templates/user-activity.gjsindex 1b4bcdc6efc..ffc1e8b2b01 100644--- a/frontend/discourse/app/templates/user-activity.gjs+++ b/frontend/discourse/app/templates/user-activity.gjs@@ -1,23 +1,23 @@-import DNavigationItem from "discourse/components/d-navigation-item";-import HorizontalOverflowNav from "discourse/components/horizontal-overflow-nav";import PluginOutlet from "discourse/components/plugin-outlet";import bodyClass from "discourse/helpers/body-class";-import icon from "discourse/helpers/d-icon";import lazyHash from "discourse/helpers/lazy-hash";import { gt } from "discourse/truth-helpers";+import DHorizontalOverflowNav from "discourse/ui-kit/d-horizontal-overflow-nav";+import DNavigationItem from "discourse/ui-kit/d-navigation-item";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default <template>{{bodyClass "user-activity-page"}}<PluginOutlet @name="user-activity-navigation-wrapper"><div class="user-navigation user-navigation-secondary">- <HorizontalOverflowNav @ariaLabel="User secondary - activity">+ <DHorizontalOverflowNav @ariaLabel="User secondary - activity"><DNavigationItem@route="userActivity.index"@ariaCurrentContext="subNav"class="user-nav__activity-all">- {{icon "bars-staggered"}}+ {{dIcon "bars-staggered"}}<span>{{i18n "user.filters.all"}}</span></DNavigationItem>@@ -26,7 +26,7 @@ export default <template>@ariaCurrentContext="subNav"class="user-nav__activity-topics">- {{icon "list-ul"}}+ {{dIcon "list-ul"}}<span>{{i18n "user_action_groups.4"}}</span></DNavigationItem><DNavigationItem@@ -34,7 +34,7 @@ export default <template>@ariaCurrentContext="subNav"class="user-nav__activity-replies">- {{icon "reply"}}+ {{dIcon "reply"}}<span>{{i18n "user_action_groups.5"}}</span></DNavigationItem>@@ -45,7 +45,7 @@ export default <template>class="user-nav__activity-read"title={{i18n "user.read_help"}}>- {{icon "clock-rotate-left"}}+ {{dIcon "clock-rotate-left"}}<span>{{i18n "user.read"}}</span></DNavigationItem>{{/if}}@@ -56,7 +56,7 @@ export default <template>@ariaCurrentContext="subNav"class="user-nav__activity-drafts">- {{icon "pencil"}}+ {{dIcon "pencil"}}<span>{{@controller.draftLabel}}</span></DNavigationItem>{{/if}}@@ -67,7 +67,7 @@ export default <template>@ariaCurrentContext="subNav"class="user-nav__activity-pending">- {{icon "clock"}}+ {{dIcon "clock"}}<span>{{@controller.pendingLabel}}</span></DNavigationItem>{{/if}}@@ -77,7 +77,7 @@ export default <template>@ariaCurrentContext="subNav"class="user-nav__activity-likes">- {{icon "heart"}}+ {{dIcon "heart"}}<span>{{i18n "user_action_groups.1"}}</span></DNavigationItem>@@ -87,7 +87,7 @@ export default <template>@ariaCurrentContext="subNav"class="user-nav__activity-bookmarks">- {{icon "bookmark"}}+ {{dIcon "bookmark"}}<span>{{i18n "user_action_groups.3"}}</span></DNavigationItem>{{/if}}@@ -97,7 +97,7 @@ export default <template>@connectorTagName="li"@outletArgs={{lazyHash [email protected]}}/>- </HorizontalOverflowNav>+ </DHorizontalOverflowNav></div></PluginOutlet><section class="user-content" id="user-content">diff --git a/frontend/discourse/app/templates/user-invited.gjs b/frontend/discourse/app/templates/user-invited.gjsindex b0709d0f471..1e21de0e4aa 100644--- a/frontend/discourse/app/templates/user-invited.gjs+++ b/frontend/discourse/app/templates/user-invited.gjs@@ -1,29 +1,29 @@-import HorizontalOverflowNav from "discourse/components/horizontal-overflow-nav";-import NavItem from "discourse/components/nav-item";import bodyClass from "discourse/helpers/body-class";+import DHorizontalOverflowNav from "discourse/ui-kit/d-horizontal-overflow-nav";+import DNavItem from "discourse/ui-kit/d-nav-item";export default <template>{{#if @controller.can_see_invite_details}}{{bodyClass "user-invites-page"}}<div class="user-navigation user-navigation-secondary">- <HorizontalOverflowNav @ariaLabel="User secondary - invites">- <NavItem+ <DHorizontalOverflowNav @ariaLabel="User secondary - invites">+ <DNavItem@route="userInvited.show"@routeParam="pending"@i18nLabel={{@controller.pendingLabel}}/>- <NavItem+ <DNavItem@route="userInvited.show"@routeParam="expired"@i18nLabel={{@controller.expiredLabel}}/>- <NavItem+ <DNavItem@route="userInvited.show"@routeParam="redeemed"@i18nLabel={{@controller.redeemedLabel}}/>- </HorizontalOverflowNav>+ </DHorizontalOverflowNav></div>{{/if}}diff --git a/frontend/discourse/app/templates/user-invited/show.gjs b/frontend/discourse/app/templates/user-invited/show.gjsindex 409588dc692..ad105c46d1c 100644--- a/frontend/discourse/app/templates/user-invited/show.gjs+++ b/frontend/discourse/app/templates/user-invited/show.gjs@@ -1,32 +1,32 @@import { fn } from "@ember/helper";import { LinkTo } from "@ember/routing";import { trustHTML } from "@ember/template";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DButton from "discourse/components/d-button";-import DropdownMenu from "discourse/components/dropdown-menu";-import EmptyState from "discourse/components/empty-state";-import LoadMore from "discourse/components/load-more";import SvgEnvelopeZero from "discourse/components/svg/envelope-zero";-import TextField from "discourse/components/text-field";import DMenu from "discourse/float-kit/components/d-menu";-import avatar from "discourse/helpers/avatar";import bodyClass from "discourse/helpers/body-class";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";-import formatDate from "discourse/helpers/format-date";-import formatDuration from "discourse/helpers/format-duration";-import number from "discourse/helpers/number";import rawDate from "discourse/helpers/raw-date";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";+import DEmptyState from "discourse/ui-kit/d-empty-state";+import DLoadMore from "discourse/ui-kit/d-load-more";+import DTextField from "discourse/ui-kit/d-text-field";+import dAvatar from "discourse/ui-kit/helpers/d-avatar";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dFormatDate from "discourse/ui-kit/helpers/d-format-date";+import dFormatDuration from "discourse/ui-kit/helpers/d-format-duration";+import dIcon from "discourse/ui-kit/helpers/d-icon";+import dNumber from "discourse/ui-kit/helpers/d-number";import { i18n } from "discourse-i18n";export default <template>{{bodyClass "user-invites-page"}}{{#if @controller.canInviteToForum}}- <LoadMore+ <DLoadMore@id="user-content"@action={{@controller.loadMore}}- class={{concatClass+ class={{dConcatClass"user-content"(if @controller.hasLoadedInitialInvites "--loaded")}}@@ -35,7 +35,7 @@ export default <template>{{#if @controller.showSearch}}<div class="user-invite-search"><form>- <TextField+ <DTextField@value={{@controller.searchTerm}}@placeholderKey="user.invited.search"/></form>@@ -133,7 +133,7 @@ export default <template>{{#each @controller.model.invites as |invite|}}<tr class="d-table__row"><td class="d-table__cell --overview">- <LinkTo @route="user" @model={{invite.user}}>{{avatar+ <LinkTo @route="user" @model={{invite.user}}>{{dAvatarinvite.userimageSize="tiny"}}</LinkTo>@@ -146,32 +146,32 @@ export default <template><div class="d-table__mobile-label">{{i18n "user.invited.redeemed_at"}}</div>- {{formatDate invite.redeemed_at}}+ {{dFormatDate invite.redeemed_at}}</td>{{#if @controller.model.can_see_invite_details}}<td class="d-table__cell --detail"><div class="d-table__mobile-label">{{i18n "user.last_seen"}}</div>- {{formatDate invite.user.last_seen_at}}+ {{dFormatDate invite.user.last_seen_at}}</td><td class="d-table__cell --detail"><div class="d-table__mobile-label">{{i18n "user.invited.topics_entered"}}</div>- {{number invite.user.topics_entered}}+ {{dNumber invite.user.topics_entered}}</td><td class="d-table__cell --detail"><div class="d-table__mobile-label">{{i18n "user.invited.posts_read_count"}}</div>- {{number invite.user.posts_read_count}}+ {{dNumber invite.user.posts_read_count}}</td><td class="d-table__cell --detail"><div class="d-table__mobile-label">{{i18n "user.invited.time_read"}}</div>- {{formatDuration invite.user.time_read}}+ {{dFormatDuration invite.user.time_read}}</td><td class="d-table__cell --detail"><div class="d-table__mobile-label">@@ -220,10 +220,10 @@ export default <template><td class="d-table__cell --overview invite-type"><div class="invite-shortkey">{{#if invite.email}}- {{icon "envelope"}}+ {{dIcon "envelope"}}{{invite.email}}{{else}}- {{icon "link"}}+ {{dIcon "link"}}{{#if invite.invite_key}}{{i18n"user.invited.invited_via_link"@@ -250,7 +250,7 @@ export default <template><ahref="/g/{{g.name}}"class="invite-extra-item-link"- >{{icon "users"}}+ >{{dIcon "users"}}{{g.name}}</a></span>@@ -263,7 +263,7 @@ export default <template>href={{invite.topic.url}}class="invite-extra-item-link">- {{icon "file-lines"}}+ {{dIcon "file-lines"}}{{invite.topic.title}}</a></span>@@ -275,7 +275,7 @@ export default <template><div class="d-table__mobile-label">{{i18n "user.invited.sent"}}</div>- {{formatDate invite.updated_at}}+ {{dFormatDate invite.updated_at}}</td><td class="d-table__cell --detail invite-expires-at">@@ -308,7 +308,7 @@ export default <template>class="btn-default btn-small"><:content>- <DropdownMenu as |dropdown|>+ <DDropdownMenu as |dropdown|><dropdown.item><DButton@action={{fn@@ -324,7 +324,7 @@ export default <template>}}/></dropdown.item>- </DropdownMenu>+ </DDropdownMenu></:content></DMenu></div>@@ -336,11 +336,11 @@ export default <template></table>{{/if}}- <ConditionalLoadingSpinner+ <DConditionalLoadingSpinner@condition={{@controller.invitesLoading}}/>{{else}}- <EmptyState+ <DEmptyState@identifier="empty-channels-list"@svgContent={{SvgEnvelopeZero}}@title={{i18n "user.invited.none.title"}}@@ -365,10 +365,10 @@ export default <template>{{i18n "user.invited.none.tip.suffix"}}{{/if}}</:tip>- </EmptyState>+ </DEmptyState>{{/if}}</section>- </LoadMore>+ </DLoadMore>{{else}}<div class="alert alert-error invite-error">{{@controller.model.error}}diff --git a/frontend/discourse/app/templates/user-notifications.gjs b/frontend/discourse/app/templates/user-notifications.gjsindex 1ac70a8e165..a13eacfa5ef 100644--- a/frontend/discourse/app/templates/user-notifications.gjs+++ b/frontend/discourse/app/templates/user-notifications.gjs@@ -1,13 +1,13 @@-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DButton from "discourse/components/d-button";-import DNavigationItem from "discourse/components/d-navigation-item";-import HorizontalOverflowNav from "discourse/components/horizontal-overflow-nav";-import LoadMore from "discourse/components/load-more";import PluginOutlet from "discourse/components/plugin-outlet";import bodyClass from "discourse/helpers/body-class";-import icon from "discourse/helpers/d-icon";import hideApplicationFooter from "discourse/helpers/hide-application-footer";import lazyHash from "discourse/helpers/lazy-hash";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DHorizontalOverflowNav from "discourse/ui-kit/d-horizontal-overflow-nav";+import DLoadMore from "discourse/ui-kit/d-load-more";+import DNavigationItem from "discourse/ui-kit/d-navigation-item";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default <template>@@ -18,13 +18,13 @@ export default <template>{{bodyClass "user-notifications-page"}}<div class="user-navigation user-navigation-secondary">- <HorizontalOverflowNav @ariaLabel="User secondary - notifications">+ <DHorizontalOverflowNav @ariaLabel="User secondary - notifications"><DNavigationItem@route="userNotifications.index"@ariaCurrentContext="subNav"class="user-nav__notifications-all">- {{icon "bell"}}+ {{dIcon "bell"}}<span>{{i18n "user.filters.all"}}</span></DNavigationItem>@@ -33,7 +33,7 @@ export default <template>@ariaCurrentContext="subNav"class="user-nav__notifications-responses">- {{icon "reply"}}+ {{dIcon "reply"}}<span>{{i18n "user_action_groups.5"}}</span></DNavigationItem>@@ -42,7 +42,7 @@ export default <template>@ariaCurrentContext="subNav"class="user-nav__notifications-likes">- {{icon "heart"}}+ {{dIcon "heart"}}<span>{{i18n "user_action_groups.2"}}</span></DNavigationItem>@@ -52,7 +52,7 @@ export default <template>@ariaCurrentContext="subNav"class="user-nav__notifications-mentions">- {{icon "at"}}+ {{dIcon "at"}}<span>{{i18n "user_action_groups.7"}}</span></DNavigationItem>{{/if}}@@ -62,7 +62,7 @@ export default <template>@ariaCurrentContext="subNav"class="user-nav__notifications-edits">- {{icon "pencil"}}+ {{dIcon "pencil"}}<span>{{i18n "user_action_groups.11"}}</span></DNavigationItem>@@ -71,7 +71,7 @@ export default <template>@ariaCurrentContext="subNav"class="user-nav__notifications-links">- {{icon "link"}}+ {{dIcon "link"}}<span>{{i18n "user_action_groups.17"}}</span></DNavigationItem>@@ -81,7 +81,7 @@ export default <template>@outletArgs={{lazyHash [email protected]}}/>- </HorizontalOverflowNav>+ </DHorizontalOverflowNav>{{#if @controller.model.content}}<div class="navigation-controls">@@ -98,12 +98,14 @@ export default <template></div><section class="user-content" id="user-content">- <LoadMore+ <DLoadMore@action={{@controller.loadMore}}class="notification-history user-stream">{{outlet}}- <ConditionalLoadingSpinner @condition={{@controller.model.loadingMore}} />- </LoadMore>+ <DConditionalLoadingSpinner+ @condition={{@controller.model.loadingMore}}+ />+ </DLoadMore></section></template>diff --git a/frontend/discourse/app/templates/user-private-messages/group.gjs b/frontend/discourse/app/templates/user-private-messages/group.gjsindex 6535eb0a0a4..b678606427f 100644--- a/frontend/discourse/app/templates/user-private-messages/group.gjs+++ b/frontend/discourse/app/templates/user-private-messages/group.gjs@@ -1,6 +1,6 @@-import DNavigationItem from "discourse/components/d-navigation-item";import MessagesSecondaryNav from "discourse/components/user-nav/messages-secondary-nav";-import icon from "discourse/helpers/d-icon";+import DNavigationItem from "discourse/ui-kit/d-navigation-item";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default <template>@@ -11,7 +11,7 @@ export default <template>@ariaCurrentContext="subNav"class="user-nav__messages-group-latest">- {{icon "envelope"}}+ {{dIcon "envelope"}}<span>{{i18n "categories.latest"}}</span></DNavigationItem>@@ -21,7 +21,7 @@ export default <template>@ariaCurrentContext="subNav"class="user-nav__messages-group-new">- {{icon "circle-exclamation"}}+ {{dIcon "circle-exclamation"}}<span>{{@controller.newLinkText}}</span></DNavigationItem>@@ -30,7 +30,7 @@ export default <template>@ariaCurrentContext="subNav"class="user-nav__messages-group-unread">- {{icon "circle-plus"}}+ {{dIcon "circle-plus"}}<span>{{@controller.unreadLinkText}}</span></DNavigationItem>@@ -39,7 +39,7 @@ export default <template>@ariaCurrentContext="subNav"class="user-nav__messages-group-archive">- {{icon "box-archive"}}+ {{dIcon "box-archive"}}<span>{{i18n "user.messages.archive"}}</span></DNavigationItem>{{/if}}diff --git a/frontend/discourse/app/templates/user-private-messages/tags.gjs b/frontend/discourse/app/templates/user-private-messages/tags.gjsindex 597ae4465db..8629acc2b82 100644--- a/frontend/discourse/app/templates/user-private-messages/tags.gjs+++ b/frontend/discourse/app/templates/user-private-messages/tags.gjs@@ -1,13 +1,13 @@import { LinkTo } from "@ember/routing";import MessagesSecondaryNav from "discourse/components/user-nav/messages-secondary-nav";-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default <template><MessagesSecondaryNav><li class="tags"><LinkTo @route="userPrivateMessages.tags.index">- {{icon "tag"}}+ {{dIcon "tag"}}<span>{{i18n "user.messages.all_tags"}}</span></LinkTo></li>diff --git a/frontend/discourse/app/templates/user-private-messages/user.gjs b/frontend/discourse/app/templates/user-private-messages/user.gjsindex f8448d54cb7..35750bd34bf 100644--- a/frontend/discourse/app/templates/user-private-messages/user.gjs+++ b/frontend/discourse/app/templates/user-private-messages/user.gjs@@ -1,7 +1,7 @@import { trustHTML } from "@ember/template";-import DNavigationItem from "discourse/components/d-navigation-item";import MessagesSecondaryNav from "discourse/components/user-nav/messages-secondary-nav";-import icon from "discourse/helpers/d-icon";+import DNavigationItem from "discourse/ui-kit/d-navigation-item";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default <template>@@ -17,7 +17,7 @@ export default <template>@ariaCurrentContext="subNav"class="user-nav__messages-latest">- {{icon "envelope"}}+ {{dIcon "envelope"}}<span>{{i18n "categories.latest"}}</span></DNavigationItem>@@ -26,7 +26,7 @@ export default <template>@ariaCurrentContext="subNav"class="user-nav__messages-sent">- {{icon "reply"}}+ {{dIcon "reply"}}<span>{{i18n "user.messages.sent"}}</span></DNavigationItem>@@ -36,7 +36,7 @@ export default <template>@ariaCurrentContext="subNav"class="user-nav__messages-new">- {{icon "circle-exclamation"}}+ {{dIcon "circle-exclamation"}}<span>{{@controller.newLinkText}}</span></DNavigationItem>@@ -45,7 +45,7 @@ export default <template>@ariaCurrentContext="subNav"class="user-nav__messages-unread">- {{icon "circle-plus"}}+ {{dIcon "circle-plus"}}<span>{{@controller.unreadLinkText}}</span></DNavigationItem>{{/if}}@@ -55,7 +55,7 @@ export default <template>@ariaCurrentContext="subNav"class="user-nav__messages-archive">- {{icon "box-archive"}}+ {{dIcon "box-archive"}}<span>{{i18n "user.messages.archive"}}</span></DNavigationItem>diff --git a/frontend/discourse/app/templates/user-topics-list.gjs b/frontend/discourse/app/templates/user-topics-list.gjsindex ef7b3e0caf3..4946037d0b5 100644--- a/frontend/discourse/app/templates/user-topics-list.gjs+++ b/frontend/discourse/app/templates/user-topics-list.gjs@@ -1,14 +1,14 @@import { on } from "@ember/modifier";import BasicTopicList from "discourse/components/basic-topic-list";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import CountI18n from "discourse/components/count-i18n";-import EmptyState from "discourse/components/empty-state";-import LoadMore from "discourse/components/load-more";import TopicDismissButtons from "discourse/components/topic-dismiss-buttons";import hideApplicationFooter from "discourse/helpers/hide-application-footer";-import loadingSpinner from "discourse/helpers/loading-spinner";import routeAction from "discourse/helpers/route-action";import { or } from "discourse/truth-helpers";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DCountI18n from "discourse/ui-kit/d-count-i18n";+import DEmptyState from "discourse/ui-kit/d-empty-state";+import DLoadMore from "discourse/ui-kit/d-load-more";+import dLoadingSpinner from "discourse/ui-kit/helpers/d-loading-spinner";export default <template>{{#if @controller.model.canLoadMore}}@@ -16,12 +16,12 @@ export default <template>{{/if}}{{#if @controller.noContent}}- <EmptyState+ <DEmptyState@title={{@controller.model.emptyState.title}}@body={{@controller.model.emptyState.body}}/>{{else}}- <LoadMore @action={{@controller.loadMore}} class="paginated-topics-list">+ <DLoadMore @action={{@controller.loadMore}} class="paginated-topics-list"><TopicDismissButtons@position="top"@selectedTopics={{@controller.bulkSelectHelper.selected}}@@ -44,7 +44,7 @@ export default <template>class="alert alert-info clickable{{if @controller.model.loadingBefore 'loading'}}">- <CountI18n+ <DCountI18n@key="topic_count_latest"@count={{or@controller.model.loadingBefore@@ -52,7 +52,7 @@ export default <template>}}/>{{#if @model.loadingBefore}}- {{loadingSpinner size="small"}}+ {{dLoadingSpinner size="small"}}{{/if}}</a></div>@@ -85,7 +85,9 @@ export default <template>}}/>- <ConditionalLoadingSpinner @condition={{@controller.model.loadingMore}} />- </LoadMore>+ <DConditionalLoadingSpinner+ @condition={{@controller.model.loadingMore}}+ />+ </DLoadMore>{{/if}}</template>diff --git a/frontend/discourse/app/templates/user.gjs b/frontend/discourse/app/templates/user.gjsindex 6fd7b6c7b39..5f32c1b4f3f 100644--- a/frontend/discourse/app/templates/user.gjs+++ b/frontend/discourse/app/templates/user.gjs@@ -1,20 +1,20 @@import { array, concat, fn, hash } from "@ember/helper";import { LinkTo } from "@ember/routing";import { trustHTML } from "@ember/template";-import DButton from "discourse/components/d-button";-import HtmlWithLinks from "discourse/components/html-with-links";import PluginOutlet from "discourse/components/plugin-outlet";import UserNav from "discourse/components/user-nav";import UserProfileAvatar from "discourse/components/user-profile-avatar";-import UserStatusMessage from "discourse/components/user-status-message";-import icon from "discourse/helpers/d-icon";import formatUsername from "discourse/helpers/format-username";import lazyHash from "discourse/helpers/lazy-hash";-import replaceEmoji from "discourse/helpers/replace-emoji";import routeAction from "discourse/helpers/route-action";import userStatus from "discourse/helpers/user-status";import UserNotificationsDropdown from "discourse/select-kit/components/user-notifications-dropdown";import { and, not } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DHtmlWithLinks from "discourse/ui-kit/d-html-with-links";+import DUserStatusMessage from "discourse/ui-kit/d-user-status-message";+import dIcon from "discourse/ui-kit/helpers/d-icon";+import dReplaceEmoji from "discourse/ui-kit/helpers/d-replace-emoji";import { i18n } from "discourse-i18n";import CollapsedInfo from "./user/collapsed-info";@@ -203,7 +203,7 @@ export default <template>}}{{#if @controller.model.status}}- <UserStatusMessage @status={{@controller.model.status}} />+ <DUserStatusMessage @status={{@controller.model.status}} />{{/if}}</div><div@@ -234,14 +234,14 @@ export default <template>{{#if @controller.showFeaturedTopic}}<div class="featured-topic user-profile__featured-topic"><span title={{i18n "user.featured_topic"}}>- {{icon "book"~}}+ {{dIcon "book"~}}</span><LinkTo@route="topic"@models={{array@controller.model.featured_topic.slug@controller.model.featured_topic.id}}- >{{replaceEmoji+ >{{dReplaceEmoji(trustHTML @controller.model.featured_topic.fancy_title)}}</LinkTo></div>@@ -252,12 +252,12 @@ export default <template>>{{#if @controller.model.location}}<divclass="user-profile-location"- >{{icon "location-dot"~}}+ >{{dIcon "location-dot"~}}{{@controller.model.location}}</div>{{/if}}{{#if @controller.model.website_name}}<div class="user-profile-website">{{! template-lint-disable link-rel-noopener }}- {{icon "globe"~}}+ {{dIcon "globe"~}}{{#if @controller.linkWebsite~}}<ahref={{@controller.model.website}}@@ -302,7 +302,7 @@ export default <template>{{#if @controller.model.suspended}}<div class="suspended"><div class="suspension-date">- {{icon "ban"}}+ {{dIcon "ban"}}<b>{{#if @controller.model.suspendedForever}}{{i18n "user.suspended_permanently"}}@@ -325,7 +325,7 @@ export default <template>{{#if @controller.model.silenced}}<div class="silenced"><div class="silence-date">- {{icon "microphone-slash"}}+ {{dIcon "microphone-slash"}}<b>{{#if @controller.model.silencedForever}}{{i18n "user.silenced_permanently"}}@@ -346,9 +346,9 @@ export default <template></div>{{/if}}{{#if @controller.isNotRestrictedOrIsStaff}}- <HtmlWithLinks>+ <DHtmlWithLinks>{{trustHTML @controller.model.bio_cooked}}- </HtmlWithLinks>+ </DHtmlWithLinks>{{/if}}</div>@@ -439,7 +439,7 @@ export default <template><li><ahref={{@controller.model.adminPath}}class="btn btn-default user-admin"- >{{icon "wrench"}}<span class="d-button-label">{{i18n+ >{{dIcon "wrench"}}<span class="d-button-label">{{i18n"admin.user.show_admin_profile"}}</span></a></li>{{/if}}diff --git a/frontend/discourse/app/templates/user/badges.gjs b/frontend/discourse/app/templates/user/badges.gjsindex 8ba7e625664..77be9c22bae 100644--- a/frontend/discourse/app/templates/user/badges.gjs+++ b/frontend/discourse/app/templates/user/badges.gjs@@ -1,8 +1,8 @@import { fn } from "@ember/helper";-import BadgeCard from "discourse/components/badge-card";import PluginOutlet from "discourse/components/plugin-outlet";import bodyClass from "discourse/helpers/body-class";import lazyHash from "discourse/helpers/lazy-hash";+import DBadgeCard from "discourse/ui-kit/d-badge-card";import { i18n } from "discourse-i18n";export default <template>@@ -31,7 +31,7 @@ export default <template><div class="badge-group-list">{{#each @controller.sortedBadges as |ub|}}- <BadgeCard+ <DBadgeCard@badge={{ub.badge}}@count={{ub.count}}@canFavorite={{ub.can_favorite}}diff --git a/frontend/discourse/app/templates/user/bookmarks.gjs b/frontend/discourse/app/templates/user/bookmarks.gjsindex 4ff683bd93e..f07ab950bfa 100644--- a/frontend/discourse/app/templates/user/bookmarks.gjs+++ b/frontend/discourse/app/templates/user/bookmarks.gjs@@ -1,16 +1,16 @@import { Input } from "@ember/component";import BookmarkList from "discourse/components/bookmark-list";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DButton from "discourse/components/d-button";-import EmptyState from "discourse/components/empty-state";import PluginOutlet from "discourse/components/plugin-outlet";import bodyClass from "discourse/helpers/body-class";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DEmptyState from "discourse/ui-kit/d-empty-state";import { i18n } from "discourse-i18n";export default <template>{{bodyClass "user-activity-bookmarks-page"}}- <ConditionalLoadingSpinner @condition={{@controller.loading}}>+ <DConditionalLoadingSpinner @condition={{@controller.loading}}><PluginOutlet @name="above-user-bookmarks" @connectorTagName="div" />{{#if @controller.permissionDenied}}@@ -18,7 +18,7 @@ export default <template>"bookmarks.list_permission_denied"}}</div>{{else if @controller.userDoesNotHaveBookmarks}}- <EmptyState+ <DEmptyState@title={{i18n "user.no_bookmarks_title"}}@body={{@controller.emptyStateBody}}/>@@ -50,5 +50,5 @@ export default <template>/>{{/if}}{{/if}}- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner></template>diff --git a/frontend/discourse/app/templates/user/collapsed-info.gjs b/frontend/discourse/app/templates/user/collapsed-info.gjsindex e9e00c53d3e..7d47fe5e0d9 100644--- a/frontend/discourse/app/templates/user/collapsed-info.gjs+++ b/frontend/discourse/app/templates/user/collapsed-info.gjs@@ -1,11 +1,11 @@import { fn, hash } from "@ember/helper";import { LinkTo } from "@ember/routing";-import DButton from "discourse/components/d-button";import PluginOutlet from "discourse/components/plugin-outlet";-import ageWithTooltip from "discourse/helpers/age-with-tooltip";import lazyHash from "discourse/helpers/lazy-hash";import routeAction from "discourse/helpers/route-action";import DropdownSelectBox from "discourse/select-kit/components/dropdown-select-box";+import DButton from "discourse/ui-kit/d-button";+import dAgeWithTooltip from "discourse/ui-kit/helpers/d-age-with-tooltip";import { i18n } from "discourse-i18n";const CollapsedInfo = <template>@@ -20,7 +20,7 @@ const CollapsedInfo = <template><div><dt class="created-at">{{i18n "user.created"}}</dt><dd class="created-at">- {{ageWithTooltip @model.created_at format="medium"}}+ {{dAgeWithTooltip @model.created_at format="medium"}}</dd></div>{{/if}}@@ -28,7 +28,7 @@ const CollapsedInfo = <template><div><dt class="last-posted-at">{{i18n "user.last_posted"}}</dt><dd class="last-posted-at">- {{ageWithTooltip @model.last_posted_at format="medium"}}+ {{dAgeWithTooltip @model.last_posted_at format="medium"}}</dd></div>{{/if}}@@ -36,7 +36,7 @@ const CollapsedInfo = <template><div><dt class="last-seen-at">{{i18n "user.last_seen"}}</dt><dd class="last-seen-at">- {{ageWithTooltip @model.last_seen_at format="medium"}}+ {{dAgeWithTooltip @model.last_seen_at format="medium"}}</dd></div>{{/if}}diff --git a/frontend/discourse/app/templates/user/messages.gjs b/frontend/discourse/app/templates/user/messages.gjsindex 8ebe8a2e8c0..12527731f7d 100644--- a/frontend/discourse/app/templates/user/messages.gjs+++ b/frontend/discourse/app/templates/user/messages.gjs@@ -1,12 +1,12 @@import BulkSelectToggle from "discourse/components/bulk-select-toggle";-import DButton from "discourse/components/d-button";import GroupNotificationsTracking from "discourse/components/group-notifications-tracking";-import HorizontalOverflowNav from "discourse/components/horizontal-overflow-nav";import PluginOutlet from "discourse/components/plugin-outlet";import MessagesDropdown from "discourse/components/user-nav/messages-dropdown";import bodyClass from "discourse/helpers/body-class";import lazyHash from "discourse/helpers/lazy-hash";import routeAction from "discourse/helpers/route-action";+import DButton from "discourse/ui-kit/d-button";+import DHorizontalOverflowNav from "discourse/ui-kit/d-horizontal-overflow-nav";export default <template>{{bodyClass "user-messages-page"}}@@ -27,7 +27,7 @@ export default <template></li></ol>- <HorizontalOverflowNav+ <DHorizontalOverflowNav@ariaLabel="User secondary - messages"id="user-navigation-secondary__horizontal-nav"class="messages-nav"diff --git a/frontend/discourse/app/templates/user/notifications-index.gjs b/frontend/discourse/app/templates/user/notifications-index.gjsindex 0aa4b06d790..52f4de72375 100644--- a/frontend/discourse/app/templates/user/notifications-index.gjs+++ b/frontend/discourse/app/templates/user/notifications-index.gjs@@ -1,11 +1,11 @@-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import EmptyState from "discourse/components/empty-state";import PluginOutlet from "discourse/components/plugin-outlet";import MenuItem from "discourse/components/user-menu/menu-item";import lazyHash from "discourse/helpers/lazy-hash";import NotificationsFilter from "discourse/select-kit/components/notifications-filter";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DEmptyState from "discourse/ui-kit/d-empty-state";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";-import concatClass from "../../helpers/concat-class";export default <template>{{#if @controller.model.error}}@@ -18,7 +18,7 @@ export default <template></div>{{else if @controller.doesNotHaveNotifications}}<PluginOutlet @name="user-notifications-empty-state">- <EmptyState+ <DEmptyState@title={{i18n "user.no_notifications_page_title"}}@body={{@controller.emptyStateBody}}/>@@ -40,7 +40,7 @@ export default <template><div class="alert alert-info">{{i18n "notifications.empty"}}</div>{{else}}<div- class={{concatClass+ class={{dConcatClass"user-notifications-list"(if @controller.siteSettings.show_user_menu_avatars "show-avatars")}}@@ -48,7 +48,7 @@ export default <template>{{#each @controller.items as |item|}}<MenuItem @item={{item}} />{{/each}}- <ConditionalLoadingSpinner @condition={{@controller.loading}} />+ <DConditionalLoadingSpinner @condition={{@controller.loading}} /><PluginOutlet@name="user-notifications-list-bottom"@outletArgs={{lazyHash controller=@controller}}diff --git a/frontend/discourse/app/templates/user/stream.gjs b/frontend/discourse/app/templates/user/stream.gjsindex 9c7fe7e8a9c..a15671020fa 100644--- a/frontend/discourse/app/templates/user/stream.gjs+++ b/frontend/discourse/app/templates/user/stream.gjs@@ -1,10 +1,10 @@-import EmptyState from "discourse/components/empty-state";import UserStream from "discourse/components/user-stream";+import DEmptyState from "discourse/ui-kit/d-empty-state";export default <template>{{#if @controller.model.stream.noContent}}{{#unless @controller.model.stream.loading}}- <EmptyState+ <DEmptyState@title={{@controller.model.emptyState.title}}@body={{@controller.model.emptyState.body}}/>diff --git a/frontend/discourse/app/templates/user/summary.gjs b/frontend/discourse/app/templates/user/summary.gjsindex f4776198789..3ca136a6b6d 100644--- a/frontend/discourse/app/templates/user/summary.gjs+++ b/frontend/discourse/app/templates/user/summary.gjs@@ -1,8 +1,6 @@import { LinkTo } from "@ember/routing";import { trustHTML } from "@ember/template";-import BadgeCard from "discourse/components/badge-card";import PluginOutlet from "discourse/components/plugin-outlet";-import UserStat from "discourse/components/user-stat";import UserSummaryCategorySearch from "discourse/components/user-summary-category-search";import UserSummarySection from "discourse/components/user-summary-section";import UserSummaryTopic from "discourse/components/user-summary-topic";@@ -10,9 +8,11 @@ import UserSummaryTopicsList from "discourse/components/user-summary-topics-listimport UserSummaryUser from "discourse/components/user-summary-user";import UserSummaryUsersList from "discourse/components/user-summary-users-list";import bodyClass from "discourse/helpers/body-class";-import categoryLink from "discourse/helpers/category-link";import lazyHash from "discourse/helpers/lazy-hash";import shortenUrl from "discourse/helpers/shorten-url";+import DBadgeCard from "discourse/ui-kit/d-badge-card";+import DUserStat from "discourse/ui-kit/d-user-stat";+import dCategoryLink from "discourse/ui-kit/helpers/d-category-link";import { i18n } from "discourse-i18n";export default <template>@@ -28,13 +28,13 @@ export default <template><h3 class="stats-title">{{i18n "user.summary.stats"}}</h3><ul><li class="stats-days-visited">- <UserStat+ <DUserStat@value={{@controller.model.days_visited}}@label="user.summary.days_visited"/></li><li class="stats-time-read">- <UserStat+ <DUserStat@value={{@controller.timeRead}}@label="user.summary.time_read"@rawTitle={{i18n@@ -46,7 +46,7 @@ export default <template></li>{{#if @controller.showRecentTimeRead}}<li class="stats-recent-read">- <UserStat+ <DUserStat@value={{@controller.recentTimeRead}}@label="user.summary.recent_time_read"@rawTitle={{i18n@@ -58,13 +58,13 @@ export default <template></li>{{/if}}<li class="stats-topics-entered">- <UserStat+ <DUserStat@value={{@controller.model.topics_entered}}@label="user.summary.topics_entered"/></li><li class="stats-posts-read">- <UserStat+ <DUserStat@value={{@controller.model.posts_read_count}}@label="user.summary.posts_read"/>@@ -72,7 +72,7 @@ export default <template>{{#if @controller.model.can_see_user_actions}}<li class="stats-likes-given linked-stat"><LinkTo @route="userActivity.likesGiven">- <UserStat+ <DUserStat@value={{@controller.model.likes_given}}@icon="heart"@label="user.summary.likes_given"@@ -81,7 +81,7 @@ export default <template></li>{{else}}<li class="stats-likes-given">- <UserStat+ <DUserStat@value={{@controller.model.likes_given}}@icon="heart"@label="user.summary.likes_given"@@ -89,7 +89,7 @@ export default <template></li>{{/if}}<li class="stats-likes-received">- <UserStat+ <DUserStat@value={{@controller.model.likes_received}}@icon="heart"@label="user.summary.likes_received"@@ -99,7 +99,7 @@ export default <template>{{#if @controller.model.can_see_user_actions}}<li class="stats-bookmark-count linked-stat"><LinkTo @route="userActivity.bookmarks">- <UserStat+ <DUserStat@value={{@controller.model.bookmark_count}}@label="user.summary.bookmark_count"/>@@ -107,7 +107,7 @@ export default <template></li>{{else}}<li class="stats-bookmark-count">- <UserStat+ <DUserStat@value={{@controller.model.bookmark_count}}@label="user.summary.bookmark_count"/>@@ -117,7 +117,7 @@ export default <template>{{#if @controller.model.can_see_user_actions}}<li class="stats-topic-count linked-stat"><LinkTo @route="userActivity.topics">- <UserStat+ <DUserStat@value={{@controller.model.topic_count}}@label="user.summary.topic_count"/>@@ -125,7 +125,7 @@ export default <template></li>{{else}}<li class="stats-topic-count">- <UserStat+ <DUserStat@value={{@controller.model.topic_count}}@label="user.summary.topic_count"/>@@ -134,7 +134,7 @@ export default <template>{{#if @controller.model.can_see_user_actions}}<li class="stats-post-count linked-stat"><LinkTo @route="userActivity.replies">- <UserStat+ <DUserStat@value={{@controller.model.post_count}}@label="user.summary.post_count"/>@@ -142,7 +142,7 @@ export default <template></li>{{else}}<li class="stats-post-count">- <UserStat+ <DUserStat@value={{@controller.model.post_count}}@label="user.summary.post_count"/>@@ -302,7 +302,7 @@ export default <template>}}><td class="category-link">- {{categoryLink+ {{dCategoryLinkcategoryallowUncategorized="true"hideParent=false@@ -340,7 +340,7 @@ export default <template>{{#if @controller.model.badges}}<div class="badge-group-list">{{#each @controller.model.badges as |badge|}}- <BadgeCard+ <DBadgeCard@badge={{badge}}@count={{badge.count}}@username={{@controller.user.username_lower}}diff --git a/frontend/discourse/app/templates/users.gjs b/frontend/discourse/app/templates/users.gjsindex 36e03cab18b..cb5b1cdab2c 100644--- a/frontend/discourse/app/templates/users.gjs+++ b/frontend/discourse/app/templates/users.gjs@@ -2,19 +2,19 @@ import { Input } from "@ember/component";import { fn, hash } from "@ember/helper";import { on } from "@ember/modifier";import { trustHTML } from "@ember/template";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DButton from "discourse/components/d-button";import DirectoryTable from "discourse/components/directory-table";-import EmptyState from "discourse/components/empty-state";-import LoadMore from "discourse/components/load-more";import PluginOutlet from "discourse/components/plugin-outlet";-import basePath from "discourse/helpers/base-path";import bodyClass from "discourse/helpers/body-class";import hideApplicationFooter from "discourse/helpers/hide-application-footer";import lazyHash from "discourse/helpers/lazy-hash";import withEventValue from "discourse/helpers/with-event-value";import ComboBox from "discourse/select-kit/components/combo-box";import PeriodChooser from "discourse/select-kit/components/period-chooser";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DEmptyState from "discourse/ui-kit/d-empty-state";+import DLoadMore from "discourse/ui-kit/d-load-more";+import dBasePath from "discourse/ui-kit/helpers/d-base-path";import { i18n } from "discourse-i18n";export default <template>@@ -24,7 +24,7 @@ export default <template>{{bodyClass "users-page"}}<section>- <LoadMore+ <DLoadMore@action={{@controller.loadMore}}@enabled={{@controller.model.canLoadMore}}@isLoading={{@controller.isLoading}}@@ -93,7 +93,7 @@ export default <template></div></div>- <ConditionalLoadingSpinner @condition={{@controller.isLoading}}>+ <DConditionalLoadingSpinner @condition={{@controller.isLoading}}>{{#if @controller.model.content}}<DirectoryTable@items={{@controller.model.content}}@@ -103,11 +103,11 @@ export default <template>@asc={{@controller.asc}}@updateOrderAndAsc={{@controller.updateOrderAndAsc}}/>- <ConditionalLoadingSpinner+ <DConditionalLoadingSpinner@condition={{@controller.model.loadingMore}}/>{{else}}- <EmptyState+ <DEmptyState@body={{if@controller.name(i18n "directory.no_results_with_search")@@ -115,7 +115,7 @@ export default <template>@controller.currentUser.staff(trustHTML(i18n- "directory.no_results.extra_body" basePath=(basePath)+ "directory.no_results.extra_body" basePath=(dBasePath)))(i18n "directory.no_results.body")@@ -123,9 +123,9 @@ export default <template>}}/>{{/if}}- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner></div></div>- </LoadMore>+ </DLoadMore></section></template>diff --git a/frontend/discourse/app/ui-kit-shims.js b/frontend/discourse/app/ui-kit-shims.jsnew file mode 100644index 00000000000..8a40d431522--- /dev/null+++ b/frontend/discourse/app/ui-kit-shims.js@@ -0,0 +1,356 @@+import { importSync } from "@embroider/macros";+import loaderShim from "discourse/lib/loader-shim";++// UI-Kit shims: map old module paths to new ui-kit locations.+// These ensure backward compatibility for plugins, themes, and existing+// imports while components are migrated to discourse/ui-kit/.++// Components - already d-prefixed (moved without rename)+loaderShim("discourse/components/d-autocomplete-results", () =>+ importSync("discourse/ui-kit/d-autocomplete-results")+);+loaderShim("discourse/components/d-breadcrumbs-container", () =>+ importSync("discourse/ui-kit/d-breadcrumbs-container")+);+loaderShim("discourse/components/d-breadcrumbs-item", () =>+ importSync("discourse/ui-kit/d-breadcrumbs-item")+);+loaderShim("discourse/components/d-button", () =>+ importSync("discourse/ui-kit/d-button")+);+loaderShim("discourse/components/d-combo-button", () =>+ importSync("discourse/ui-kit/d-combo-button")+);+loaderShim("discourse/components/d-editor", () =>+ importSync("discourse/ui-kit/d-editor")+);+loaderShim("discourse/components/d-modal", () =>+ importSync("discourse/ui-kit/d-modal")+);+loaderShim("discourse/components/d-modal-cancel", () =>+ importSync("discourse/ui-kit/d-modal-cancel")+);+loaderShim("discourse/components/d-multi-select", () =>+ importSync("discourse/ui-kit/d-multi-select")+);+loaderShim("discourse/components/d-navigation-item", () =>+ importSync("discourse/ui-kit/d-navigation-item")+);+loaderShim("discourse/components/d-otp", () =>+ importSync("discourse/ui-kit/d-otp")+);+loaderShim("discourse/components/d-page-action-button", () =>+ importSync("discourse/ui-kit/d-page-action-button")+);+loaderShim("discourse/components/d-page-header", () =>+ importSync("discourse/ui-kit/d-page-header")+);+loaderShim("discourse/components/d-page-subheader", () =>+ importSync("discourse/ui-kit/d-page-subheader")+);+loaderShim("discourse/components/d-select", () =>+ importSync("discourse/ui-kit/d-select")+);+loaderShim("discourse/components/d-stat-tiles", () =>+ importSync("discourse/ui-kit/d-stat-tiles")+);+loaderShim("discourse/components/d-textarea", () =>+ importSync("discourse/ui-kit/d-textarea")+);+loaderShim("discourse/components/d-toggle-switch", () =>+ importSync("discourse/ui-kit/d-toggle-switch")+);++// Components - renamed (old unprefixed path -> new d-prefixed path)+loaderShim("discourse/components/async-content", () =>+ importSync("discourse/ui-kit/d-async-content")+);+loaderShim("discourse/components/avatar-flair", () =>+ importSync("discourse/ui-kit/d-avatar-flair")+);+loaderShim("discourse/components/badge-button", () =>+ importSync("discourse/ui-kit/d-badge-button")+);+loaderShim("discourse/components/badge-card", () =>+ importSync("discourse/ui-kit/d-badge-card")+);+loaderShim("discourse/components/calendar-date-time-input", () =>+ importSync("discourse/ui-kit/d-calendar-date-time-input")+);+loaderShim("discourse/components/cdn-img", () =>+ importSync("discourse/ui-kit/d-cdn-img")+);+loaderShim("discourse/components/char-counter", () =>+ importSync("discourse/ui-kit/d-char-counter")+);+loaderShim("discourse/components/color-picker", () =>+ importSync("discourse/ui-kit/d-color-picker")+);+loaderShim("discourse/components/color-picker-choice", () =>+ importSync("discourse/ui-kit/d-color-picker-choice")+);+loaderShim("discourse/components/conditional-in-element", () =>+ importSync("discourse/ui-kit/d-conditional-in-element")+);+loaderShim("discourse/components/conditional-loading-section", () =>+ importSync("discourse/ui-kit/d-conditional-loading-section")+);+loaderShim("discourse/components/conditional-loading-spinner", () =>+ importSync("discourse/ui-kit/d-conditional-loading-spinner")+);+loaderShim("discourse/components/cook-text", () =>+ importSync("discourse/ui-kit/d-cook-text")+);+loaderShim("discourse/components/copy-button", () =>+ importSync("discourse/ui-kit/d-copy-button")+);+loaderShim("discourse/components/count-i18n", () =>+ importSync("discourse/ui-kit/d-count-i18n")+);+loaderShim("discourse/components/custom-html", () =>+ importSync("discourse/ui-kit/d-custom-html")+);+loaderShim("discourse/components/date-input", () =>+ importSync("discourse/ui-kit/d-date-input")+);+loaderShim("discourse/components/date-picker", () =>+ importSync("discourse/ui-kit/d-date-picker")+);+loaderShim("discourse/components/date-time-input", () =>+ importSync("discourse/ui-kit/d-date-time-input")+);+loaderShim("discourse/components/date-time-input-range", () =>+ importSync("discourse/ui-kit/d-date-time-input-range")+);+loaderShim("discourse/components/decorated-html", () =>+ importSync("discourse/ui-kit/d-decorated-html")+);+loaderShim("discourse/components/d-icon-grid-picker", () =>+ importSync("discourse/ui-kit/d-icon-grid-picker")+);+loaderShim("discourse/components/dropdown-menu", () =>+ importSync("discourse/ui-kit/d-dropdown-menu")+);+loaderShim("discourse/components/empty-state", () =>+ importSync("discourse/ui-kit/d-empty-state")+);+loaderShim("discourse/components/expanding-text-area", () =>+ importSync("discourse/ui-kit/d-expanding-text-area")+);+loaderShim("discourse/components/filter-input", () =>+ importSync("discourse/ui-kit/d-filter-input")+);+loaderShim("discourse/components/flash-message", () =>+ importSync("discourse/ui-kit/d-flash-message")+);+loaderShim("discourse/components/future-date-input", () =>+ importSync("discourse/ui-kit/d-future-date-input")+);+loaderShim("discourse/components/highlighted-code", () =>+ importSync("discourse/ui-kit/d-highlighted-code")+);+loaderShim("discourse/components/horizontal-overflow-nav", () =>+ importSync("discourse/ui-kit/d-horizontal-overflow-nav")+);+loaderShim("discourse/components/html-with-links", () =>+ importSync("discourse/ui-kit/d-html-with-links")+);+loaderShim("discourse/components/input-tip", () =>+ importSync("discourse/ui-kit/d-input-tip")+);+loaderShim("discourse/components/interpolated-translation", () =>+ importSync("discourse/ui-kit/d-interpolated-translation")+);+loaderShim("discourse/components/light-dark-img", () =>+ importSync("discourse/ui-kit/d-light-dark-img")+);+loaderShim("discourse/components/load-more", () =>+ importSync("discourse/ui-kit/d-load-more")+);+loaderShim("discourse/components/nav-item", () =>+ importSync("discourse/ui-kit/d-nav-item")+);+loaderShim("discourse/components/number-field", () =>+ importSync("discourse/ui-kit/d-number-field")+);+loaderShim("discourse/components/password-field", () =>+ importSync("discourse/ui-kit/d-password-field")+);+loaderShim("discourse/components/pick-files-button", () =>+ importSync("discourse/ui-kit/d-pick-files-button")+);+loaderShim("discourse/components/popup-input-tip", () =>+ importSync("discourse/ui-kit/d-popup-input-tip")+);+loaderShim("discourse/components/radio-button", () =>+ importSync("discourse/ui-kit/d-radio-button")+);+loaderShim("discourse/components/relative-date", () =>+ importSync("discourse/ui-kit/d-relative-date")+);+loaderShim("discourse/components/relative-time-picker", () =>+ importSync("discourse/ui-kit/d-relative-time-picker")+);+loaderShim("discourse/components/responsive-table", () =>+ importSync("discourse/ui-kit/d-responsive-table")+);+loaderShim("discourse/components/save-controls", () =>+ importSync("discourse/ui-kit/d-save-controls")+);+loaderShim("discourse/components/second-factor-input", () =>+ importSync("discourse/ui-kit/d-second-factor-input")+);+loaderShim("discourse/components/small-user-list", () =>+ importSync("discourse/ui-kit/d-small-user-list")+);+loaderShim("discourse/components/table-header-toggle", () =>+ importSync("discourse/ui-kit/d-table-header-toggle")+);+loaderShim("discourse/components/tap-tile", () =>+ importSync("discourse/ui-kit/d-tap-tile")+);+loaderShim("discourse/components/tap-tile-grid", () =>+ importSync("discourse/ui-kit/d-tap-tile-grid")+);+loaderShim("discourse/components/text-field", () =>+ importSync("discourse/ui-kit/d-text-field")+);+loaderShim("discourse/components/textarea", () =>+ importSync("discourse/ui-kit/d-textarea")+);+loaderShim("discourse/components/time-input", () =>+ importSync("discourse/ui-kit/d-time-input")+);+loaderShim("discourse/components/time-shortcut-picker", () =>+ importSync("discourse/ui-kit/d-time-shortcut-picker")+);+loaderShim("discourse/components/toggle-password-mask", () =>+ importSync("discourse/ui-kit/d-toggle-password-mask")+);+loaderShim("discourse/components/user-avatar", () =>+ importSync("discourse/ui-kit/d-user-avatar")+);+loaderShim("discourse/components/user-avatar-flair", () =>+ importSync("discourse/ui-kit/d-user-avatar-flair")+);+loaderShim("discourse/components/user-info", () =>+ importSync("discourse/ui-kit/d-user-info")+);+loaderShim("discourse/components/user-link", () =>+ importSync("discourse/ui-kit/d-user-link")+);+loaderShim("discourse/components/user-stat", () =>+ importSync("discourse/ui-kit/d-user-stat")+);+loaderShim("discourse/components/user-status-message", () =>+ importSync("discourse/ui-kit/d-user-status-message")+);++// Helpers+loaderShim("discourse/helpers/d-icon", () =>+ importSync("discourse/ui-kit/helpers/d-icon")+);+loaderShim("discourse/helpers/age-with-tooltip", () =>+ importSync("discourse/ui-kit/helpers/d-age-with-tooltip")+);+loaderShim("discourse/helpers/avatar", () =>+ importSync("discourse/ui-kit/helpers/d-avatar")+);+loaderShim("discourse/helpers/base-path", () =>+ importSync("discourse/ui-kit/helpers/d-base-path")+);+loaderShim("discourse/helpers/bound-avatar", () =>+ importSync("discourse/ui-kit/helpers/d-bound-avatar")+);+loaderShim("discourse/helpers/bound-avatar-template", () =>+ importSync("discourse/ui-kit/helpers/d-bound-avatar-template")+);+loaderShim("discourse/helpers/bound-category-link", () =>+ importSync("discourse/ui-kit/helpers/d-bound-category-link")+);+loaderShim("discourse/helpers/category-badge", () =>+ importSync("discourse/ui-kit/helpers/d-category-badge")+);+loaderShim("discourse/helpers/category-link", () =>+ importSync("discourse/ui-kit/helpers/d-category-link")+);+loaderShim("discourse/helpers/concat-class", () =>+ importSync("discourse/ui-kit/helpers/d-concat-class")+);+loaderShim("discourse/helpers/dasherize", () =>+ importSync("discourse/ui-kit/helpers/d-dasherize")+);+loaderShim("discourse/helpers/dir-span", () =>+ importSync("discourse/ui-kit/helpers/d-dir-span")+);+loaderShim("discourse/helpers/discourse-tag", () =>+ importSync("discourse/ui-kit/helpers/d-discourse-tag")+);+loaderShim("discourse/helpers/discourse-tags", () =>+ importSync("discourse/ui-kit/helpers/d-discourse-tags")+);+loaderShim("discourse/helpers/element", () =>+ importSync("discourse/ui-kit/helpers/d-element")+);+loaderShim("discourse/helpers/emoji", () =>+ importSync("discourse/ui-kit/helpers/d-emoji")+);+loaderShim("discourse/helpers/format-date", () =>+ importSync("discourse/ui-kit/helpers/d-format-date")+);+loaderShim("discourse/helpers/format-duration", () =>+ importSync("discourse/ui-kit/helpers/d-format-duration")+);+loaderShim("discourse/helpers/icon-or-image", () =>+ importSync("discourse/ui-kit/helpers/d-icon-or-image")+);+loaderShim("discourse/helpers/loading-spinner", () =>+ importSync("discourse/ui-kit/helpers/d-loading-spinner")+);+loaderShim("discourse/helpers/number", () =>+ importSync("discourse/ui-kit/helpers/d-number")+);+loaderShim("discourse/helpers/replace-emoji", () =>+ importSync("discourse/ui-kit/helpers/d-replace-emoji")+);+loaderShim("discourse/helpers/topic-link", () =>+ importSync("discourse/ui-kit/helpers/d-topic-link")+);+loaderShim("discourse/helpers/unique-id", () =>+ importSync("discourse/ui-kit/helpers/d-unique-id")+);+loaderShim("discourse/helpers/user-avatar", () =>+ importSync("discourse/ui-kit/helpers/d-user-avatar")+);++// Modifiers+loaderShim("discourse/modifiers/d-autocomplete", () =>+ importSync("discourse/ui-kit/modifiers/d-autocomplete")+);+loaderShim("discourse/modifiers/auto-focus", () =>+ importSync("discourse/ui-kit/modifiers/d-auto-focus")+);+loaderShim("discourse/modifiers/close-on-click-outside", () =>+ importSync("discourse/ui-kit/modifiers/d-close-on-click-outside")+);+loaderShim("discourse/modifiers/draggable", () =>+ importSync("discourse/ui-kit/modifiers/d-draggable")+);+loaderShim("discourse/modifiers/observe-intersection", () =>+ importSync("discourse/ui-kit/modifiers/d-observe-intersection")+);+loaderShim("discourse/modifiers/on-resize", () =>+ importSync("discourse/ui-kit/modifiers/d-on-resize")+);+loaderShim("discourse/modifiers/scroll-into-view", () =>+ importSync("discourse/ui-kit/modifiers/d-scroll-into-view")+);+loaderShim("discourse/modifiers/swipe", () =>+ importSync("discourse/ui-kit/modifiers/d-swipe")+);+loaderShim("discourse/modifiers/tab-to-sibling", () =>+ importSync("discourse/ui-kit/modifiers/d-tab-to-sibling")+);+loaderShim("discourse/modifiers/trap-tab", () =>+ importSync("discourse/ui-kit/modifiers/d-trap-tab")+);diff --git a/frontend/discourse/app/components/async-content.gjs b/frontend/discourse/app/ui-kit/d-async-content.gjssimilarity index 88%rename from frontend/discourse/app/components/async-content.gjsrename to frontend/discourse/app/ui-kit/d-async-content.gjsindex ded7cb4c1c4..7e13ea740c8 100644--- a/frontend/discourse/app/components/async-content.gjs+++ b/frontend/discourse/app/ui-kit/d-async-content.gjs@@ -4,19 +4,18 @@ import { hash } from "@ember/helper";import { trustHTML } from "@ember/template";import { TrackedAsyncData } from "ember-async-data";import { Promise as RsvpPromise } from "rsvp";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import FlashMessage from "discourse/components/flash-message";-import { popupAjaxError } from "discourse/lib/ajax-error";+import { extractErrorInfo, popupAjaxError } from "discourse/lib/ajax-error";import discourseDebounce from "discourse/lib/debounce";import { bind } from "discourse/lib/decorators";import { INPUT_DELAY } from "discourse/lib/environment";import { eq } from "discourse/truth-helpers";-import { extractErrorInfo } from "../lib/ajax-error";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DFlashMessage from "discourse/ui-kit/d-flash-message";const ERROR_MODES = ["flash", "popup"];const DEFAULT_ERROR_MODE = "flash";-export default class AsyncContent extends Component {+export default class DAsyncContent extends Component {#debounce = false;@cached@@ -98,7 +97,7 @@ export default class AsyncContent extends Component {{{#if (has-block "loading")}}{{yield to="loading"}}{{else}}- <ConditionalLoadingSpinner @condition={{this.data.isPending}} />+ <DConditionalLoadingSpinner @condition={{this.data.isPending}} />{{/if}}{{else if this.data.isResolved}}{{#if this.data.value}}@@ -131,6 +130,6 @@ class AsyncContentInlineError extends Component {}<template>- <FlashMessage role="alert" @flash={{this.errorMessage}} @type="error" />+ <DFlashMessage role="alert" @flash={{this.errorMessage}} @type="error" /></template>}diff --git a/frontend/discourse/app/components/d-autocomplete-results.gjs b/frontend/discourse/app/ui-kit/d-autocomplete-results.gjssimilarity index 100%rename from frontend/discourse/app/components/d-autocomplete-results.gjsrename to frontend/discourse/app/ui-kit/d-autocomplete-results.gjsdiff --git a/frontend/discourse/app/components/avatar-flair.gjs b/frontend/discourse/app/ui-kit/d-avatar-flair.gjssimilarity index 84%rename from frontend/discourse/app/components/avatar-flair.gjsrename to frontend/discourse/app/ui-kit/d-avatar-flair.gjsindex 0d2aec70c93..14727376011 100644--- a/frontend/discourse/app/components/avatar-flair.gjs+++ b/frontend/discourse/app/ui-kit/d-avatar-flair.gjs@@ -1,12 +1,12 @@import Component from "@glimmer/component";import { concat } from "@ember/helper";import { trustHTML } from "@ember/template";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import { convertIconClass } from "discourse/lib/icon-library";import { escapeExpression } from "discourse/lib/utilities";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";-export default class AvatarFlair extends Component {+export default class DAvatarFlair extends Component {get icon() {return convertIconClass(this.args.flairUrl);}@@ -43,7 +43,7 @@ export default class AvatarFlair extends Component {<template><div- class={{concatClass+ class={{dConcatClass"avatar-flair"(concat "avatar-flair-" @flairName)(if @flairBgColor "rounded")@@ -53,7 +53,7 @@ export default class AvatarFlair extends Component {title={{this.title}}>{{#if this.isIcon}}- {{icon this.icon}}+ {{dIcon this.icon}}{{/if}}</div></template>diff --git a/frontend/discourse/app/components/badge-button.gjs b/frontend/discourse/app/ui-kit/d-badge-button.gjssimilarity index 82%rename from frontend/discourse/app/components/badge-button.gjsrename to frontend/discourse/app/ui-kit/d-badge-button.gjsindex 70e2d6d5b7b..dea1c1af1f1 100644--- a/frontend/discourse/app/components/badge-button.gjs+++ b/frontend/discourse/app/ui-kit/d-badge-button.gjs@@ -1,8 +1,8 @@import Component from "@glimmer/component";-import iconOrImage from "discourse/helpers/icon-or-image";import domFromString from "discourse/lib/dom-from-string";+import dIconOrImage from "discourse/ui-kit/helpers/d-icon-or-image";-export default class BadgeButton extends Component {+export default class DBadgeButton extends Component {get title() {const description = this.args.badge?.description;if (description) {@@ -23,7 +23,7 @@ export default class BadgeButton extends Component {{{unless @badge.enabled 'disabled'}}"...attributes>- {{iconOrImage @badge}}+ {{dIconOrImage @badge}}{{#if this.showName}}<span class="badge-display-name">{{@badge.name}}</span>{{/if}}diff --git a/frontend/discourse/app/components/badge-card.gjs b/frontend/discourse/app/ui-kit/d-badge-card.gjssimilarity index 88%rename from frontend/discourse/app/components/badge-card.gjsrename to frontend/discourse/app/ui-kit/d-badge-card.gjsindex 55293fd9737..6ee4c5f5cf0 100644--- a/frontend/discourse/app/components/badge-card.gjs+++ b/frontend/discourse/app/ui-kit/d-badge-card.gjs@@ -1,17 +1,17 @@import Component from "@glimmer/component";import { trustHTML } from "@ember/template";import { isEmpty } from "@ember/utils";-import DButton from "discourse/components/d-button";-import icon from "discourse/helpers/d-icon";-import iconOrImage from "discourse/helpers/icon-or-image";+import PluginOutlet from "discourse/components/plugin-outlet";import lazyHash from "discourse/helpers/lazy-hash";-import number from "discourse/helpers/number";import { emojiUnescape, sanitize } from "discourse/lib/text";import { eq, not } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import dIcon from "discourse/ui-kit/helpers/d-icon";+import dIconOrImage from "discourse/ui-kit/helpers/d-icon-or-image";+import dNumber from "discourse/ui-kit/helpers/d-number";import { i18n } from "discourse-i18n";-import PluginOutlet from "./plugin-outlet";-export default class BadgeCard extends Component {+export default class DBadgeCard extends Component {get size() {return this.args.size || "medium";}@@ -77,7 +77,7 @@ export default class BadgeCard extends Component {class="badge-icon {{@badge.badgeTypeClassName}}"aria-hidden="true">- {{iconOrImage @badge}}+ {{dIconOrImage @badge}}</span><div class="badge-info"><div class="badge-info-item">@@ -103,7 +103,7 @@ export default class BadgeCard extends Component {(i18n"badges.awarded"count=this.displayCount- number=(number this.displayCount)+ number=(dNumber this.displayCount))}}</div>@@ -118,7 +118,7 @@ export default class BadgeCard extends Component {class="check-display status-checked"aria-label={{i18n "notifications.titles.granted_badge"}}>- {{icon "check"}}+ {{dIcon "check"}}</div>{{/if}}diff --git a/frontend/discourse/app/components/d-breadcrumbs-container.gjs b/frontend/discourse/app/ui-kit/d-breadcrumbs-container.gjssimilarity index 84%rename from frontend/discourse/app/components/d-breadcrumbs-container.gjsrename to frontend/discourse/app/ui-kit/d-breadcrumbs-container.gjsindex d1383666fb7..b22ba3434c7 100644--- a/frontend/discourse/app/components/d-breadcrumbs-container.gjs+++ b/frontend/discourse/app/ui-kit/d-breadcrumbs-container.gjs@@ -1,8 +1,8 @@import Component from "@glimmer/component";import { service } from "@ember/service";import { modifier } from "ember-modifier";-import concatClass from "discourse/helpers/concat-class";import { eq } from "discourse/truth-helpers";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";export default class DBreadcrumbsContainer extends Component {@service breadcrumbs;@@ -23,13 +23,13 @@ export default class DBreadcrumbsContainer extends Component {{{#each this.breadcrumbs.items as |item index|}}{{#let item.templateForContainer as |Template|}}<Template- @linkClass={{concatClass+ @linkClass={{dConcatClass"d-breadcrumbs__link"@additionalLinkClasses}}@isLast={{eq index this.lastItemIndex}}aria-current={{if (eq index this.lastItemIndex) "page"}}- class={{concatClass "d-breadcrumbs__item" @additionalItemClasses}}+ class={{dConcatClass "d-breadcrumbs__item" @additionalItemClasses}}/>{{/let}}{{/each}}diff --git a/frontend/discourse/app/components/d-breadcrumbs-item.gjs b/frontend/discourse/app/ui-kit/d-breadcrumbs-item.gjssimilarity index 91%rename from frontend/discourse/app/components/d-breadcrumbs-item.gjsrename to frontend/discourse/app/ui-kit/d-breadcrumbs-item.gjsindex 70e79b4e26f..14ef0a37831 100644--- a/frontend/discourse/app/components/d-breadcrumbs-item.gjs+++ b/frontend/discourse/app/ui-kit/d-breadcrumbs-item.gjs@@ -1,8 +1,8 @@import Component from "@glimmer/component";import { LinkTo } from "@ember/routing";import { service } from "@ember/service";-import icon from "discourse/helpers/d-icon";import getURL from "discourse/lib/get-url";+import dIcon from "discourse/ui-kit/helpers/d-icon";export default class DBreadcrumbsItem extends Component {@service breadcrumbs;@@ -35,7 +35,7 @@ export default class DBreadcrumbsItem extends Component {{{/if}}{{#unless @isLast}}<span class="separator">- {{~icon "angle-right"~}}+ {{~dIcon "angle-right"~}}</span>{{/unless}}</li>diff --git a/frontend/discourse/app/components/d-button.gjs b/frontend/discourse/app/ui-kit/d-button.gjssimilarity index 93%rename from frontend/discourse/app/components/d-button.gjsrename to frontend/discourse/app/ui-kit/d-button.gjsindex 4b11fba2040..85fb9f01196 100644--- a/frontend/discourse/app/components/d-button.gjs+++ b/frontend/discourse/app/ui-kit/d-button.gjs@@ -6,11 +6,11 @@ import { next } from "@ember/runloop";import { service } from "@ember/service";import { trustHTML } from "@ember/template";import { isEmpty } from "@ember/utils";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";-/** @type {import("discourse/helpers/element.gjs").default} */-import element from "discourse/helpers/element";import { or } from "discourse/truth-helpers";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+/** @type {import("discourse/ui-kit/helpers/d-element.gjs").default} */+import dElement from "discourse/ui-kit/helpers/d-element";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";/**@@ -226,7 +226,7 @@ export default class DButton extends Component {}get wrapperElement() {- return element(this.args.href ? "a" : "button");+ return dElement(this.args.href ? "a" : "button");}<template>@@ -235,7 +235,7 @@ export default class DButton extends Component {href={{@href}}type={{unless @href (or @type "button")}}{{! For legacy compatibility. Prefer passing class as attributes. }}- class={{concatClass+ class={{dConcatClass@class(if @isLoading "is-loading")(if this.btnLink "btn-link" "btn")@@ -258,14 +258,14 @@ export default class DButton extends Component {{{on "mousedown" this.mouseDown}}>{{#if @isLoading}}- {{~icon "spinner" class="loading-icon"~}}+ {{~dIcon "spinner" class="loading-icon"~}}{{else if @icon}}{{#if @ariaHidden}}<span aria-hidden="true">- {{~icon @icon~}}+ {{~dIcon @icon~}}</span>{{else}}- {{~icon @icon~}}+ {{~dIcon @icon~}}{{/if}}{{/if}}@@ -289,7 +289,7 @@ export default class DButton extends Component {{{#if @suffixIcon}}<span class="d-button__suffix-icon">- {{~icon @suffixIcon~}}+ {{~dIcon @suffixIcon~}}</span>{{/if}}</this.wrapperElement>diff --git a/frontend/discourse/app/components/calendar-date-time-input.gjs b/frontend/discourse/app/ui-kit/d-calendar-date-time-input.gjssimilarity index 95%rename from frontend/discourse/app/components/calendar-date-time-input.gjsrename to frontend/discourse/app/ui-kit/d-calendar-date-time-input.gjsindex 6a0a8b95de9..c683020d73b 100644--- a/frontend/discourse/app/components/calendar-date-time-input.gjs+++ b/frontend/discourse/app/ui-kit/d-calendar-date-time-input.gjs@@ -7,10 +7,10 @@ import didInsert from "@ember/render-modifiers/modifiers/did-insert";import didUpdate from "@ember/render-modifiers/modifiers/did-update";import { waitForPromise } from "@ember/test-waiters";import { isEmpty } from "@ember/utils";-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";-export default class CalendarDateTimeInput extends Component {+export default class DCalendarDateTimeInput extends Component {_timeFormat = this.args.timeFormat || "HH:mm:ss";_dateFormat = this.args.dateFormat || "YYYY-MM-DD";_dateTimeFormat = this.args.dateTimeFormat || "YYYY-MM-DD HH:mm:ss";@@ -123,7 +123,7 @@ export default class CalendarDateTimeInput extends Component {<div class="date-picker" id="picker-container-{{@datePickerId}}"></div><div class="time-pickers">- {{icon "far-clock"}}+ {{dIcon "far-clock"}}<Inputmaxlength={{5}}placeholder="hh:mm"diff --git a/frontend/discourse/app/components/cdn-img.gjs b/frontend/discourse/app/ui-kit/d-cdn-img.gjssimilarity index 92%rename from frontend/discourse/app/components/cdn-img.gjsrename to frontend/discourse/app/ui-kit/d-cdn-img.gjsindex 7e0069f9d76..0707a6fabff 100644--- a/frontend/discourse/app/components/cdn-img.gjs+++ b/frontend/discourse/app/ui-kit/d-cdn-img.gjs@@ -2,7 +2,7 @@ import Component from "@glimmer/component";import { trustHTML } from "@ember/template";import { getURLWithCDN } from "discourse/lib/get-url";-export default class CdnImg extends Component {+export default class DCdnImg extends Component {get cdnSrc() {return getURLWithCDN(this.args.src);}diff --git a/frontend/discourse/app/components/char-counter.gjs b/frontend/discourse/app/ui-kit/d-char-counter.gjssimilarity index 61%rename from frontend/discourse/app/components/char-counter.gjsrename to frontend/discourse/app/ui-kit/d-char-counter.gjsindex 9e3ef1c0515..0d5e4602086 100644--- a/frontend/discourse/app/components/char-counter.gjs+++ b/frontend/discourse/app/ui-kit/d-char-counter.gjs@@ -1,10 +1,13 @@-import concatClass from "discourse/helpers/concat-class";import { gt } from "discourse/truth-helpers";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";-const CharCounter = <template>+const DCharCounter = <template><div- class={{concatClass "char-counter" (if (gt @value.length @max) "exceeded")}}+ class={{dConcatClass+ "char-counter"+ (if (gt @value.length @max) "exceeded")+ }}...attributes>{{yield}}@@ -17,4 +20,4 @@ const CharCounter = <template></div></template>;-export default CharCounter;+export default DCharCounter;diff --git a/frontend/discourse/app/components/color-picker-choice.js b/frontend/discourse/app/ui-kit/d-color-picker-choice.jssimilarity index 93%rename from frontend/discourse/app/components/color-picker-choice.jsrename to frontend/discourse/app/ui-kit/d-color-picker-choice.jsindex 28565cc9c1d..c0394e963e9 100644--- a/frontend/discourse/app/components/color-picker-choice.js+++ b/frontend/discourse/app/ui-kit/d-color-picker-choice.js@@ -12,7 +12,7 @@ import { i18n } from "discourse-i18n";@tagName("button")@attributeBindings("style", "title", "ariaLabel:aria-label")@classNameBindings(":colorpicker", "isUsed:used-color:unused-color")-export default class ColorPickerChoice extends Component {+export default class DColorPickerChoice extends Component {@computed("color", "usedColors")get isUsed() {return (this.usedColors || []).includes(this.color.toUpperCase());diff --git a/frontend/discourse/app/components/color-picker.gjs b/frontend/discourse/app/ui-kit/d-color-picker.gjssimilarity index 77%rename from frontend/discourse/app/components/color-picker.gjsrename to frontend/discourse/app/ui-kit/d-color-picker.gjsindex bc25ce7ac0c..962108161dd 100644--- a/frontend/discourse/app/components/color-picker.gjs+++ b/frontend/discourse/app/ui-kit/d-color-picker.gjs@@ -2,12 +2,12 @@import Component from "@ember/component";import { action } from "@ember/object";import { tagName } from "@ember-decorators/component";-import ColorPickerChoice from "discourse/components/color-picker-choice";-import icon from "discourse/helpers/d-icon";+import DColorPickerChoice from "discourse/ui-kit/d-color-picker-choice";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";@tagName("")-export default class ColorPicker extends Component {+export default class DColorPicker extends Component {role = "group";@action@@ -32,14 +32,14 @@ export default class ColorPicker extends Component {...attributes>{{#each this.colors as |c|}}- <ColorPickerChoice+ <DColorPickerChoice@color={{c}}@usedColors={{this.usedColors}}@selectColor={{this.selectColor}}@ariaLabel={{this.getColorLabel c}}>- {{icon "check"}}- </ColorPickerChoice>+ {{dIcon "check"}}+ </DColorPickerChoice>{{/each}}</div></template>diff --git a/frontend/discourse/app/components/d-combo-button.gjs b/frontend/discourse/app/ui-kit/d-combo-button.gjssimilarity index 95%rename from frontend/discourse/app/components/d-combo-button.gjsrename to frontend/discourse/app/ui-kit/d-combo-button.gjsindex 425b6145a7a..b09e571ebb3 100644--- a/frontend/discourse/app/components/d-combo-button.gjs+++ b/frontend/discourse/app/ui-kit/d-combo-button.gjs@@ -1,8 +1,8 @@import Component from "@glimmer/component";import { hash } from "@ember/helper";import curryComponent from "ember-curry-component";-import DButton from "discourse/components/d-button";import DMenu from "discourse/float-kit/components/d-menu";+import DButton from "discourse/ui-kit/d-button";// eslint-disable-next-line ember/no-empty-glimmer-component-classesclass Button extends Component {diff --git a/frontend/discourse/app/components/conditional-in-element.gjs b/frontend/discourse/app/ui-kit/d-conditional-in-element.gjssimilarity index 76%rename from frontend/discourse/app/components/conditional-in-element.gjsrename to frontend/discourse/app/ui-kit/d-conditional-in-element.gjsindex 6f20c40407e..28e743dade0 100644--- a/frontend/discourse/app/components/conditional-in-element.gjs+++ b/frontend/discourse/app/ui-kit/d-conditional-in-element.gjs@@ -1,4 +1,4 @@-const ConditionalInElement = <template>+const DConditionalInElement = <template>{{#if @inline}}{{yield}}{{else if @element}}@@ -10,4 +10,4 @@ const ConditionalInElement = <template>{{/if}}</template>;-export default ConditionalInElement;+export default DConditionalInElement;diff --git a/frontend/discourse/app/components/conditional-loading-section.gjs b/frontend/discourse/app/ui-kit/d-conditional-loading-section.gjssimilarity index 79%rename from frontend/discourse/app/components/conditional-loading-section.gjsrename to frontend/discourse/app/ui-kit/d-conditional-loading-section.gjsindex c47152987a0..a282cae219a 100644--- a/frontend/discourse/app/components/conditional-loading-section.gjs+++ b/frontend/discourse/app/ui-kit/d-conditional-loading-section.gjs@@ -1,17 +1,17 @@/* eslint-disable ember/no-classic-components */import Component from "@ember/component";import { tagName } from "@ember-decorators/component";-import concatClass from "discourse/helpers/concat-class";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";@tagName("")-export default class ConditionalLoadingSection extends Component {+export default class DConditionalLoadingSection extends Component {isLoading = false;title = i18n("conditional_loading_section.loading");<template><div- class={{concatClass+ class={{dConcatClass"conditional-loading-section"(if this.isLoading "is-loading")}}diff --git a/frontend/discourse/app/components/conditional-loading-spinner.gjs b/frontend/discourse/app/ui-kit/d-conditional-loading-spinner.gjssimilarity index 70%rename from frontend/discourse/app/components/conditional-loading-spinner.gjsrename to frontend/discourse/app/ui-kit/d-conditional-loading-spinner.gjsindex d85d0ef17b1..acfdb0a9396 100644--- a/frontend/discourse/app/components/conditional-loading-spinner.gjs+++ b/frontend/discourse/app/ui-kit/d-conditional-loading-spinner.gjs@@ -1,16 +1,16 @@-import concatClass from "discourse/helpers/concat-class";+import PluginOutlet from "discourse/components/plugin-outlet";import lazyHash from "discourse/helpers/lazy-hash";import { eq } from "discourse/truth-helpers";-import PluginOutlet from "./plugin-outlet";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";-const ConditionalLoadingSpinner = <template>+const DConditionalLoadingSpinner = <template><PluginOutlet@name="conditional-loading-spinner"@defaultGlimmer={{true}}@outletArgs={{lazyHash condition=@condition size=@size}}><div- class={{concatClass+ class={{dConcatClass"loading-container"(if @condition "visible")(if (eq @size "small") "inline-spinner")@@ -27,4 +27,4 @@ const ConditionalLoadingSpinner = <template></PluginOutlet></template>;-export default ConditionalLoadingSpinner;+export default DConditionalLoadingSpinner;diff --git a/frontend/discourse/app/components/cook-text.gjs b/frontend/discourse/app/ui-kit/d-cook-text.gjssimilarity index 96%rename from frontend/discourse/app/components/cook-text.gjsrename to frontend/discourse/app/ui-kit/d-cook-text.gjsindex c66240336fe..3f3d012e68d 100644--- a/frontend/discourse/app/components/cook-text.gjs+++ b/frontend/discourse/app/ui-kit/d-cook-text.gjs@@ -8,7 +8,7 @@ import { ajax } from "discourse/lib/ajax";import { loadOneboxes } from "discourse/lib/load-oneboxes";import { cook } from "discourse/lib/text";-export default class CookText extends Component {+export default class DCookText extends Component {@service siteSettings;@tracked cooked = null;diff --git a/frontend/discourse/app/components/copy-button.gjs b/frontend/discourse/app/ui-kit/d-copy-button.gjssimilarity index 93%rename from frontend/discourse/app/components/copy-button.gjsrename to frontend/discourse/app/ui-kit/d-copy-button.gjsindex 9dbe3bd228c..62c5282312a 100644--- a/frontend/discourse/app/components/copy-button.gjs+++ b/frontend/discourse/app/ui-kit/d-copy-button.gjs@@ -2,12 +2,12 @@import Component from "@ember/component";import { action } from "@ember/object";import { tagName } from "@ember-decorators/component";-import DButton from "discourse/components/d-button";import discourseDebounce from "discourse/lib/debounce";import { bind } from "discourse/lib/decorators";+import DButton from "discourse/ui-kit/d-button";@tagName("")-export default class CopyButton extends Component {+export default class DCopyButton extends Component {copyIcon = "copy";copyClass = "btn-primary";diff --git a/frontend/discourse/app/components/count-i18n.gjs b/frontend/discourse/app/ui-kit/d-count-i18n.gjssimilarity index 91%rename from frontend/discourse/app/components/count-i18n.gjsrename to frontend/discourse/app/ui-kit/d-count-i18n.gjsindex 04f355e2e00..e64648185e1 100644--- a/frontend/discourse/app/components/count-i18n.gjs+++ b/frontend/discourse/app/ui-kit/d-count-i18n.gjs@@ -3,7 +3,7 @@ import { service } from "@ember/service";import { trustHTML } from "@ember/template";import { i18n } from "discourse-i18n";-export default class CountI18n extends Component {+export default class DCountI18n extends Component {@service currentUser;get fullKey() {diff --git a/frontend/discourse/app/components/custom-html.gjs b/frontend/discourse/app/ui-kit/d-custom-html.gjssimilarity index 94%rename from frontend/discourse/app/components/custom-html.gjsrename to frontend/discourse/app/ui-kit/d-custom-html.gjsindex b1ed4defd14..bb9f986cdea 100644--- a/frontend/discourse/app/components/custom-html.gjs+++ b/frontend/discourse/app/ui-kit/d-custom-html.gjs@@ -5,7 +5,7 @@ import willDestroy from "@ember/render-modifiers/modifiers/will-destroy";import { service } from "@ember/service";import { getCustomHTML } from "discourse/helpers/custom-html";-export default class CustomHtml extends Component {+export default class DCustomHtml extends Component {@service appEvents;get html() {diff --git a/frontend/discourse/app/components/date-input.gjs b/frontend/discourse/app/ui-kit/d-date-input.gjssimilarity index 98%rename from frontend/discourse/app/components/date-input.gjsrename to frontend/discourse/app/ui-kit/d-date-input.gjsindex cad725af4af..a0582db5f41 100644--- a/frontend/discourse/app/components/date-input.gjs+++ b/frontend/discourse/app/ui-kit/d-date-input.gjs@@ -18,7 +18,7 @@ function isInputDateSupported() {}@classNames("d-date-input")-export default class DateInput extends Component {+export default class DDateInput extends Component {date = null;useNativePicker = isInputDateSupported();_picker = null;diff --git a/frontend/discourse/app/components/date-picker.gjs b/frontend/discourse/app/ui-kit/d-date-picker.gjssimilarity index 98%rename from frontend/discourse/app/components/date-picker.gjsrename to frontend/discourse/app/ui-kit/d-date-picker.gjsindex a354e20dec0..c3bc6d7c3cf 100644--- a/frontend/discourse/app/components/date-picker.gjs+++ b/frontend/discourse/app/ui-kit/d-date-picker.gjs@@ -10,7 +10,7 @@ import { i18n } from "discourse-i18n";const DATE_FORMAT = "YYYY-MM-DD";@classNames("date-picker-wrapper")-export default class DatePicker extends Component {+export default class DDatePicker extends Component {value = null;minDate = null;maxDate = null;diff --git a/frontend/discourse/app/components/date-time-input-range.gjs b/frontend/discourse/app/ui-kit/d-date-time-input-range.gjssimilarity index 91%rename from frontend/discourse/app/components/date-time-input-range.gjsrename to frontend/discourse/app/ui-kit/d-date-time-input-range.gjsindex 285edb60d08..e64cb14cd6f 100644--- a/frontend/discourse/app/components/date-time-input-range.gjs+++ b/frontend/discourse/app/ui-kit/d-date-time-input-range.gjs@@ -3,11 +3,11 @@ import Component from "@ember/component";import { fn, hash } from "@ember/helper";import { action } from "@ember/object";import { tagName } from "@ember-decorators/component";-import DateTimeInput from "discourse/components/date-time-input";+import DDateTimeInput from "discourse/ui-kit/d-date-time-input";import { i18n } from "discourse-i18n";@tagName("")-export default class DateTimeInputRange extends Component {+export default class DDateTimeInputRange extends Component {from = null;to = null;onChangeTo = null;@@ -51,7 +51,7 @@ export default class DateTimeInputRange extends Component {<template><div class="d-date-time-input-range" ...attributes>- <DateTimeInput+ <DDateTimeInput@date={{this.from}}@onChange={{fn this.onChangeRanges (hash prop="from")}}@showTime={{this.showFromTime}}@@ -60,7 +60,7 @@ export default class DateTimeInputRange extends Component {class="from"/>- <DateTimeInput+ <DDateTimeInput@date={{this.to}}@relativeDate={{this.from}}@onChange={{fn this.onChangeRanges (hash prop="to")}}diff --git a/frontend/discourse/app/components/date-time-input.gjs b/frontend/discourse/app/ui-kit/d-date-time-input.gjssimilarity index 90%rename from frontend/discourse/app/components/date-time-input.gjsrename to frontend/discourse/app/ui-kit/d-date-time-input.gjsindex 3a4d985cd29..114ae5d27cb 100644--- a/frontend/discourse/app/components/date-time-input.gjs+++ b/frontend/discourse/app/ui-kit/d-date-time-input.gjs@@ -2,12 +2,12 @@import Component from "@ember/component";import { action, computed } from "@ember/object";import { tagName } from "@ember-decorators/component";-import DButton from "discourse/components/d-button";-import DateInput from "discourse/components/date-input";-import TimeInput from "discourse/components/time-input";+import DButton from "discourse/ui-kit/d-button";+import DDateInput from "discourse/ui-kit/d-date-input";+import DTimeInput from "discourse/ui-kit/d-time-input";@tagName("")-export default class DateTimeInput extends Component {+export default class DDateTimeInput extends Component {date = null;relativeDate = null;showTime = true;@@ -81,7 +81,7 @@ export default class DateTimeInput extends Component {<template><div class="d-date-time-input" ...attributes>{{#unless this.timeFirst}}- <DateInput+ <DDateInput@date={{this.date}}@placeholder={{this.placeholder}}@relativeDate={{this.relativeDate}}@@ -91,7 +91,7 @@ export default class DateTimeInput extends Component {{{/unless}}{{#if this.showTime}}- <TimeInput+ <DTimeInput@date={{this.date}}@relativeDate={{this.relativeDate}}@onChange={{this.onChangeTime}}@@ -99,7 +99,7 @@ export default class DateTimeInput extends Component {{{/if}}{{#if this.timeFirst}}- <DateInput+ <DDateInput@date={{this.date}}@placeholder={{this.placeholder}}@relativeDate={{this.relativeDate}}diff --git a/frontend/discourse/app/components/decorated-html.gjs b/frontend/discourse/app/ui-kit/d-decorated-html.gjssimilarity index 99%rename from frontend/discourse/app/components/decorated-html.gjsrename to frontend/discourse/app/ui-kit/d-decorated-html.gjsindex b15d9d6d81b..14a01cc4cd6 100644--- a/frontend/discourse/app/components/decorated-html.gjs+++ b/frontend/discourse/app/ui-kit/d-decorated-html.gjs@@ -108,7 +108,7 @@ export function resetHtmlDecorators() {* @param {string} [className] - CSS class name for the wrapper div* @param {string} [id] - ID attribute for the wrapper div*/-export default class DecoratedHtml extends Component {+export default class DDecoratedHtml extends Component {renderGlimmerInfos = trackedArray();decoratedContent = helperFn(({ decorateArgs }, on) => {diff --git a/frontend/discourse/app/components/dropdown-menu.gjs b/frontend/discourse/app/ui-kit/d-dropdown-menu.gjssimilarity index 86%rename from frontend/discourse/app/components/dropdown-menu.gjsrename to frontend/discourse/app/ui-kit/d-dropdown-menu.gjsindex f96bbd20054..e32dd79c7a0 100644--- a/frontend/discourse/app/components/dropdown-menu.gjs+++ b/frontend/discourse/app/ui-kit/d-dropdown-menu.gjs@@ -8,10 +8,10 @@ const DropdownDivider = <template><li ...attributes><hr class="dropdown-menu__divider" /></li></template>;-const DropdownMenu = <template>+const DDropdownMenu = <template><ul class="dropdown-menu" ...attributes>{{yield (hash item=DropdownItem divider=DropdownDivider)}}</ul></template>;-export default DropdownMenu;+export default DDropdownMenu;diff --git a/frontend/discourse/app/components/d-editor.gjs b/frontend/discourse/app/ui-kit/d-editor.gjssimilarity index 97%rename from frontend/discourse/app/components/d-editor.gjsrename to frontend/discourse/app/ui-kit/d-editor.gjsindex 2791c34dca9..1a733a75198 100644--- a/frontend/discourse/app/components/d-editor.gjs+++ b/frontend/discourse/app/ui-kit/d-editor.gjs@@ -17,16 +17,12 @@ import TextareaEditor from "discourse/components/composer/textarea-editor";import ToggleSwitch from "discourse/components/composer/toggle-switch";import ToolbarButtons from "discourse/components/composer/toolbar-buttons";import ToolbarScrollContainer from "discourse/components/composer/toolbar-scroll-container";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DButton from "discourse/components/d-button";import DEditorPreview from "discourse/components/d-editor-preview";import EmojiAutocompleteResults from "discourse/components/emoji-autocomplete-results";import EmojiPickerDetached from "discourse/components/emoji-picker/detached";import UpsertHyperlink from "discourse/components/modal/upsert-hyperlink";import PluginOutlet from "discourse/components/plugin-outlet";-import PopupInputTip from "discourse/components/popup-input-tip";import UserAutocompleteResults from "discourse/components/user-autocomplete-results";-import concatClass from "discourse/helpers/concat-class";import Toolbar from "discourse/lib/composer/toolbar";import { USER_OPTION_COMPOSITION_MODES } from "discourse/lib/constants";import discourseDebounce from "discourse/lib/debounce";@@ -44,12 +40,16 @@ import {initUserStatusHtml,renderUserStatusHtml,} from "discourse/lib/user-status-on-autocomplete";+import { PLATFORM_KEY_MODIFIER } from "discourse/services/keyboard-shortcuts";+import { not } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DPopupInputTip from "discourse/ui-kit/d-popup-input-tip";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import {EMOJI_ALLOWED_PRECEDING_CHARS_REGEXP,SKIP,-} from "discourse/modifiers/d-autocomplete";-import { PLATFORM_KEY_MODIFIER } from "discourse/services/keyboard-shortcuts";-import { not } from "discourse/truth-helpers";+} from "discourse/ui-kit/modifiers/d-autocomplete";import { i18n } from "discourse-i18n";let _createCallbacks = [];@@ -779,7 +779,7 @@ export default class DEditor extends Component {<template><div- class={{concatClass "d-editor-container" this.editorContainerModeClass}}+ class={{dConcatClass "d-editor-container" this.editorContainerModeClass}}><div class="d-editor-textarea-column">{{yield}}@@ -825,7 +825,7 @@ export default class DEditor extends Component {</ToolbarScrollContainer>{{/if}}- <ConditionalLoadingSpinner @condition={{this.loading}} />+ <DConditionalLoadingSpinner @condition={{this.loading}} /><this.editorComponent@class="d-editor-input"@onSetup={{this.setupEditor}}@@ -843,7 +843,7 @@ export default class DEditor extends Component {@replaceToolbar={{this.replaceToolbar}}@toggleRichEditor={{this.toggleRichEditor}}/>- <PopupInputTip @validation={{this.validation}} />+ <DPopupInputTip @validation={{this.validation}} /><PluginOutlet@name="after-d-editor"@connectorTagName="div"diff --git a/frontend/discourse/app/components/empty-state.gjs b/frontend/discourse/app/ui-kit/d-empty-state.gjssimilarity index 86%rename from frontend/discourse/app/components/empty-state.gjsrename to frontend/discourse/app/ui-kit/d-empty-state.gjsindex 2a1b447d732..05be59bf3d0 100644--- a/frontend/discourse/app/components/empty-state.gjs+++ b/frontend/discourse/app/ui-kit/d-empty-state.gjs@@ -1,9 +1,9 @@import { concat } from "@ember/helper";-import DButton from "discourse/components/d-button";-import icon from "discourse/helpers/d-icon";import { or } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import dIcon from "discourse/ui-kit/helpers/d-icon";-const EmptyState = <template>+const DEmptyState = <template><divclass="empty-state__container{{if @identifier (concat '--' @identifier)}}@@ -42,7 +42,7 @@ const EmptyState = <template>{{#if (or @tipText (has-block "tip"))}}<div class="empty-state__tip">{{#if @tipIcon}}- {{icon @tipIcon}}+ {{dIcon @tipIcon}}{{/if}}{{#if (has-block "tip")}}{{yield to="tip"}}@@ -55,4 +55,4 @@ const EmptyState = <template></div></template>;-export default EmptyState;+export default DEmptyState;diff --git a/frontend/discourse/app/components/expanding-text-area.gjs b/frontend/discourse/app/ui-kit/d-expanding-text-area.gjssimilarity index 70%rename from frontend/discourse/app/components/expanding-text-area.gjsrename to frontend/discourse/app/ui-kit/d-expanding-text-area.gjsindex 86165a81d9d..667086b6268 100644--- a/frontend/discourse/app/components/expanding-text-area.gjs+++ b/frontend/discourse/app/ui-kit/d-expanding-text-area.gjs@@ -1,10 +1,10 @@import { on } from "@ember/modifier";-import autoFocus from "discourse/modifiers/auto-focus";+import dAutoFocus from "discourse/ui-kit/modifiers/d-auto-focus";-const ExpandingTextArea = <template>+const DExpandingTextArea = <template><div class="expanding-text-area" data-replicated-value={{@value}}><textarea- {{(if @autoFocus autoFocus)}}+ {{(if @autoFocus dAutoFocus)}}{{! deprecated args: }}autocorrect={{@autocorrect}}class={{@class}}@@ -18,4 +18,4 @@ const ExpandingTextArea = <template></div></template>;-export default ExpandingTextArea;+export default DExpandingTextArea;diff --git a/frontend/discourse/app/components/filter-input.gjs b/frontend/discourse/app/ui-kit/d-filter-input.gjssimilarity index 84%rename from frontend/discourse/app/components/filter-input.gjsrename to frontend/discourse/app/ui-kit/d-filter-input.gjsindex aa3370ae480..664ab97ad86 100644--- a/frontend/discourse/app/components/filter-input.gjs+++ b/frontend/discourse/app/ui-kit/d-filter-input.gjs@@ -3,14 +3,14 @@ import { tracked } from "@glimmer/tracking";import { on } from "@ember/modifier";import { action } from "@ember/object";import { modifier } from "ember-modifier";-import DButton from "discourse/components/d-button";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import noop from "discourse/helpers/noop";import { and } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";-export default class FilterInput extends Component {+export default class DFilterInput extends Component {@tracked isFocused = false;registerInput = modifier((element) => {@@ -42,14 +42,14 @@ export default class FilterInput extends Component {<template><div- class={{concatClass+ class={{dConcatClass@containerClass"filter-input-container"(if this.isFocused "is-focused")}}>{{#if @icons.left}}- {{icon @icons.left class="-left"}}+ {{dIcon @icons.left class="-left"}}{{/if}}<input@@ -75,7 +75,7 @@ export default class FilterInput extends Component {{{/if}}{{#if @icons.right}}- {{icon @icons.right class="-right"}}+ {{dIcon @icons.right class="-right"}}{{/if}}</div></template>diff --git a/frontend/discourse/app/components/flash-message.gjs b/frontend/discourse/app/ui-kit/d-flash-message.gjssimilarity index 68%rename from frontend/discourse/app/components/flash-message.gjsrename to frontend/discourse/app/ui-kit/d-flash-message.gjsindex 2971fc9fcf7..ba6dfe97b2e 100644--- a/frontend/discourse/app/components/flash-message.gjs+++ b/frontend/discourse/app/ui-kit/d-flash-message.gjs@@ -1,9 +1,9 @@import Component from "@glimmer/component";-import concatClass from "discourse/helpers/concat-class";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";const FLASH_TYPES = ["success", "error", "warning", "info"];-export default class FlashMessage extends Component {+export default class DFlashMessage extends Component {get flashClass() {if (this.args.type && !FLASH_TYPES.includes(this.args.type)) {throw `@type must be one of ${FLASH_TYPES.join(", ")}`;@@ -13,7 +13,7 @@ export default class FlashMessage extends Component {<template>{{#if @flash}}- <div class={{concatClass "alert" this.flashClass}} ...attributes>+ <div class={{dConcatClass "alert" this.flashClass}} ...attributes>{{~@flash~}}</div>{{/if}}diff --git a/frontend/discourse/app/components/future-date-input.gjs b/frontend/discourse/app/ui-kit/d-future-date-input.gjssimilarity index 95%rename from frontend/discourse/app/components/future-date-input.gjsrename to frontend/discourse/app/ui-kit/d-future-date-input.gjsindex 48b02e38001..b9f7e1551a7 100644--- a/frontend/discourse/app/components/future-date-input.gjs+++ b/frontend/discourse/app/ui-kit/d-future-date-input.gjs@@ -6,7 +6,6 @@ import { action, computed } from "@ember/object";import { isEmpty } from "@ember/utils";import { tagName } from "@ember-decorators/component";import DatePickerFuture from "discourse/components/date-picker-future";-import icon from "discourse/helpers/d-icon";import withEventValue from "discourse/helpers/with-event-value";import {extendedDefaultTimeShortcuts,@@ -18,10 +17,11 @@ import {import FutureDateInputSelector, {FORMAT,} from "discourse/select-kit/components/future-date-input-selector";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";@tagName("")-export default class FutureDateInput extends Component {+export default class DFutureDateInput extends Component {selection = null;includeDateTime = true;@@ -149,7 +149,7 @@ export default class FutureDateInput extends Component {{{#unless this.noRelativeOptions}}<div class="control-group"><label class={{this.labelClasses}}>- {{#if this.displayLabelIcon}}{{icon+ {{#if this.displayLabelIcon}}{{dIconthis.displayLabelIcon}}{{/if}}{{this.displayLabel}}</label>@@ -166,7 +166,7 @@ export default class FutureDateInput extends Component {{{#if this.displayDateAndTimePicker}}<div class="control-group future-date-input-date-picker">- {{icon "calendar-days"}}+ {{dIcon "calendar-days"}}<DatePickerFuture@value={{this._date}}@defaultDate={{this._date}}@@ -175,7 +175,7 @@ export default class FutureDateInput extends Component {</div><div class="control-group future-date-input-time-picker">- {{icon "far-clock"}}+ {{dIcon "far-clock"}}<Inputplaceholder="--:--"@type="time"diff --git a/frontend/discourse/app/components/highlighted-code.gjs b/frontend/discourse/app/ui-kit/d-highlighted-code.gjssimilarity index 91%rename from frontend/discourse/app/components/highlighted-code.gjsrename to frontend/discourse/app/ui-kit/d-highlighted-code.gjsindex 935e8c76a7d..373892fb478 100644--- a/frontend/discourse/app/components/highlighted-code.gjs+++ b/frontend/discourse/app/ui-kit/d-highlighted-code.gjs@@ -3,7 +3,7 @@ import { service } from "@ember/service";import { modifier } from "ember-modifier";import highlightSyntax from "discourse/lib/highlight-syntax";-export default class HighlightedCode extends Component {+export default class DHighlightedCode extends Component {@service session;@service siteSettings;diff --git a/frontend/discourse/app/components/horizontal-overflow-nav.gjs b/frontend/discourse/app/ui-kit/d-horizontal-overflow-nav.gjssimilarity index 92%rename from frontend/discourse/app/components/horizontal-overflow-nav.gjsrename to frontend/discourse/app/ui-kit/d-horizontal-overflow-nav.gjsindex 2a08b6a6f45..3b88e62f33a 100644--- a/frontend/discourse/app/components/horizontal-overflow-nav.gjs+++ b/frontend/discourse/app/ui-kit/d-horizontal-overflow-nav.gjs@@ -4,13 +4,13 @@ import { registerDestructor } from "@ember/destroyable";import { on } from "@ember/modifier";import { action } from "@ember/object";import didInsert from "@ember/render-modifiers/modifiers/did-insert";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import { bind } from "discourse/lib/decorators";import { isDocumentRTL } from "discourse/lib/text-direction";-import onResize from "discourse/modifiers/on-resize";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";+import dOnResize from "discourse/ui-kit/modifiers/d-on-resize";-export default class HorizontalOverflowNav extends Component {+export default class DHorizontalOverflowNav extends Component {@tracked hasScroll;@tracked hideRightScroll = false;@tracked hideLeftScroll = true;@@ -156,17 +156,17 @@ export default class HorizontalOverflowNav extends Component {{{on "mouseup" this.stopScroll}}{{on "mouseleave" this.stopScroll}}data-direction="left"- class={{concatClass+ class={{dConcatClass"horizontal-overflow-nav__scroll-left"(if this.hideLeftScroll "disabled")}}>- {{icon "chevron-left"}}+ {{dIcon "chevron-left"}}</a>{{/if}}<ul- {{onResize this.onResize}}+ {{dOnResize this.onResize}}{{on "scroll" this.onScroll}}{{didInsert this.setup}}{{on "mousedown" this.scrollDrag}}@@ -182,12 +182,12 @@ export default class HorizontalOverflowNav extends Component {{{on "mousedown" this.horizontalScroll}}{{on "mouseup" this.stopScroll}}{{on "mouseleave" this.stopScroll}}- class={{concatClass+ class={{dConcatClass"horizontal-overflow-nav__scroll-right"(if this.hideRightScroll "disabled")}}>- {{icon "chevron-right"}}+ {{dIcon "chevron-right"}}</a>{{/if}}</nav>diff --git a/frontend/discourse/app/components/html-with-links.gjs b/frontend/discourse/app/ui-kit/d-html-with-links.gjssimilarity index 90%rename from frontend/discourse/app/components/html-with-links.gjsrename to frontend/discourse/app/ui-kit/d-html-with-links.gjsindex 1b7fe6e0a56..6b1429cf257 100644--- a/frontend/discourse/app/components/html-with-links.gjs+++ b/frontend/discourse/app/ui-kit/d-html-with-links.gjs@@ -6,7 +6,7 @@ import {shouldOpenInNewTab,} from "discourse/lib/click-track";-export default class HtmlWithLinks extends Component {+export default class DHtmlWithLinks extends Component {@actionclick(event) {if (event.target.tagName === "A") {diff --git a/frontend/discourse/app/components/d-icon-grid-picker/content.gjs b/frontend/discourse/app/ui-kit/d-icon-grid-picker/content.gjssimilarity index 95%rename from frontend/discourse/app/components/d-icon-grid-picker/content.gjsrename to frontend/discourse/app/ui-kit/d-icon-grid-picker/content.gjsindex 49e15f724b0..11035c72236 100644--- a/frontend/discourse/app/components/d-icon-grid-picker/content.gjs+++ b/frontend/discourse/app/ui-kit/d-icon-grid-picker/content.gjs@@ -6,14 +6,14 @@ import { on } from "@ember/modifier";import { action } from "@ember/object";import { service } from "@ember/service";import { modifier } from "ember-modifier";-/** @type {import("discourse/components/async-content.gjs")} */-import AsyncContent from "discourse/components/async-content";-import FilterInput from "discourse/components/filter-input";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import withEventValue from "discourse/helpers/with-event-value";import { ajax } from "discourse/lib/ajax";import { eq } from "discourse/truth-helpers";+/** @type {import("discourse/ui-kit/d-async-content.gjs")} */+import DAsyncContent from "discourse/ui-kit/d-async-content";+import DFilterInput from "discourse/ui-kit/d-filter-input";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";/* Module-level cache for the unfiltered icon list, keyed by onlyAvailable flag */@@ -291,7 +291,7 @@ export default class DIconGridPickerContent extends Component {{{on "keydown" this.onKeyDown}}><div class="d-icon-grid-picker__filter-container">- <FilterInput+ <DFilterInput{{! @glint-expect-error: FilterInput lacks Element type declaration }}aria-label={{i18n "d_icon_grid_picker.search_placeholder"}}aria-controls="d-icon-grid-picker-listbox"@@ -324,7 +324,7 @@ export default class DIconGridPickerContent extends Component {role="option"aria-label={{favIcon}}aria-selected="true"- class={{concatClass+ class={{dConcatClass"d-icon-grid-picker__icon --selected"(if @showSelectedName "d-icon-grid-picker__selected-chip")}}@@ -333,7 +333,7 @@ export default class DIconGridPickerContent extends Component {{{this.snapToGrid}}{{on "click" (fn @onSelect favIcon)}}>- {{icon favIcon}}+ {{dIcon favIcon}}{{#if @showSelectedName}}<spanclass="d-icon-grid-picker__selected-name"@@ -352,7 +352,7 @@ export default class DIconGridPickerContent extends Component {{{this.registerIconTooltip}}{{on "click" (fn @onSelect favIcon)}}>- {{icon favIcon}}+ {{dIcon favIcon}}</button>{{/if}}{{/each}}@@ -360,7 +360,7 @@ export default class DIconGridPickerContent extends Component {{{/if}}<div class="d-icon-grid-picker__grid" role="presentation">- <AsyncContent+ <DAsyncContent@asyncData={{this.fetchIcons}}@context={{this.filter}}@debounce={{true}}@@ -378,7 +378,7 @@ export default class DIconGridPickerContent extends Component {role="option"aria-label={{item.id}}aria-selected={{if (eq item.id @value) "true" "false"}}- class={{concatClass+ class={{dConcatClass"d-icon-grid-picker__icon"(if (eq item.id @value) "--selected")}}@@ -386,7 +386,7 @@ export default class DIconGridPickerContent extends Component {{{this.registerIconTooltip}}{{on "click" (fn @onSelect item.id)}}>- {{icon item.id}}+ {{dIcon item.id}}</button>{{/each}}</:content>@@ -395,7 +395,7 @@ export default class DIconGridPickerContent extends Component {{{i18n "d_icon_grid_picker.no_results"}}</div></:empty>- </AsyncContent>+ </DAsyncContent></div></div><div class="sr-only" aria-live="polite" role="status">diff --git a/frontend/discourse/app/components/d-icon-grid-picker/index.gjs b/frontend/discourse/app/ui-kit/d-icon-grid-picker/index.gjssimilarity index 92%rename from frontend/discourse/app/components/d-icon-grid-picker/index.gjsrename to frontend/discourse/app/ui-kit/d-icon-grid-picker/index.gjsindex 0d9ac721bfc..aa966664493 100644--- a/frontend/discourse/app/components/d-icon-grid-picker/index.gjs+++ b/frontend/discourse/app/ui-kit/d-icon-grid-picker/index.gjs@@ -3,15 +3,15 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";import { trustHTML } from "@ember/template";-/** @type {import("discourse/components/d-button.gjs").default} */-import DButton from "discourse/components/d-button";-/** @type {import("discourse/components/d-icon-grid-picker/content.gjs").default} */-import DIconGridPickerContent from "discourse/components/d-icon-grid-picker/content";/** @type {import("discourse/float-kit/components/d-menu.gjs").default} */import DMenu from "discourse/float-kit/components/d-menu";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import { isValidHex, normalizeHex } from "discourse/lib/color-transformations";+/** @type {import("discourse/ui-kit/d-button.gjs").default} */+import DButton from "discourse/ui-kit/d-button";+/** @type {import("discourse/ui-kit/d-icon-grid-picker/content.gjs").default} */+import DIconGridPickerContent from "discourse/ui-kit/d-icon-grid-picker/content";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";/**@@ -147,7 +147,7 @@ export default class DIconGridPicker extends Component {<template><div- class={{concatClass+ class={{dConcatClass"d-icon-grid-picker"(if this.showClearButton "--has-clear")}}@@ -171,7 +171,7 @@ export default class DIconGridPicker extends Component {><:trigger>{{#if @value}}- {{icon @value}}+ {{dIcon @value}}{{/if}}{{#if this.triggerLabel}}@@ -181,7 +181,7 @@ export default class DIconGridPicker extends Component {{{/if}}{{#if @showCaret}}- {{icon this.caretIcon class="d-icon-grid-picker__caret"}}+ {{dIcon this.caretIcon class="d-icon-grid-picker__caret"}}{{/if}}</:trigger><:content>diff --git a/frontend/discourse/app/components/input-tip.gjs b/frontend/discourse/app/ui-kit/d-input-tip.gjssimilarity index 54%rename from frontend/discourse/app/components/input-tip.gjsrename to frontend/discourse/app/ui-kit/d-input-tip.gjsindex 12902c8d7da..ee42bfd4156 100644--- a/frontend/discourse/app/components/input-tip.gjs+++ b/frontend/discourse/app/ui-kit/d-input-tip.gjs@@ -1,16 +1,16 @@-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";-const InputTip = <template>+const DInputTip = <template><divclass="tip {{if @validation.failed 'bad' 'good'}}"id={{@id}}...attributes>{{#if @validation.reason}}- {{icon (if @validation.failed "xmark" "check")}}+ {{dIcon (if @validation.failed "xmark" "check")}}{{@validation.reason}}{{/if}}</div></template>;-export default InputTip;+export default DInputTip;diff --git a/frontend/discourse/app/components/interpolated-translation.gjs b/frontend/discourse/app/ui-kit/d-interpolated-translation.gjssimilarity index 96%rename from frontend/discourse/app/components/interpolated-translation.gjsrename to frontend/discourse/app/ui-kit/d-interpolated-translation.gjsindex fb5c452acaf..ae60d4badf8 100644--- a/frontend/discourse/app/components/interpolated-translation.gjs+++ b/frontend/discourse/app/ui-kit/d-interpolated-translation.gjs@@ -2,8 +2,8 @@ import Component from "@glimmer/component";import { action } from "@ember/object";import { getOwner } from "@ember/owner";import curryComponent from "ember-curry-component";-import uniqueId from "discourse/helpers/unique-id";import { isProduction } from "discourse/lib/environment";+import dUniqueId from "discourse/ui-kit/helpers/d-unique-id";import I18n, { i18n, I18nMissingInterpolationArgument } from "discourse-i18n";/**@@ -32,7 +32,7 @@ import I18n, { i18n, I18nMissingInterpolationArgument } from "discourse-i18n";* @param {String} key - The i18n translation key to use* @param {Object} [options] - Hash of options to pass to the i18n function for string interpolation*/-export default class InterpolatedTranslation extends Component {+export default class DInterpolatedTranslation extends Component {/*** Throws errors in dev, or logs them to the browser console in production.*@@ -73,7 +73,7 @@ export default class InterpolatedTranslation extends Component {placeholderAppearance.forEach((placeholderAppearances, placeholderName) => {placeholderKeys.set(placeholderName,- `__PLACEHOLDER__${placeholderName}__${uniqueId()}__`+ `__PLACEHOLDER__${placeholderName}__${dUniqueId()}__`);placeholderElements.set(placeholderName,@@ -160,7 +160,7 @@ export default class InterpolatedTranslation extends Component {}if (missing.length > 0) {- InterpolatedTranslation.log(+ DInterpolatedTranslation.log(`Translation error for key '${this.args.key}': ${missing.join(", ")}`,I18nMissingInterpolationArgument);@@ -178,7 +178,7 @@ export default class InterpolatedTranslation extends Component {{{/let}}{{#unless (has-block)}}- {{InterpolatedTranslation.log+ {{DInterpolatedTranslation.log"The <InterpolatedTranslation> component shouldn't be used for translations that don't insert components. Use `i18n()` instead."}}{{/unless}}@@ -236,7 +236,7 @@ class Placeholder extends Component {{{/each}}{{#unless (has-block)}}- {{InterpolatedTranslation.log+ {{DInterpolatedTranslation.log"The <InterpolatedTranslation> component shouldn't be used for translations that don't insert components. Use `i18n()` instead."}}{{/unless}}diff --git a/frontend/discourse/app/components/light-dark-img.gjs b/frontend/discourse/app/ui-kit/d-light-dark-img.gjssimilarity index 92%rename from frontend/discourse/app/components/light-dark-img.gjsrename to frontend/discourse/app/ui-kit/d-light-dark-img.gjsindex f405497c183..cc5cae0a5a9 100644--- a/frontend/discourse/app/components/light-dark-img.gjs+++ b/frontend/discourse/app/ui-kit/d-light-dark-img.gjs@@ -1,9 +1,9 @@import Component from "@glimmer/component";import { service } from "@ember/service";-import CdnImg from "discourse/components/cdn-img";import { getURLWithCDN } from "discourse/lib/get-url";+import DCdnImg from "discourse/ui-kit/d-cdn-img";-export default class LightDarkImg extends Component {+export default class DLightDarkImg extends Component {@service session;@service interfaceColor;@@ -48,7 +48,7 @@ export default class LightDarkImg extends Component {height={{@darkImg.height}}media={{this.darkMediaQuery}}/>- <CdnImg+ <DCdnImg...attributes@src={{this.defaultImg.url}}@width={{this.defaultImg.width}}@@ -56,7 +56,7 @@ export default class LightDarkImg extends Component {/></picture>{{else if @lightImg.url}}- <CdnImg+ <DCdnImg...attributes@src={{@lightImg.url}}@width={{@lightImg.width}}diff --git a/frontend/discourse/app/components/load-more.gjs b/frontend/discourse/app/ui-kit/d-load-more.gjssimilarity index 92%rename from frontend/discourse/app/components/load-more.gjsrename to frontend/discourse/app/ui-kit/d-load-more.gjsindex 41db4e6abc9..f47f1027acb 100644--- a/frontend/discourse/app/components/load-more.gjs+++ b/frontend/discourse/app/ui-kit/d-load-more.gjs@@ -1,8 +1,8 @@import Component from "@glimmer/component";import { action } from "@ember/object";-import element from "discourse/helpers/element";import discourseDebounce from "discourse/lib/debounce";-import observeIntersection from "discourse/modifiers/observe-intersection";+import dElement from "discourse/ui-kit/helpers/d-element";+import dObserveIntersection from "discourse/ui-kit/modifiers/d-observe-intersection";let ENABLE_LOAD_MORE_OBSERVER = true;@@ -74,7 +74,7 @@ export function enableLoadMoreObserver() {* />* ```*/-export default class LoadMore extends Component {+export default class DLoadMore extends Component {observer;root = this.args.root || null;rootMargin = this.args.rootMargin || "0px 0px 0px 0px";@@ -92,11 +92,11 @@ export default class LoadMore extends Component {}<template>- {{#let (element (if (has-block) "div" "")) as |Wrapper|}}+ {{#let (dElement (if (has-block) "div" "")) as |Wrapper|}}<Wrapper ...attributes>{{yield}}<div- {{observeIntersection+ {{dObserveIntersectionthis.onIntersectionthreshold=this.thresholdrootMargin=this.rootMargindiff --git a/frontend/discourse/app/components/d-modal-cancel.gjs b/frontend/discourse/app/ui-kit/d-modal-cancel.gjssimilarity index 81%rename from frontend/discourse/app/components/d-modal-cancel.gjsrename to frontend/discourse/app/ui-kit/d-modal-cancel.gjsindex cb1c00c1cb7..f7db92536b3 100644--- a/frontend/discourse/app/components/d-modal-cancel.gjs+++ b/frontend/discourse/app/ui-kit/d-modal-cancel.gjs@@ -1,4 +1,4 @@-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";const DModalCancel = <template>diff --git a/frontend/discourse/app/components/d-modal.gjs b/frontend/discourse/app/ui-kit/d-modal.gjssimilarity index 93%rename from frontend/discourse/app/components/d-modal.gjsrename to frontend/discourse/app/ui-kit/d-modal.gjsindex b8d3a6e534a..243afff0a5f 100644--- a/frontend/discourse/app/components/d-modal.gjs+++ b/frontend/discourse/app/ui-kit/d-modal.gjs@@ -7,18 +7,18 @@ import willDestroy from "@ember/render-modifiers/modifiers/will-destroy";import { service } from "@ember/service";import { waitForPromise } from "@ember/test-waiters";import { modifier as modifierFn } from "ember-modifier";-import ConditionalInElement from "discourse/components/conditional-in-element";-import DButton from "discourse/components/d-button";-import FlashMessage from "discourse/components/flash-message";-import concatClass from "discourse/helpers/concat-class";-import element from "discourse/helpers/element";import htmlClass from "discourse/helpers/html-class";import { waitForAnimationEnd } from "discourse/lib/animation-utils";import { lock, unlock } from "discourse/lib/body-scroll-lock";import { getMaxAnimationTimeMs } from "discourse/lib/swipe-events";-import swipe from "discourse/modifiers/swipe";-import trapTab from "discourse/modifiers/trap-tab";import { and, not, or } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DConditionalInElement from "discourse/ui-kit/d-conditional-in-element";+import DFlashMessage from "discourse/ui-kit/d-flash-message";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dElement from "discourse/ui-kit/helpers/d-element";+import dSwipe from "discourse/ui-kit/modifiers/d-swipe";+import dTrapTab from "discourse/ui-kit/modifiers/d-trap-tab";export const CLOSE_INITIATED_BY_BUTTON = "initiatedByCloseButton";export const CLOSE_INITIATED_BY_ESC = "initiatedByESC";@@ -273,7 +273,7 @@ export default class DModal extends Component {throw `@tagName must be form or div`;}- return element(tagName);+ return dElement(tagName);}#animateBackdropOpacity(position) {@@ -327,7 +327,7 @@ export default class DModal extends Component {<template>{{! template-lint-disable no-invalid-interactive }}- <ConditionalInElement+ <DConditionalInElement@element={{this.modal.containerElement}}@inline={{@inline}}@append={{true}}@@ -336,7 +336,7 @@ export default class DModal extends Component {{{htmlClass "modal-open"}}{{/unless}}<this.dynamicElement- class={{concatClass+ class={{dConcatClass"modal""d-modal"(if @inline "-inline")@@ -349,7 +349,7 @@ export default class DModal extends Component {...attributes{{didInsert this.setupModal}}{{willDestroy this.cleanupModal}}- {{trapTab preventScroll=false autofocus=this.autofocus}}+ {{dTrapTab preventScroll=false autofocus=this.autofocus}}><div class="d-modal__container" {{this.registerModalContainer}}>{{yield to="aboveHeader"}}@@ -366,7 +366,7 @@ export default class DModal extends Component {)}}<div- class={{concatClass+ class={{dConcatClass"d-modal__header"(if(and this.mobileDismissable (has-block "headerPrimaryAction"))@@ -374,7 +374,7 @@ export default class DModal extends Component {)@headerClass}}- {{swipe+ {{dSwipeonDidSwipe=this.handleSwipeonDidEndSwipe=this.handleSwipeEndedenabled=this.dismissable@@ -430,7 +430,7 @@ export default class DModal extends Component {{{yield to="belowHeader"}}- <FlashMessage+ <DFlashMessageid="modal-alert"role="alert"@flash={{@flash}}@@ -438,7 +438,7 @@ export default class DModal extends Component {/><div- class={{concatClass "d-modal__body" @bodyClass}}+ class={{dConcatClass "d-modal__body" @bodyClass}}tabindex="-1"{{this.setupModalBody}}>@@ -461,7 +461,7 @@ export default class DModal extends Component {{{#unless @inline}}<divclass="d-modal__backdrop"- {{swipe+ {{dSwipeonDidSwipe=this.handleSwipeonDidEndSwipe=this.handleSwipeEndedenabled=this.dismissable@@ -471,6 +471,6 @@ export default class DModal extends Component {{{on "pointerdown" this.handleWrapperPointerDown}}></div>{{/unless}}- </ConditionalInElement>+ </DConditionalInElement></template>}diff --git a/frontend/discourse/app/components/d-multi-select.gjs b/frontend/discourse/app/ui-kit/d-multi-select.gjssimilarity index 91%rename from frontend/discourse/app/components/d-multi-select.gjsrename to frontend/discourse/app/ui-kit/d-multi-select.gjsindex c7ba3c81d84..acf35ed965f 100644--- a/frontend/discourse/app/components/d-multi-select.gjs+++ b/frontend/discourse/app/ui-kit/d-multi-select.gjs@@ -7,18 +7,18 @@ import { action } from "@ember/object";import didInsert from "@ember/render-modifiers/modifiers/did-insert";import { trustHTML } from "@ember/template";import { TrackedAsyncData } from "ember-async-data";-import DButton from "discourse/components/d-button";-import DropdownMenu from "discourse/components/dropdown-menu";-import TextField from "discourse/components/text-field";import DMenu from "discourse/float-kit/components/d-menu";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";-import element from "discourse/helpers/element";import discourseDebounce from "discourse/lib/debounce";import { INPUT_DELAY } from "discourse/lib/environment";import { makeArray } from "discourse/lib/helpers";-import scrollIntoView from "discourse/modifiers/scroll-into-view";import { eq } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";+import DTextField from "discourse/ui-kit/d-text-field";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dElement from "discourse/ui-kit/helpers/d-element";+import dIcon from "discourse/ui-kit/helpers/d-icon";+import dScrollIntoView from "discourse/ui-kit/modifiers/d-scroll-into-view";import { i18n } from "discourse-i18n";class Skeleton extends Component {@@ -235,8 +235,8 @@ export default class DMultiSelect extends Component {<template><DMenu@identifier="d-multi-select"- @triggerComponent={{element "div"}}- @triggerClass={{concatClass (if this.hasSelection "--has-selection")}}+ @triggerComponent={{dElement "div"}}+ @triggerClass={{dConcatClass (if this.hasSelection "--has-selection")}}@visibilityOptimizer={{@visibilityOptimizer}}@placement={{@placement}}@allowedPlacements={{@allowedPlacements}}@@ -262,7 +262,7 @@ export default class DMultiSelect extends Component {}}</span>{{#unless item.preventRemoval}}- {{icon+ {{dIcon"xmark"class="d-multi-select-trigger__remove-selection-icon"}}@@ -281,13 +281,13 @@ export default class DMultiSelect extends Component {/></:trigger><:content>- <DropdownMenu- class={{concatClass "d-multi-select__content" @contentClass}}+ <DDropdownMenu+ class={{dConcatClass "d-multi-select__content" @contentClass}}as |menu|><menu.item class="d-multi-select__search-container">- {{icon "magnifying-glass"}}- <TextField+ {{dIcon "magnifying-glass"}}+ <DTextFieldclass="d-multi-select__search-input"autocomplete="off"@placeholder={{i18n "multi_select.search"}}@@ -318,13 +318,13 @@ export default class DMultiSelect extends Component {<div class="d-multi-select__search-results">{{#each this.availableOptions as |result|}}<menu.item- class={{concatClass+ class={{dConcatClass"d-multi-select__result"(if (eq result this.preselectedItem) "--preselected" "")}}role="button"title={{this.getDisplayText result}}- {{scrollIntoView (eq result this.preselectedItem)}}+ {{dScrollIntoView (eq result this.preselectedItem)}}{{on "mouseenter" (fn (mut this.preselectedItem) result)}}{{on "click" (fn this.toggle result)}}>@@ -340,7 +340,7 @@ export default class DMultiSelect extends Component {</div>{{/if}}{{/if}}- </DropdownMenu>+ </DDropdownMenu></:content></DMenu></template>diff --git a/frontend/discourse/app/components/nav-item.gjs b/frontend/discourse/app/ui-kit/d-nav-item.gjssimilarity index 94%rename from frontend/discourse/app/components/nav-item.gjsrename to frontend/discourse/app/ui-kit/d-nav-item.gjsindex 8a8b9fa241c..f97b438ea09 100644--- a/frontend/discourse/app/components/nav-item.gjs+++ b/frontend/discourse/app/ui-kit/d-nav-item.gjs@@ -4,12 +4,12 @@ import { LinkTo } from "@ember/routing";import { service } from "@ember/service";import { trustHTML } from "@ember/template";import { isPresent } from "@ember/utils";-import concatClass from "discourse/helpers/concat-class";import getURL from "discourse/lib/get-url";import { iconHTML } from "discourse/lib/icon-library";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";-export default class NavItem extends Component {+export default class DNavItem extends Component {@service router;@service session;@@ -86,7 +86,7 @@ export default class NavItem extends Component {}<template>- <li class={{concatClass (if this.active "active") @class}} ...attributes>+ <li class={{dConcatClass (if this.active "active") @class}} ...attributes>{{#if this.refreshHref}}<a href={{this.refreshHref}}>{{this.contents}}</a>{{else if @routeParam}}diff --git a/frontend/discourse/app/components/d-navigation-item.gjs b/frontend/discourse/app/ui-kit/d-navigation-item.gjssimilarity index 100%rename from frontend/discourse/app/components/d-navigation-item.gjsrename to frontend/discourse/app/ui-kit/d-navigation-item.gjsdiff --git a/frontend/discourse/app/components/number-field.js b/frontend/discourse/app/ui-kit/d-number-field.jssimilarity index 92%rename from frontend/discourse/app/components/number-field.jsrename to frontend/discourse/app/ui-kit/d-number-field.jsindex fc97829c923..0fdbd04a3e2 100644--- a/frontend/discourse/app/components/number-field.js+++ b/frontend/discourse/app/ui-kit/d-number-field.js@@ -1,12 +1,12 @@import { computed } from "@ember/object";import { classNameBindings } from "@ember-decorators/component";-import TextField from "discourse/components/text-field";import deprecated from "discourse/lib/deprecated";import { allowOnlyNumericInput } from "discourse/lib/utilities";+import DTextField from "discourse/ui-kit/d-text-field";import { i18n } from "discourse-i18n";@classNameBindings("invalid")-export default class NumberField extends TextField {+export default class DNumberField extends DTextField {init() {super.init(...arguments);deprecated(diff --git a/frontend/discourse/app/components/d-otp/index.gjs b/frontend/discourse/app/ui-kit/d-otp/index.gjssimilarity index 97%rename from frontend/discourse/app/components/d-otp/index.gjsrename to frontend/discourse/app/ui-kit/d-otp/index.gjsindex 57de263c56a..b973919c779 100644--- a/frontend/discourse/app/components/d-otp/index.gjs+++ b/frontend/discourse/app/ui-kit/d-otp/index.gjs@@ -6,8 +6,8 @@ import { action } from "@ember/object";import { trackedArray } from "@ember/reactive/collections";import { service } from "@ember/service";import { isBlank } from "@ember/utils";-import autoFocus from "discourse/modifiers/auto-focus";import preventScrollOnFocus from "discourse/modifiers/prevent-scroll-on-focus";+import dAutoFocus from "discourse/ui-kit/modifiers/d-auto-focus";import { i18n } from "discourse-i18n";/** @type {import("./slot.gjs").default} */import Slot from "./slot";@@ -187,7 +187,7 @@ export default class DOTP extends Component {{{on "blur" this.onBlur}}{{on "paste" this.onPaste}}aria-label={{i18n "d_otp.screen_reader" count=this.slots}}- {{(if this.autoFocus (modifier autoFocus))}}+ {{(if this.autoFocus (modifier dAutoFocus))}}...attributes/></div>diff --git a/frontend/discourse/app/components/d-otp/slot.gjs b/frontend/discourse/app/ui-kit/d-otp/slot.gjssimilarity index 89%rename from frontend/discourse/app/components/d-otp/slot.gjsrename to frontend/discourse/app/ui-kit/d-otp/slot.gjsindex 4d9a5502a57..9156581e9e2 100644--- a/frontend/discourse/app/components/d-otp/slot.gjs+++ b/frontend/discourse/app/ui-kit/d-otp/slot.gjs@@ -1,6 +1,6 @@import Component from "@glimmer/component";import { isBlank } from "@ember/utils";-import concatClass from "discourse/helpers/concat-class";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";const PLACEHOLDER_CHAR = "-";@@ -27,7 +27,7 @@ export default class Slot extends Component {<template><div- class={{concatClass+ class={{dConcatClass"d-otp-slot"(if @isFocused "--is-focused")(if this.showCursor "--show-cursor")diff --git a/frontend/discourse/app/components/d-page-action-button.gjs b/frontend/discourse/app/ui-kit/d-page-action-button.gjssimilarity index 98%rename from frontend/discourse/app/components/d-page-action-button.gjsrename to frontend/discourse/app/ui-kit/d-page-action-button.gjsindex 31965e885d5..2946cd6bd56 100644--- a/frontend/discourse/app/components/d-page-action-button.gjs+++ b/frontend/discourse/app/ui-kit/d-page-action-button.gjs@@ -1,5 +1,5 @@import { hash } from "@ember/helper";-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";export const DPageActionButton = <template><DButtondiff --git a/frontend/discourse/app/components/d-page-header.gjs b/frontend/discourse/app/ui-kit/d-page-header.gjssimilarity index 91%rename from frontend/discourse/app/components/d-page-header.gjsrename to frontend/discourse/app/ui-kit/d-page-header.gjsindex 6108aafb53a..584d16054f3 100644--- a/frontend/discourse/app/components/d-page-header.gjs+++ b/frontend/discourse/app/ui-kit/d-page-header.gjs@@ -3,7 +3,12 @@ import { tracked } from "@glimmer/tracking";import { hash } from "@ember/helper";import { service } from "@ember/service";import { trustHTML } from "@ember/template";-import DBreadcrumbsContainer from "discourse/components/d-breadcrumbs-container";+import DMenu from "discourse/float-kit/components/d-menu";+import { bind } from "discourse/lib/decorators";+import { or } from "discourse/truth-helpers";+import DBreadcrumbsContainer from "discourse/ui-kit/d-breadcrumbs-container";+import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";+import DHorizontalOverflowNav from "discourse/ui-kit/d-horizontal-overflow-nav";import {DangerActionListItem,DangerButton,@@ -12,12 +17,7 @@ import {PrimaryButton,WrappedActionListItem,WrappedButton,-} from "discourse/components/d-page-action-button";-import DropdownMenu from "discourse/components/dropdown-menu";-import HorizontalOverflowNav from "discourse/components/horizontal-overflow-nav";-import DMenu from "discourse/float-kit/components/d-menu";-import { bind } from "discourse/lib/decorators";-import { or } from "discourse/truth-helpers";+} from "discourse/ui-kit/d-page-action-button";import { i18n } from "discourse-i18n";const HEADLESS_ACTIONS = ["new", "edit"];@@ -100,7 +100,7 @@ export default class DPageHeader extends Component {class="btn-small btn-default"><:content>- <DropdownMenu class="d-page-header__mobile-actions">+ <DDropdownMenu class="d-page-header__mobile-actions">{{#let(hashPrimary=DefaultActionListItem@@ -116,7 +116,7 @@ export default class DPageHeader extends Component {<@headerActionComponent @actions={{actions}} />{{/if}}{{/let}}- </DropdownMenu>+ </DDropdownMenu></:content></DMenu>{{else}}@@ -160,9 +160,9 @@ export default class DPageHeader extends Component {{{#unless @hideTabs}}<div class="d-nav-submenu">- <HorizontalOverflowNav class="d-nav-submenu__tabs">+ <DHorizontalOverflowNav class="d-nav-submenu__tabs">{{yield to="tabs"}}- </HorizontalOverflowNav>+ </DHorizontalOverflowNav></div>{{/unless}}</div>diff --git a/frontend/discourse/app/components/d-page-subheader.gjs b/frontend/discourse/app/ui-kit/d-page-subheader.gjssimilarity index 91%rename from frontend/discourse/app/components/d-page-subheader.gjsrename to frontend/discourse/app/ui-kit/d-page-subheader.gjsindex 7a56756ad40..9c83a550b0d 100644--- a/frontend/discourse/app/components/d-page-subheader.gjs+++ b/frontend/discourse/app/ui-kit/d-page-subheader.gjs@@ -2,6 +2,8 @@ import Component from "@glimmer/component";import { hash } from "@ember/helper";import { service } from "@ember/service";import { trustHTML } from "@ember/template";+import DMenu from "discourse/float-kit/components/d-menu";+import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";import {DangerActionListItem,DangerButton,@@ -10,9 +12,7 @@ import {PrimaryButton,WrappedActionListItem,WrappedButton,-} from "discourse/components/d-page-action-button";-import DropdownMenu from "discourse/components/dropdown-menu";-import DMenu from "discourse/float-kit/components/d-menu";+} from "discourse/ui-kit/d-page-action-button";import { i18n } from "discourse-i18n";export default class DPageSubheader extends Component {@@ -42,7 +42,7 @@ export default class DPageSubheader extends Component {class="btn-small btn-default"><:content>- <DropdownMenu class="d-page-subheader__mobile-actions">+ <DDropdownMenu class="d-page-subheader__mobile-actions">{{yield(hashPrimary=DefaultActionListItem@@ -52,7 +52,7 @@ export default class DPageSubheader extends Component {)to="actions"}}- </DropdownMenu>+ </DDropdownMenu></:content></DMenu>{{else}}diff --git a/frontend/discourse/app/components/password-field.js b/frontend/discourse/app/ui-kit/d-password-field.jssimilarity index 88%rename from frontend/discourse/app/components/password-field.jsrename to frontend/discourse/app/ui-kit/d-password-field.jsindex 46af0df6fbd..40e9e8a985e 100644--- a/frontend/discourse/app/components/password-field.js+++ b/frontend/discourse/app/ui-kit/d-password-field.js@@ -1,10 +1,10 @@-import TextField from "discourse/components/text-field";+import DTextField from "discourse/ui-kit/d-text-field";/**Same as text-field, but with special features for a password input.Be sure to test on a variety of browsers and operating systems when changing this logic.**/-export default class PasswordField extends TextField {+export default class DPasswordField extends DTextField {canToggle = false;keyPress(e) {diff --git a/frontend/discourse/app/components/pick-files-button.gjs b/frontend/discourse/app/ui-kit/d-pick-files-button.gjssimilarity index 94%rename from frontend/discourse/app/components/pick-files-button.gjsrename to frontend/discourse/app/ui-kit/d-pick-files-button.gjsindex 05f0a876025..9fddda46409 100644--- a/frontend/discourse/app/components/pick-files-button.gjs+++ b/frontend/discourse/app/ui-kit/d-pick-files-button.gjs@@ -5,8 +5,6 @@ import didInsert from "@ember/render-modifiers/modifiers/did-insert";import { service } from "@ember/service";import { isBlank } from "@ember/utils";import { classNames } from "@ember-decorators/component";-import DButton from "discourse/components/d-button";-import concatClass from "discourse/helpers/concat-class";import noop from "discourse/helpers/noop";import { bind } from "discourse/lib/decorators";import {@@ -14,6 +12,8 @@ import {authorizesAllExtensions,} from "discourse/lib/uploads";import { or } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";// This picker is intended to be used with UppyUploadMixin or with@@ -25,7 +25,7 @@ import { i18n } from "discourse-i18n";// is sometimes useful if you need to do something outside the uppy upload with// the file, such as directly using JSON or CSV data from a file in JS.@classNames("pick-files-button")-export default class PickFilesButton extends Component {+export default class DPickFilesButton extends Component {@service dialog;fileInputId = null;@@ -132,7 +132,7 @@ export default class PickFilesButton extends Component {@action={{this.openSystemFilePicker}}@label={{this.label}}@icon={{this.icon}}- class={{concatClass this.class "btn-default"}}+ class={{dConcatClass this.class "btn-default"}}/>{{/if}}{{#if this.acceptsAllFormats}}diff --git a/frontend/discourse/app/components/popup-input-tip.gjs b/frontend/discourse/app/ui-kit/d-popup-input-tip.gjssimilarity index 90%rename from frontend/discourse/app/components/popup-input-tip.gjsrename to frontend/discourse/app/ui-kit/d-popup-input-tip.gjsindex 3960a379a47..ad46bd28b30 100644--- a/frontend/discourse/app/components/popup-input-tip.gjs+++ b/frontend/discourse/app/ui-kit/d-popup-input-tip.gjs@@ -9,12 +9,12 @@ import {classNameBindings,tagName,} from "@ember-decorators/component";-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";@tagName("a")@classNameBindings(":popup-tip", "good", "bad", "lastShownAt::hide")@attributeBindings("role", "ariaLabel", "tabindex")-export default class PopupInputTip extends Component {+export default class DPopupInputTip extends Component {@service composer;tipReason = null;@@ -82,5 +82,5 @@ export default class PopupInputTip extends Component {}}- <template>{{this.tipReason}} {{icon "circle-xmark"}}</template>+ <template>{{this.tipReason}} {{dIcon "circle-xmark"}}</template>}diff --git a/frontend/discourse/app/components/radio-button.js b/frontend/discourse/app/ui-kit/d-radio-button.jssimilarity index 93%rename from frontend/discourse/app/components/radio-button.jsrename to frontend/discourse/app/ui-kit/d-radio-button.jsindex d39ecea1027..e49c24164ae 100644--- a/frontend/discourse/app/components/radio-button.js+++ b/frontend/discourse/app/ui-kit/d-radio-button.js@@ -12,7 +12,7 @@ import $ from "jquery";"checked:checked","disabled:disabled")-export default class RadioButton extends Component {+export default class DRadioButton extends Component {type = "radio";click() {diff --git a/frontend/discourse/app/ui-kit/d-relative-date.gjs b/frontend/discourse/app/ui-kit/d-relative-date.gjsnew file mode 100644index 00000000000..6829f21fff0--- /dev/null+++ b/frontend/discourse/app/ui-kit/d-relative-date.gjs@@ -0,0 +1,5 @@+import dAgeWithTooltip from "discourse/ui-kit/helpers/d-age-with-tooltip";++const DRelativeDate = <template>{{dAgeWithTooltip @date}}</template>;++export default DRelativeDate;diff --git a/frontend/discourse/app/components/relative-time-picker.gjs b/frontend/discourse/app/ui-kit/d-relative-time-picker.gjssimilarity index 98%rename from frontend/discourse/app/components/relative-time-picker.gjsrename to frontend/discourse/app/ui-kit/d-relative-time-picker.gjsindex 4232a575d7b..09fbe2f115a 100644--- a/frontend/discourse/app/components/relative-time-picker.gjs+++ b/frontend/discourse/app/ui-kit/d-relative-time-picker.gjs@@ -52,7 +52,7 @@ function intervalFromMinutes(minutes) {}}-export default class RelativeTimePicker extends Component {+export default class DRelativeTimePicker extends Component {@tracked inputValue;@tracked duration;@tracked interval;diff --git a/frontend/discourse/app/components/responsive-table.gjs b/frontend/discourse/app/ui-kit/d-responsive-table.gjssimilarity index 71%rename from frontend/discourse/app/components/responsive-table.gjsrename to frontend/discourse/app/ui-kit/d-responsive-table.gjsindex 6927ea786b7..cd95b17701b 100644--- a/frontend/discourse/app/components/responsive-table.gjs+++ b/frontend/discourse/app/ui-kit/d-responsive-table.gjs@@ -1,13 +1,13 @@import HorizontalScrollSyncWrapper from "discourse/components/horizontal-scroll-sync-wrapper";-import concatClass from "discourse/helpers/concat-class";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";-const ResponsiveTable = <template>+const DResponsiveTable = <template><HorizontalScrollSyncWrapper class="directory-table-container" ...attributes><divrole="table"aria-label={{@ariaLabel}}style={{@style}}- class={{concatClass "directory-table" @className}}+ class={{dConcatClass "directory-table" @className}}><div class="directory-table__header">{{yield to="header"}}@@ -20,4 +20,4 @@ const ResponsiveTable = <template></HorizontalScrollSyncWrapper></template>;-export default ResponsiveTable;+export default DResponsiveTable;diff --git a/frontend/discourse/app/components/save-controls.gjs b/frontend/discourse/app/ui-kit/d-save-controls.gjssimilarity index 89%rename from frontend/discourse/app/components/save-controls.gjsrename to frontend/discourse/app/ui-kit/d-save-controls.gjsindex a5bd00e597c..756d142998e 100644--- a/frontend/discourse/app/components/save-controls.gjs+++ b/frontend/discourse/app/ui-kit/d-save-controls.gjs@@ -2,11 +2,11 @@import Component from "@ember/component";import { computed } from "@ember/object";import { tagName } from "@ember-decorators/component";-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";@tagName("")-export default class SaveControls extends Component {+export default class DSaveControls extends Component {@computed("model.isSaving", "saveDisabled")get buttonDisabled() {return this.model?.isSaving || this.saveDisabled;diff --git a/frontend/discourse/app/components/second-factor-input.gjs b/frontend/discourse/app/ui-kit/d-second-factor-input.gjssimilarity index 79%rename from frontend/discourse/app/components/second-factor-input.gjsrename to frontend/discourse/app/ui-kit/d-second-factor-input.gjsindex 63c36e680ee..fb46906a57d 100644--- a/frontend/discourse/app/components/second-factor-input.gjs+++ b/frontend/discourse/app/ui-kit/d-second-factor-input.gjs@@ -1,18 +1,18 @@import Component from "@glimmer/component";import { on } from "@ember/modifier";-import DOTP from "discourse/components/d-otp";import withEventValue from "discourse/helpers/with-event-value";import { SECOND_FACTOR_METHODS } from "discourse/models/user";-import autoFocus from "discourse/modifiers/auto-focus";+import DOtp from "discourse/ui-kit/d-otp";+import dAutoFocus from "discourse/ui-kit/modifiers/d-auto-focus";-export default class SecondFactorInput extends Component {+export default class DSecondFactorInput extends Component {get isTotp() {return this.args.secondFactorMethod === SECOND_FACTOR_METHODS.TOTP;}<template>{{#if this.isTotp}}- <DOTP+ <DOtp@onFill={{@onFill}}@onChange={{@onChange}}class="second-factor-token-input"@@ -29,7 +29,7 @@ export default class SecondFactorInput extends Component {class="second-factor-token-input"...attributes{{on "input" (withEventValue @onChange)}}- {{autoFocus}}+ {{dAutoFocus}}/>{{/if}}</template>diff --git a/frontend/discourse/app/components/d-select.gjs b/frontend/discourse/app/ui-kit/d-select.gjssimilarity index 100%rename from frontend/discourse/app/components/d-select.gjsrename to frontend/discourse/app/ui-kit/d-select.gjsdiff --git a/frontend/discourse/app/components/small-user-list.gjs b/frontend/discourse/app/ui-kit/d-small-user-list.gjssimilarity index 92%rename from frontend/discourse/app/components/small-user-list.gjsrename to frontend/discourse/app/ui-kit/d-small-user-list.gjsindex 096a5042ad4..3fc4add386d 100644--- a/frontend/discourse/app/components/small-user-list.gjs+++ b/frontend/discourse/app/ui-kit/d-small-user-list.gjs@@ -1,10 +1,10 @@import Component from "@glimmer/component";import { service } from "@ember/service";import PluginOutlet from "discourse/components/plugin-outlet";-import avatar from "discourse/helpers/bound-avatar-template";import getURL from "discourse/lib/get-url";import { applyValueTransformer } from "discourse/lib/transformer";import { userPath } from "discourse/lib/url";+import dBoundAvatarTemplate from "discourse/ui-kit/helpers/d-bound-avatar-template";import { i18n } from "discourse-i18n";export function smallUserAttrs(user) {@@ -21,7 +21,7 @@ export function smallUserAttrs(user) {});}-export default class SmallUserList extends Component {+export default class DSmallUserList extends Component {@service currentUser;get users() {@@ -74,7 +74,7 @@ export default class SmallUserList extends Component {aria-hidden="false"role="listitem">- {{avatar user.template "tiny"}}+ {{dBoundAvatarTemplate user.template "tiny"}}</a>{{/if}}{{/each}}diff --git a/frontend/discourse/app/components/d-stat-tiles.gjs b/frontend/discourse/app/ui-kit/d-stat-tiles.gjssimilarity index 100%rename from frontend/discourse/app/components/d-stat-tiles.gjsrename to frontend/discourse/app/ui-kit/d-stat-tiles.gjsdiff --git a/frontend/discourse/app/components/table-header-toggle.gjs b/frontend/discourse/app/ui-kit/d-table-header-toggle.gjssimilarity index 93%rename from frontend/discourse/app/components/table-header-toggle.gjsrename to frontend/discourse/app/ui-kit/d-table-header-toggle.gjsindex ad9530eb74b..7b37045f293 100644--- a/frontend/discourse/app/components/table-header-toggle.gjs+++ b/frontend/discourse/app/ui-kit/d-table-header-toggle.gjs@@ -2,10 +2,10 @@ import Component from "@glimmer/component";import { on } from "@ember/modifier";import { action } from "@ember/object";import { schedule } from "@ember/runloop";-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";-export default class TableHeaderToggle extends Component {+export default class DTableHeaderToggle extends Component {get id() {return `table-header-toggle-${this.args.field.replace(/\s/g, "")}`;}@@ -116,11 +116,11 @@ export default class TableHeaderToggle extends Component {{{yield}}<span class="text">{{#if this.iconName}}- {{icon this.iconName}}+ {{dIcon this.iconName}}{{/if}}{{this.label}}{{#if this.chevronIcon}}- {{icon this.chevronIcon}}+ {{dIcon this.chevronIcon}}{{/if}}</span></div>diff --git a/frontend/discourse/app/components/tap-tile-grid.gjs b/frontend/discourse/app/ui-kit/d-tap-tile-grid.gjssimilarity index 86%rename from frontend/discourse/app/components/tap-tile-grid.gjsrename to frontend/discourse/app/ui-kit/d-tap-tile-grid.gjsindex 9714719e044..51a0b44bd3e 100644--- a/frontend/discourse/app/components/tap-tile-grid.gjs+++ b/frontend/discourse/app/ui-kit/d-tap-tile-grid.gjs@@ -4,7 +4,7 @@ import { hash } from "@ember/helper";import { tagName } from "@ember-decorators/component";@tagName("")-export default class TapTileGrid extends Component {+export default class DTapTileGrid extends Component {activeTile = null;<template>diff --git a/frontend/discourse/app/components/tap-tile.gjs b/frontend/discourse/app/ui-kit/d-tap-tile.gjssimilarity index 90%rename from frontend/discourse/app/components/tap-tile.gjsrename to frontend/discourse/app/ui-kit/d-tap-tile.gjsindex 0c9e25baa11..78f8571fe4f 100644--- a/frontend/discourse/app/components/tap-tile.gjs+++ b/frontend/discourse/app/ui-kit/d-tap-tile.gjs@@ -7,13 +7,13 @@ import {classNameBindings,classNames,} from "@ember-decorators/component";-import icon from "discourse/helpers/d-icon";import { deepEqual } from "discourse/lib/object";+import dIcon from "discourse/ui-kit/helpers/d-icon";@classNames("tap-tile")@classNameBindings("active")@attributeBindings("role", "ariaPressed", "tabIndex")-export default class TapTile extends Component {+export default class DTapTile extends Component {role = "button";tabIndex = 0;@@ -54,7 +54,7 @@ export default class TapTile extends Component {<template>{{#if this.icon}}- {{icon this.icon}}+ {{dIcon this.icon}}{{/if}}{{yield}}</template>diff --git a/frontend/discourse/app/components/text-field.js b/frontend/discourse/app/ui-kit/d-text-field.jssimilarity index 93%rename from frontend/discourse/app/components/text-field.jsrename to frontend/discourse/app/ui-kit/d-text-field.jsindex 2cda1efb5c1..eb31164f341 100644--- a/frontend/discourse/app/components/text-field.js+++ b/frontend/discourse/app/ui-kit/d-text-field.js@@ -1,10 +1,10 @@import { computed } from "@ember/object";import { cancel, next } from "@ember/runloop";import { attributeBindings } from "@ember-decorators/component";+import TextField from "discourse/components/ember-text-field";import discourseDebounce from "discourse/lib/debounce";import { siteDir } from "discourse/lib/text-direction";import { i18n } from "discourse-i18n";-import TextField from "./ember-text-field";const DEBOUNCE_MS = 500;@@ -18,7 +18,7 @@ const DEBOUNCE_MS = 500;"aria-label","aria-controls")-export default class DiscourseTextField extends TextField {+export default class DTextField extends TextField {_prevValue = null;_timer = null;diff --git a/frontend/discourse/app/components/textarea.gjs b/frontend/discourse/app/ui-kit/d-textarea.gjssimilarity index 94%rename from frontend/discourse/app/components/textarea.gjsrename to frontend/discourse/app/ui-kit/d-textarea.gjsindex 62737fd473e..63548178567 100644--- a/frontend/discourse/app/components/textarea.gjs+++ b/frontend/discourse/app/ui-kit/d-textarea.gjs@@ -34,7 +34,7 @@ function sendAction(eventName, view, event) {}// eslint-disable-next-line ember/no-classic-classes-const TextArea = Component.extend({+const DTextarea = Component.extend({classNames: ["ember-text-area"],tagName: "textarea",@@ -63,6 +63,7 @@ const TextArea = Component.extend({"spellcheck","tabindex","title",+ "aria-label",],rows: null,cols: null,@@ -131,6 +132,6 @@ const TextArea = Component.extend({},});-TextArea.toString = () => "@ember/component/text-area";+DTextarea.toString = () => "@ember/component/text-area";-export default TextArea;+export default DTextarea;diff --git a/frontend/discourse/app/components/time-input.gjs b/frontend/discourse/app/ui-kit/d-time-input.gjssimilarity index 98%rename from frontend/discourse/app/components/time-input.gjsrename to frontend/discourse/app/ui-kit/d-time-input.gjsindex 9049b2f46ea..0ba59edf517 100644--- a/frontend/discourse/app/components/time-input.gjs+++ b/frontend/discourse/app/ui-kit/d-time-input.gjs@@ -37,7 +37,7 @@ function convertMinutesToDurationString(n) {}@tagName("")-export default class TimeInput extends Component {+export default class DTimeInput extends Component {hours = null;minutes = null;relativeDate = null;diff --git a/frontend/discourse/app/components/time-shortcut-picker.gjs b/frontend/discourse/app/ui-kit/d-time-shortcut-picker.gjssimilarity index 94%rename from frontend/discourse/app/components/time-shortcut-picker.gjsrename to frontend/discourse/app/ui-kit/d-time-shortcut-picker.gjsindex f4a0caa344c..ca32b63bb0c 100644--- a/frontend/discourse/app/components/time-shortcut-picker.gjs+++ b/frontend/discourse/app/ui-kit/d-time-shortcut-picker.gjs@@ -5,10 +5,6 @@ import { action, computed } from "@ember/object";import { tagName } from "@ember-decorators/component";import { observes, on } from "@ember-decorators/object";import DatePickerFuture from "discourse/components/date-picker-future";-import RelativeTimePicker from "discourse/components/relative-time-picker";-import TapTile from "discourse/components/tap-tile";-import TapTileGrid from "discourse/components/tap-tile-grid";-import icon from "discourse/helpers/d-icon";import {defaultTimeShortcuts,formatTime,@@ -17,6 +13,10 @@ import {TIME_SHORTCUT_TYPES,} from "discourse/lib/time-shortcut";import { laterToday, now, parseCustomDatetime } from "discourse/lib/time-utils";+import DRelativeTimePicker from "discourse/ui-kit/d-relative-time-picker";+import DTapTile from "discourse/ui-kit/d-tap-tile";+import DTapTileGrid from "discourse/ui-kit/d-tap-tile-grid";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";const BINDINGS = {@@ -45,7 +45,7 @@ const BINDINGS = {};@tagName("")-export default class TimeShortcutPicker extends Component {+export default class DTimeShortcutPicker extends Component {userTimezone = null;onTimeSelected = null;@@ -295,10 +295,10 @@ export default class TimeShortcutPicker extends Component {}<template>- <TapTileGrid @activeTile={{this.selectedShortcut}} as |grid|>+ <DTapTileGrid @activeTile={{this.selectedShortcut}} as |grid|>{{#each this.options key="id" as |option|}}{{#unless option.hidden}}- <TapTile+ <DTapTile@tileId={{option.id}}@activeTile={{grid.activeTile}}@onChange={{this.selectShortcut}}@@ -306,14 +306,14 @@ export default class TimeShortcutPicker extends Component {<div class="tap-tile-title">{{i18n option.label}}</div><div class="tap-tile-date">{{option.timeFormatted}}</div>- </TapTile>+ </DTapTile>{{/unless}}{{#if option.isCustomTimeShortcut}}{{#if this.customDatetimeSelected}}<div class="control-group custom-date-time-wrap custom-input-wrap"><div class="tap-tile-date-input">- {{icon "calendar-days"}}+ {{dIcon "calendar-days"}}<DatePickerFuture@value={{this.customDate}}@defaultDate={{this.defaultCustomDate}}@@ -322,7 +322,7 @@ export default class TimeShortcutPicker extends Component {/></div><div class="tap-tile-time-input">- {{icon "far-clock"}}+ {{dIcon "far-clock"}}<Inputplaceholder="--:--"id="custom-time"@@ -338,7 +338,7 @@ export default class TimeShortcutPicker extends Component {<label class="control-label" for="bookmark-relative-time-picker">{{i18n "relative_time_picker.relative"}}</label>- <RelativeTimePicker+ <DRelativeTimePicker@durationMinutes={{this.selectedDurationMins}}@onChange={{this.relativeTimeChanged}}id="bookmark-relative-time-picker"@@ -347,6 +347,6 @@ export default class TimeShortcutPicker extends Component {{{/if}}{{/if}}{{/each}}- </TapTileGrid>+ </DTapTileGrid></template>}diff --git a/frontend/discourse/app/components/toggle-password-mask.gjs b/frontend/discourse/app/ui-kit/d-toggle-password-mask.gjssimilarity index 69%rename from frontend/discourse/app/components/toggle-password-mask.gjsrename to frontend/discourse/app/ui-kit/d-toggle-password-mask.gjsindex e5f0163bab4..56ea1d885ef 100644--- a/frontend/discourse/app/components/toggle-password-mask.gjs+++ b/frontend/discourse/app/ui-kit/d-toggle-password-mask.gjs@@ -1,6 +1,6 @@-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";-const TogglePasswordMask = <template>+const DTogglePasswordMask = <template><DButton@action={{@togglePasswordMask}}@icon={{if @maskPassword "far-eye" "far-eye-slash"}}@@ -13,4 +13,4 @@ const TogglePasswordMask = <template>/></template>;-export default TogglePasswordMask;+export default DTogglePasswordMask;diff --git a/frontend/discourse/app/components/d-toggle-switch.gjs b/frontend/discourse/app/ui-kit/d-toggle-switch.gjssimilarity index 91%rename from frontend/discourse/app/components/d-toggle-switch.gjsrename to frontend/discourse/app/ui-kit/d-toggle-switch.gjsindex 5e80405ac4d..7005882e035 100644--- a/frontend/discourse/app/components/d-toggle-switch.gjs+++ b/frontend/discourse/app/ui-kit/d-toggle-switch.gjs@@ -1,5 +1,5 @@import Component from "@glimmer/component";-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class DToggleSwitch extends Component {@@ -23,7 +23,7 @@ export default class DToggleSwitch extends Component {<span class="d-toggle-switch__checkbox-slider">{{#if @state}}- {{icon "check"}}+ {{dIcon "check"}}{{/if}}</span></label>diff --git a/frontend/discourse/app/components/user-avatar-flair.gjs b/frontend/discourse/app/ui-kit/d-user-avatar-flair.gjssimilarity index 88%rename from frontend/discourse/app/components/user-avatar-flair.gjsrename to frontend/discourse/app/ui-kit/d-user-avatar-flair.gjsindex 38be1564eb2..c927c129115 100644--- a/frontend/discourse/app/components/user-avatar-flair.gjs+++ b/frontend/discourse/app/ui-kit/d-user-avatar-flair.gjs@@ -1,9 +1,9 @@import Component from "@glimmer/component";import { service } from "@ember/service";-import AvatarFlair from "discourse/components/avatar-flair";import autoGroupFlairForUser from "discourse/lib/avatar-flair";+import DAvatarFlair from "discourse/ui-kit/d-avatar-flair";-export default class UserAvatarFlair extends Component {+export default class DUserAvatarFlair extends Component {@service site;get flair() {@@ -35,7 +35,7 @@ export default class UserAvatarFlair extends Component {<template>{{#if this.flair}}- <AvatarFlair+ <DAvatarFlair@flairName={{this.flair.flairName}}@flairUrl={{this.flair.flairUrl}}@flairBgColor={{this.flair.flairBgColor}}diff --git a/frontend/discourse/app/components/user-avatar.gjs b/frontend/discourse/app/ui-kit/d-user-avatar.gjssimilarity index 77%rename from frontend/discourse/app/components/user-avatar.gjsrename to frontend/discourse/app/ui-kit/d-user-avatar.gjsindex b444e815a19..01e9ee93782 100644--- a/frontend/discourse/app/components/user-avatar.gjs+++ b/frontend/discourse/app/ui-kit/d-user-avatar.gjs@@ -1,11 +1,11 @@import Component from "@glimmer/component";import { service } from "@ember/service";-import UserLink from "discourse/components/user-link";-import avatar from "discourse/helpers/avatar";-import concatClass from "discourse/helpers/concat-class";+import DUserLink from "discourse/ui-kit/d-user-link";+import dAvatar from "discourse/ui-kit/helpers/d-avatar";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";// TODO (saquetim) the pattern <a>{{avatar ...}}</a> is used a lot. Should we replace it with this component to ensure consistency???-export default class UserAvatar extends Component {+export default class DUserAvatar extends Component {@service currentUser;@service siteSettings;@@ -30,22 +30,22 @@ export default class UserAvatar extends Component {}<template>- <UserLink+ <DUserLink...attributes@ariaHidden={{@ariaHidden}}@ariaLabel={{@ariaLabel}}@href={{@href}}@user={{@user}}>- {{avatar+ {{dAvatar@user- extraClasses=(concatClass+ extraClasses=(dConcatClass@avatarClasses (if this.hideFromAnonUser "non-clickable"))imageSize=@sizehideTitle=@hideTitleloading=(if @lazy "lazy")}}- </UserLink>+ </DUserLink></template>}diff --git a/frontend/discourse/app/components/user-info.gjs b/frontend/discourse/app/ui-kit/d-user-info.gjssimilarity index 86%rename from frontend/discourse/app/components/user-info.gjsrename to frontend/discourse/app/ui-kit/d-user-info.gjsindex ed964e092c7..6d3da8e9851 100644--- a/frontend/discourse/app/components/user-info.gjs+++ b/frontend/discourse/app/ui-kit/d-user-info.gjs@@ -3,18 +3,18 @@ import Component from "@ember/component";import { computed, set } from "@ember/object";import { tagName } from "@ember-decorators/component";import PluginOutlet from "discourse/components/plugin-outlet";-import UserAvatarFlair from "discourse/components/user-avatar-flair";-import UserStatusMessage from "discourse/components/user-status-message";-import avatar from "discourse/helpers/avatar";-import concatClass from "discourse/helpers/concat-class";import formatUsername from "discourse/helpers/format-username";import lazyHash from "discourse/helpers/lazy-hash";import { prioritizeNameInUx } from "discourse/lib/settings";import { userPath } from "discourse/lib/url";import { and } from "discourse/truth-helpers";+import DUserAvatarFlair from "discourse/ui-kit/d-user-avatar-flair";+import DUserStatusMessage from "discourse/ui-kit/d-user-status-message";+import dAvatar from "discourse/ui-kit/helpers/d-avatar";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";@tagName("")-export default class UserInfo extends Component {+export default class DUserInfo extends Component {size = "small";includeLink = true;includeAvatar = true;@@ -51,7 +51,7 @@ export default class UserInfo extends Component {<template><divdata-username={{this.dataUsername}}- class={{concatClass "user-info" this.size}}+ class={{dConcatClass "user-info" this.size}}...attributes>{{#if this.includeAvatar}}@@ -61,14 +61,14 @@ export default class UserInfo extends Component {href={{this.userPath}}data-user-card={{@user.username}}aria-hidden="true"- >{{avatar @user imageSize="large"}}</a>- <UserAvatarFlair @user={{@user}} />+ >{{dAvatar @user imageSize="large"}}</a>+ <DUserAvatarFlair @user={{@user}} /></div></div>{{/if}}<div class="user-detail"><div- class={{concatClass+ class={{dConcatClass"name-line"(if @showStatus "--show-status")(if this.nameFirst "--name-first")@@ -88,7 +88,7 @@ export default class UserInfo extends Component {<span class="username">{{formatUsername @user.username}}</span>{{/if}}{{#if (and @showStatus @user.status)}}- <UserStatusMessage+ <DUserStatusMessage@status={{@user.status}}@showDescription={{@showStatusDescription}}/>diff --git a/frontend/discourse/app/components/user-link.gjs b/frontend/discourse/app/ui-kit/d-user-link.gjssimilarity index 96%rename from frontend/discourse/app/components/user-link.gjsrename to frontend/discourse/app/ui-kit/d-user-link.gjsindex b8f3127228a..f5e83703aa4 100644--- a/frontend/discourse/app/components/user-link.gjs+++ b/frontend/discourse/app/ui-kit/d-user-link.gjs@@ -3,7 +3,7 @@ import { service } from "@ember/service";import { userPath } from "discourse/lib/url";import { i18n } from "discourse-i18n";-export default class UserLink extends Component {+export default class DUserLink extends Component {@service currentUser;@service siteSettings;diff --git a/frontend/discourse/app/components/user-stat.gjs b/frontend/discourse/app/ui-kit/d-user-stat.gjssimilarity index 65%rename from frontend/discourse/app/components/user-stat.gjsrename to frontend/discourse/app/ui-kit/d-user-stat.gjsindex e44bc324ad6..92296ec9987 100644--- a/frontend/discourse/app/components/user-stat.gjs+++ b/frontend/discourse/app/ui-kit/d-user-stat.gjs@@ -1,11 +1,11 @@import Component from "@glimmer/component";import { trustHTML } from "@ember/template";-import icon from "discourse/helpers/d-icon";-import formatDuration from "discourse/helpers/format-duration";-import number from "discourse/helpers/number";+import dFormatDuration from "discourse/ui-kit/helpers/d-format-duration";+import dIcon from "discourse/ui-kit/helpers/d-icon";+import dNumber from "discourse/ui-kit/helpers/d-number";import { i18n } from "discourse-i18n";-export default class UserStat extends Component {+export default class DUserStat extends Component {get type() {return this.args.type ?? "number";}@@ -22,15 +22,15 @@ export default class UserStat extends Component {<div class="user-stat"><span class="value" title={{@rawTitle}}>{{#if this.isNumber}}- {{number @value}}+ {{dNumber @value}}{{else if this.isDuration}}- {{formatDuration @value}}+ {{dFormatDuration @value}}{{else}}{{@value}}{{/if}}</span><span class="label">- {{#if @icon}}{{icon @icon}}{{/if}}+ {{#if @icon}}{{dIcon @icon}}{{/if}}{{trustHTML (i18n @label count=@value)}}</span></div>diff --git a/frontend/discourse/app/components/user-status-message.gjs b/frontend/discourse/app/ui-kit/d-user-status-message.gjssimilarity index 85%rename from frontend/discourse/app/components/user-status-message.gjsrename to frontend/discourse/app/ui-kit/d-user-status-message.gjsindex 5665d589b52..9d90b7fd70e 100644--- a/frontend/discourse/app/components/user-status-message.gjs+++ b/frontend/discourse/app/ui-kit/d-user-status-message.gjs@@ -1,10 +1,10 @@import Component from "@glimmer/component";import { service } from "@ember/service";import DTooltip from "discourse/float-kit/components/d-tooltip";-import emoji from "discourse/helpers/emoji";import { until } from "discourse/lib/formatter";+import dEmoji from "discourse/ui-kit/helpers/d-emoji";-export default class UserStatusMessage extends Component {+export default class DUserStatusMessage extends Component {@service currentUser;get until() {@@ -27,7 +27,7 @@ export default class UserStatusMessage extends Component {...attributes><:trigger>- {{emoji @status.emoji skipTitle=true}}+ {{dEmoji @status.emoji skipTitle=true}}{{#if @showDescription}}<span class="user-status-message-description">{{@status.description}}@@ -35,7 +35,7 @@ export default class UserStatusMessage extends Component {{{/if}}</:trigger><:content>- {{emoji @status.emoji skipTitle=true}}+ {{dEmoji @status.emoji skipTitle=true}}<div class="user-status-tooltip-wrapper"><span class="user-status-tooltip-description">{{@status.description}}diff --git a/frontend/discourse/app/helpers/age-with-tooltip.js b/frontend/discourse/app/ui-kit/helpers/d-age-with-tooltip.jssimilarity index 80%rename from frontend/discourse/app/helpers/age-with-tooltip.jsrename to frontend/discourse/app/ui-kit/helpers/d-age-with-tooltip.jsindex 120fb859c62..8ddab808712 100644--- a/frontend/discourse/app/helpers/age-with-tooltip.js+++ b/frontend/discourse/app/ui-kit/helpers/d-age-with-tooltip.js@@ -1,7 +1,7 @@import { trustHTML } from "@ember/template";import { autoUpdatingRelativeAge } from "discourse/lib/formatter";-export default function ageWithTooltip(dt, params = {}) {+export default function dAgeWithTooltip(dt, params = {}) {return trustHTML(autoUpdatingRelativeAge(new Date(dt), {...params,diff --git a/frontend/discourse/app/helpers/avatar.js b/frontend/discourse/app/ui-kit/helpers/d-avatar.jssimilarity index 97%rename from frontend/discourse/app/helpers/avatar.jsrename to frontend/discourse/app/ui-kit/helpers/d-avatar.jsindex 41228c40333..b0faa1d21a9 100644--- a/frontend/discourse/app/helpers/avatar.js+++ b/frontend/discourse/app/ui-kit/helpers/d-avatar.js@@ -80,6 +80,6 @@ export function renderAvatar(user, options) {}}-export default function avatar(user, params) {+export default function dAvatar(user, params) {return trustHTML(renderAvatar.call(this, user, params));}diff --git a/frontend/discourse/app/helpers/base-path.js b/frontend/discourse/app/ui-kit/helpers/d-base-path.jssimilarity index 64%rename from frontend/discourse/app/helpers/base-path.jsrename to frontend/discourse/app/ui-kit/helpers/d-base-path.jsindex 6a28abda0ed..b80c6fb82d6 100644--- a/frontend/discourse/app/helpers/base-path.js+++ b/frontend/discourse/app/ui-kit/helpers/d-base-path.js@@ -1,5 +1,5 @@import getUrl from "discourse/lib/get-url";-export default function basePath() {+export default function dBasePath() {return getUrl("");}diff --git a/frontend/discourse/app/helpers/bound-avatar-template.js b/frontend/discourse/app/ui-kit/helpers/d-bound-avatar-template.jssimilarity index 80%rename from frontend/discourse/app/helpers/bound-avatar-template.jsrename to frontend/discourse/app/ui-kit/helpers/d-bound-avatar-template.jsindex acdde3c5ed3..95e2c75466c 100644--- a/frontend/discourse/app/helpers/bound-avatar-template.js+++ b/frontend/discourse/app/ui-kit/helpers/d-bound-avatar-template.js@@ -2,7 +2,7 @@ import { trustHTML } from "@ember/template";import { isEmpty } from "@ember/utils";import { avatarImg } from "discourse/lib/avatar-utils";-export default function boundAvatarTemplate(avatarTemplate, size, options) {+export default function dBoundAvatarTemplate(avatarTemplate, size, options) {if (isEmpty(avatarTemplate)) {return trustHTML("<div class='avatar-placeholder'></div>");} else {diff --git a/frontend/discourse/app/helpers/bound-avatar.js b/frontend/discourse/app/ui-kit/helpers/d-bound-avatar.jssimilarity index 73%rename from frontend/discourse/app/helpers/bound-avatar.jsrename to frontend/discourse/app/ui-kit/helpers/d-bound-avatar.jsindex fedda219c8a..310a6b2bdc8 100644--- a/frontend/discourse/app/helpers/bound-avatar.js+++ b/frontend/discourse/app/ui-kit/helpers/d-bound-avatar.js@@ -1,9 +1,9 @@import { trustHTML } from "@ember/template";import { isEmpty } from "@ember/utils";-import { addExtraUserClasses } from "discourse/helpers/user-avatar";import { avatarImg } from "discourse/lib/avatar-utils";+import { addExtraUserClasses } from "discourse/ui-kit/helpers/d-user-avatar";-export default function boundAvatar(user, size) {+export default function dBoundAvatar(user, size) {if (isEmpty(user)) {return trustHTML("<div class='avatar-placeholder'></div>");}diff --git a/frontend/discourse/app/ui-kit/helpers/d-bound-category-link.js b/frontend/discourse/app/ui-kit/helpers/d-bound-category-link.jsnew file mode 100644index 00000000000..1520783d67d--- /dev/null+++ b/frontend/discourse/app/ui-kit/helpers/d-bound-category-link.js@@ -0,0 +1 @@+export { categoryLinkHTML as default } from "discourse/ui-kit/helpers/d-category-link";diff --git a/frontend/discourse/app/helpers/category-badge.js b/frontend/discourse/app/ui-kit/helpers/d-category-badge.jssimilarity index 66%rename from frontend/discourse/app/helpers/category-badge.jsrename to frontend/discourse/app/ui-kit/helpers/d-category-badge.jsindex 15f14e61896..610fb28e251 100644--- a/frontend/discourse/app/helpers/category-badge.js+++ b/frontend/discourse/app/ui-kit/helpers/d-category-badge.js@@ -1,7 +1,7 @@import { isPresent } from "@ember/utils";-import { categoryLinkHTML } from "discourse/helpers/category-link";+import { categoryLinkHTML } from "discourse/ui-kit/helpers/d-category-link";-export default function categoryBadge(cat, options = {}) {+export default function dCategoryBadge(cat, options = {}) {return categoryLinkHTML(cat, {hideParent: options.hideParent,allowUncategorized: options.allowUncategorized,diff --git a/frontend/discourse/app/helpers/category-link.js b/frontend/discourse/app/ui-kit/helpers/d-category-link.jssimilarity index 97%rename from frontend/discourse/app/helpers/category-link.jsrename to frontend/discourse/app/ui-kit/helpers/d-category-link.jsindex 554a0bfc964..54ebada73c2 100644--- a/frontend/discourse/app/helpers/category-link.js+++ b/frontend/discourse/app/ui-kit/helpers/d-category-link.js@@ -1,13 +1,13 @@import { get } from "@ember/object";import { trustHTML } from "@ember/template";import categoryVariables from "discourse/helpers/category-variables";-import replaceEmoji from "discourse/helpers/replace-emoji";import getURL from "discourse/lib/get-url";import { helperContext } from "discourse/lib/helpers";import { iconHTML } from "discourse/lib/icon-library";import { applyValueTransformer } from "discourse/lib/transformer";import { escapeExpression } from "discourse/lib/utilities";import Category from "discourse/models/category";+import dReplaceEmoji from "discourse/ui-kit/helpers/d-replace-emoji";import { i18n } from "discourse-i18n";let _renderer = defaultCategoryLinkRenderer;@@ -122,7 +122,9 @@ export function categoryLinkHTML(category, options) {return trustHTML(categoryBadgeHTML(category, categoryOptions));}-export default categoryLinkHTML;+export default function dCategoryLink(...args) {+ return categoryLinkHTML(...args);+}function buildTopicCount(count) {return `<span class="topic-count" aria-label="${i18n(@@ -193,7 +195,7 @@ export function defaultCategoryLinkRenderer(category, opts) {}if (opts.styleType === "emoji" && opts.emoji) {- html += replaceEmoji(`:${opts.emoji}:`);+ html += dReplaceEmoji(`:${opts.emoji}:`);}// not ideal as we have to call it manually and we pass a fake category objectdiff --git a/frontend/discourse/app/helpers/concat-class.js b/frontend/discourse/app/ui-kit/helpers/d-concat-class.jssimilarity index 69%rename from frontend/discourse/app/helpers/concat-class.jsrename to frontend/discourse/app/ui-kit/helpers/d-concat-class.jsindex d31a6adc832..c3d5b479529 100644--- a/frontend/discourse/app/helpers/concat-class.js+++ b/frontend/discourse/app/ui-kit/helpers/d-concat-class.js@@ -1,4 +1,4 @@-export default function concatClass(...args) {+export default function dConcatClass(...args) {const classes = args.flat().filter(Boolean).join(" ");if (classes.length) {diff --git a/frontend/discourse/app/helpers/dasherize.js b/frontend/discourse/app/ui-kit/helpers/d-dasherize.jssimilarity index 69%rename from frontend/discourse/app/helpers/dasherize.jsrename to frontend/discourse/app/ui-kit/helpers/d-dasherize.jsindex 02ec8926abe..51e9ece856e 100644--- a/frontend/discourse/app/helpers/dasherize.js+++ b/frontend/discourse/app/ui-kit/helpers/d-dasherize.js@@ -1,5 +1,5 @@import { dasherize as emberDasherize } from "@ember/string";-export default function dasherize(value = "") {+export default function dDasherize(value = "") {return emberDasherize(value.replace(".", "-"));}diff --git a/frontend/discourse/app/helpers/dir-span.js b/frontend/discourse/app/ui-kit/helpers/d-dir-span.jssimilarity index 91%rename from frontend/discourse/app/helpers/dir-span.jsrename to frontend/discourse/app/ui-kit/helpers/d-dir-span.jsindex 52142f3569c..aa85c0c10d0 100644--- a/frontend/discourse/app/helpers/dir-span.js+++ b/frontend/discourse/app/ui-kit/helpers/d-dir-span.js@@ -9,7 +9,7 @@ function setDir(text) {return `<span ${mixed ? 'dir="auto"' : ""}>${content}</span>`;}-export default function dirSpan(str, params = {}) {+export default function dDirSpan(str, params = {}) {let isHtmlSafe = false;if (params.htmlSafe) {isHtmlSafe = params.htmlSafe === "true";diff --git a/frontend/discourse/app/helpers/discourse-tag.js b/frontend/discourse/app/ui-kit/helpers/d-discourse-tag.jssimilarity index 72%rename from frontend/discourse/app/helpers/discourse-tag.jsrename to frontend/discourse/app/ui-kit/helpers/d-discourse-tag.jsindex e422755f95a..f0aeed88548 100644--- a/frontend/discourse/app/helpers/discourse-tag.js+++ b/frontend/discourse/app/ui-kit/helpers/d-discourse-tag.js@@ -1,6 +1,6 @@import { trustHTML } from "@ember/template";import renderTag from "discourse/lib/render-tag";-export default function discourseTag(name, params) {+export default function dDiscourseTag(name, params) {return trustHTML(renderTag(name, params));}diff --git a/frontend/discourse/app/helpers/discourse-tags.js b/frontend/discourse/app/ui-kit/helpers/d-discourse-tags.jssimilarity index 72%rename from frontend/discourse/app/helpers/discourse-tags.jsrename to frontend/discourse/app/ui-kit/helpers/d-discourse-tags.jsindex 18e45443bef..101b4300391 100644--- a/frontend/discourse/app/helpers/discourse-tags.js+++ b/frontend/discourse/app/ui-kit/helpers/d-discourse-tags.js@@ -1,6 +1,6 @@import { trustHTML } from "@ember/template";import renderTags from "discourse/lib/render-tags";-export default function discourseTags(topic, params) {+export default function dDiscourseTags(topic, params) {return trustHTML(renderTags(topic, params));}diff --git a/frontend/discourse/app/helpers/element.gjs b/frontend/discourse/app/ui-kit/helpers/d-element.gjssimilarity index 97%rename from frontend/discourse/app/helpers/element.gjsrename to frontend/discourse/app/ui-kit/helpers/d-element.gjsindex f1c18f5c2b5..9788ec3eca6 100644--- a/frontend/discourse/app/helpers/element.gjs+++ b/frontend/discourse/app/ui-kit/helpers/d-element.gjs@@ -58,7 +58,7 @@ const shortcuts = {* }* ```*/-export default function element(tagName) {+export default function dElement(tagName) {if (typeof tagName !== "string") {throw new Error(`element helper only accepts string literals, you passed ${tagName}`diff --git a/frontend/discourse/app/helpers/emoji.js b/frontend/discourse/app/ui-kit/helpers/d-emoji.jssimilarity index 84%rename from frontend/discourse/app/helpers/emoji.jsrename to frontend/discourse/app/ui-kit/helpers/d-emoji.jsindex 6e0bd5ae3bd..dba0f716794 100644--- a/frontend/discourse/app/helpers/emoji.js+++ b/frontend/discourse/app/ui-kit/helpers/d-emoji.js@@ -2,7 +2,7 @@ import { trustHTML } from "@ember/template";import { emojiUnescape } from "discourse/lib/text";import { escapeExpression } from "discourse/lib/utilities";-export default function emoji(code, options) {+export default function dEmoji(code, options) {const escaped = escapeExpression(`:${code}:`);return trustHTML(emojiUnescape(escaped, options));}diff --git a/frontend/discourse/app/helpers/format-date.js b/frontend/discourse/app/ui-kit/helpers/d-format-date.jssimilarity index 92%rename from frontend/discourse/app/helpers/format-date.jsrename to frontend/discourse/app/ui-kit/helpers/d-format-date.jsindex 46d7f83afc4..4e7bcd5de1d 100644--- a/frontend/discourse/app/helpers/format-date.js+++ b/frontend/discourse/app/ui-kit/helpers/d-format-date.js@@ -6,7 +6,7 @@ import { autoUpdatingRelativeAge } from "discourse/lib/formatter";update the dates on a regular interval.**/-export default function formatDate(val, params = {}) {+export default function dFormatDate(val, params = {}) {let leaveAgo,format = "medium",title = true;diff --git a/frontend/discourse/app/helpers/format-duration.js b/frontend/discourse/app/ui-kit/helpers/d-format-duration.jssimilarity index 74%rename from frontend/discourse/app/helpers/format-duration.jsrename to frontend/discourse/app/ui-kit/helpers/d-format-duration.jsindex e50fd6664bd..2384889ae2b 100644--- a/frontend/discourse/app/helpers/format-duration.js+++ b/frontend/discourse/app/ui-kit/helpers/d-format-duration.js@@ -1,6 +1,6 @@import { trustHTML } from "@ember/template";import { durationTiny } from "discourse/lib/formatter";-export default function formatDuration(seconds) {+export default function dFormatDuration(seconds) {return trustHTML(durationTiny(seconds));}diff --git a/frontend/discourse/app/helpers/icon-or-image.js b/frontend/discourse/app/ui-kit/helpers/d-icon-or-image.jssimilarity index 90%rename from frontend/discourse/app/helpers/icon-or-image.jsrename to frontend/discourse/app/ui-kit/helpers/d-icon-or-image.jsindex cb36cb071f4..b70fac4227c 100644--- a/frontend/discourse/app/helpers/icon-or-image.js+++ b/frontend/discourse/app/ui-kit/helpers/d-icon-or-image.js@@ -3,7 +3,7 @@ import { trustHTML } from "@ember/template";import { isEmpty } from "@ember/utils";import { convertIconClass, iconHTML } from "discourse/lib/icon-library";-export default function iconOrImage(badge) {+export default function dIconOrImage(badge) {const icon = get(badge, "icon");const image = get(badge, "image");diff --git a/frontend/discourse/app/helpers/d-icon.js b/frontend/discourse/app/ui-kit/helpers/d-icon.jssimilarity index 100%rename from frontend/discourse/app/helpers/d-icon.jsrename to frontend/discourse/app/ui-kit/helpers/d-icon.jsdiff --git a/frontend/discourse/app/helpers/loading-spinner.js b/frontend/discourse/app/ui-kit/helpers/d-loading-spinner.jssimilarity index 83%rename from frontend/discourse/app/helpers/loading-spinner.jsrename to frontend/discourse/app/ui-kit/helpers/d-loading-spinner.jsindex e9e36570df0..d96123c0f3d 100644--- a/frontend/discourse/app/helpers/loading-spinner.js+++ b/frontend/discourse/app/ui-kit/helpers/d-loading-spinner.js@@ -10,6 +10,6 @@ export function renderSpinner(cssClass) {export const spinnerHTML = renderSpinner();-export default function loadingSpinner({ size } = {}) {+export default function dLoadingSpinner({ size } = {}) {return trustHTML(renderSpinner(size));}diff --git a/frontend/discourse/app/helpers/number.js b/frontend/discourse/app/ui-kit/helpers/d-number.jssimilarity index 95%rename from frontend/discourse/app/helpers/number.jsrename to frontend/discourse/app/ui-kit/helpers/d-number.jsindex fce5c09687a..6818d4dd3e0 100644--- a/frontend/discourse/app/helpers/number.js+++ b/frontend/discourse/app/ui-kit/helpers/d-number.js@@ -3,7 +3,7 @@ import { number as numberFormatter } from "discourse/lib/formatter";import { escapeExpression } from "discourse/lib/utilities";import I18n, { i18n } from "discourse-i18n";-export default function number(orig, params = {}) {+export default function dNumber(orig, params = {}) {orig = Math.round(parseFloat(orig));if (isNaN(orig)) {orig = 0;diff --git a/frontend/discourse/app/helpers/replace-emoji.js b/frontend/discourse/app/ui-kit/helpers/d-replace-emoji.jssimilarity index 84%rename from frontend/discourse/app/helpers/replace-emoji.jsrename to frontend/discourse/app/ui-kit/helpers/d-replace-emoji.jsindex 71636aa1f0e..002947cbe18 100644--- a/frontend/discourse/app/helpers/replace-emoji.js+++ b/frontend/discourse/app/ui-kit/helpers/d-replace-emoji.js@@ -2,7 +2,7 @@ import { isHTMLSafe, trustHTML } from "@ember/template";import { emojiUnescape } from "discourse/lib/text";import { escapeExpression } from "discourse/lib/utilities";-export default function replaceEmoji(text, options) {+export default function dReplaceEmoji(text, options) {text = isHTMLSafe(text) ? text.toString() : escapeExpression(text);return trustHTML(emojiUnescape(text, options));}diff --git a/frontend/discourse/app/helpers/topic-link.js b/frontend/discourse/app/ui-kit/helpers/d-topic-link.jssimilarity index 89%rename from frontend/discourse/app/helpers/topic-link.jsrename to frontend/discourse/app/ui-kit/helpers/d-topic-link.jsindex 2cddea31663..162fe59bfa4 100644--- a/frontend/discourse/app/helpers/topic-link.js+++ b/frontend/discourse/app/ui-kit/helpers/d-topic-link.js@@ -1,6 +1,6 @@import { trustHTML } from "@ember/template";-export default function topicLink(topic, args = {}) {+export default function dTopicLink(topic, args = {}) {const title = topic.get("fancyTitle");const url = topic.linked_post_numberdiff --git a/frontend/discourse/app/helpers/unique-id.js b/frontend/discourse/app/ui-kit/helpers/d-unique-id.jssimilarity index 89%rename from frontend/discourse/app/helpers/unique-id.jsrename to frontend/discourse/app/ui-kit/helpers/d-unique-id.jsindex a1b3cef924c..5370fdd9f05 100644--- a/frontend/discourse/app/helpers/unique-id.js+++ b/frontend/discourse/app/ui-kit/helpers/d-unique-id.js@@ -1,5 +1,5 @@// https://github.com/emberjs/ember.js/blob/master/packages/@ember/-internals/glimmer/lib/helpers/unique-id.ts-export default function uniqueId() {+export default function dUniqueId() {return ([3e7] + -1e3 + -4e3 + -2e3 + -1e11).replace(/[0-3]/g,(a) =>diff --git a/frontend/discourse/app/ui-kit/helpers/d-user-avatar.js b/frontend/discourse/app/ui-kit/helpers/d-user-avatar.jsnew file mode 100644index 00000000000..bf8f82e14a4--- /dev/null+++ b/frontend/discourse/app/ui-kit/helpers/d-user-avatar.js@@ -0,0 +1 @@+export * from "./d-avatar";diff --git a/frontend/discourse/app/modifiers/auto-focus.js b/frontend/discourse/app/ui-kit/modifiers/d-auto-focus.jssimilarity index 85%rename from frontend/discourse/app/modifiers/auto-focus.jsrename to frontend/discourse/app/ui-kit/modifiers/d-auto-focus.jsindex 4d4b43e5318..8a4d4c0ba79 100644--- a/frontend/discourse/app/modifiers/auto-focus.js+++ b/frontend/discourse/app/ui-kit/modifiers/d-auto-focus.js@@ -1,6 +1,6 @@import Modifier from "ember-modifier";-export default class AutoFocusModifier extends Modifier {+export default class DAutoFocusModifier extends Modifier {didFocus = false;modify(element, _, { selectText, preventScroll }) {diff --git a/frontend/discourse/app/modifiers/d-autocomplete.js b/frontend/discourse/app/ui-kit/modifiers/d-autocomplete.jssimilarity index 99%rename from frontend/discourse/app/modifiers/d-autocomplete.jsrename to frontend/discourse/app/ui-kit/modifiers/d-autocomplete.jsindex 97af3d2f8d8..9e7c5906c2d 100644--- a/frontend/discourse/app/modifiers/d-autocomplete.js+++ b/frontend/discourse/app/ui-kit/modifiers/d-autocomplete.js@@ -4,11 +4,11 @@ import { action } from "@ember/object";import { cancel } from "@ember/runloop";import { service } from "@ember/service";import Modifier from "ember-modifier";-import DAutocompleteResults from "discourse/components/d-autocomplete-results";import { VISIBILITY_OPTIMIZERS } from "discourse/float-kit/lib/constants";import { extractError } from "discourse/lib/ajax-error";import discourseDebounce from "discourse/lib/debounce";import { INPUT_DELAY } from "discourse/lib/environment";+import DAutocompleteResults from "discourse/ui-kit/d-autocomplete-results";export const SKIP = "skip";export const CANCELLED_STATUS = "__CANCELLED";diff --git a/frontend/discourse/app/modifiers/close-on-click-outside.js b/frontend/discourse/app/ui-kit/modifiers/d-close-on-click-outside.jssimilarity index 95%rename from frontend/discourse/app/modifiers/close-on-click-outside.jsrename to frontend/discourse/app/ui-kit/modifiers/d-close-on-click-outside.jsindex 7fbafd31b64..21f312def7d 100644--- a/frontend/discourse/app/modifiers/close-on-click-outside.js+++ b/frontend/discourse/app/ui-kit/modifiers/d-close-on-click-outside.js@@ -2,7 +2,7 @@ import { registerDestructor } from "@ember/destroyable";import Modifier from "ember-modifier";import { bind } from "discourse/lib/decorators";-export default class CloseOnClickOutside extends Modifier {+export default class DCloseOnClickOutside extends Modifier {constructor(owner, args) {super(owner, args);registerDestructor(this, (instance) => instance.cleanup());diff --git a/frontend/discourse/app/modifiers/draggable.js b/frontend/discourse/app/ui-kit/modifiers/d-draggable.jssimilarity index 97%rename from frontend/discourse/app/modifiers/draggable.jsrename to frontend/discourse/app/ui-kit/modifiers/d-draggable.jsindex b218565cfdb..c89ac7ffb86 100644--- a/frontend/discourse/app/modifiers/draggable.js+++ b/frontend/discourse/app/ui-kit/modifiers/d-draggable.js@@ -2,7 +2,7 @@ import { registerDestructor } from "@ember/destroyable";import Modifier from "ember-modifier";import { bind } from "discourse/lib/decorators";-export default class DraggableModifier extends Modifier {+export default class DDraggableModifier extends Modifier {hasStarted = false;element;diff --git a/frontend/discourse/app/modifiers/observe-intersection.js b/frontend/discourse/app/ui-kit/modifiers/d-observe-intersection.jssimilarity index 100%rename from frontend/discourse/app/modifiers/observe-intersection.jsrename to frontend/discourse/app/ui-kit/modifiers/d-observe-intersection.jsdiff --git a/frontend/discourse/app/modifiers/on-resize.js b/frontend/discourse/app/ui-kit/modifiers/d-on-resize.jssimilarity index 93%rename from frontend/discourse/app/modifiers/on-resize.jsrename to frontend/discourse/app/ui-kit/modifiers/d-on-resize.jsindex ef0278d4a17..2d4e1ff60b0 100644--- a/frontend/discourse/app/modifiers/on-resize.js+++ b/frontend/discourse/app/ui-kit/modifiers/d-on-resize.js@@ -2,7 +2,7 @@ import { registerDestructor } from "@ember/destroyable";import { cancel, throttle } from "@ember/runloop";import Modifier from "ember-modifier";-export default class OnResize extends Modifier {+export default class DOnResize extends Modifier {constructor(owner, args) {super(owner, args);registerDestructor(this, (instance) => instance.cleanup());diff --git a/frontend/discourse/app/modifiers/scroll-into-view.js b/frontend/discourse/app/ui-kit/modifiers/d-scroll-into-view.jssimilarity index 93%rename from frontend/discourse/app/modifiers/scroll-into-view.jsrename to frontend/discourse/app/ui-kit/modifiers/d-scroll-into-view.jsindex f2e503a389e..c7f98ced313 100644--- a/frontend/discourse/app/modifiers/scroll-into-view.js+++ b/frontend/discourse/app/ui-kit/modifiers/d-scroll-into-view.js@@ -15,7 +15,7 @@ import Modifier from "ember-modifier";** @extends {Modifier<ScrollIntoViewSignature>}*/-export default class ScrollIntoViewModifier extends Modifier {+export default class DScrollIntoViewModifier extends Modifier {/*** @param {Element} element* @param {[boolean, ScrollIntoViewOptions?]} positionaldiff --git a/frontend/discourse/app/modifiers/swipe.js b/frontend/discourse/app/ui-kit/modifiers/d-swipe.jssimilarity index 98%rename from frontend/discourse/app/modifiers/swipe.jsrename to frontend/discourse/app/ui-kit/modifiers/d-swipe.jsindex e92f61da0fa..1ac009669b0 100644--- a/frontend/discourse/app/modifiers/swipe.js+++ b/frontend/discourse/app/ui-kit/modifiers/d-swipe.js@@ -30,7 +30,7 @@ import SwipeEvents from "discourse/lib/swipe-events";/*** SwipeModifier class.*/-export default class SwipeModifier extends Modifier {+export default class DSwipeModifier extends Modifier {@service site;/**diff --git a/frontend/discourse/app/modifiers/tab-to-sibling.js b/frontend/discourse/app/ui-kit/modifiers/d-tab-to-sibling.jssimilarity index 97%rename from frontend/discourse/app/modifiers/tab-to-sibling.jsrename to frontend/discourse/app/ui-kit/modifiers/d-tab-to-sibling.jsindex e26211e1faf..6cc7a25a194 100644--- a/frontend/discourse/app/modifiers/tab-to-sibling.js+++ b/frontend/discourse/app/ui-kit/modifiers/d-tab-to-sibling.js@@ -23,9 +23,9 @@ import { bind } from "discourse/lib/decorators";* {{/each}}* </div>*- * @component TabToSiblingModifier+ * @component DTabToSiblingModifier*/-export default class TabToSiblingModifier extends Modifier {+export default class DTabToSiblingModifier extends Modifier {/*** @param {object} owner - The owner object* @param {Array} args - Arguments passed to the modifierdiff --git a/frontend/discourse/app/modifiers/trap-tab.js b/frontend/discourse/app/ui-kit/modifiers/d-trap-tab.jssimilarity index 98%rename from frontend/discourse/app/modifiers/trap-tab.jsrename to frontend/discourse/app/ui-kit/modifiers/d-trap-tab.jsindex fd4f4232ae6..392789c5035 100644--- a/frontend/discourse/app/modifiers/trap-tab.js+++ b/frontend/discourse/app/ui-kit/modifiers/d-trap-tab.js@@ -7,7 +7,7 @@ import { focusOffScreen } from "discourse/modifiers/prevent-scroll-on-focus";const FOCUSABLE_ELEMENTS ="details:not(.is-disabled) summary, [autofocus], a, input, select, textarea, summary";-export default class TrapTabModifier extends Modifier {+export default class DTrapTabModifier extends Modifier {@service capabilities;element = null;diff --git a/frontend/discourse/dialog-holder/components/dialog-holder.gjs b/frontend/discourse/dialog-holder/components/dialog-holder.gjsindex 03a1252c1cd..606b2117dac 100644--- a/frontend/discourse/dialog-holder/components/dialog-holder.gjs+++ b/frontend/discourse/dialog-holder/components/dialog-holder.gjs@@ -5,8 +5,8 @@ import { service } from "@ember/service";import { trustHTML } from "@ember/template";import A11yDialog from "a11y-dialog";import { modifier } from "ember-modifier";-import DButton from "discourse/components/d-button";import { notEq, or } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";export default class DialogHolder extends Component {@service dialog;diff --git a/frontend/discourse/float-kit/components/d-default-toast.gjs b/frontend/discourse/float-kit/components/d-default-toast.gjsindex 63474a63034..5316ca759e8 100644--- a/frontend/discourse/float-kit/components/d-default-toast.gjs+++ b/frontend/discourse/float-kit/components/d-default-toast.gjs@@ -1,14 +1,14 @@import { concat, fn, hash } from "@ember/helper";import didInsert from "@ember/render-modifiers/modifiers/did-insert";import { trustHTML } from "@ember/template";-import DButton from "discourse/components/d-button";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import { or } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";const DDefaultToast = <template><div- class={{concatClass+ class={{dConcatClass"fk-d-default-toast"(concat "-" (or @data.theme "default"))}}@@ -22,7 +22,7 @@ const DDefaultToast = <template>{{/if}}{{#if @data.icon}}<div class="fk-d-default-toast__icon-container">- {{icon @data.icon}}+ {{dIcon @data.icon}}</div>{{/if}}<div class="fk-d-default-toast__main-container">diff --git a/frontend/discourse/float-kit/components/d-float-body.gjs b/frontend/discourse/float-kit/components/d-float-body.gjsindex 471eb04b10f..b79d2e5e55a 100644--- a/frontend/discourse/float-kit/components/d-float-body.gjs+++ b/frontend/discourse/float-kit/components/d-float-body.gjs@@ -6,10 +6,10 @@ import DFloatPortal from "discourse/float-kit/components/d-float-portal";import { getScrollParent } from "discourse/float-kit/lib/get-scroll-parent";import FloatKitApplyFloatingUi from "discourse/float-kit/modifiers/apply-floating-ui";import FloatKitCloseOnEscape from "discourse/float-kit/modifiers/close-on-escape";-import concatClass from "discourse/helpers/concat-class";-import closeOnClickOutside from "discourse/modifiers/close-on-click-outside";-import TrapTab from "discourse/modifiers/trap-tab";import { and } from "discourse/truth-helpers";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dCloseOnClickOutside from "discourse/ui-kit/modifiers/d-close-on-click-outside";+import dTrapTab from "discourse/ui-kit/modifiers/d-trap-tab";export default class DFloatBody extends Component {closeOnScroll = modifierFn(() => {@@ -77,7 +77,7 @@ export default class DFloatBody extends Component {@portalOutletElement={{@instance.portalOutletElement}}><div- class={{concatClass+ class={{dConcatClass@mainClass(if this.options.animated "-animated")(if @instance.expanded "-expanded")@@ -89,11 +89,11 @@ export default class DFloatBody extends Component {role={{@role}}{{FloatKitApplyFloatingUi this.trigger this.options @instance}}{{this.trapPointerDown}}- {{(if @trapTab (modifier TrapTab autofocus=this.options.autofocus))}}+ {{(if @trapTab (modifier dTrapTab autofocus=this.options.autofocus))}}{{(if(and @instance.expanded this.supportsCloseOnClickOutside)(modifier- closeOnClickOutside+ dCloseOnClickOutside(fn @instance.close (hash focusTrigger=false))(hash target=this.content))diff --git a/frontend/discourse/float-kit/components/d-inline-float.gjs b/frontend/discourse/float-kit/components/d-inline-float.gjsindex c89978c2a10..c9182ad0a4b 100644--- a/frontend/discourse/float-kit/components/d-inline-float.gjs+++ b/frontend/discourse/float-kit/components/d-inline-float.gjs@@ -1,10 +1,10 @@import Component from "@glimmer/component";import { concat } from "@ember/helper";import { service } from "@ember/service";-import DModal from "discourse/components/d-modal";import DFloatBody from "discourse/float-kit/components/d-float-body";-import concatClass from "discourse/helpers/concat-class";import { and } from "discourse/truth-helpers";+import DModal from "discourse/ui-kit/d-modal";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";export default class DInlineFloat extends Component {@service site;@@ -17,7 +17,7 @@ export default class DInlineFloat extends Component {@hideHeader={{true}}data-identifier={{@instance.options.identifier}}data-content- class={{concatClass+ class={{dConcatClass"fk-d-menu-modal"(concat @instance.options.identifier "-content")}}diff --git a/frontend/discourse/float-kit/components/d-menu.gjs b/frontend/discourse/float-kit/components/d-menu.gjsindex aa0795060a7..3989b9be965 100644--- a/frontend/discourse/float-kit/components/d-menu.gjs+++ b/frontend/discourse/float-kit/components/d-menu.gjs@@ -6,14 +6,14 @@ import { getOwner } from "@ember/owner";import { service } from "@ember/service";import curryComponent from "ember-curry-component";import { modifier } from "ember-modifier";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";import DFloatBody from "discourse/float-kit/components/d-float-body";import { MENU } from "discourse/float-kit/lib/constants";import DMenuInstance from "discourse/float-kit/lib/d-menu-instance";-import concatClass from "discourse/helpers/concat-class";import { isTesting } from "discourse/lib/environment";import { and } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";export default class DMenu extends Component {@service site;@@ -121,7 +121,7 @@ export default class DMenu extends Component {<template><this.triggerComponent{{this.registerTrigger}}- class={{concatClass+ class={{dConcatClass"fk-d-menu__trigger"(if this.menuInstance.expanded "-expanded")(concat this.options.identifier "-trigger")@@ -147,7 +147,7 @@ export default class DMenu extends Component {@closeModal={{this.menuInstance.close}}@hideHeader={{true}}@autofocus={{this.options.autofocus}}- class={{concatClass+ class={{dConcatClass"fk-d-menu-modal"(concat this.options.identifier "-content")@contentClass@@ -175,7 +175,7 @@ export default class DMenu extends Component {<DFloatBody@instance={{this.menuInstance}}@trapTab={{this.options.trapTab}}- @mainClass={{concatClass+ @mainClass={{dConcatClass"fk-d-menu"(concat this.options.identifier "-content")@classdiff --git a/frontend/discourse/float-kit/components/d-toast.gjs b/frontend/discourse/float-kit/components/d-toast.gjsindex 7f4509b392f..b39901f4540 100644--- a/frontend/discourse/float-kit/components/d-toast.gjs+++ b/frontend/discourse/float-kit/components/d-toast.gjs@@ -2,11 +2,11 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";import autoCloseToast from "discourse/float-kit/modifiers/auto-close-toast";-import concatClass from "discourse/helpers/concat-class";import deprecated from "discourse/lib/deprecated";import { getMaxAnimationTimeMs } from "discourse/lib/swipe-events";-import swipe from "discourse/modifiers/swipe";import { and } from "discourse/truth-helpers";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dSwipe from "discourse/ui-kit/modifiers/d-swipe";const VELOCITY_THRESHOLD = -1.2;@@ -80,14 +80,14 @@ export default class DToast extends Component {<outputrole={{if @toast.options.autoClose "status" "log"}}key={{@toast.id}}- class={{concatClass "fk-d-toast" @toast.options.class}}+ class={{dConcatClass "fk-d-toast" @toast.options.class}}{{autoCloseToastduration=this.durationprogressBar=this.progressBar}}- {{swipe onDidSwipe=this.didSwipe onDidEndSwipe=this.didEndSwipe}}+ {{dSwipe onDidSwipe=this.didSwipe onDidEndSwipe=this.didEndSwipe}}data-test-duration={{this.duration}}><@toast.options.componentdiff --git a/frontend/discourse/float-kit/components/d-tooltip.gjs b/frontend/discourse/float-kit/components/d-tooltip.gjsindex 0e547dc65be..632215afcd8 100644--- a/frontend/discourse/float-kit/components/d-tooltip.gjs+++ b/frontend/discourse/float-kit/components/d-tooltip.gjs@@ -6,9 +6,9 @@ import { modifier } from "ember-modifier";import DFloatBody from "discourse/float-kit/components/d-float-body";import { TOOLTIP } from "discourse/float-kit/lib/constants";import DTooltipInstance from "discourse/float-kit/lib/d-tooltip-instance";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import { and } from "discourse/truth-helpers";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";export default class DTooltip extends Component {@service tooltip;@@ -50,7 +50,7 @@ export default class DTooltip extends Component {<template><span{{this.registerTrigger this.allowedProperties}}- class={{concatClass+ class={{dConcatClass"fk-d-tooltip__trigger"(if this.tooltipInstance.expanded "-expanded")}}@@ -67,7 +67,7 @@ export default class DTooltip extends Component {{{~else~}}{{#if @icon}}<span class="fk-d-tooltip__icon">- {{~icon @icon~}}+ {{~dIcon @icon~}}</span>{{/if}}{{#if @label}}@@ -79,7 +79,7 @@ export default class DTooltip extends Component {<DFloatBody@instance={{this.tooltipInstance}}@trapTab={{and this.options.interactive this.options.trapTab}}- @mainClass={{concatClass+ @mainClass={{dConcatClass"fk-d-tooltip__content"(concat this.options.identifier "-content")}}diff --git a/frontend/discourse/float-kit/lib/d-toast-instance.js b/frontend/discourse/float-kit/lib/d-toast-instance.jsindex 138c5b093e8..7373c6c2c5a 100644--- a/frontend/discourse/float-kit/lib/d-toast-instance.js+++ b/frontend/discourse/float-kit/lib/d-toast-instance.js@@ -2,14 +2,14 @@ import { action } from "@ember/object";import { setOwner } from "@ember/owner";import { service } from "@ember/service";import { TOAST } from "discourse/float-kit/lib/constants";-import uniqueId from "discourse/helpers/unique-id";+import dUniqueId from "discourse/ui-kit/helpers/d-unique-id";export default class DToastInstance {@service site;@service toasts;options = null;- id = uniqueId();+ id = dUniqueId();constructor(owner, options = {}) {setOwner(this, owner);diff --git a/frontend/discourse/select-kit/components/category-chooser.js b/frontend/discourse/select-kit/components/category-chooser.jsindex ed75cf43ab5..555c4080a47 100644--- a/frontend/discourse/select-kit/components/category-chooser.js+++ b/frontend/discourse/select-kit/components/category-chooser.js@@ -2,11 +2,11 @@ import { computed, set } from "@ember/object";import { trustHTML } from "@ember/template";import { isNone } from "@ember/utils";import { classNames } from "@ember-decorators/component";-import { categoryBadgeHTML } from "discourse/helpers/category-link";import Category from "discourse/models/category";import PermissionType from "discourse/models/permission-type";import CategoryRow from "discourse/select-kit/components/category-row";import ComboBoxComponent from "discourse/select-kit/components/combo-box";+import { categoryBadgeHTML } from "discourse/ui-kit/helpers/d-category-link";import { i18n } from "discourse-i18n";import { pluginApiIdentifiers, selectKitOptions } from "./select-kit";diff --git a/frontend/discourse/select-kit/components/category-drop-more-collection.gjs b/frontend/discourse/select-kit/components/category-drop-more-collection.gjsindex c13adf41ab1..7d3589c5ddc 100644--- a/frontend/discourse/select-kit/components/category-drop-more-collection.gjs+++ b/frontend/discourse/select-kit/components/category-drop-more-collection.gjs@@ -1,11 +1,11 @@import Component from "@glimmer/component";import { hash } from "@ember/helper";import { LinkTo } from "@ember/routing";-import icon from "discourse/helpers/d-icon";import {ALL_CATEGORIES_ID,NO_CATEGORIES_ID,} from "discourse/select-kit/components/category-drop";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class CategoryDropMoreCollection extends Component {@@ -40,12 +40,12 @@ export default class CategoryDropMoreCollection extends Component {{{#if @selectKit.options.parentCategory}}<LinkTo @route="discovery.subcategories" @model={{this.slugPath}}>{{i18n "categories.view_all"}}- {{icon "up-right-from-square"}}+ {{dIcon "up-right-from-square"}}</LinkTo>{{else}}<LinkTo @route="discovery.categories">{{i18n "categories.view_all"}}- {{icon "up-right-from-square"}}+ {{dIcon "up-right-from-square"}}</LinkTo>{{/if}}</div>diff --git a/frontend/discourse/select-kit/components/category-drop.js b/frontend/discourse/select-kit/components/category-drop.jsindex 6be97717b8d..7e6b5906f6f 100644--- a/frontend/discourse/select-kit/components/category-drop.js+++ b/frontend/discourse/select-kit/components/category-drop.js@@ -1,7 +1,6 @@import { action, computed } from "@ember/object";import { trustHTML } from "@ember/template";import { classNameBindings, classNames } from "@ember-decorators/component";-import { categoryBadgeHTML } from "discourse/helpers/category-link";import DiscourseURL, {getCategoryAndTagUrl,getEditCategoryUrl,@@ -16,6 +15,7 @@ import {pluginApiIdentifiers,selectKitOptions,} from "discourse/select-kit/components/select-kit";+import { categoryBadgeHTML } from "discourse/ui-kit/helpers/d-category-link";import { i18n } from "discourse-i18n";import CategoryDropHeader from "./category-drop/category-drop-header";diff --git a/frontend/discourse/select-kit/components/category-drop/category-drop-header.gjs b/frontend/discourse/select-kit/components/category-drop/category-drop-header.gjsindex 484319bbc0b..653019811ed 100644--- a/frontend/discourse/select-kit/components/category-drop/category-drop-header.gjs+++ b/frontend/discourse/select-kit/components/category-drop/category-drop-header.gjs@@ -1,8 +1,8 @@import { computed } from "@ember/object";import { classNames } from "@ember-decorators/component";-import icon from "discourse/helpers/d-icon";import ComboBoxSelectBoxHeaderComponent from "discourse/select-kit/components/combo-box/combo-box-header";import { resolveComponent } from "discourse/select-kit/components/select-kit";+import dIcon from "discourse/ui-kit/helpers/d-icon";@classNames("category-drop-header")export default class CategoryDropHeader extends ComboBoxSelectBoxHeaderComponent {@@ -30,7 +30,7 @@ export default class CategoryDropHeader extends ComboBoxSelectBoxHeaderComponent/>{{/let}}- {{icon this.caretIcon class="angle-icon"}}+ {{dIcon this.caretIcon class="angle-icon"}}</div></template>}diff --git a/frontend/discourse/select-kit/components/category-row.gjs b/frontend/discourse/select-kit/components/category-row.gjsindex c53899896e4..cd849c84c50 100644--- a/frontend/discourse/select-kit/components/category-row.gjs+++ b/frontend/discourse/select-kit/components/category-row.gjs@@ -6,10 +6,10 @@ import { guidFor } from "@ember/object/internals";import { service } from "@ember/service";import { trustHTML } from "@ember/template";import { isEmpty, isNone } from "@ember/utils";-import { categoryBadgeHTML } from "discourse/helpers/category-link";-import concatClass from "discourse/helpers/concat-class";-import dirSpan from "discourse/helpers/dir-span";import Category from "discourse/models/category";+import { categoryBadgeHTML } from "discourse/ui-kit/helpers/d-category-link";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dDirSpan from "discourse/ui-kit/helpers/d-dir-span";import { i18n } from "discourse-i18n";export default class CategoryRow extends Component {@@ -277,7 +277,7 @@ export default class CategoryRow extends Component {<template>{{! template-lint-disable no-pointer-down-event-binding }}<div- class={{concatClass+ class={{dConcatClass"category-row""select-kit-row"(if this.isSelected "is-selected")@@ -307,7 +307,7 @@ export default class CategoryRow extends Component {{{#if this.shouldDisplayDescription}}<div class="category-desc" aria-hidden="true">- {{dirSpan this.descriptionText htmlSafe="true"}}+ {{dDirSpan this.descriptionText htmlSafe="true"}}</div>{{/if}}{{else}}diff --git a/frontend/discourse/select-kit/components/combo-box/combo-box-header.gjs b/frontend/discourse/select-kit/components/combo-box/combo-box-header.gjsindex 43e2c3155e7..cf96deea8ca 100644--- a/frontend/discourse/select-kit/components/combo-box/combo-box-header.gjs+++ b/frontend/discourse/select-kit/components/combo-box/combo-box-header.gjs@@ -1,10 +1,10 @@import { tracked } from "@glimmer/tracking";import { computed } from "@ember/object";import { classNames } from "@ember-decorators/component";-import DButton from "discourse/components/d-button";-import icon from "discourse/helpers/d-icon";import { resolveComponent } from "discourse/select-kit/components/select-kit";import SingleSelectHeaderComponent from "discourse/select-kit/components/select-kit/single-select-header";+import DButton from "discourse/ui-kit/d-button";+import dIcon from "discourse/ui-kit/helpers/d-icon";@classNames("combo-box-header")export default class ComboBoxHeader extends SingleSelectHeaderComponent {@@ -60,7 +60,7 @@ export default class ComboBoxHeader extends SingleSelectHeaderComponent {<template><div class="select-kit-header-wrapper">- {{#each this.icons as |iconName|}} {{icon iconName}} {{/each}}+ {{#each this.icons as |iconName|}} {{dIcon iconName}} {{/each}}{{#let(resolveComponent this this.selectKit.options.selectedNameComponent)@@ -83,7 +83,7 @@ export default class ComboBoxHeader extends SingleSelectHeaderComponent {{{/if}}{{#if this.caretIcon}}- {{icon this.caretIcon class="angle-icon"}}+ {{dIcon this.caretIcon class="angle-icon"}}{{/if}}</div></template>diff --git a/frontend/discourse/select-kit/components/dropdown-select-box/dropdown-select-box-header.gjs b/frontend/discourse/select-kit/components/dropdown-select-box/dropdown-select-box-header.gjsindex 2ac692f8f98..fe15e6e24db 100644--- a/frontend/discourse/select-kit/components/dropdown-select-box/dropdown-select-box-header.gjs+++ b/frontend/discourse/select-kit/components/dropdown-select-box/dropdown-select-box-header.gjs@@ -1,8 +1,8 @@import { computed } from "@ember/object";import { classNameBindings, classNames } from "@ember-decorators/component";-import icon from "discourse/helpers/d-icon";import { resolveComponent } from "discourse/select-kit/components/select-kit";import SingleSelectHeaderComponent from "discourse/select-kit/components/select-kit/single-select-header";+import dIcon from "discourse/ui-kit/helpers/d-icon";@classNames("dropdown-select-box-header")@classNameBindings("btnClassName", "btnStyleClass", "btnCustomClasses")@@ -49,7 +49,7 @@ export default class DropdownSelectBoxHeader extends SingleSelectHeaderComponent<template><div class="select-kit-header-wrapper">- {{#each this.icons as |iconName|}} {{icon iconName}} {{/each}}+ {{#each this.icons as |iconName|}} {{dIcon iconName}} {{/each}}{{#let(resolveComponent this this.selectKit.options.selectedNameComponent)@@ -64,7 +64,7 @@ export default class DropdownSelectBoxHeader extends SingleSelectHeaderComponent{{/let}}{{#if this.selectKit.options.showCaret}}- {{icon this.caretIcon class="angle-icon"}}+ {{dIcon this.caretIcon class="angle-icon"}}{{/if}}​{{! Zero-width space character, so icon-only button height = regular button height }}diff --git a/frontend/discourse/select-kit/components/dropdown-select-box/dropdown-select-box-row.gjs b/frontend/discourse/select-kit/components/dropdown-select-box/dropdown-select-box-row.gjsindex bcfbc5a6752..86dfcb1421d 100644--- a/frontend/discourse/select-kit/components/dropdown-select-box/dropdown-select-box-row.gjs+++ b/frontend/discourse/select-kit/components/dropdown-select-box/dropdown-select-box-row.gjs@@ -1,8 +1,8 @@import { computed } from "@ember/object";import { trustHTML } from "@ember/template";import { classNames } from "@ember-decorators/component";-import icon from "discourse/helpers/d-icon";import SelectKitRowComponent from "discourse/select-kit/components/select-kit/select-kit-row";+import dIcon from "discourse/ui-kit/helpers/d-icon";@classNames("dropdown-select-box-row")export default class DropdownSelectBoxRow extends SelectKitRowComponent {@@ -11,7 +11,7 @@ export default class DropdownSelectBoxRow extends SelectKitRowComponent {<div class="icons"><span class="selection-indicator"></span>{{#each this.icons as |i|}}- {{icon i}}+ {{dIcon i}}{{/each}}</div>{{/if}}diff --git a/frontend/discourse/select-kit/components/email-group-user-chooser-row.gjs b/frontend/discourse/select-kit/components/email-group-user-chooser-row.gjsindex 3e6aa45cd48..ff3e4ba079c 100644--- a/frontend/discourse/select-kit/components/email-group-user-chooser-row.gjs+++ b/frontend/discourse/select-kit/components/email-group-user-chooser-row.gjs@@ -1,36 +1,36 @@import { classNames } from "@ember-decorators/component";-import UserStatusMessage from "discourse/components/user-status-message";-import avatar from "discourse/helpers/avatar";-import icon from "discourse/helpers/d-icon";import decorateUsernameSelector from "discourse/helpers/decorate-username-selector";import formatUsername from "discourse/helpers/format-username";import SelectKitRowComponent from "discourse/select-kit/components/select-kit/select-kit-row";import { and } from "discourse/truth-helpers";+import DUserStatusMessage from "discourse/ui-kit/d-user-status-message";+import dAvatar from "discourse/ui-kit/helpers/d-avatar";+import dIcon from "discourse/ui-kit/helpers/d-icon";@classNames("email-group-user-chooser-row")export default class EmailGroupUserChooserRow extends SelectKitRowComponent {<template>{{#if this.item.isUser}}- {{avatar this.item imageSize="tiny"}}+ {{dAvatar this.item imageSize="tiny"}}<div><span class="identifier">{{formatUsername this.item.id}}</span><span class="name">{{this.item.name}}</span></div>{{#if (and this.item.showUserStatus this.item.status)}}- <UserStatusMessage+ <DUserStatusMessage@status={{this.item.status}}@showDescription={{true}}/>{{/if}}{{decorateUsernameSelector this.item.id}}{{else if this.item.isGroup}}- {{icon "users"}}+ {{dIcon "users"}}<div><span class="identifier">{{this.item.id}}</span><span class="name">{{this.item.full_name}}</span></div>{{else}}- {{icon "envelope"}}+ {{dIcon "envelope"}}<span class="identifier">{{this.item.id}}</span>{{/if}}</template>diff --git a/frontend/discourse/select-kit/components/flair-row.gjs b/frontend/discourse/select-kit/components/flair-row.gjsindex f2f2620b153..177aa44a45c 100644--- a/frontend/discourse/select-kit/components/flair-row.gjs+++ b/frontend/discourse/select-kit/components/flair-row.gjs@@ -1,12 +1,12 @@import { classNames } from "@ember-decorators/component";-import AvatarFlair from "discourse/components/avatar-flair";import SelectKitRowComponent from "discourse/select-kit/components/select-kit/select-kit-row";+import DAvatarFlair from "discourse/ui-kit/d-avatar-flair";@classNames("flair-row")export default class FlairRow extends SelectKitRowComponent {<template>{{#if this.item.url}}- <AvatarFlair+ <DAvatarFlair@flairName={{this.item.name}}@flairUrl={{this.item.url}}@flairBgColor={{this.item.bgColor}}diff --git a/frontend/discourse/select-kit/components/future-date-input-selector/future-date-input-selector-header.gjs b/frontend/discourse/select-kit/components/future-date-input-selector/future-date-input-selector-header.gjsindex 03645800f42..528724be6b5 100644--- a/frontend/discourse/select-kit/components/future-date-input-selector/future-date-input-selector-header.gjs+++ b/frontend/discourse/select-kit/components/future-date-input-selector/future-date-input-selector-header.gjs@@ -1,7 +1,7 @@import { classNames } from "@ember-decorators/component";-import icon from "discourse/helpers/d-icon";import ComboBoxHeaderComponent from "discourse/select-kit/components/combo-box/combo-box-header";import { resolveComponent } from "discourse/select-kit/components/select-kit";+import dIcon from "discourse/ui-kit/helpers/d-icon";@classNames("future-date-input-selector-header")export default class FutureDateInputSelectorHeader extends ComboBoxHeaderComponent {@@ -9,7 +9,7 @@ export default class FutureDateInputSelectorHeader extends ComboBoxHeaderCompone<div class="select-kit-header-wrapper">{{#if this.icons}}<div class="future-date-input-selector-icons">- {{#each this.icons as |iconName|}} {{icon iconName}} {{/each}}+ {{#each this.icons as |iconName|}} {{dIcon iconName}} {{/each}}</div>{{/if}}@@ -30,7 +30,7 @@ export default class FutureDateInputSelectorHeader extends ComboBoxHeaderCompone</span>{{/if}}- {{icon this.caretIcon class="angle-icon"}}+ {{dIcon this.caretIcon class="angle-icon"}}</div></template>}diff --git a/frontend/discourse/select-kit/components/future-date-input-selector/future-date-input-selector-row.gjs b/frontend/discourse/select-kit/components/future-date-input-selector/future-date-input-selector-row.gjsindex eea56e0e35a..75a16cae7d9 100644--- a/frontend/discourse/select-kit/components/future-date-input-selector/future-date-input-selector-row.gjs+++ b/frontend/discourse/select-kit/components/future-date-input-selector/future-date-input-selector-row.gjs@@ -1,13 +1,13 @@import { classNames } from "@ember-decorators/component";-import icon from "discourse/helpers/d-icon";import SelectKitRowComponent from "discourse/select-kit/components/select-kit/select-kit-row";+import dIcon from "discourse/ui-kit/helpers/d-icon";@classNames("future-date-input-selector-row")export default class FutureDateInputSelectorRow extends SelectKitRowComponent {<template>{{#if this.item.icon}}<div class="future-date-input-selector-icons">- {{icon this.item.icon}}+ {{dIcon this.item.icon}}</div>{{/if}}diff --git a/frontend/discourse/select-kit/components/mini-tag-chooser/selected-collection.gjs b/frontend/discourse/select-kit/components/mini-tag-chooser/selected-collection.gjsindex 8f8bd80a71e..a51973dca85 100644--- a/frontend/discourse/select-kit/components/mini-tag-chooser/selected-collection.gjs+++ b/frontend/discourse/select-kit/components/mini-tag-chooser/selected-collection.gjs@@ -4,8 +4,8 @@ import Component from "@ember/component";import { fn } from "@ember/helper";import { computed } from "@ember/object";import { tagName } from "@ember-decorators/component";-import DButton from "discourse/components/d-button";-import discourseTag from "discourse/helpers/discourse-tag";+import DButton from "discourse/ui-kit/d-button";+import dDiscourseTag from "discourse/ui-kit/helpers/d-discourse-tag";@tagName("")export default class SelectedCollection extends Component {@@ -55,7 +55,7 @@ export default class SelectedCollection extends Component {tabindex="0"class={{tag.classNames}}>- {{discourseTag tag.value noHref=true}}+ {{dDiscourseTag tag.value noHref=true}}</DButton>{{/each}}</div>diff --git a/frontend/discourse/select-kit/components/multi-select/multi-select-filter.gjs b/frontend/discourse/select-kit/components/multi-select/multi-select-filter.gjsindex f792476ae33..075d97967a4 100644--- a/frontend/discourse/select-kit/components/multi-select/multi-select-filter.gjs+++ b/frontend/discourse/select-kit/components/multi-select/multi-select-filter.gjs@@ -3,8 +3,8 @@ import { on } from "@ember/modifier";import { action, computed } from "@ember/object";import { isEmpty } from "@ember/utils";import { classNames } from "@ember-decorators/component";-import icon from "discourse/helpers/d-icon";import SelectKitFilterComponent from "discourse/select-kit/components/select-kit/select-kit-filter";+import dIcon from "discourse/ui-kit/helpers/d-icon";@classNames("multi-select-filter")export default class MultiSelectFilter extends SelectKitFilterComponent {@@ -60,7 +60,7 @@ export default class MultiSelectFilter extends SelectKitFilterComponent {/>{{#if this.selectKit.options.filterIcon}}- {{icon this.selectKit.options.filterIcon class="filter-icon"}}+ {{dIcon this.selectKit.options.filterIcon class="filter-icon"}}{{/if}}{{/unless}}</template>diff --git a/frontend/discourse/select-kit/components/multi-select/multi-select-header.gjs b/frontend/discourse/select-kit/components/multi-select/multi-select-header.gjsindex 89feeeae280..dbba2d16e4f 100644--- a/frontend/discourse/select-kit/components/multi-select/multi-select-header.gjs+++ b/frontend/discourse/select-kit/components/multi-select/multi-select-header.gjs@@ -6,11 +6,11 @@ import {classNames,tagName,} from "@ember-decorators/component";-import icon from "discourse/helpers/d-icon";import FormatSelectedContent from "discourse/select-kit/components/multi-select/format-selected-content";import { resolveComponent } from "discourse/select-kit/components/select-kit";import SelectKitHeaderComponent from "discourse/select-kit/components/select-kit/select-kit-header";import { or } from "discourse/truth-helpers";+import dIcon from "discourse/ui-kit/helpers/d-icon";@tagName("summary")@classNames("multi-select-header")@@ -64,7 +64,7 @@ export default class MultiSelectHeader extends SelectKitHeaderComponent {<template><div class="select-kit-header-wrapper">{{#each this.icons as |iconName|}}- {{icon iconName}}+ {{dIcon iconName}}{{/each}}{{#if this.selectKit.options.useHeaderFilter}}@@ -102,7 +102,7 @@ export default class MultiSelectHeader extends SelectKitHeaderComponent {@selectKit={{this.selectKit}}/>{{#if this.caretIcon}}- {{icon this.caretIcon class="angle-icon"}}+ {{dIcon this.caretIcon class="angle-icon"}}{{/if}}{{/if}}</div>diff --git a/frontend/discourse/select-kit/components/multi-select/selected-category.gjs b/frontend/discourse/select-kit/components/multi-select/selected-category.gjsindex ecea45226cd..b27642bab6f 100644--- a/frontend/discourse/select-kit/components/multi-select/selected-category.gjs+++ b/frontend/discourse/select-kit/components/multi-select/selected-category.gjs@@ -2,9 +2,9 @@ import { on } from "@ember/modifier";import { computed } from "@ember/object";import { trustHTML } from "@ember/template";import { classNames } from "@ember-decorators/component";-import { categoryBadgeHTML } from "discourse/helpers/category-link";-import icon from "discourse/helpers/d-icon";import SelectedNameComponent from "discourse/select-kit/components/selected-name";+import { categoryBadgeHTML } from "discourse/ui-kit/helpers/d-category-link";+import dIcon from "discourse/ui-kit/helpers/d-icon";@classNames("selected-category")export default class SelectedCategory extends SelectedNameComponent {@@ -29,7 +29,7 @@ export default class SelectedCategory extends SelectedNameComponent {><div class="body">{{this.badge}}- {{icon "xmark"}}+ {{dIcon "xmark"}}</div></div></template>diff --git a/frontend/discourse/select-kit/components/none-category-row.gjs b/frontend/discourse/select-kit/components/none-category-row.gjsindex 4a0052a9d6a..de1598af1ab 100644--- a/frontend/discourse/select-kit/components/none-category-row.gjs+++ b/frontend/discourse/select-kit/components/none-category-row.gjs@@ -1,9 +1,9 @@import { computed } from "@ember/object";import { trustHTML } from "@ember/template";import { classNames } from "@ember-decorators/component";-import { categoryBadgeHTML } from "discourse/helpers/category-link";-import dirSpan from "discourse/helpers/dir-span";import CategoryRowComponent from "discourse/select-kit/components/category-row";+import { categoryBadgeHTML } from "discourse/ui-kit/helpers/d-category-link";+import dDirSpan from "discourse/ui-kit/helpers/d-dir-span";@classNames("none category-row")export default class NoneCategoryRow extends CategoryRowComponent {@@ -26,7 +26,7 @@ export default class NoneCategoryRow extends CategoryRowComponent {</div>{{#if this.shouldDisplayDescription}}- <div class="category-desc" aria-hidden="true">{{dirSpan+ <div class="category-desc" aria-hidden="true">{{dDirSpanthis.descriptionTexthtmlSafe="true"}}</div>diff --git a/frontend/discourse/select-kit/components/notifications-filter/notifications-filter-header.gjs b/frontend/discourse/select-kit/components/notifications-filter/notifications-filter-header.gjsindex 139f090d14c..d374130815e 100644--- a/frontend/discourse/select-kit/components/notifications-filter/notifications-filter-header.gjs+++ b/frontend/discourse/select-kit/components/notifications-filter/notifications-filter-header.gjs@@ -1,7 +1,7 @@import { computed } from "@ember/object";import { classNames } from "@ember-decorators/component";-import icon from "discourse/helpers/d-icon";import DropdownSelectBoxHeaderComponent from "discourse/select-kit/components/dropdown-select-box/dropdown-select-box-header";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";@classNames("notifications-filter-header", "btn-flat")@@ -24,7 +24,7 @@ export default class NotificationsFilterHeader extends DropdownSelectBoxHeaderCo<span class="header-text">{{i18n this.label}}</span>- {{icon this.caretIcon class="angle-icon"}}+ {{dIcon this.caretIcon class="angle-icon"}}</div></template>}diff --git a/frontend/discourse/select-kit/components/period-chooser/period-chooser-header.gjs b/frontend/discourse/select-kit/components/period-chooser/period-chooser-header.gjsindex b607af47ddb..94c7735d62b 100644--- a/frontend/discourse/select-kit/components/period-chooser/period-chooser-header.gjs+++ b/frontend/discourse/select-kit/components/period-chooser/period-chooser-header.gjs@@ -1,8 +1,8 @@import { computed } from "@ember/object";import { classNames } from "@ember-decorators/component";-import icon from "discourse/helpers/d-icon";import periodTitle from "discourse/helpers/period-title";import DropdownSelectBoxHeaderComponent from "discourse/select-kit/components/dropdown-select-box/dropdown-select-box-header";+import dIcon from "discourse/ui-kit/helpers/d-icon";@classNames("period-chooser-header", "btn-flat")export default class PeriodChooserHeader extends DropdownSelectBoxHeaderComponent {@@ -22,6 +22,6 @@ export default class PeriodChooserHeader extends DropdownSelectBoxHeaderComponen}}</h2>- {{icon this.caretIcon class="angle-icon"}}+ {{dIcon this.caretIcon class="angle-icon"}}</template>}diff --git a/frontend/discourse/select-kit/components/select-kit/select-kit-create-row.gjs b/frontend/discourse/select-kit/components/select-kit/select-kit-create-row.gjsindex 0cc1094a099..576db7506aa 100644--- a/frontend/discourse/select-kit/components/select-kit/select-kit-create-row.gjs+++ b/frontend/discourse/select-kit/components/select-kit/select-kit-create-row.gjs@@ -1,12 +1,12 @@import { classNames } from "@ember-decorators/component";-import icon from "discourse/helpers/d-icon";import SelectKitRowComponent from "discourse/select-kit/components/select-kit/select-kit-row";+import dIcon from "discourse/ui-kit/helpers/d-icon";@classNames("create")export default class SelectKitCreateRow extends SelectKitRowComponent {<template>{{#each this.icons as |i|}}- {{icon i translatedTitle=this.dasherizedTitle}}+ {{dIcon i translatedTitle=this.dasherizedTitle}}{{/each}}<span class="name">diff --git a/frontend/discourse/select-kit/components/select-kit/select-kit-filter.gjs b/frontend/discourse/select-kit/components/select-kit/select-kit-filter.gjsindex ecdeb1ef3a8..c0d82b3ad98 100644--- a/frontend/discourse/select-kit/components/select-kit/select-kit-filter.gjs+++ b/frontend/discourse/select-kit/components/select-kit/select-kit-filter.gjs@@ -8,8 +8,8 @@ import {classNameBindings,classNames,} from "@ember-decorators/component";-import icon from "discourse/helpers/d-icon";import selectKitPropUtils from "discourse/select-kit/lib/select-kit-prop-utils";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";@classNames("select-kit-filter")@@ -166,7 +166,7 @@ export default class SelectKitFilter extends Component {/>{{#if this.selectKit.options.filterIcon}}- {{icon this.selectKit.options.filterIcon class="filter-icon"}}+ {{dIcon this.selectKit.options.filterIcon class="filter-icon"}}{{/if}}{{/unless}}</template>diff --git a/frontend/discourse/select-kit/components/select-kit/select-kit-none-row.gjs b/frontend/discourse/select-kit/components/select-kit/select-kit-none-row.gjsindex 59b3be9ef28..10598fe356d 100644--- a/frontend/discourse/select-kit/components/select-kit/select-kit-none-row.gjs+++ b/frontend/discourse/select-kit/components/select-kit/select-kit-none-row.gjs@@ -1,12 +1,12 @@import { classNames } from "@ember-decorators/component";-import icon from "discourse/helpers/d-icon";import SelectKitRowComponent from "discourse/select-kit/components/select-kit/select-kit-row";+import dIcon from "discourse/ui-kit/helpers/d-icon";@classNames("none")export default class SelectKitNoneRow extends SelectKitRowComponent {<template>{{#each this.icons as |i|}}- {{icon i translatedTitle=this.dasherizedTitle}}+ {{dIcon i translatedTitle=this.dasherizedTitle}}{{/each}}<span class="name">diff --git a/frontend/discourse/select-kit/components/select-kit/select-kit-row.gjs b/frontend/discourse/select-kit/components/select-kit/select-kit-row.gjsindex fe908190074..e5911ac7aaa 100644--- a/frontend/discourse/select-kit/components/select-kit/select-kit-row.gjs+++ b/frontend/discourse/select-kit/components/select-kit/select-kit-row.gjs@@ -10,10 +10,10 @@ import {classNames,tagName,} from "@ember-decorators/component";-import icon from "discourse/helpers/d-icon";import { makeArray } from "discourse/lib/helpers";import { isValidInput } from "discourse/select-kit/lib/input-utils";import selectKitPropUtils from "discourse/select-kit/lib/select-kit-prop-utils";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";@classNames("select-kit-row")@@ -229,7 +229,7 @@ export default class SelectKitRow extends Component {<template>{{#each this.icons as |i|}}- {{icon i translatedTitle=this.dasherizedTitle}}+ {{dIcon i translatedTitle=this.dasherizedTitle}}{{/each}}<span class="name">diff --git a/frontend/discourse/select-kit/components/select-kit/single-select-header.gjs b/frontend/discourse/select-kit/components/select-kit/single-select-header.gjsindex dbfdef2f79a..442faafebd0 100644--- a/frontend/discourse/select-kit/components/select-kit/single-select-header.gjs+++ b/frontend/discourse/select-kit/components/select-kit/single-select-header.gjs@@ -4,9 +4,9 @@ import {classNames,tagName,} from "@ember-decorators/component";-import icon from "discourse/helpers/d-icon";import { resolveComponent } from "discourse/select-kit/components/select-kit";import SelectKitHeaderComponent from "discourse/select-kit/components/select-kit/select-kit-header";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";@tagName("summary")@@ -41,7 +41,7 @@ export default class SingleSelectHeader extends SelectKitHeaderComponent {<template><div class="select-kit-header-wrapper">- {{#each this.icons as |iconName|}} {{icon iconName}} {{/each}}+ {{#each this.icons as |iconName|}} {{dIcon iconName}} {{/each}}{{#let(resolveComponent this this.selectKit.options.selectedNameComponent)diff --git a/frontend/discourse/select-kit/components/selected-choice-category.gjs b/frontend/discourse/select-kit/components/selected-choice-category.gjsindex a1c7560b68f..685743320b6 100644--- a/frontend/discourse/select-kit/components/selected-choice-category.gjs+++ b/frontend/discourse/select-kit/components/selected-choice-category.gjs@@ -1,8 +1,8 @@import { computed } from "@ember/object";import { trustHTML } from "@ember/template";import { tagName } from "@ember-decorators/component";-import { categoryBadgeHTML } from "discourse/helpers/category-link";import SelectedChoiceComponent from "discourse/select-kit/components/selected-choice";+import { categoryBadgeHTML } from "discourse/ui-kit/helpers/d-category-link";@tagName("")export default class SelectedChoiceCategory extends SelectedChoiceComponent {diff --git a/frontend/discourse/select-kit/components/selected-choice.gjs b/frontend/discourse/select-kit/components/selected-choice.gjsindex 346797f53ff..f53b1d3aed6 100644--- a/frontend/discourse/select-kit/components/selected-choice.gjs+++ b/frontend/discourse/select-kit/components/selected-choice.gjs@@ -5,8 +5,8 @@ import { on } from "@ember/modifier";import { computed } from "@ember/object";import { guidFor } from "@ember/object/internals";import { tagName } from "@ember-decorators/component";-import icon from "discourse/helpers/d-icon";import selectKitPropUtils from "discourse/select-kit/lib/select-kit-prop-utils";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";@tagName("")@@ -62,7 +62,7 @@ export default class SelectedChoice extends Component {id="{{this.id}}-choice"class="btn btn-default selected-choice {{this.extraClass}}">- {{icon "xmark"}}+ {{dIcon "xmark"}}{{#if (has-block)}}{{yield}}{{else}}diff --git a/frontend/discourse/select-kit/components/selected-flair.gjs b/frontend/discourse/select-kit/components/selected-flair.gjsindex de6c7ee5d04..2b7d0ec5b86 100644--- a/frontend/discourse/select-kit/components/selected-flair.gjs+++ b/frontend/discourse/select-kit/components/selected-flair.gjs@@ -1,12 +1,12 @@import { tagName } from "@ember-decorators/component";-import AvatarFlair from "discourse/components/avatar-flair";import SelectedNameComponent from "discourse/select-kit/components/selected-name";+import DAvatarFlair from "discourse/ui-kit/d-avatar-flair";@tagName("")export default class SelectedFlair extends SelectedNameComponent {<template>{{#if this.item.url}}- <AvatarFlair+ <DAvatarFlair@flairName={{this.item.name}}@flairUrl={{this.item.url}}@flairBgColor={{this.item.bgColor}}diff --git a/frontend/discourse/select-kit/components/selected-font.gjs b/frontend/discourse/select-kit/components/selected-font.gjsindex 15298e44038..285e34b1f98 100644--- a/frontend/discourse/select-kit/components/selected-font.gjs+++ b/frontend/discourse/select-kit/components/selected-font.gjs@@ -1,9 +1,9 @@-import concatClass from "discourse/helpers/concat-class";import SelectedNameComponent from "discourse/select-kit/components/selected-name";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";export default class SelectedFont extends SelectedNameComponent {<template>- <span class={{concatClass "name" this.item.classNames}}>+ <span class={{dConcatClass "name" this.item.classNames}}>{{this.label}}</span></template>diff --git a/frontend/discourse/select-kit/components/selected-name.gjs b/frontend/discourse/select-kit/components/selected-name.gjsindex 15294333ed3..61d2c8eaf91 100644--- a/frontend/discourse/select-kit/components/selected-name.gjs+++ b/frontend/discourse/select-kit/components/selected-name.gjs@@ -5,11 +5,11 @@ import { fn } from "@ember/helper";import { computed, get } from "@ember/object";import { guidFor } from "@ember/object/internals";import { tagName } from "@ember-decorators/component";-import DButton from "discourse/components/d-button";-import icon from "discourse/helpers/d-icon";import { makeArray } from "discourse/lib/helpers";import selectKitPropUtils from "discourse/select-kit/lib/select-kit-prop-utils";import { and } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import dIcon from "discourse/ui-kit/helpers/d-icon";@tagName("")@selectKitPropUtils@@ -126,7 +126,7 @@ export default class SelectedName extends Component {{{/if}}{{#if (and this.renderIcon this.item.icon)}}- {{icon this.item.icon}}+ {{dIcon this.item.icon}}{{/if}}<span class="name">@@ -148,7 +148,7 @@ export default class SelectedName extends Component {lang={{this.lang}}class="select-kit-selected-name selected-name choice">- {{icon this.item.icon}}+ {{dIcon this.item.icon}}</div>{{/if}}{{/if}}diff --git a/frontend/discourse/select-kit/components/tag-category-admin-dropdown.js b/frontend/discourse/select-kit/components/tag-category-admin-dropdown.jsindex ef873f34250..ce3d3d6aafc 100644--- a/frontend/discourse/select-kit/components/tag-category-admin-dropdown.js+++ b/frontend/discourse/select-kit/components/tag-category-admin-dropdown.js@@ -1,8 +1,8 @@import { computed } from "@ember/object";import { classNames } from "@ember-decorators/component";-import { categoryBadgeHTML } from "discourse/helpers/category-link";import renderTag from "discourse/lib/render-tag";import DropdownSelectBoxComponent from "discourse/select-kit/components/dropdown-select-box";+import { categoryBadgeHTML } from "discourse/ui-kit/helpers/d-category-link";import { i18n } from "discourse-i18n";import { pluginApiIdentifiers, selectKitOptions } from "./select-kit";diff --git a/frontend/discourse/select-kit/components/tag-chooser-row.gjs b/frontend/discourse/select-kit/components/tag-chooser-row.gjsindex 79948eec691..5c61ffce0aa 100644--- a/frontend/discourse/select-kit/components/tag-chooser-row.gjs+++ b/frontend/discourse/select-kit/components/tag-chooser-row.gjs@@ -1,10 +1,10 @@import { classNames } from "@ember-decorators/component";-import discourseTag from "discourse/helpers/discourse-tag";import SelectKitRowComponent from "discourse/select-kit/components/select-kit/select-kit-row";+import dDiscourseTag from "discourse/ui-kit/helpers/d-discourse-tag";@classNames("tag-chooser-row")export default class TagChooserRow extends SelectKitRowComponent {<template>- {{discourseTag this.rowName count=this.item.count noHref=true}}+ {{dDiscourseTag this.rowName count=this.item.count noHref=true}}</template>}diff --git a/frontend/discourse/select-kit/components/tag-drop/tag-drop-header.gjs b/frontend/discourse/select-kit/components/tag-drop/tag-drop-header.gjsindex 380a742e399..1d0f16cf015 100644--- a/frontend/discourse/select-kit/components/tag-drop/tag-drop-header.gjs+++ b/frontend/discourse/select-kit/components/tag-drop/tag-drop-header.gjs@@ -1,7 +1,7 @@import { classNames } from "@ember-decorators/component";-import icon from "discourse/helpers/d-icon";import ComboBoxSelectBoxHeaderComponent from "discourse/select-kit/components/combo-box/combo-box-header";import { resolveComponent } from "discourse/select-kit/components/select-kit";+import dIcon from "discourse/ui-kit/helpers/d-icon";@classNames("tag-drop-header")export default class TagDropHeader extends ComboBoxSelectBoxHeaderComponent {@@ -19,7 +19,7 @@ export default class TagDropHeader extends ComboBoxSelectBoxHeaderComponent {/>{{/let}}- {{icon this.caretIcon class="angle-icon"}}+ {{dIcon this.caretIcon class="angle-icon"}}</div></template>}diff --git a/frontend/discourse/select-kit/components/tag-row.gjs b/frontend/discourse/select-kit/components/tag-row.gjsindex 8b2a9fb9b1c..19d1baec89c 100644--- a/frontend/discourse/select-kit/components/tag-row.gjs+++ b/frontend/discourse/select-kit/components/tag-row.gjs@@ -1,7 +1,7 @@import { computed } from "@ember/object";import { classNames } from "@ember-decorators/component";-import discourseTag from "discourse/helpers/discourse-tag";import SelectKitRowComponent from "discourse/select-kit/components/select-kit/select-kit-row";+import dDiscourseTag from "discourse/ui-kit/helpers/d-discourse-tag";@classNames("tag-row")export default class TagRow extends SelectKitRowComponent {@@ -12,7 +12,7 @@ export default class TagRow extends SelectKitRowComponent {<template>{{#if this.isTag}}- {{discourseTag+ {{dDiscourseTagthis.rowNamenoHref=truedescription=this.item.descriptiondiff --git a/frontend/discourse/select-kit/components/topic-row.gjs b/frontend/discourse/select-kit/components/topic-row.gjsindex 581952b8fdf..282bee75f38 100644--- a/frontend/discourse/select-kit/components/topic-row.gjs+++ b/frontend/discourse/select-kit/components/topic-row.gjs@@ -1,16 +1,16 @@import { classNames } from "@ember-decorators/component";import TopicStatus from "discourse/components/topic-status";-import boundCategoryLink from "discourse/helpers/bound-category-link";-import replaceEmoji from "discourse/helpers/replace-emoji";import SelectKitRowComponent from "discourse/select-kit/components/select-kit/select-kit-row";+import dBoundCategoryLink from "discourse/ui-kit/helpers/d-bound-category-link";+import dReplaceEmoji from "discourse/ui-kit/helpers/d-replace-emoji";@classNames("topic-row")export default class TopicRow extends SelectKitRowComponent {<template><TopicStatus @topic={{this.item}} @disableActions={{true}} />- <div class="topic-title">{{replaceEmoji this.item.title}}</div>+ <div class="topic-title">{{dReplaceEmoji this.item.title}}</div><div class="topic-categories">- {{boundCategoryLink+ {{dBoundCategoryLinkthis.item.categoryancestors=this.item.category.predecessorshideParent=truediff --git a/frontend/discourse/select-kit/components/user-chooser/user-row.gjs b/frontend/discourse/select-kit/components/user-chooser/user-row.gjsindex fd88e6fa080..b1f8fd756a0 100644--- a/frontend/discourse/select-kit/components/user-chooser/user-row.gjs+++ b/frontend/discourse/select-kit/components/user-chooser/user-row.gjs@@ -1,12 +1,12 @@import { classNames } from "@ember-decorators/component";-import avatar from "discourse/helpers/avatar";import formatUsername from "discourse/helpers/format-username";import SelectKitRowComponent from "discourse/select-kit/components/select-kit/select-kit-row";+import dAvatar from "discourse/ui-kit/helpers/d-avatar";@classNames("user-row")export default class UserRow extends SelectKitRowComponent {<template>- {{avatar this.item imageSize="tiny"}}+ {{dAvatar this.item imageSize="tiny"}}<span class="username">{{formatUsername this.item.username}}</span>diff --git a/frontend/discourse/tests/acceptance/modal-service-test.gjs b/frontend/discourse/tests/acceptance/modal-service-test.gjsindex c8081e2dd3b..786b4e90b2b 100644--- a/frontend/discourse/tests/acceptance/modal-service-test.gjs+++ b/frontend/discourse/tests/acceptance/modal-service-test.gjs@@ -5,14 +5,14 @@ import { action } from "@ember/object";import { getOwner } from "@ember/owner";import { click, settled, triggerKeyEvent, visit } from "@ember/test-helpers";import { test } from "qunit";+import { acceptance } from "discourse/tests/helpers/qunit-helpers";+import { registerTemporaryModule } from "discourse/tests/helpers/temporary-module-helper";import DModal, {CLOSE_INITIATED_BY_BUTTON,CLOSE_INITIATED_BY_CLICK_OUTSIDE,CLOSE_INITIATED_BY_ESC,CLOSE_INITIATED_BY_MODAL_SHOW,-} from "discourse/components/d-modal";-import { acceptance } from "discourse/tests/helpers/qunit-helpers";-import { registerTemporaryModule } from "discourse/tests/helpers/temporary-module-helper";+} from "discourse/ui-kit/d-modal";class MyModalClass extends Component {<template>diff --git a/frontend/discourse/tests/acceptance/topic-discovery-test.js b/frontend/discourse/tests/acceptance/topic-discovery-test.jsindex 77f9430361b..85222abf5fc 100644--- a/frontend/discourse/tests/acceptance/topic-discovery-test.js+++ b/frontend/discourse/tests/acceptance/topic-discovery-test.js@@ -1,9 +1,5 @@import { click, currentURL, find, visit } from "@ember/test-helpers";import { test } from "qunit";-import {- disableLoadMoreObserver,- enableLoadMoreObserver,-} from "discourse/components/load-more";import { cloneJSON } from "discourse/lib/object";import discoveryFixtures from "discourse/tests/fixtures/discovery-fixtures";import topFixtures from "discourse/tests/fixtures/top-fixtures";@@ -13,6 +9,10 @@ import {} from "discourse/tests/helpers/qunit-helpers";import selectKit from "discourse/tests/helpers/select-kit-helper";import stubIntersectionObserver from "discourse/tests/helpers/stub-intersection-observer";+import {+ disableLoadMoreObserver,+ enableLoadMoreObserver,+} from "discourse/ui-kit/d-load-more";acceptance("Topic Discovery", function (needs) {needs.settings({diff --git a/frontend/discourse/tests/acceptance/user-menu-test.js b/frontend/discourse/tests/acceptance/user-menu-test.jsindex f49a6195eec..ba3c8aa8f22 100644--- a/frontend/discourse/tests/acceptance/user-menu-test.js+++ b/frontend/discourse/tests/acceptance/user-menu-test.js@@ -10,7 +10,6 @@ import {} from "@ember/test-helpers";import { test } from "qunit";import { Promise } from "rsvp";-import DButton from "discourse/components/d-button";import { AUTO_GROUPS } from "discourse/lib/constants";import { cloneJSON } from "discourse/lib/object";import { withPluginApi } from "discourse/lib/plugin-api";@@ -24,6 +23,7 @@ import {queryAll,updateCurrentUser,} from "discourse/tests/helpers/qunit-helpers";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";acceptance("User menu", function (needs) {diff --git a/frontend/discourse/tests/helpers/qunit-helpers.js b/frontend/discourse/tests/helpers/qunit-helpers.jsindex 6b2112e4ce7..aff03b98992 100644--- a/frontend/discourse/tests/helpers/qunit-helpers.js+++ b/frontend/discourse/tests/helpers/qunit-helpers.js@@ -24,8 +24,6 @@ import {} from "discourse/components/composer-editor";import { resetComposerMessagesCache } from "discourse/components/composer-messages";import { clearPluginDocumentTitleCounters } from "discourse/components/d-document";-import { clearToolbarCallbacks } from "discourse/components/d-editor";-import { resetHtmlDecorators } from "discourse/components/decorated-html";import { clearExtraHeaderButtons as clearExtraGlimmerHeaderButtons } from "discourse/components/header";import { clearExtraHeaderIcons as clearExtraGlimmerHeaderIcons } from "discourse/components/header/icons";import { clearRegisteredTabs } from "discourse/components/more-topics";@@ -113,6 +111,8 @@ import {currentSettings,mergeSettings,} from "discourse/tests/helpers/site-settings";+import { resetHtmlDecorators } from "discourse/ui-kit/d-decorated-html";+import { clearToolbarCallbacks } from "discourse/ui-kit/d-editor";import I18n from "discourse-i18n";import { setupDSelectAssertions } from "./d-select-assertions";import { setupFormKitAssertions } from "./form-kit-assertions";diff --git a/frontend/discourse/tests/helpers/rich-editor-helper.gjs b/frontend/discourse/tests/helpers/rich-editor-helper.gjsindex 7296439e36a..c9068dde56a 100644--- a/frontend/discourse/tests/helpers/rich-editor-helper.gjs+++ b/frontend/discourse/tests/helpers/rich-editor-helper.gjs@@ -1,6 +1,6 @@import { tracked } from "@glimmer/tracking";import { click, render, settled, waitFor } from "@ember/test-helpers";-import DEditor from "discourse/components/d-editor";+import DEditor from "discourse/ui-kit/d-editor";export async function setupRichEditor(assert, markdown, multiToggle = false) {const self = new (class {diff --git a/frontend/discourse/tests/integration/components/d-breadcrumbs-test.gjs b/frontend/discourse/tests/integration/components/d-breadcrumbs-test.gjsdeleted file mode 100644index 5fcc6d5e7d9..00000000000--- a/frontend/discourse/tests/integration/components/d-breadcrumbs-test.gjs+++ /dev/null@@ -1,76 +0,0 @@-import { render } from "@ember/test-helpers";-import { module, test } from "qunit";-import DBreadcrumbsContainer from "discourse/components/d-breadcrumbs-container";-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import { setupRenderingTest } from "discourse/tests/helpers/component-test";-import { i18n } from "discourse-i18n";--module(- "Component | DBreadcrumbsContainer and DBreadcrumbsItem",- function (hooks) {- setupRenderingTest(hooks);-- test("it renders a DBreadcrumbsContainer with multiple DBreadcrumbsItems", async function (assert) {- await render(- <template>- <DBreadcrumbsContainer />- <DBreadcrumbsItem @path="/admin" @label={{i18n "admin_title"}} />- <DBreadcrumbsItem- @path="/about"- @label={{i18n "about.simple_title"}}- />- </template>- );-- assert- .dom(".d-breadcrumbs .d-breadcrumbs__item .d-breadcrumbs__link")- .exists({ count: 2 });- });-- test("it renders a DBreadcrumbsItem with additional link and item classes", async function (assert) {- await render(- <template>- <DBreadcrumbsContainer- @additionalLinkClasses="some-class"- @additionalItemClasses="other-class"- />- <DBreadcrumbsItem @path="/admin" @label={{i18n "admin_title"}} />- </template>- );-- assert.dom(".d-breadcrumbs .d-breadcrumbs__item.other-class").exists();- assert- .dom(- ".d-breadcrumbs .d-breadcrumbs__item .d-breadcrumbs__link.some-class"- )- .exists();- });-- test("separator is rendered on every item except the last", async function (assert) {- await render(- <template>- <DBreadcrumbsContainer />- <DBreadcrumbsItem @path="/admin" @label="Admin" />- <DBreadcrumbsItem @path="/admin/backups" @label="Backups" />- <DBreadcrumbsItem @path="/admin/backups/logs" @label="Logs" />- </template>- );-- assert.dom(".d-breadcrumbs li .separator").exists({ count: 2 });- assert.dom(".d-breadcrumbs li:last-child .separator").doesNotExist();- });-- test("it renders multiple DBreadcrumbsContainer elements with the same DBreadcrumbsItem links", async function (assert) {- await render(- <template>- <DBreadcrumbsContainer />- <DBreadcrumbsContainer />- <DBreadcrumbsItem @path="/admin" @label={{i18n "admin_title"}} />- </template>- );-- assert.dom(".d-breadcrumbs").exists({ count: 2 });- assert.dom(".d-breadcrumbs .d-breadcrumbs__item").exists({ count: 2 });- });- }-);diff --git a/frontend/discourse/tests/integration/components/d-icon-grid-picker-test.gjs b/frontend/discourse/tests/integration/components/d-icon-grid-picker-test.gjsindex ca671f79fae..d274575c3ca 100644--- a/frontend/discourse/tests/integration/components/d-icon-grid-picker-test.gjs+++ b/frontend/discourse/tests/integration/components/d-icon-grid-picker-test.gjs@@ -1,8 +1,8 @@import { click, render, triggerKeyEvent, waitFor } from "@ember/test-helpers";import { module, test } from "qunit";-import DIconGridPicker from "discourse/components/d-icon-grid-picker";import { setupRenderingTest } from "discourse/tests/helpers/component-test";import pretender, { response } from "discourse/tests/helpers/create-pretender";+import DIconGridPicker from "discourse/ui-kit/d-icon-grid-picker";const noop = () => {};diff --git a/frontend/discourse/tests/integration/components/float-kit/d-button-tooltip-test.gjs b/frontend/discourse/tests/integration/components/float-kit/d-button-tooltip-test.gjsindex 1083481efd4..d406d3955c1 100644--- a/frontend/discourse/tests/integration/components/float-kit/d-button-tooltip-test.gjs+++ b/frontend/discourse/tests/integration/components/float-kit/d-button-tooltip-test.gjs@@ -1,9 +1,9 @@import { render } from "@ember/test-helpers";import { module, test } from "qunit";-import DButton from "discourse/components/d-button";import DButtonTooltip from "discourse/float-kit/components/d-button-tooltip";import DTooltip from "discourse/float-kit/components/d-tooltip";import { setupRenderingTest } from "discourse/tests/helpers/component-test";+import DButton from "discourse/ui-kit/d-button";module("Integration | Component | FloatKit | d-button-tooltip",diff --git a/frontend/discourse/tests/integration/components/float-kit/d-menu-test.gjs b/frontend/discourse/tests/integration/components/float-kit/d-menu-test.gjsindex d25e2ea3009..eabc991b469 100644--- a/frontend/discourse/tests/integration/components/float-kit/d-menu-test.gjs+++ b/frontend/discourse/tests/integration/components/float-kit/d-menu-test.gjs@@ -10,13 +10,13 @@ import {triggerKeyEvent,} from "@ember/test-helpers";import { module, test } from "qunit";-import DButton from "discourse/components/d-button";import DDefaultToast from "discourse/float-kit/components/d-default-toast";import DMenu from "discourse/float-kit/components/d-menu";import DMenuInstance from "discourse/float-kit/lib/d-menu-instance";-import element_ from "discourse/helpers/element";import { forceMobile } from "discourse/lib/mobile";import { setupRenderingTest } from "discourse/tests/helpers/component-test";+import DButton from "discourse/ui-kit/d-button";+import dElement from "discourse/ui-kit/helpers/d-element";module("Integration | Component | FloatKit | d-menu", function (hooks) {setupRenderingTest(hooks);@@ -560,7 +560,7 @@ module("Integration | Component | FloatKit | d-menu", function (hooks) {test("@triggerComponent", async function (assert) {await render(<template>- <DMenu @inline={{true}} @triggerComponent={{element_ "span"}}>1</DMenu>+ <DMenu @inline={{true}} @triggerComponent={{dElement "span"}}>1</DMenu></template>);diff --git a/frontend/discourse/tests/integration/components/form-kit/controls/select-test.gjs b/frontend/discourse/tests/integration/components/form-kit/controls/select-test.gjsindex 98aae50e137..5e233fb764c 100644--- a/frontend/discourse/tests/integration/components/form-kit/controls/select-test.gjs+++ b/frontend/discourse/tests/integration/components/form-kit/controls/select-test.gjs@@ -1,10 +1,10 @@import { hash } from "@ember/helper";import { render } from "@ember/test-helpers";import { module, test } from "qunit";-import { NO_VALUE_OPTION } from "discourse/components/d-select";import Form from "discourse/components/form";import { setupRenderingTest } from "discourse/tests/helpers/component-test";import formKit from "discourse/tests/helpers/form-kit-helper";+import { NO_VALUE_OPTION } from "discourse/ui-kit/d-select";module("Integration | Component | FormKit | Controls | Select",diff --git a/frontend/discourse/tests/integration/components/input-size-test.gjs b/frontend/discourse/tests/integration/components/input-size-test.gjsindex 16b13d341e5..8aec0eeedf1 100644--- a/frontend/discourse/tests/integration/components/input-size-test.gjs+++ b/frontend/discourse/tests/integration/components/input-size-test.gjs@@ -1,10 +1,10 @@import { hash } from "@ember/helper";import { find, render } from "@ember/test-helpers";import { module, test } from "qunit";-import DButton from "discourse/components/d-button";-import TextField from "discourse/components/text-field";import ComboBox from "discourse/select-kit/components/combo-box";import { setupRenderingTest } from "discourse/tests/helpers/component-test";+import DButton from "discourse/ui-kit/d-button";+import DTextField from "discourse/ui-kit/d-text-field";module("Integration | Component | consistent input/dropdown/button sizes",@@ -35,7 +35,7 @@ module(test("button + text input", async function (assert) {await render(<template>- <TextField /> <DButton @icon="plus" @label="topic.create" />+ <DTextField /> <DButton @icon="plus" @label="topic.create" /></template>);@@ -49,7 +49,7 @@ module(test("combo box + input", async function (assert) {await render(<template>- <ComboBox @options={{hash none="category.none"}} /> <TextField />+ <ComboBox @options={{hash none="category.none"}} /> <DTextField /></template>);diff --git a/frontend/discourse/tests/integration/components/number-field-test.gjs b/frontend/discourse/tests/integration/components/number-field-test.gjsindex 822c02feeb1..7ee1dfe8c00 100644--- a/frontend/discourse/tests/integration/components/number-field-test.gjs+++ b/frontend/discourse/tests/integration/components/number-field-test.gjs@@ -1,8 +1,8 @@import { fillIn, render, triggerKeyEvent } from "@ember/test-helpers";import { module, test } from "qunit";-import NumberField from "discourse/components/number-field";import { withSilencedDeprecationsAsync } from "discourse/lib/deprecated";import { setupRenderingTest } from "discourse/tests/helpers/component-test";+import DNumberField from "discourse/ui-kit/d-number-field";module("Integration | Component | number-field", function (hooks) {setupRenderingTest(hooks);@@ -13,7 +13,7 @@ module("Integration | Component | number-field", function (hooks) {await withSilencedDeprecationsAsync("discourse.number-field", async () => {await render(<template>- <NumberField @value={{this.value}} @classNames="number-field-test" />+ <DNumberField @value={{this.value}} @classNames="number-field-test" /></template>);});@@ -42,7 +42,7 @@ module("Integration | Component | number-field", function (hooks) {await withSilencedDeprecationsAsync("discourse.number-field", async () => {await render(<template>- <NumberField+ <DNumberField@value={{this.value}}@classNames="number-field-test"@min="1"@@ -63,7 +63,7 @@ module("Integration | Component | number-field", function (hooks) {await withSilencedDeprecationsAsync("discourse.number-field", async () => {await render(<template>- <NumberField+ <DNumberField@value={{this.value}}@classNames="number-field-test"@min="-10"diff --git a/frontend/discourse/tests/integration/components/relative-time-picker-test.gjs b/frontend/discourse/tests/integration/components/relative-time-picker-test.gjsindex cffd7f52ce5..4d4e66a5e2d 100644--- a/frontend/discourse/tests/integration/components/relative-time-picker-test.gjs+++ b/frontend/discourse/tests/integration/components/relative-time-picker-test.gjs@@ -1,9 +1,9 @@import { tracked } from "@glimmer/tracking";import { fillIn, render, settled, typeIn } from "@ember/test-helpers";import { module, test } from "qunit";-import RelativeTimePicker from "discourse/components/relative-time-picker";import { setupRenderingTest } from "discourse/tests/helpers/component-test";import selectKit from "discourse/tests/helpers/select-kit-helper";+import DRelativeTimePicker from "discourse/ui-kit/d-relative-time-picker";module("Integration | Component | relative-time-picker", function (hooks) {setupRenderingTest(hooks);@@ -12,7 +12,7 @@ module("Integration | Component | relative-time-picker", function (hooks) {let updatedValue;const update = (value) => (updatedValue = value);await render(- <template><RelativeTimePicker @onChange={{update}} /></template>+ <template><DRelativeTimePicker @onChange={{update}} /></template>);// empty and "days" by default@@ -84,7 +84,7 @@ module("Integration | Component | relative-time-picker", function (hooks) {const update = (value) => (testState.minutes = value);await render(<template>- <RelativeTimePicker+ <DRelativeTimePicker@onChange={{update}}@durationMinutes={{testState.minutes}}/>@@ -164,7 +164,7 @@ module("Integration | Component | relative-time-picker", function (hooks) {await render(<template>- <RelativeTimePicker @durationMinutes={{testState.value}} />+ <DRelativeTimePicker @durationMinutes={{testState.value}} /></template>);@@ -179,7 +179,7 @@ module("Integration | Component | relative-time-picker", function (hooks) {test("prefills and preselects minutes", async function (assert) {await render(- <template><RelativeTimePicker @durationMinutes="5" /></template>+ <template><DRelativeTimePicker @durationMinutes="5" /></template>);assert.strictEqual(selectKit().header().value(), "mins");@@ -188,7 +188,7 @@ module("Integration | Component | relative-time-picker", function (hooks) {test("prefills and preselects null minutes", async function (assert) {await render(- <template><RelativeTimePicker @durationMinutes={{null}} /></template>+ <template><DRelativeTimePicker @durationMinutes={{null}} /></template>);assert.strictEqual(selectKit().header().value(), "mins");@@ -197,7 +197,7 @@ module("Integration | Component | relative-time-picker", function (hooks) {test("prefills and preselects hours based on converted minutes", async function (assert) {await render(- <template><RelativeTimePicker @durationMinutes="90" /></template>+ <template><DRelativeTimePicker @durationMinutes="90" /></template>);assert.strictEqual(selectKit().header().value(), "hours");@@ -206,7 +206,7 @@ module("Integration | Component | relative-time-picker", function (hooks) {test("prefills and preselects days based on converted minutes", async function (assert) {await render(- <template><RelativeTimePicker @durationMinutes="2880" /></template>+ <template><DRelativeTimePicker @durationMinutes="2880" /></template>);assert.strictEqual(selectKit().header().value(), "days");@@ -215,7 +215,7 @@ module("Integration | Component | relative-time-picker", function (hooks) {test("prefills and preselects months based on converted minutes", async function (assert) {await render(- <template><RelativeTimePicker @durationMinutes="151200" /></template>+ <template><DRelativeTimePicker @durationMinutes="151200" /></template>);assert.strictEqual(selectKit().header().value(), "months");@@ -224,7 +224,7 @@ module("Integration | Component | relative-time-picker", function (hooks) {test("prefills and preselects years based on converted minutes", async function (assert) {await render(- <template><RelativeTimePicker @durationMinutes="525700" /></template>+ <template><DRelativeTimePicker @durationMinutes="525700" /></template>);assert.strictEqual(selectKit().header().value(), "years");@@ -233,7 +233,7 @@ module("Integration | Component | relative-time-picker", function (hooks) {test("prefills and preselects hours", async function (assert) {await render(- <template><RelativeTimePicker @durationHours="5" /></template>+ <template><DRelativeTimePicker @durationHours="5" /></template>);assert.strictEqual(selectKit().header().value(), "hours");@@ -242,7 +242,7 @@ module("Integration | Component | relative-time-picker", function (hooks) {test("prefills and preselects null hours", async function (assert) {await render(- <template><RelativeTimePicker @durationHours={{null}} /></template>+ <template><DRelativeTimePicker @durationHours={{null}} /></template>);assert.strictEqual(selectKit().header().value(), "hours");@@ -251,7 +251,7 @@ module("Integration | Component | relative-time-picker", function (hooks) {test("prefills and preselects minutes based on converted hours", async function (assert) {await render(- <template><RelativeTimePicker @durationHours="0.5" /></template>+ <template><DRelativeTimePicker @durationHours="0.5" /></template>);assert.strictEqual(selectKit().header().value(), "mins");@@ -260,7 +260,7 @@ module("Integration | Component | relative-time-picker", function (hooks) {test("prefills and preselects days based on converted hours", async function (assert) {await render(- <template><RelativeTimePicker @durationHours="48" /></template>+ <template><DRelativeTimePicker @durationHours="48" /></template>);assert.strictEqual(selectKit().header().value(), "days");@@ -269,7 +269,7 @@ module("Integration | Component | relative-time-picker", function (hooks) {test("prefills and preselects months based on converted hours", async function (assert) {await render(- <template><RelativeTimePicker @durationHours="2160" /></template>+ <template><DRelativeTimePicker @durationHours="2160" /></template>);assert.strictEqual(selectKit().header().value(), "months");@@ -278,7 +278,7 @@ module("Integration | Component | relative-time-picker", function (hooks) {test("prefills and preselects years based on converted hours", async function (assert) {await render(- <template><RelativeTimePicker @durationHours="17520" /></template>+ <template><DRelativeTimePicker @durationHours="17520" /></template>);assert.strictEqual(selectKit().header().value(), "years");@@ -290,7 +290,7 @@ module("Integration | Component | relative-time-picker", function (hooks) {const update = (value) => (updatedValue = value);await render(<template>- <RelativeTimePicker @onChange={{update}} @durationOutputUnit="hours" />+ <DRelativeTimePicker @onChange={{update}} @durationOutputUnit="hours" /></template>);@@ -322,7 +322,7 @@ module("Integration | Component | relative-time-picker", function (hooks) {let updatedValue;const update = (value) => (updatedValue = value);await render(- <template><RelativeTimePicker @onChange={{update}} /></template>+ <template><DRelativeTimePicker @onChange={{update}} /></template>);await typeIn(".relative-time-duration", "2");diff --git a/frontend/discourse/tests/integration/components/select-kit/future-date-input-test.gjs b/frontend/discourse/tests/integration/components/select-kit/future-date-input-test.gjsindex e9e3e1217a1..b682e1f84ae 100644--- a/frontend/discourse/tests/integration/components/select-kit/future-date-input-test.gjs+++ b/frontend/discourse/tests/integration/components/select-kit/future-date-input-test.gjs@@ -1,10 +1,10 @@import { fn, hash } from "@ember/helper";import { fillIn, render } from "@ember/test-helpers";import { module, test } from "qunit";-import FutureDateInput from "discourse/components/future-date-input";import { setupRenderingTest } from "discourse/tests/helpers/component-test";import { fakeTime, queryAll } from "discourse/tests/helpers/qunit-helpers";import selectKit from "discourse/tests/helpers/select-kit-helper";+import DFutureDateInput from "discourse/ui-kit/d-future-date-input";import { i18n } from "discourse-i18n";function getOptions() {@@ -31,7 +31,7 @@ module(test("rendering and expanding", async function (assert) {await render(<template>- <FutureDateInput+ <DFutureDateInput@options={{hash none="time_shortcut.select_timeframe"}}/></template>@@ -60,7 +60,7 @@ module(true);- await render(<template><FutureDateInput /></template>);+ await render(<template><DFutureDateInput /></template>);await this.subject.expand();const options = getOptions();@@ -84,7 +84,7 @@ module(});test("shows 'Custom date and time' by default", async function (assert) {- await render(<template><FutureDateInput /></template>);+ await render(<template><DFutureDateInput /></template>);await this.subject.expand();const options = getOptions();@@ -95,7 +95,7 @@ module(test("doesn't show 'Custom date and time' if disabled", async function (assert) {await render(- <template><FutureDateInput @includeDateTime={{false}} /></template>+ <template><DFutureDateInput @includeDateTime={{false}} /></template>);await this.subject.expand();@@ -107,7 +107,7 @@ module(test("shows the now option if enabled", async function (assert) {await render(- <template><FutureDateInput @includeNow={{true}} /></template>+ <template><DFutureDateInput @includeNow={{true}} /></template>);await this.subject.expand();@@ -122,7 +122,7 @@ module(await render(<template>- <FutureDateInput+ <DFutureDateInput@input={{this.input}}@onChangeInput={{fn (mut this.input)}}/>diff --git a/frontend/discourse/tests/integration/components/select-kit/single-select-test.gjs b/frontend/discourse/tests/integration/components/select-kit/single-select-test.gjsindex 03db5283f88..94d30241083 100644--- a/frontend/discourse/tests/integration/components/select-kit/single-select-test.gjs+++ b/frontend/discourse/tests/integration/components/select-kit/single-select-test.gjs@@ -1,10 +1,10 @@import { hash } from "@ember/helper";import { find, render, tab } from "@ember/test-helpers";import { module, test } from "qunit";-import DButton from "discourse/components/d-button";import SingleSelect from "discourse/select-kit/components/single-select";import { setupRenderingTest } from "discourse/tests/helpers/component-test";import selectKit from "discourse/tests/helpers/select-kit-helper";+import DButton from "discourse/ui-kit/d-button";import I18n, { i18n } from "discourse-i18n";const DEFAULT_CONTENT = [diff --git a/frontend/discourse/tests/integration/components/text-field-test.gjs b/frontend/discourse/tests/integration/components/text-field-test.gjsindex 1618a1ccebf..4d27c3fe5cb 100644--- a/frontend/discourse/tests/integration/components/text-field-test.gjs+++ b/frontend/discourse/tests/integration/components/text-field-test.gjs@@ -1,8 +1,8 @@import { fillIn, render } from "@ember/test-helpers";import { module, test } from "qunit";-import TextField from "discourse/components/text-field";import { resetSiteDirForTesting } from "discourse/lib/text-direction";import { setupRenderingTest } from "discourse/tests/helpers/component-test";+import DTextField from "discourse/ui-kit/d-text-field";module("Integration | Component | text-field", function (hooks) {setupRenderingTest(hooks);@@ -27,14 +27,14 @@ module("Integration | Component | text-field", function (hooks) {});test("renders correctly with no properties set", async function (assert) {- await render(<template><TextField /></template>);+ await render(<template><DTextField /></template>);assert.dom("input[type=text]").exists();});test("support a placeholder", async function (assert) {await render(- <template><TextField @placeholderKey="placeholder.i18n.key" /></template>+ <template><DTextField @placeholderKey="placeholder.i18n.key" /></template>);assert.dom("input[type=text]").exists();@@ -47,7 +47,7 @@ module("Integration | Component | text-field", function (hooks) {this.siteSettings.support_mixed_text_direction = true;await render(- <template><TextField @value="זהו שם עברי עם מקום עברי" /></template>+ <template><DTextField @value="זהו שם עברי עם מקום עברי" /></template>);assert.dom("input").hasAttribute("dir", "auto");@@ -59,7 +59,7 @@ module("Integration | Component | text-field", function (hooks) {document.documentElement.classList.add("rtl");resetSiteDirForTesting();- await render(<template><TextField /></template>);+ await render(<template><DTextField /></template>);assert.dom("input").hasAttribute("dir", "rtl");@@ -84,7 +84,7 @@ module("Integration | Component | text-field", function (hooks) {await render(<template>- <TextField+ <DTextFieldclass="tf-test"@value={{this.value}}@onChange={{this.changed}}@@ -111,7 +111,7 @@ module("Integration | Component | text-field", function (hooks) {await render(<template>- <TextField+ <DTextFieldclass="tf-test"@value={{this.value}}@onChangeImmediate={{this.changed}}diff --git a/frontend/discourse/tests/integration/components/async-content-test.gjs b/frontend/discourse/tests/integration/ui-kit/d-async-content-test.gjssimilarity index 86%rename from frontend/discourse/tests/integration/components/async-content-test.gjsrename to frontend/discourse/tests/integration/ui-kit/d-async-content-test.gjsindex f92c9ab1cd6..32fc8fb8938 100644--- a/frontend/discourse/tests/integration/components/async-content-test.gjs+++ b/frontend/discourse/tests/integration/ui-kit/d-async-content-test.gjs@@ -7,11 +7,11 @@ import { TrackedAsyncData } from "ember-async-data";import { module, test } from "qunit";import { Promise as RsvpPromise } from "rsvp";import sinon from "sinon";-import AsyncContent from "discourse/components/async-content";import DialogHolder from "discourse/dialog-holder/components/dialog-holder";import { setupRenderingTest } from "discourse/tests/helpers/component-test";+import DAsyncContent from "discourse/ui-kit/d-async-content";-module("Integration | Component | AsyncContent", function (hooks) {+module("Integration | ui-kit | DAsyncContent", function (hooks) {setupRenderingTest(hooks);module("@asyncData", function () {@@ -20,11 +20,11 @@ module("Integration | Component | AsyncContent", function (hooks) {await render(<template>- <AsyncContent @asyncData={{promise}}>+ <DAsyncContent @asyncData={{promise}}><:content as |data|><div class="content">{{data}}</div></:content>- </AsyncContent>+ </DAsyncContent></template>);@@ -37,11 +37,11 @@ module("Integration | Component | AsyncContent", function (hooks) {await render(<template>- <AsyncContent @asyncData={{promise}}>+ <DAsyncContent @asyncData={{promise}}><:content as |data|><div class="content">{{data}}</div></:content>- </AsyncContent>+ </DAsyncContent></template>);@@ -54,11 +54,11 @@ module("Integration | Component | AsyncContent", function (hooks) {await render(<template>- <AsyncContent @asyncData={{promise}}>+ <DAsyncContent @asyncData={{promise}}><:content as |data|><div class="content">{{data}}</div></:content>- </AsyncContent>+ </DAsyncContent></template>);@@ -70,11 +70,11 @@ module("Integration | Component | AsyncContent", function (hooks) {await render(<template>- <AsyncContent @asyncData={{promise}}>+ <DAsyncContent @asyncData={{promise}}><:content as |data|><div class="content">{{data}}</div></:content>- </AsyncContent>+ </DAsyncContent></template>);@@ -86,11 +86,11 @@ module("Integration | Component | AsyncContent", function (hooks) {await render(<template>- <AsyncContent @asyncData={{promise}}>+ <DAsyncContent @asyncData={{promise}}><:content as |data|><div class="content">{{data}}</div></:content>- </AsyncContent>+ </DAsyncContent></template>);@@ -107,11 +107,11 @@ module("Integration | Component | AsyncContent", function (hooks) {await render(<template>- <AsyncContent @asyncData={{promise}} @context="correct">+ <DAsyncContent @asyncData={{promise}} @context="correct"><:content as |data|><div class="content">{{data}}</div></:content>- </AsyncContent>+ </DAsyncContent></template>);@@ -134,11 +134,11 @@ module("Integration | Component | AsyncContent", function (hooks) {<template><button {{on "click" this.changeContext}}>Change Context</button>- <AsyncContent @asyncData={{this.load}} @context={{this.context}}>+ <DAsyncContent @asyncData={{this.load}} @context={{this.context}}><:content as |data|><div class="content">{{data}}</div></:content>- </AsyncContent>+ </DAsyncContent></template>});@@ -159,11 +159,11 @@ module("Integration | Component | AsyncContent", function (hooks) {const renderPromise = render(<template><div data-async-content-test>- <AsyncContent @asyncData={{promise}}>+ <DAsyncContent @asyncData={{promise}}><:content><div class="content"></div></:content>- </AsyncContent>+ </DAsyncContent></div></template>);@@ -186,7 +186,7 @@ module("Integration | Component | AsyncContent", function (hooks) {const renderPromise = render(<template><div data-async-content-test>- <AsyncContent @asyncData={{promise}}>+ <DAsyncContent @asyncData={{promise}}><:loading><div class="loading-provided"></div></:loading>@@ -194,7 +194,7 @@ module("Integration | Component | AsyncContent", function (hooks) {<:content><div class="content"></div></:content>- </AsyncContent>+ </DAsyncContent></div></template>);@@ -217,13 +217,13 @@ module("Integration | Component | AsyncContent", function (hooks) {await render(<template>- <AsyncContent @asyncData={{promise}}>+ <DAsyncContent @asyncData={{promise}}><:content as |data|><div class="content">{{data}}</div></:content>- </AsyncContent>+ </DAsyncContent></template>);@@ -237,13 +237,13 @@ module("Integration | Component | AsyncContent", function (hooks) {await render(<template>- <AsyncContent @asyncData={{promise}}>+ <DAsyncContent @asyncData={{promise}}><:content as |data|><div class="content">{{data}}</div></:content>- </AsyncContent>+ </DAsyncContent></template>);@@ -260,13 +260,13 @@ module("Integration | Component | AsyncContent", function (hooks) {await render(<template>- <AsyncContent @asyncData={{promise}}>+ <DAsyncContent @asyncData={{promise}}><:empty><div class="empty">Empty</div></:empty>- </AsyncContent>+ </DAsyncContent></template>);@@ -278,13 +278,13 @@ module("Integration | Component | AsyncContent", function (hooks) {await render(<template>- <AsyncContent @asyncData={{promise}}>+ <DAsyncContent @asyncData={{promise}}><:empty><div class="empty">Empty</div></:empty>- </AsyncContent>+ </DAsyncContent></template>);@@ -296,13 +296,13 @@ module("Integration | Component | AsyncContent", function (hooks) {await render(<template>- <AsyncContent @asyncData={{promise}}>+ <DAsyncContent @asyncData={{promise}}><:content><div class="content">Empty</div></:content>- </AsyncContent>+ </DAsyncContent></template>);@@ -315,13 +315,13 @@ module("Integration | Component | AsyncContent", function (hooks) {await render(<template>- <AsyncContent @asyncData={{promise}}>+ <DAsyncContent @asyncData={{promise}}><:empty><div class="empty">Empty</div></:empty>- </AsyncContent>+ </DAsyncContent></template>);@@ -338,7 +338,7 @@ module("Integration | Component | AsyncContent", function (hooks) {const promise = Promise.reject("error");await render(- <template><AsyncContent @asyncData={{promise}} /></template>+ <template><DAsyncContent @asyncData={{promise}} /></template>);assert.dom(".alert-error").exists();@@ -354,7 +354,7 @@ module("Integration | Component | AsyncContent", function (hooks) {await render(<template>- <AsyncContent @asyncData={{promise}} @errorMode="popup" />+ <DAsyncContent @asyncData={{promise}} @errorMode="popup" /><DialogHolder /></template>);@@ -371,13 +371,13 @@ module("Integration | Component | AsyncContent", function (hooks) {await render(<template>- <AsyncContent @asyncData={{promise}}>+ <DAsyncContent @asyncData={{promise}}><:error as |error|><div class="error">{{error}}</div></:error>- </AsyncContent>+ </DAsyncContent></template>);@@ -391,13 +391,13 @@ module("Integration | Component | AsyncContent", function (hooks) {await render(<template>- <AsyncContent @asyncData={{promise}}>+ <DAsyncContent @asyncData={{promise}}><:error as |error AsyncContentInlineErrorMessage|><div class="error"><AsyncContentInlineErrorMessage /></div></:error>- </AsyncContent>+ </DAsyncContent></template>);@@ -415,13 +415,13 @@ module("Integration | Component | AsyncContent", function (hooks) {await render(<template>- <AsyncContent @asyncData={{promise}}>+ <DAsyncContent @asyncData={{promise}}><:error as |error|><div class="error">{{error}}</div></:error>- </AsyncContent>+ </DAsyncContent></template>);@@ -433,13 +433,13 @@ module("Integration | Component | AsyncContent", function (hooks) {await render(<template>- <AsyncContent @asyncData={{promise}}>+ <DAsyncContent @asyncData={{promise}}><:error as |error|><div class="error">{{error}}</div></:error>- </AsyncContent>+ </DAsyncContent></template>);diff --git a/frontend/discourse/tests/integration/components/avatar-flair-test.gjs b/frontend/discourse/tests/integration/ui-kit/d-avatar-flair-test.gjssimilarity index 91%rename from frontend/discourse/tests/integration/components/avatar-flair-test.gjsrename to frontend/discourse/tests/integration/ui-kit/d-avatar-flair-test.gjsindex e091e380eb9..bb8e00336d0 100644--- a/frontend/discourse/tests/integration/components/avatar-flair-test.gjs+++ b/frontend/discourse/tests/integration/ui-kit/d-avatar-flair-test.gjs@@ -1,12 +1,12 @@import { render } from "@ember/test-helpers";import { module, test } from "qunit";-import AvatarFlair from "discourse/components/avatar-flair";import { setupRenderingTest } from "discourse/tests/helpers/component-test";+import DAvatarFlair from "discourse/ui-kit/d-avatar-flair";function renderComponent(flairArgs) {return render(<template>- <AvatarFlair+ <DAvatarFlair@flairBgColor={{flairArgs.flair_bg_color}}@flairColor={{flairArgs.flair_color}}@flairName={{flairArgs.flair_name}}@@ -16,7 +16,7 @@ function renderComponent(flairArgs) {);}-module("Integration | Component | AvatarFlair", function (hooks) {+module("Integration | ui-kit | DAvatarFlair", function (hooks) {setupRenderingTest(hooks);test("avatar flair with an icon", async function (assert) {diff --git a/frontend/discourse/tests/integration/components/badge-button-test.gjs b/frontend/discourse/tests/integration/ui-kit/d-badge-button-test.gjssimilarity index 70%rename from frontend/discourse/tests/integration/components/badge-button-test.gjsrename to frontend/discourse/tests/integration/ui-kit/d-badge-button-test.gjsindex b48c34d042f..135202fea7f 100644--- a/frontend/discourse/tests/integration/components/badge-button-test.gjs+++ b/frontend/discourse/tests/integration/ui-kit/d-badge-button-test.gjs@@ -1,15 +1,15 @@import { render } from "@ember/test-helpers";import { module, test } from "qunit";-import BadgeButton from "discourse/components/badge-button";import { setupRenderingTest } from "discourse/tests/helpers/component-test";+import DBadgeButton from "discourse/ui-kit/d-badge-button";-module("Integration | Component | badge-button", function (hooks) {+module("Integration | ui-kit | DBadgeButton", function (hooks) {setupRenderingTest(hooks);test("disabled badge", async function (assert) {const badge = { enabled: false };- await render(<template><BadgeButton @badge={{badge}} /></template>);+ await render(<template><DBadgeButton @badge={{badge}} /></template>);assert.dom(".user-badge.disabled").exists();});@@ -17,7 +17,7 @@ module("Integration | Component | badge-button", function (hooks) {test("enabled badge", async function (assert) {const badge = { enabled: true };- await render(<template><BadgeButton @badge={{badge}} /></template>);+ await render(<template><DBadgeButton @badge={{badge}} /></template>);assert.dom(".user-badge.disabled").doesNotExist();});@@ -25,7 +25,7 @@ module("Integration | Component | badge-button", function (hooks) {test("data-badge-name", async function (assert) {const badge = { name: "foo" };- await render(<template><BadgeButton @badge={{badge}} /></template>);+ await render(<template><DBadgeButton @badge={{badge}} /></template>);assert.dom('.user-badge[data-badge-name="foo"]').exists();});@@ -33,7 +33,7 @@ module("Integration | Component | badge-button", function (hooks) {test("title", async function (assert) {this.set("badge", { description: "a <a href>good</a> run" });- await render(<template><BadgeButton @badge={{this.badge}} /></template>);+ await render(<template><DBadgeButton @badge={{this.badge}} /></template>);assert.dom(".user-badge")@@ -53,7 +53,7 @@ module("Integration | Component | badge-button", function (hooks) {test("icon", async function (assert) {const badge = { icon: "xmark" };- await render(<template><BadgeButton @badge={{badge}} /></template>);+ await render(<template><DBadgeButton @badge={{badge}} /></template>);assert.dom(".d-icon.d-icon-xmark").exists();});@@ -63,9 +63,9 @@ module("Integration | Component | badge-button", function (hooks) {await render(<template>- <BadgeButton @badge={{badge}}>+ <DBadgeButton @badge={{badge}}><span class="test"></span>- </BadgeButton>+ </DBadgeButton></template>);@@ -75,7 +75,7 @@ module("Integration | Component | badge-button", function (hooks) {test("badgeTypeClassName", async function (assert) {const badge = { badgeTypeClassName: "foo" };- await render(<template><BadgeButton @badge={{badge}} /></template>);+ await render(<template><DBadgeButton @badge={{badge}} /></template>);assert.dom(".user-badge.foo").exists();});@@ -84,7 +84,7 @@ module("Integration | Component | badge-button", function (hooks) {const badge = { name: "foo" };await render(- <template><BadgeButton @badge={{badge}} @showName={{false}} /></template>+ <template><DBadgeButton @badge={{badge}} @showName={{false}} /></template>);assert.dom(".badge-display-name").doesNotExist();@@ -93,7 +93,7 @@ module("Integration | Component | badge-button", function (hooks) {test("showName defaults to true", async function (assert) {const badge = { name: "foo" };- await render(<template><BadgeButton @badge={{badge}} /></template>);+ await render(<template><DBadgeButton @badge={{badge}} /></template>);assert.dom(".badge-display-name").exists();});diff --git a/frontend/discourse/tests/integration/ui-kit/d-breadcrumbs-test.gjs b/frontend/discourse/tests/integration/ui-kit/d-breadcrumbs-test.gjsnew file mode 100644index 00000000000..b7a9e6b50eb--- /dev/null+++ b/frontend/discourse/tests/integration/ui-kit/d-breadcrumbs-test.gjs@@ -0,0 +1,70 @@+import { render } from "@ember/test-helpers";+import { module, test } from "qunit";+import { setupRenderingTest } from "discourse/tests/helpers/component-test";+import DBreadcrumbsContainer from "discourse/ui-kit/d-breadcrumbs-container";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import { i18n } from "discourse-i18n";++module("Integration | ui-kit | DBreadcrumbs", function (hooks) {+ setupRenderingTest(hooks);++ test("it renders a DBreadcrumbsContainer with multiple DBreadcrumbsItems", async function (assert) {+ await render(+ <template>+ <DBreadcrumbsContainer />+ <DBreadcrumbsItem @path="/admin" @label={{i18n "admin_title"}} />+ <DBreadcrumbsItem @path="/about" @label={{i18n "about.simple_title"}} />+ </template>+ );++ assert+ .dom(".d-breadcrumbs .d-breadcrumbs__item .d-breadcrumbs__link")+ .exists({ count: 2 });+ });++ test("it renders a DBreadcrumbsItem with additional link and item classes", async function (assert) {+ await render(+ <template>+ <DBreadcrumbsContainer+ @additionalLinkClasses="some-class"+ @additionalItemClasses="other-class"+ />+ <DBreadcrumbsItem @path="/admin" @label={{i18n "admin_title"}} />+ </template>+ );++ assert.dom(".d-breadcrumbs .d-breadcrumbs__item.other-class").exists();+ assert+ .dom(+ ".d-breadcrumbs .d-breadcrumbs__item .d-breadcrumbs__link.some-class"+ )+ .exists();+ });++ test("separator is rendered on every item except the last", async function (assert) {+ await render(+ <template>+ <DBreadcrumbsContainer />+ <DBreadcrumbsItem @path="/admin" @label="Admin" />+ <DBreadcrumbsItem @path="/admin/backups" @label="Backups" />+ <DBreadcrumbsItem @path="/admin/backups/logs" @label="Logs" />+ </template>+ );++ assert.dom(".d-breadcrumbs li .separator").exists({ count: 2 });+ assert.dom(".d-breadcrumbs li:last-child .separator").doesNotExist();+ });++ test("it renders multiple DBreadcrumbsContainer elements with the same DBreadcrumbsItem links", async function (assert) {+ await render(+ <template>+ <DBreadcrumbsContainer />+ <DBreadcrumbsContainer />+ <DBreadcrumbsItem @path="/admin" @label={{i18n "admin_title"}} />+ </template>+ );++ assert.dom(".d-breadcrumbs").exists({ count: 2 });+ assert.dom(".d-breadcrumbs .d-breadcrumbs__item").exists({ count: 2 });+ });+});diff --git a/frontend/discourse/tests/integration/components/d-button-test.gjs b/frontend/discourse/tests/integration/ui-kit/d-button-test.gjssimilarity index 98%rename from frontend/discourse/tests/integration/components/d-button-test.gjsrename to frontend/discourse/tests/integration/ui-kit/d-button-test.gjsindex d3b91f93936..59c41101269 100644--- a/frontend/discourse/tests/integration/components/d-button-test.gjs+++ b/frontend/discourse/tests/integration/ui-kit/d-button-test.gjs@@ -1,10 +1,10 @@import { click, render, triggerKeyEvent } from "@ember/test-helpers";import { module, test } from "qunit";-import DButton from "discourse/components/d-button";import { setupRenderingTest } from "discourse/tests/helpers/component-test";+import DButton from "discourse/ui-kit/d-button";import I18n, { i18n } from "discourse-i18n";-module("Integration | Component | d-button", function (hooks) {+module("Integration | ui-kit | DButton", function (hooks) {setupRenderingTest(hooks);test("icon only button", async function (assert) {diff --git a/frontend/discourse/tests/integration/components/char-counter-test.gjs b/frontend/discourse/tests/integration/ui-kit/d-char-counter-test.gjssimilarity index 79%rename from frontend/discourse/tests/integration/components/char-counter-test.gjsrename to frontend/discourse/tests/integration/ui-kit/d-char-counter-test.gjsindex 9b2914eeced..b3de5bb979a 100644--- a/frontend/discourse/tests/integration/components/char-counter-test.gjs+++ b/frontend/discourse/tests/integration/ui-kit/d-char-counter-test.gjs@@ -2,11 +2,11 @@ import { fn } from "@ember/helper";import { on } from "@ember/modifier";import { fillIn, render } from "@ember/test-helpers";import { module, test } from "qunit";-import CharCounter from "discourse/components/char-counter";import withEventValue from "discourse/helpers/with-event-value";import { setupRenderingTest } from "discourse/tests/helpers/component-test";+import DCharCounter from "discourse/ui-kit/d-char-counter";-module("Integration | Component | char-counter", function (hooks) {+module("Integration | ui-kit | DCharCounter", function (hooks) {setupRenderingTest(hooks);test("shows the number of characters", async function (assert) {@@ -15,7 +15,7 @@ module("Integration | Component | char-counter", function (hooks) {await render(<template>- <CharCounter @value={{this.value}} @max={{this.max}} />+ <DCharCounter @value={{this.value}} @max={{this.max}} /></template>);@@ -27,11 +27,11 @@ module("Integration | Component | char-counter", function (hooks) {await render(<template>- <CharCounter @value={{this.charCounterContent}} @max={{this.max}}>+ <DCharCounter @value={{this.charCounterContent}} @max={{this.max}}><textarea{{on "input" (withEventValue (fn (mut this.charCounterContent)))}}></textarea>- </CharCounter>+ </DCharCounter></template>);@@ -52,7 +52,7 @@ module("Integration | Component | char-counter", function (hooks) {await render(<template>- <CharCounter @value={{this.value}} @max={{this.max}} />+ <DCharCounter @value={{this.value}} @max={{this.max}} /></template>);diff --git a/frontend/discourse/tests/integration/components/cook-text-test.gjs b/frontend/discourse/tests/integration/ui-kit/d-cook-text-test.gjssimilarity index 78%rename from frontend/discourse/tests/integration/components/cook-text-test.gjsrename to frontend/discourse/tests/integration/ui-kit/d-cook-text-test.gjsindex 6b5a135198c..bd8f65d8803 100644--- a/frontend/discourse/tests/integration/components/cook-text-test.gjs+++ b/frontend/discourse/tests/integration/ui-kit/d-cook-text-test.gjs@@ -1,11 +1,11 @@import { render } from "@ember/test-helpers";import { resetCache } from "pretty-text/upload-short-url";import { module, test } from "qunit";-import CookText from "discourse/components/cook-text";import { setupRenderingTest } from "discourse/tests/helpers/component-test";import pretender, { response } from "discourse/tests/helpers/create-pretender";+import DCookText from "discourse/ui-kit/d-cook-text";-module("Integration | Component | cook-text", function (hooks) {+module("Integration | ui-kit | DCookText", function (hooks) {setupRenderingTest(hooks);hooks.afterEach(function () {@@ -14,7 +14,7 @@ module("Integration | Component | cook-text", function (hooks) {test("renders markdown", async function (assert) {await render(- <template><CookText @rawText="_foo_" class="post-body" /></template>+ <template><DCookText @rawText="_foo_" class="post-body" /></template>);assert.dom(".post-body").hasHtml("<p><em>foo</em></p>");@@ -33,7 +33,7 @@ module("Integration | Component | cook-text", function (hooks) {await render(<template>- <CookText @rawText="" class="post-body" />+ <DCookText @rawText="" class="post-body" /></template>);diff --git a/frontend/discourse/tests/integration/components/date-input-test.gjs b/frontend/discourse/tests/integration/ui-kit/d-date-input-test.gjssimilarity index 79%rename from frontend/discourse/tests/integration/components/date-input-test.gjsrename to frontend/discourse/tests/integration/ui-kit/d-date-input-test.gjsindex be8cd3eea10..21f35150920 100644--- a/frontend/discourse/tests/integration/components/date-input-test.gjs+++ b/frontend/discourse/tests/integration/ui-kit/d-date-input-test.gjs@@ -1,17 +1,17 @@import { fillIn, render, triggerEvent } from "@ember/test-helpers";import { module, test } from "qunit";-import DateInput from "discourse/components/date-input";import { setupRenderingTest } from "discourse/tests/helpers/component-test";+import DDateInput from "discourse/ui-kit/d-date-input";const DEFAULT_DATE = moment("2019-01-29");-module("Integration | Component | date-input", function (hooks) {+module("Integration | ui-kit | DDateInput", function (hooks) {setupRenderingTest(hooks);test("default", async function (assert) {this.setProperties({ date: DEFAULT_DATE });- await render(<template><DateInput @date={{this.date}} /></template>);+ await render(<template><DDateInput @date={{this.date}} /></template>);assert.dom(".date-picker").hasValue("2019-01-29");});@@ -22,7 +22,7 @@ module("Integration | Component | date-input", function (hooks) {await render(<template>- <DateInput @date={{this.date}} @onChange={{this.onChange}} />+ <DDateInput @date={{this.date}} @onChange={{this.onChange}} /></template>);@@ -38,7 +38,7 @@ module("Integration | Component | date-input", function (hooks) {await render(<template>- <DateInput @date={{this.date}} @onChange={{this.onChange}} />+ <DDateInput @date={{this.date}} @onChange={{this.onChange}} /></template>);@@ -55,7 +55,7 @@ module("Integration | Component | date-input", function (hooks) {await render(<template>- <DateInput @date={{this.date}} @onChange={{this.onChange}} />+ <DDateInput @date={{this.date}} @onChange={{this.onChange}} /></template>);assert.dom(".date-picker").hasValue("2023-05-05");diff --git a/frontend/discourse/tests/integration/components/date-time-input-range-test.gjs b/frontend/discourse/tests/integration/ui-kit/d-date-time-input-range-test.gjssimilarity index 93%rename from frontend/discourse/tests/integration/components/date-time-input-range-test.gjsrename to frontend/discourse/tests/integration/ui-kit/d-date-time-input-range-test.gjsindex 65c3361bd02..1824c8ea8ee 100644--- a/frontend/discourse/tests/integration/components/date-time-input-range-test.gjs+++ b/frontend/discourse/tests/integration/ui-kit/d-date-time-input-range-test.gjs@@ -1,14 +1,14 @@import { fn } from "@ember/helper";import { fillIn, render } from "@ember/test-helpers";import { module, test } from "qunit";-import DateTimeInputRange from "discourse/components/date-time-input-range";import { setupRenderingTest } from "discourse/tests/helpers/component-test";import selectKit from "discourse/tests/helpers/select-kit-helper";+import DDateTimeInputRange from "discourse/ui-kit/d-date-time-input-range";const DEFAULT_DATE_TIME_STRING = "2019-01-29 14:45";const DEFAULT_DATE_TIME = moment(DEFAULT_DATE_TIME_STRING);-module("Integration | Component | date-time-input-range", function (hooks) {+module("Integration | ui-kit | DDateTimeInputRange", function (hooks) {setupRenderingTest(hooks);test("default", async function (assert) {@@ -16,7 +16,7 @@ module("Integration | Component | date-time-input-range", function (hooks) {await render(<template>- <DateTimeInputRange+ <DDateTimeInputRange@from={{this.state.from}}@to={{this.state.to}}@onChange={{fn (mut this.state)}}@@ -55,7 +55,7 @@ module("Integration | Component | date-time-input-range", function (hooks) {await render(<template>- <DateTimeInputRange+ <DDateTimeInputRange@from={{this.state.from}}@to={{this.state.to}}@relativeDate={{this.state.from}}@@ -83,7 +83,7 @@ module("Integration | Component | date-time-input-range", function (hooks) {await render(<template>- <DateTimeInputRange+ <DDateTimeInputRange@from={{this.state.from}}@to={{this.state.to}}@onChange={{fn (mut this.state)}}diff --git a/frontend/discourse/tests/integration/components/date-time-input-test.gjs b/frontend/discourse/tests/integration/ui-kit/d-date-time-input-test.gjssimilarity index 82%rename from frontend/discourse/tests/integration/components/date-time-input-test.gjsrename to frontend/discourse/tests/integration/ui-kit/d-date-time-input-test.gjsindex c406671fa43..907a25f5026 100644--- a/frontend/discourse/tests/integration/components/date-time-input-test.gjs+++ b/frontend/discourse/tests/integration/ui-kit/d-date-time-input-test.gjs@@ -1,17 +1,17 @@import { fillIn, render, triggerEvent } from "@ember/test-helpers";import { module, test } from "qunit";-import DateTimeInput from "discourse/components/date-time-input";import { setupRenderingTest } from "discourse/tests/helpers/component-test";+import DDateTimeInput from "discourse/ui-kit/d-date-time-input";const DEFAULT_DATE_TIME = moment("2019-01-29 14:45");-module("Integration | Component | date-time-input", function (hooks) {+module("Integration | ui-kit | DDateTimeInput", function (hooks) {setupRenderingTest(hooks);test("default", async function (assert) {this.setProperties({ date: DEFAULT_DATE_TIME });- await render(<template><DateTimeInput @date={{this.date}} /></template>);+ await render(<template><DDateTimeInput @date={{this.date}} /></template>);assert.dom(".date-picker").hasValue("2019-01-29");assert@@ -22,7 +22,7 @@ module("Integration | Component | date-time-input", function (hooks) {test("prevents mutations", async function (assert) {this.setProperties({ date: DEFAULT_DATE_TIME });- await render(<template><DateTimeInput @date={{this.date}} /></template>);+ await render(<template><DDateTimeInput @date={{this.date}} /></template>);await fillIn(".date-picker", "2019-01-02");@@ -35,7 +35,7 @@ module("Integration | Component | date-time-input", function (hooks) {await render(<template>- <DateTimeInput @date={{this.date}} @onChange={{this.onChange}} />+ <DDateTimeInput @date={{this.date}} @onChange={{this.onChange}} /></template>);@@ -50,7 +50,7 @@ module("Integration | Component | date-time-input", function (hooks) {await render(<template>- <DateTimeInput @date={{this.date}} @showTime={{false}} />+ <DDateTimeInput @date={{this.date}} @showTime={{false}} /></template>);@@ -66,7 +66,7 @@ module("Integration | Component | date-time-input", function (hooks) {await render(<template>- <DateTimeInput+ <DDateTimeInput@date={{this.date}}@timezone={{this.timezone}}@onChange={{this.onChange}}diff --git a/frontend/discourse/tests/integration/components/decorated-html-test.gjs b/frontend/discourse/tests/integration/ui-kit/d-decorated-html-test.gjssimilarity index 88%rename from frontend/discourse/tests/integration/components/decorated-html-test.gjsrename to frontend/discourse/tests/integration/ui-kit/d-decorated-html-test.gjsindex d9d189c726d..0f6f7e1b3ab 100644--- a/frontend/discourse/tests/integration/components/decorated-html-test.gjs+++ b/frontend/discourse/tests/integration/ui-kit/d-decorated-html-test.gjs@@ -4,12 +4,12 @@ import { trustHTML } from "@ember/template";import { render, settled } from "@ember/test-helpers";import curryComponent from "ember-curry-component";import { module, test } from "qunit";-import DecoratedHtml, {- registerHtmlDecorator,-} from "discourse/components/decorated-html";import { setupRenderingTest } from "discourse/tests/helpers/component-test";+import DDecoratedHtml, {+ registerHtmlDecorator,+} from "discourse/ui-kit/d-decorated-html";-module("Integration | Component | <DecoratedHtml />", function (hooks) {+module("Integration | ui-kit | DDecoratedHtml", function (hooks) {setupRenderingTest(hooks);test("renders and re-renders content", async function (assert) {@@ -17,7 +17,7 @@ module("Integration | Component | <DecoratedHtml />", function (hooks) {@tracked html = trustHTML("<h1>Initial</h1>");})();- await render(<template><DecoratedHtml @html={{state.html}} /></template>);+ await render(<template><DDecoratedHtml @html={{state.html}} /></template>);assert.dom("h1").hasText("Initial");@@ -44,7 +44,7 @@ module("Integration | Component | <DecoratedHtml />", function (hooks) {await render(<template>- <DecoratedHtml @html={{state.html}} @decorate={{decorate}} />+ <DDecoratedHtml @html={{state.html}} @decorate={{decorate}} /></template>);@@ -74,7 +74,7 @@ module("Integration | Component | <DecoratedHtml />", function (hooks) {await render(<template>- <DecoratedHtml @html={{state.html}} @decorate={{decorate}} />+ <DDecoratedHtml @html={{state.html}} @decorate={{decorate}} /></template>);@@ -92,7 +92,7 @@ module("Integration | Component | <DecoratedHtml />", function (hooks) {await render(<template>- <DecoratedHtml @html={{trustHTML "<div>Content</div>"}} />+ <DDecoratedHtml @html={{trustHTML "<div>Content</div>"}} /></template>);@@ -114,7 +114,7 @@ module("Integration | Component | <DecoratedHtml />", function (hooks) {await render(<template>- <DecoratedHtml+ <DDecoratedHtml@html={{trustHTML "<div>Content</div>"}}@decorate={{customDecorator}}/>diff --git a/frontend/discourse/tests/integration/components/dropdown-menu-test.gjs b/frontend/discourse/tests/integration/ui-kit/d-dropdown-menu-test.gjssimilarity index 71%rename from frontend/discourse/tests/integration/components/dropdown-menu-test.gjsrename to frontend/discourse/tests/integration/ui-kit/d-dropdown-menu-test.gjsindex 3823d2dd65e..ceac0bd0997 100644--- a/frontend/discourse/tests/integration/components/dropdown-menu-test.gjs+++ b/frontend/discourse/tests/integration/ui-kit/d-dropdown-menu-test.gjs@@ -1,13 +1,13 @@import { render } from "@ember/test-helpers";import { module, test } from "qunit";-import DropdownMenu from "discourse/components/dropdown-menu";import { setupRenderingTest } from "discourse/tests/helpers/component-test";+import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";-module("Integration | Component | <DropdownMenu />", function (hooks) {+module("Integration | ui-kit | DDropdownMenu", function (hooks) {setupRenderingTest(hooks);test("dropdown menu", async function (assert) {- await render(<template><DropdownMenu class="test" /></template>);+ await render(<template><DDropdownMenu class="test" /></template>);assert.dom("ul.dropdown-menu.test")@@ -17,9 +17,9 @@ module("Integration | Component | <DropdownMenu />", function (hooks) {test("dropdown menu item", async function (assert) {await render(<template>- <DropdownMenu as |dm|><dm.item+ <DDropdownMenu as |dm|><dm.itemclass="test"- >test</dm.item></DropdownMenu>+ >test</dm.item></DDropdownMenu></template>);@@ -32,7 +32,7 @@ module("Integration | Component | <DropdownMenu />", function (hooks) {test("dropdown menu divider", async function (assert) {await render(<template>- <DropdownMenu as |dm|><dm.divider class="test" /></DropdownMenu>+ <DDropdownMenu as |dm|><dm.divider class="test" /></DDropdownMenu></template>);diff --git a/frontend/discourse/tests/integration/components/d-editor-test.gjs b/frontend/discourse/tests/integration/ui-kit/d-editor-test.gjssimilarity index 99%rename from frontend/discourse/tests/integration/components/d-editor-test.gjsrename to frontend/discourse/tests/integration/ui-kit/d-editor-test.gjsindex 46fe1b0ae78..9cd522073a3 100644--- a/frontend/discourse/tests/integration/components/d-editor-test.gjs+++ b/frontend/discourse/tests/integration/ui-kit/d-editor-test.gjs@@ -11,7 +11,6 @@ import {triggerKeyEvent,} from "@ember/test-helpers";import { module, test } from "qunit";-import DEditor from "discourse/components/d-editor";import DMenus from "discourse/float-kit/components/d-menus";import { ToolbarBase } from "discourse/lib/composer/toolbar";import { withPluginApi } from "discourse/lib/plugin-api";@@ -25,9 +24,10 @@ import {getTextareaSelection,setTextareaSelection,} from "discourse/tests/helpers/textarea-selection-helper";+import DEditor from "discourse/ui-kit/d-editor";import { i18n } from "discourse-i18n";-module("Integration | Component | d-editor", function (hooks) {+module("Integration | ui-kit | DEditor", function (hooks) {setupRenderingTest(hooks);hooks.beforeEach(function () {@@ -1477,7 +1477,7 @@ third line`});});-module("Integration | Component | d-editor | rich editor", function (hooks) {+module("Integration | ui-kit | DEditor | Rich Editor", function (hooks) {setupRenderingTest(hooks);test("hides preview when rich editor is enabled", async function (assert) {diff --git a/frontend/discourse/tests/integration/components/empty-state-test.gjs b/frontend/discourse/tests/integration/ui-kit/d-empty-state-test.gjssimilarity index 67%rename from frontend/discourse/tests/integration/components/empty-state-test.gjsrename to frontend/discourse/tests/integration/ui-kit/d-empty-state-test.gjsindex 7f4518ab5ee..f0dd02b9b20 100644--- a/frontend/discourse/tests/integration/components/empty-state-test.gjs+++ b/frontend/discourse/tests/integration/ui-kit/d-empty-state-test.gjs@@ -1,15 +1,15 @@import { render } from "@ember/test-helpers";import { module, test } from "qunit";-import EmptyState from "discourse/components/empty-state";import { setupRenderingTest } from "discourse/tests/helpers/component-test";+import DEmptyState from "discourse/ui-kit/d-empty-state";-module("Integration | Component | empty-state", function (hooks) {+module("Integration | ui-kit | DEmptyState", function (hooks) {setupRenderingTest(hooks);test("it renders", async function (assert) {await render(<template>- <EmptyState @title="user.no_bookmarks_title" @body="body" />+ <DEmptyState @title="user.no_bookmarks_title" @body="body" /></template>);diff --git a/frontend/discourse/tests/integration/components/filter-input-test.gjs b/frontend/discourse/tests/integration/ui-kit/d-filter-input-test.gjssimilarity index 74%rename from frontend/discourse/tests/integration/components/filter-input-test.gjsrename to frontend/discourse/tests/integration/ui-kit/d-filter-input-test.gjsindex 5beb6d0af99..27d4ce1f1b1 100644--- a/frontend/discourse/tests/integration/components/filter-input-test.gjs+++ b/frontend/discourse/tests/integration/ui-kit/d-filter-input-test.gjs@@ -1,15 +1,15 @@import { hash } from "@ember/helper";import { click, fillIn, render, triggerEvent } from "@ember/test-helpers";import { module, test } from "qunit";-import FilterInput from "discourse/components/filter-input";import { setupRenderingTest } from "discourse/tests/helpers/component-test";+import DFilterInput from "discourse/ui-kit/d-filter-input";-module("Integration | Component | FilterInput", function (hooks) {+module("Integration | ui-kit | DFilterInput", function (hooks) {setupRenderingTest(hooks);test("Left icon", async function (assert) {await render(- <template><FilterInput @icons={{hash left="bell"}} /></template>+ <template><DFilterInput @icons={{hash left="bell"}} /></template>);assert.dom(".d-icon-bell.-left").exists();@@ -17,21 +17,21 @@ module("Integration | Component | FilterInput", function (hooks) {test("Right icon", async function (assert) {await render(- <template><FilterInput @icons={{hash right="bell"}} /></template>+ <template><DFilterInput @icons={{hash right="bell"}} /></template>);assert.dom(".d-icon-bell.-right").exists();});test("containerClass argument", async function (assert) {- await render(<template><FilterInput @containerClass="foo" /></template>);+ await render(<template><DFilterInput @containerClass="foo" /></template>);assert.dom(".filter-input-container.foo").exists();});test("Html attributes", async function (assert) {await render(- <template><FilterInput data-foo="1" placeholder="bar" /></template>+ <template><DFilterInput data-foo="1" placeholder="bar" /></template>);assert.dom('.filter-input[data-foo="1"]').exists();@@ -44,7 +44,7 @@ module("Integration | Component | FilterInput", function (hooks) {this.set("value", event.target.value);});await render(- <template><FilterInput @filterAction={{this.action}} /></template>+ <template><DFilterInput @filterAction={{this.action}} /></template>);await fillIn(".filter-input", "foo");@@ -53,7 +53,7 @@ module("Integration | Component | FilterInput", function (hooks) {test("Focused state", async function (assert) {await render(- <template><FilterInput @filterAction={{this.action}} /></template>+ <template><DFilterInput @filterAction={{this.action}} /></template>);await triggerEvent(".filter-input", "focusin");@@ -69,7 +69,10 @@ module("Integration | Component | FilterInput", function (hooks) {this.set("value", "test");await render(<template>- <FilterInput @onClearInput={{this.clearAction}} @value={{this.value}} />+ <DFilterInput+ @onClearInput={{this.clearAction}}+ @value={{this.value}}+ /></template>);@@ -87,7 +90,7 @@ module("Integration | Component | FilterInput", function (hooks) {});await render(<template>- <FilterInput @onClearInput={{this.clearAction}} @value="test" />+ <DFilterInput @onClearInput={{this.clearAction}} @value="test" /></template>);await click(".filter-input-clear-btn");@@ -99,7 +102,7 @@ module("Integration | Component | FilterInput", function (hooks) {this.set("clearAction", () => {});await render(<template>- <FilterInput @onClearInput={{this.clearAction}} @value="test" />+ <DFilterInput @onClearInput={{this.clearAction}} @value="test" /></template>);await click(".filter-input-clear-btn");diff --git a/frontend/discourse/tests/integration/components/flash-message-test.gjs b/frontend/discourse/tests/integration/ui-kit/d-flash-message-test.gjssimilarity index 74%rename from frontend/discourse/tests/integration/components/flash-message-test.gjsrename to frontend/discourse/tests/integration/ui-kit/d-flash-message-test.gjsindex 130a4fc77d6..eba03874d22 100644--- a/frontend/discourse/tests/integration/components/flash-message-test.gjs+++ b/frontend/discourse/tests/integration/ui-kit/d-flash-message-test.gjs@@ -1,9 +1,9 @@import { render } from "@ember/test-helpers";import { module, test } from "qunit";-import FlashMessage from "discourse/components/flash-message";import { setupRenderingTest } from "discourse/tests/helpers/component-test";+import DFlashMessage from "discourse/ui-kit/d-flash-message";-module("Integration | Component | flash-message", function (hooks) {+module("Integration | ui-kit | DFlashMessage", function (hooks) {setupRenderingTest(hooks);test("it renders the correct class for a success flash", async function (assert) {@@ -11,7 +11,7 @@ module("Integration | Component | flash-message", function (hooks) {const type = "success";await render(- <template><FlashMessage @flash={{flash}} @type={{type}} /></template>+ <template><DFlashMessage @flash={{flash}} @type={{type}} /></template>);assert.dom(".alert.alert-success").hasText(flash);@@ -23,7 +23,7 @@ module("Integration | Component | flash-message", function (hooks) {const type = "error";await render(- <template><FlashMessage @flash={{flash}} @type={{type}} /></template>+ <template><DFlashMessage @flash={{flash}} @type={{type}} /></template>);assert.dom(".alert.alert-error").hasText(flash);@@ -35,7 +35,7 @@ module("Integration | Component | flash-message", function (hooks) {const type = "warning";await render(- <template><FlashMessage @flash={{flash}} @type={{type}} /></template>+ <template><DFlashMessage @flash={{flash}} @type={{type}} /></template>);assert.dom(".alert.alert-warning").hasText(flash);@@ -47,7 +47,7 @@ module("Integration | Component | flash-message", function (hooks) {const type = "info";await render(- <template><FlashMessage @flash={{flash}} @type={{type}} /></template>+ <template><DFlashMessage @flash={{flash}} @type={{type}} /></template>);assert.dom(".alert.alert-info").hasText(flash);@@ -55,7 +55,7 @@ module("Integration | Component | flash-message", function (hooks) {});test("it does not render anything when flash is not provided", async function (assert) {- await render(<template><FlashMessage /></template>);+ await render(<template><DFlashMessage /></template>);assert.dom(".alert").doesNotExist();});diff --git a/frontend/discourse/tests/integration/components/highlighted-code-test.gjs b/frontend/discourse/tests/integration/ui-kit/d-highlighted-code-test.gjssimilarity index 80%rename from frontend/discourse/tests/integration/components/highlighted-code-test.gjsrename to frontend/discourse/tests/integration/ui-kit/d-highlighted-code-test.gjsindex 55dbbf33f54..d28b3b3e29d 100644--- a/frontend/discourse/tests/integration/components/highlighted-code-test.gjs+++ b/frontend/discourse/tests/integration/ui-kit/d-highlighted-code-test.gjs@@ -1,16 +1,16 @@import { tracked } from "@glimmer/tracking";import { render, settled } from "@ember/test-helpers";import { module, test } from "qunit";-import HighlightedCode from "discourse/components/highlighted-code";import { setupRenderingTest } from "discourse/tests/helpers/component-test";+import DHighlightedCode from "discourse/ui-kit/d-highlighted-code";-module("Integration | Component | highlighted-code", function (hooks) {+module("Integration | ui-kit | DHighlightedCode", function (hooks) {setupRenderingTest(hooks);test("highlighting code", async function (assert) {await render(<template>- <HighlightedCode @lang="ruby" @code="def test; end" />+ <DHighlightedCode @lang="ruby" @code="def test; end" /></template>);@@ -22,7 +22,7 @@ module("Integration | Component | highlighted-code", function (hooks) {await render(<template>- <HighlightedCode @lang="ruby" @code={{longCodeBlock}} />+ <DHighlightedCode @lang="ruby" @code={{longCodeBlock}} /></template>);@@ -32,7 +32,7 @@ module("Integration | Component | highlighted-code", function (hooks) {test("highlighting code with lang=auto", async function (assert) {await render(<template>- <HighlightedCode @lang="auto" @code="def test; end" />+ <DHighlightedCode @lang="auto" @code="def test; end" /></template>);@@ -56,7 +56,7 @@ module("Integration | Component | highlighted-code", function (hooks) {await render(<template>- <HighlightedCode @lang="ruby" @code={{testState.code}} />+ <DHighlightedCode @lang="ruby" @code={{testState.code}} />{{testState.code}}</template>);diff --git a/frontend/discourse/tests/integration/components/interpolated-translation-test.gjs b/frontend/discourse/tests/integration/ui-kit/d-interpolated-translation-test.gjssimilarity index 84%rename from frontend/discourse/tests/integration/components/interpolated-translation-test.gjsrename to frontend/discourse/tests/integration/ui-kit/d-interpolated-translation-test.gjsindex c0923d0e4e1..8f0b77e42b5 100644--- a/frontend/discourse/tests/integration/components/interpolated-translation-test.gjs+++ b/frontend/discourse/tests/integration/ui-kit/d-interpolated-translation-test.gjs@@ -8,12 +8,12 @@ import {} from "@ember/test-helpers";import { module, test } from "qunit";import sinon from "sinon";-import InterpolatedTranslation from "discourse/components/interpolated-translation";-import UserLink from "discourse/components/user-link";import { setupRenderingTest } from "discourse/tests/helpers/component-test";+import DInterpolatedTranslation from "discourse/ui-kit/d-interpolated-translation";+import DUserLink from "discourse/ui-kit/d-user-link";import I18n, { I18nMissingInterpolationArgument } from "discourse-i18n";-module("Integration | Component | InterpolatedTranslation", function (hooks) {+module("Integration | ui-kit | DInterpolatedTranslation", function (hooks) {setupRenderingTest(hooks);hooks.beforeEach(function () {@@ -49,11 +49,11 @@ module("Integration | Component | InterpolatedTranslation", function (hooks) {test("renders translation with component placeholder", async function (assert) {await render(<template>- <InterpolatedTranslation @key="hello" as |Placeholder|>+ <DInterpolatedTranslation @key="hello" as |Placeholder|><Placeholder @name="username">- <UserLink @username="pento">pento</UserLink>+ <DUserLink @username="pento">pento</DUserLink></Placeholder>- </InterpolatedTranslation>+ </DInterpolatedTranslation></template>);@@ -67,11 +67,11 @@ module("Integration | Component | InterpolatedTranslation", function (hooks) {test("renders translation with repeated component placeholder", async function (assert) {await render(<template>- <InterpolatedTranslation @key="repeated_placeholders" as |Placeholder|>+ <DInterpolatedTranslation @key="repeated_placeholders" as |Placeholder|><Placeholder @name="username">- <UserLink @username="pento">pento</UserLink>+ <DUserLink @username="pento">pento</DUserLink></Placeholder>- </InterpolatedTranslation>+ </DInterpolatedTranslation></template>);@@ -93,7 +93,7 @@ module("Integration | Component | InterpolatedTranslation", function (hooks) {});await render(- <template><InterpolatedTranslation @key="simple_text" /></template>+ <template><DInterpolatedTranslation @key="simple_text" /></template>);assert.strictEqual(errors, 1);@@ -118,7 +118,7 @@ module("Integration | Component | InterpolatedTranslation", function (hooks) {await render(<template>- <InterpolatedTranslation+ <DInterpolatedTranslation@key="with_options"@options={{hash name="John" site="Discourse"}}/>@@ -135,15 +135,15 @@ module("Integration | Component | InterpolatedTranslation", function (hooks) {test("renders translation with both string options and component placeholders", async function (assert) {await render(<template>- <InterpolatedTranslation+ <DInterpolatedTranslation@key="mixed_placeholders"@options={{hash count=5}}as |Placeholder|><Placeholder @name="username">- <UserLink @username="alice">alice</UserLink>+ <DUserLink @username="alice">alice</DUserLink></Placeholder>- </InterpolatedTranslation>+ </DInterpolatedTranslation></template>);@@ -154,18 +154,18 @@ module("Integration | Component | InterpolatedTranslation", function (hooks) {test("renders translation with multiple component placeholders", async function (assert) {await render(<template>- <InterpolatedTranslation+ <DInterpolatedTranslation@key="multiple_placeholders"@options={{hash time="2:30 PM"}}as |Placeholder|><Placeholder @name="user">- <UserLink @username="bob">bob</UserLink>+ <DUserLink @username="bob">bob</DUserLink></Placeholder><Placeholder @name="topic"><strong>Important Topic</strong></Placeholder>- </InterpolatedTranslation>+ </DInterpolatedTranslation></template>);@@ -188,7 +188,7 @@ module("Integration | Component | InterpolatedTranslation", function (hooks) {});await render(- <template><InterpolatedTranslation @key="nonexistent_key" /></template>+ <template><DInterpolatedTranslation @key="nonexistent_key" /></template>);// When a translation key is missing, i18n returns the key itself@@ -215,7 +215,9 @@ module("Integration | Component | InterpolatedTranslation", function (hooks) {});// Translation has %{username} placeholder but no placeholder component is provided- await render(<template><InterpolatedTranslation @key="hello" /></template>);+ await render(+ <template><DInterpolatedTranslation @key="hello" /></template>+ );assert.strictEqual(errors, 1);assert.true(stub.calledWithMatch("Error occurred:"));@@ -242,8 +244,8 @@ module("Integration | Component | InterpolatedTranslation", function (hooks) {await render(<template>- <InterpolatedTranslation @key="hello" as |Placeholder|>- <Placeholder @name="username" /></InterpolatedTranslation>+ <DInterpolatedTranslation @key="hello" as |Placeholder|>+ <Placeholder @name="username" /></DInterpolatedTranslation></template>);@@ -262,15 +264,15 @@ module("Integration | Component | InterpolatedTranslation", function (hooks) {await render(<template>- <InterpolatedTranslation+ <DInterpolatedTranslation@key={{state.key}}@options={{state.options}}as |Placeholder|><Placeholder @name="username">- <UserLink @username="pento">pento</UserLink>+ <DUserLink @username="pento">pento</DUserLink></Placeholder>- </InterpolatedTranslation>+ </DInterpolatedTranslation></template>);diff --git a/frontend/discourse/tests/integration/components/light-dark-img-test.gjs b/frontend/discourse/tests/integration/ui-kit/d-light-dark-img-test.gjssimilarity index 87%rename from frontend/discourse/tests/integration/components/light-dark-img-test.gjsrename to frontend/discourse/tests/integration/ui-kit/d-light-dark-img-test.gjsindex 4f9744472b9..15539d667d3 100644--- a/frontend/discourse/tests/integration/components/light-dark-img-test.gjs+++ b/frontend/discourse/tests/integration/ui-kit/d-light-dark-img-test.gjs@@ -1,13 +1,13 @@import { getOwner } from "@ember/owner";import { render } from "@ember/test-helpers";import { module, test } from "qunit";-import LightDarkImg from "discourse/components/light-dark-img";import { setupRenderingTest } from "discourse/tests/helpers/component-test";+import DLightDarkImg from "discourse/ui-kit/d-light-dark-img";const lightSrc = { url: "/images/light.jpg", width: 376, height: 500 };const darkSrc = { url: "/images/light.jpg", width: 432, height: 298 };-module("Integration | Component | light-dark-img", function (hooks) {+module("Integration | ui-kit | DLightDarkImg", function (hooks) {setupRenderingTest(hooks);hooks.afterEach(function () {@@ -20,7 +20,7 @@ module("Integration | Component | light-dark-img", function (hooks) {this.session.set("defaultColorSchemeIsDark", false);this.session.set("darkModeAvailable", false);- await render(<template><LightDarkImg /></template>);+ await render(<template><DLightDarkImg /></template>);assert.dom("picture").doesNotExist("there is no picture tag");assert.dom("img").doesNotExist("there is no img tag");@@ -31,7 +31,7 @@ module("Integration | Component | light-dark-img", function (hooks) {this.session.set("defaultColorSchemeIsDark", false);this.session.set("darkModeAvailable", false);- await render(<template><LightDarkImg @lightImg={{lightSrc}} /></template>);+ await render(<template><DLightDarkImg @lightImg={{lightSrc}} /></template>);assert.dom("picture").doesNotExist("there is no picture tag");assert.dom("img").exists("there is an img tag");@@ -47,7 +47,7 @@ module("Integration | Component | light-dark-img", function (hooks) {await render(<template>- <LightDarkImg @lightImg={{lightSrc}} @darkImg={{darkSrc}} />+ <DLightDarkImg @lightImg={{lightSrc}} @darkImg={{darkSrc}} /></template>);@@ -63,7 +63,7 @@ module("Integration | Component | light-dark-img", function (hooks) {this.session.set("defaultColorSchemeIsDark", false);this.session.set("darkModeAvailable", true);- await render(<template><LightDarkImg /></template>);+ await render(<template><DLightDarkImg /></template>);assert.dom("picture").doesNotExist("there is no picture tag");assert.dom("img").doesNotExist("there is no img tag");@@ -74,7 +74,7 @@ module("Integration | Component | light-dark-img", function (hooks) {this.session.set("defaultColorSchemeIsDark", false);this.session.set("darkModeAvailable", true);- await render(<template><LightDarkImg @lightImg={{lightSrc}} /></template>);+ await render(<template><DLightDarkImg @lightImg={{lightSrc}} /></template>);assert.dom("picture").doesNotExist("there is no picture tag");assert.dom("img").exists("there is an img tag");@@ -90,7 +90,7 @@ module("Integration | Component | light-dark-img", function (hooks) {await render(<template>- <LightDarkImg @lightImg={{lightSrc}} @darkImg={{darkSrc}} />+ <DLightDarkImg @lightImg={{lightSrc}} @darkImg={{darkSrc}} /></template>);@@ -113,7 +113,7 @@ module("Integration | Component | light-dark-img", function (hooks) {this.session.set("defaultColorSchemeIsDark", true);this.session.set("darkModeAvailable", false);- await render(<template><LightDarkImg /></template>);+ await render(<template><DLightDarkImg /></template>);assert.dom("picture").doesNotExist("there is no picture tag");assert.dom("img").doesNotExist("there is no img tag");@@ -124,7 +124,7 @@ module("Integration | Component | light-dark-img", function (hooks) {this.session.set("defaultColorSchemeIsDark", true);this.session.set("darkModeAvailable", false);- await render(<template><LightDarkImg @lightImg={{lightSrc}} /></template>);+ await render(<template><DLightDarkImg @lightImg={{lightSrc}} /></template>);assert.dom("picture").doesNotExist("there is no picture tag");assert.dom("img").exists("there is an img tag");@@ -140,7 +140,7 @@ module("Integration | Component | light-dark-img", function (hooks) {await render(<template>- <LightDarkImg @lightImg={{lightSrc}} @darkImg={{darkSrc}} />+ <DLightDarkImg @lightImg={{lightSrc}} @darkImg={{darkSrc}} /></template>);@@ -163,7 +163,7 @@ module("Integration | Component | light-dark-img", function (hooks) {this.session.set("defaultColorSchemeIsDark", true);this.session.set("darkModeAvailable", true);- await render(<template><LightDarkImg /></template>);+ await render(<template><DLightDarkImg /></template>);assert.dom("picture").doesNotExist("there is no picture tag");assert.dom("img").doesNotExist("there is no img tag");@@ -174,7 +174,7 @@ module("Integration | Component | light-dark-img", function (hooks) {this.session.set("defaultColorSchemeIsDark", true);this.session.set("darkModeAvailable", true);- await render(<template><LightDarkImg @lightImg={{lightSrc}} /></template>);+ await render(<template><DLightDarkImg @lightImg={{lightSrc}} /></template>);assert.dom("picture").doesNotExist("there is no picture tag");assert.dom("img").exists("there is an img tag");@@ -190,7 +190,7 @@ module("Integration | Component | light-dark-img", function (hooks) {await render(<template>- <LightDarkImg @lightImg={{lightSrc}} @darkImg={{darkSrc}} />+ <DLightDarkImg @lightImg={{lightSrc}} @darkImg={{darkSrc}} /></template>);diff --git a/frontend/discourse/tests/integration/components/load-more-test.gjs b/frontend/discourse/tests/integration/ui-kit/d-load-more-test.gjssimilarity index 85%rename from frontend/discourse/tests/integration/components/load-more-test.gjsrename to frontend/discourse/tests/integration/ui-kit/d-load-more-test.gjsindex 35815133073..e5451a36c4a 100644--- a/frontend/discourse/tests/integration/components/load-more-test.gjs+++ b/frontend/discourse/tests/integration/ui-kit/d-load-more-test.gjs@@ -1,13 +1,13 @@import { render } from "@ember/test-helpers";import { module, test } from "qunit";-import LoadMore, {- disableLoadMoreObserver,- enableLoadMoreObserver,-} from "discourse/components/load-more";import { setupRenderingTest } from "discourse/tests/helpers/component-test";import stubIntersectionObserver from "discourse/tests/helpers/stub-intersection-observer";+import DLoadMore, {+ disableLoadMoreObserver,+ enableLoadMoreObserver,+} from "discourse/ui-kit/d-load-more";-module("Integration | Component | load-more", function (hooks) {+module("Integration | ui-kit | DLoadMore", function (hooks) {setupRenderingTest(hooks);hooks.beforeEach(function () {@@ -27,13 +27,13 @@ module("Integration | Component | load-more", function (hooks) {await render(<template>- <LoadMore @action={{performLoadMore}}>+ <DLoadMore @action={{performLoadMore}}><table class="numbers"><tbody><tr /></tbody></table>- </LoadMore>+ </DLoadMore></template>);@@ -50,13 +50,13 @@ module("Integration | Component | load-more", function (hooks) {await render(<template>- <LoadMore @action={{performLoadMore}} @enabled={{false}}>+ <DLoadMore @action={{performLoadMore}} @enabled={{false}}><table class="numbers"><tbody><tr /></tbody></table>- </LoadMore>+ </DLoadMore></template>);@@ -71,13 +71,13 @@ module("Integration | Component | load-more", function (hooks) {await render(<template>- <LoadMore @action={{loadMore}} @isLoading={{true}}>+ <DLoadMore @action={{loadMore}} @isLoading={{true}}><table class="numbers"><tbody><tr /></tbody></table>- </LoadMore>+ </DLoadMore></template>);diff --git a/frontend/discourse/tests/integration/components/d-modal-test.gjs b/frontend/discourse/tests/integration/ui-kit/d-modal-test.gjssimilarity index 97%rename from frontend/discourse/tests/integration/components/d-modal-test.gjsrename to frontend/discourse/tests/integration/ui-kit/d-modal-test.gjsindex 7ecc50ada42..7c9298fd6dd 100644--- a/frontend/discourse/tests/integration/components/d-modal-test.gjs+++ b/frontend/discourse/tests/integration/ui-kit/d-modal-test.gjs@@ -3,13 +3,13 @@ import { on } from "@ember/modifier";import { action } from "@ember/object";import { click, render, settled, triggerKeyEvent } from "@ember/test-helpers";import { module, test } from "qunit";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";import noop from "discourse/helpers/noop";import { forceMobile } from "discourse/lib/mobile";import { setupRenderingTest } from "discourse/tests/helpers/component-test";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";-module("Integration | Component | d-modal", function (hooks) {+module("Integration | ui-kit | DModal", function (hooks) {setupRenderingTest(hooks);test("title and subtitle", async function (assert) {diff --git a/frontend/discourse/tests/integration/components/d-multi-select-test.gjs b/frontend/discourse/tests/integration/ui-kit/d-multi-select-test.gjssimilarity index 98%rename from frontend/discourse/tests/integration/components/d-multi-select-test.gjsrename to frontend/discourse/tests/integration/ui-kit/d-multi-select-test.gjsindex a38338a0341..07b3e248587 100644--- a/frontend/discourse/tests/integration/components/d-multi-select-test.gjs+++ b/frontend/discourse/tests/integration/ui-kit/d-multi-select-test.gjs@@ -9,8 +9,8 @@ import {triggerKeyEvent,} from "@ember/test-helpers";import { module, test } from "qunit";-import DMultiSelect from "discourse/components/d-multi-select";import { setupRenderingTest } from "discourse/tests/helpers/component-test";+import DMultiSelect from "discourse/ui-kit/d-multi-select";class TestComponent extends Component {@tracked selection = this.args.selection ?? [];@@ -45,7 +45,7 @@ class TestComponent extends Component {</template>}-module("Integration | Component | DMultiSelect", function (hooks) {+module("Integration | ui-kit | DMultiSelect", function (hooks) {setupRenderingTest(hooks);test("filter", async function (assert) {diff --git a/frontend/discourse/tests/integration/components/d-otp-test.gjs b/frontend/discourse/tests/integration/ui-kit/d-otp-test.gjssimilarity index 88%rename from frontend/discourse/tests/integration/components/d-otp-test.gjsrename to frontend/discourse/tests/integration/ui-kit/d-otp-test.gjsindex 974ef6b84c6..aa8789f72f9 100644--- a/frontend/discourse/tests/integration/components/d-otp-test.gjs+++ b/frontend/discourse/tests/integration/ui-kit/d-otp-test.gjs@@ -1,26 +1,26 @@import { next } from "@ember/runloop";import { render, settled } from "@ember/test-helpers";import { module, test } from "qunit";-import DOTP from "discourse/components/d-otp";import { setupRenderingTest } from "discourse/tests/helpers/component-test";+import DOtp from "discourse/ui-kit/d-otp";-module("Integration | Component | DOTP", function (hooks) {+module("Integration | ui-kit | DOtp", function (hooks) {setupRenderingTest(hooks);test("renders 6 slots by default", async function (assert) {- await render(<template><DOTP /></template>);+ await render(<template><DOtp /></template>);assert.dom(".d-otp-slot").exists({ count: 6 });});test("renders custom number of slots", async function (assert) {- await render(<template><DOTP @slots={{8}} /></template>);+ await render(<template><DOtp @slots={{8}} /></template>);assert.dom(".d-otp-slot").exists({ count: 8 });});test("accepts input and fills slots", async function (assert) {- await render(<template><DOTP /></template>);+ await render(<template><DOtp /></template>);const input = this.element.querySelector(".d-otp-input");input.value = "123456";@@ -42,7 +42,7 @@ module("Integration | Component | DOTP", function (hooks) {this.set("filledValue", value);};- await render(<template><DOTP @onFill={{this.onFillCallback}} /></template>);+ await render(<template><DOtp @onFill={{this.onFillCallback}} /></template>);const input = this.element.querySelector(".d-otp-input");input.value = "123456";@@ -61,7 +61,7 @@ module("Integration | Component | DOTP", function (hooks) {};await render(- <template><DOTP @onChange={{this.onChangeCallback}} /></template>+ <template><DOtp @onChange={{this.onChangeCallback}} /></template>);const input = this.element.querySelector(".d-otp-input");@@ -81,17 +81,17 @@ module("Integration | Component | DOTP", function (hooks) {});test("@autoFocus", async function (assert) {- await render(<template><DOTP /></template>);+ await render(<template><DOtp /></template>);assert.dom(".d-otp-slot[data-index='0'].--is-focused").exists();- await render(<template><DOTP @autoFocus={{false}} /></template>);+ await render(<template><DOtp @autoFocus={{false}} /></template>);assert.dom(".d-otp-slot[data-index='0'].--is-focused").doesNotExist();});test("shows placeholder dashes for empty slots", async function (assert) {- await render(<template><DOTP /></template>);+ await render(<template><DOtp /></template>);assert.dom(".d-otp-slot:nth-child(1)").hasText("");assert.dom(".d-otp-slot:nth-child(2)").hasText(" -");@@ -102,7 +102,7 @@ module("Integration | Component | DOTP", function (hooks) {});test("handles paste with spaces correctly", async function (assert) {- await render(<template><DOTP /></template>);+ await render(<template><DOtp /></template>);const input = this.element.querySelector(".d-otp-input");@@ -124,7 +124,7 @@ module("Integration | Component | DOTP", function (hooks) {});test("removes non-digit characters from paste", async function (assert) {- await render(<template><DOTP /></template>);+ await render(<template><DOtp /></template>);const input = this.element.querySelector(".d-otp-input");@@ -145,7 +145,7 @@ module("Integration | Component | DOTP", function (hooks) {});test("removes all content when all is selected and backspace is pressed", async function (assert) {- await render(<template><DOTP /></template>);+ await render(<template><DOtp /></template>);const input = this.element.querySelector(".d-otp-input");input.value = "123456";diff --git a/frontend/discourse/tests/integration/components/d-page-header-test.gjs b/frontend/discourse/tests/integration/ui-kit/d-page-header-test.gjssimilarity index 95%rename from frontend/discourse/tests/integration/components/d-page-header-test.gjsrename to frontend/discourse/tests/integration/ui-kit/d-page-header-test.gjsindex 2818174a319..79cb68d188f 100644--- a/frontend/discourse/tests/integration/components/d-page-header-test.gjs+++ b/frontend/discourse/tests/integration/ui-kit/d-page-header-test.gjs@@ -1,10 +1,10 @@import { click, render } from "@ember/test-helpers";import { module, test } from "qunit";-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DPageHeader from "discourse/components/d-page-header";-import NavItem from "discourse/components/nav-item";import { forceMobile } from "discourse/lib/mobile";import { setupRenderingTest } from "discourse/tests/helpers/component-test";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DNavItem from "discourse/ui-kit/d-nav-item";+import DPageHeader from "discourse/ui-kit/d-page-header";import { i18n } from "discourse-i18n";const DPageHeaderActionsTestComponent = <template>@@ -19,7 +19,7 @@ const DPageHeaderActionsTestComponent = <template></div></template>;-module("Integration | Component | DPageHeader", function (hooks) {+module("Integration | ui-kit | DPageHeader", function (hooks) {setupRenderingTest(hooks);test("no @titleLabel", async function (assert) {@@ -108,7 +108,7 @@ module("Integration | Component | DPageHeader", function (hooks) {<template><DPageHeader><:tabs>- <NavItem+ <DNavItem@route="admin.backups.settings"@label="settings"class="d-backups-tabs__settings"@@ -218,7 +218,7 @@ module("Integration | Component | DPageHeader", function (hooks) {});});-module("Integration | Component | DPageHeader | Mobile", function (hooks) {+module("Integration | ui-kit | DPageHeader | Mobile", function (hooks) {hooks.beforeEach(function () {forceMobile();});diff --git a/frontend/discourse/tests/integration/components/d-page-subheader-test.gjs b/frontend/discourse/tests/integration/ui-kit/d-page-subheader-test.gjssimilarity index 95%rename from frontend/discourse/tests/integration/components/d-page-subheader-test.gjsrename to frontend/discourse/tests/integration/ui-kit/d-page-subheader-test.gjsindex 0f95b4f9511..700c3aa88fc 100644--- a/frontend/discourse/tests/integration/components/d-page-subheader-test.gjs+++ b/frontend/discourse/tests/integration/ui-kit/d-page-subheader-test.gjs@@ -1,11 +1,11 @@import { click, render } from "@ember/test-helpers";import { module, test } from "qunit";-import DPageSubheader from "discourse/components/d-page-subheader";import { forceMobile } from "discourse/lib/mobile";import { setupRenderingTest } from "discourse/tests/helpers/component-test";+import DPageSubheader from "discourse/ui-kit/d-page-subheader";import { i18n } from "discourse-i18n";-module("Integration | Component | DPageSubheader", function (hooks) {+module("Integration | ui-kit | DPageSubheader", function (hooks) {setupRenderingTest(hooks);test("@titleLabel", async function (assert) {@@ -115,7 +115,7 @@ module("Integration | Component | DPageSubheader", function (hooks) {});});-module("Integration | Component | DPageSubheader | Mobile", function (hooks) {+module("Integration | ui-kit | DPageSubheader | Mobile", function (hooks) {hooks.beforeEach(function () {forceMobile();});diff --git a/frontend/discourse/tests/integration/components/d-select-test.gjs b/frontend/discourse/tests/integration/ui-kit/d-select-test.gjssimilarity index 93%rename from frontend/discourse/tests/integration/components/d-select-test.gjsrename to frontend/discourse/tests/integration/ui-kit/d-select-test.gjsindex 01c13b767dd..8056ed6038f 100644--- a/frontend/discourse/tests/integration/components/d-select-test.gjs+++ b/frontend/discourse/tests/integration/ui-kit/d-select-test.gjs@@ -1,10 +1,10 @@import { render, select } from "@ember/test-helpers";import { module, test } from "qunit";-import DSelect, { NO_VALUE_OPTION } from "discourse/components/d-select";import { setupRenderingTest } from "discourse/tests/helpers/component-test";+import DSelect, { NO_VALUE_OPTION } from "discourse/ui-kit/d-select";import { i18n } from "discourse-i18n";-module("Integration | Component | d-select", function (hooks) {+module("Integration | ui-kit | DSelect", function (hooks) {setupRenderingTest(hooks);test("@onChange", async function (assert) {diff --git a/frontend/discourse/tests/integration/components/small-user-list-test.gjs b/frontend/discourse/tests/integration/ui-kit/d-small-user-list-test.gjssimilarity index 75%rename from frontend/discourse/tests/integration/components/small-user-list-test.gjsrename to frontend/discourse/tests/integration/ui-kit/d-small-user-list-test.gjsindex b150b32bfa2..c4616f4e531 100644--- a/frontend/discourse/tests/integration/components/small-user-list-test.gjs+++ b/frontend/discourse/tests/integration/ui-kit/d-small-user-list-test.gjs@@ -1,9 +1,9 @@import { render } from "@ember/test-helpers";import { module, test } from "qunit";-import SmallUserList from "discourse/components/small-user-list";import { setupRenderingTest } from "discourse/tests/helpers/component-test";+import DSmallUserList from "discourse/ui-kit/d-small-user-list";-module("Integration | Component | SmallUserList", function (hooks) {+module("Integration | ui-kit | DSmallUserList", function (hooks) {setupRenderingTest(hooks);test("renders avatars and support for unknown", async function (assert) {@@ -12,7 +12,7 @@ module("Integration | Component | SmallUserList", function (hooks) {{ id: 457, username: "someone", unknown: true },];- await render(<template><SmallUserList @users={{users}} /></template>);+ await render(<template><DSmallUserList @users={{users}} /></template>);assert.dom(".small-user-list").exists();assert.dom('[data-user-card="eviltrout"]').exists({ count: 1 });diff --git a/frontend/discourse/tests/integration/components/d-stat-tiles-test.gjs b/frontend/discourse/tests/integration/ui-kit/d-stat-tiles-test.gjssimilarity index 94%rename from frontend/discourse/tests/integration/components/d-stat-tiles-test.gjsrename to frontend/discourse/tests/integration/ui-kit/d-stat-tiles-test.gjsindex 4dd68b72b7f..d0c680dee15 100644--- a/frontend/discourse/tests/integration/components/d-stat-tiles-test.gjs+++ b/frontend/discourse/tests/integration/ui-kit/d-stat-tiles-test.gjs@@ -1,12 +1,12 @@import { render, triggerEvent } from "@ember/test-helpers";import { module, test } from "qunit";-import DStatTiles from "discourse/components/d-stat-tiles";import { setupRenderingTest } from "discourse/tests/helpers/component-test";+import DStatTiles from "discourse/ui-kit/d-stat-tiles";const content = "This is a tooltip";const label = "Stat Label";-module("Integration | Component | DStatTiles", function (hooks) {+module("Integration | ui-kit | DStatTiles", function (hooks) {setupRenderingTest(hooks);test("formats the @value in a readable way with the raw number as the title attr", async function (assert) {diff --git a/frontend/discourse/tests/integration/components/time-input-test.gjs b/frontend/discourse/tests/integration/ui-kit/d-time-input-test.gjssimilarity index 83%rename from frontend/discourse/tests/integration/components/time-input-test.gjsrename to frontend/discourse/tests/integration/ui-kit/d-time-input-test.gjsindex 11a0caec6fc..90f1b64ee61 100644--- a/frontend/discourse/tests/integration/components/time-input-test.gjs+++ b/frontend/discourse/tests/integration/ui-kit/d-time-input-test.gjs@@ -1,14 +1,14 @@import { render } from "@ember/test-helpers";import { module, test } from "qunit";-import TimeInput from "discourse/components/time-input";import { setupRenderingTest } from "discourse/tests/helpers/component-test";import selectKit from "discourse/tests/helpers/select-kit-helper";+import DTimeInput from "discourse/ui-kit/d-time-input";function setTime(time) {this.setProperties(time);}-module("Integration | Component | time-input", function (hooks) {+module("Integration | ui-kit | DTimeInput", function (hooks) {setupRenderingTest(hooks);hooks.beforeEach(function () {@@ -20,7 +20,7 @@ module("Integration | Component | time-input", function (hooks) {await render(<template>- <TimeInput @hours={{this.hours}} @minutes={{this.minutes}} />+ <DTimeInput @hours={{this.hours}} @minutes={{this.minutes}} /></template>);@@ -32,7 +32,7 @@ module("Integration | Component | time-input", function (hooks) {await render(<template>- <TimeInput @hours={{this.hours}} @minutes={{this.minutes}} />+ <DTimeInput @hours={{this.hours}} @minutes={{this.minutes}} /></template>);@@ -47,7 +47,7 @@ module("Integration | Component | time-input", function (hooks) {await render(<template>- <TimeInput+ <DTimeInput@hours={{this.hours}}@minutes={{this.minutes}}@onChange={{this.onChange}}diff --git a/frontend/discourse/tests/integration/components/time-shortcut-picker-test.gjs b/frontend/discourse/tests/integration/ui-kit/d-time-shortcut-picker-test.gjssimilarity index 83%rename from frontend/discourse/tests/integration/components/time-shortcut-picker-test.gjsrename to frontend/discourse/tests/integration/ui-kit/d-time-shortcut-picker-test.gjsindex eb523ac0d3b..e22add79884 100644--- a/frontend/discourse/tests/integration/components/time-shortcut-picker-test.gjs+++ b/frontend/discourse/tests/integration/ui-kit/d-time-shortcut-picker-test.gjs@@ -1,11 +1,11 @@import { click, render } from "@ember/test-helpers";import { module, test } from "qunit";-import TimeShortcutPicker from "discourse/components/time-shortcut-picker";import { setupRenderingTest } from "discourse/tests/helpers/component-test";import { fakeTime, queryAll } from "discourse/tests/helpers/qunit-helpers";+import DTimeShortcutPicker from "discourse/ui-kit/d-time-shortcut-picker";import { i18n } from "discourse-i18n";-module("Integration | Component | time-shortcut-picker", function (hooks) {+module("Integration | ui-kit | DTimeShortcutPicker", function (hooks) {setupRenderingTest(hooks);hooks.beforeEach(function () {@@ -27,7 +27,7 @@ module("Integration | Component | time-shortcut-picker", function (hooks) {this.clock = fakeTime(tuesday, this.currentUser.user_option.timezone, true);await render(- <template><TimeShortcutPicker @_itsatrap={{this.itsatrap}} /></template>+ <template><DTimeShortcutPicker @_itsatrap={{this.itsatrap}} /></template>);const expected = [@@ -55,7 +55,7 @@ module("Integration | Component | time-shortcut-picker", function (hooks) {this.clock = fakeTime(monday, this.currentUser.user_option.timezone, true);await render(- <template><TimeShortcutPicker @_itsatrap={{this.itsatrap}} /></template>+ <template><DTimeShortcutPicker @_itsatrap={{this.itsatrap}} /></template>);assert.dom("#tap_tile_later_this_week").exists("has later this week");@@ -70,7 +70,7 @@ module("Integration | Component | time-shortcut-picker", function (hooks) {);await render(- <template><TimeShortcutPicker @_itsatrap={{this.itsatrap}} /></template>+ <template><DTimeShortcutPicker @_itsatrap={{this.itsatrap}} /></template>);assert@@ -86,7 +86,7 @@ module("Integration | Component | time-shortcut-picker", function (hooks) {);await render(- <template><TimeShortcutPicker @_itsatrap={{this.itsatrap}} /></template>+ <template><DTimeShortcutPicker @_itsatrap={{this.itsatrap}} /></template>);assert@@ -102,7 +102,7 @@ module("Integration | Component | time-shortcut-picker", function (hooks) {);await render(- <template><TimeShortcutPicker @_itsatrap={{this.itsatrap}} /></template>+ <template><DTimeShortcutPicker @_itsatrap={{this.itsatrap}} /></template>);assert.dom("#tap_tile_later_today").exists("has later today");@@ -116,7 +116,7 @@ module("Integration | Component | time-shortcut-picker", function (hooks) {);await render(- <template><TimeShortcutPicker @_itsatrap={{this.itsatrap}} /></template>+ <template><DTimeShortcutPicker @_itsatrap={{this.itsatrap}} /></template>);assert@@ -132,7 +132,7 @@ module("Integration | Component | time-shortcut-picker", function (hooks) {);await render(- <template><TimeShortcutPicker @_itsatrap={{this.itsatrap}} /></template>+ <template><DTimeShortcutPicker @_itsatrap={{this.itsatrap}} /></template>);await click("#tap_tile_custom");@@ -145,7 +145,7 @@ module("Integration | Component | time-shortcut-picker", function (hooks) {this.clock = fakeTime(sunday, this.currentUser.user_option.timezone, true);await render(- <template><TimeShortcutPicker @_itsatrap={{this.itsatrap}} /></template>+ <template><DTimeShortcutPicker @_itsatrap={{this.itsatrap}} /></template>);assert@@ -162,7 +162,7 @@ module("Integration | Component | time-shortcut-picker", function (hooks) {this.clock = fakeTime(monday, this.currentUser.user_option.timezone, true);await render(- <template><TimeShortcutPicker @_itsatrap={{this.itsatrap}} /></template>+ <template><DTimeShortcutPicker @_itsatrap={{this.itsatrap}} /></template>);assert@@ -182,7 +182,7 @@ module("Integration | Component | time-shortcut-picker", function (hooks) {);await render(- <template><TimeShortcutPicker @_itsatrap={{this.itsatrap}} /></template>+ <template><DTimeShortcutPicker @_itsatrap={{this.itsatrap}} /></template>);assertdiff --git a/frontend/discourse/tests/integration/components/d-toggle-switch-test.gjs b/frontend/discourse/tests/integration/ui-kit/d-toggle-switch-test.gjssimilarity index 92%rename from frontend/discourse/tests/integration/components/d-toggle-switch-test.gjsrename to frontend/discourse/tests/integration/ui-kit/d-toggle-switch-test.gjsindex 3774bf2ee72..5b9891e1e96 100644--- a/frontend/discourse/tests/integration/components/d-toggle-switch-test.gjs+++ b/frontend/discourse/tests/integration/ui-kit/d-toggle-switch-test.gjs@@ -1,10 +1,10 @@import { render } from "@ember/test-helpers";import { module, test } from "qunit";-import DToggleSwitch from "discourse/components/d-toggle-switch";import { setupRenderingTest } from "discourse/tests/helpers/component-test";+import DToggleSwitch from "discourse/ui-kit/d-toggle-switch";import I18n, { i18n } from "discourse-i18n";-module("Integration | Component | d-toggle-switch", function (hooks) {+module("Integration | ui-kit | DToggleSwitch", function (hooks) {setupRenderingTest(hooks);test("it renders a toggle button in a disabled state", async function (assert) {diff --git a/frontend/discourse/tests/integration/components/user-avatar-flair-test.gjs b/frontend/discourse/tests/integration/ui-kit/d-user-avatar-flair-test.gjssimilarity index 85%rename from frontend/discourse/tests/integration/components/user-avatar-flair-test.gjsrename to frontend/discourse/tests/integration/ui-kit/d-user-avatar-flair-test.gjsindex c123af3241e..96f0c92536e 100644--- a/frontend/discourse/tests/integration/components/user-avatar-flair-test.gjs+++ b/frontend/discourse/tests/integration/ui-kit/d-user-avatar-flair-test.gjs@@ -1,9 +1,9 @@import { render } from "@ember/test-helpers";import { module, test } from "qunit";-import UserAvatarFlair from "discourse/components/user-avatar-flair";import { resetFlair } from "discourse/lib/avatar-flair";import { AUTO_GROUPS } from "discourse/lib/constants";import { setupRenderingTest } from "discourse/tests/helpers/component-test";+import DUserAvatarFlair from "discourse/ui-kit/d-user-avatar-flair";function setupSiteGroups(that) {that.site.groups = [@@ -38,7 +38,7 @@ function setupSiteGroups(that) {];}-module("Integration | Component | user-avatar-flair", function (hooks) {+module("Integration | ui-kit | DUserAvatarFlair", function (hooks) {setupRenderingTest(hooks);hooks.beforeEach(function () {@@ -58,7 +58,7 @@ module("Integration | Component | user-avatar-flair", function (hooks) {});setupSiteGroups(this);- await render(<template><UserAvatarFlair @user={{this.args}} /></template>);+ await render(<template><DUserAvatarFlair @user={{this.args}} /></template>);assert.dom(".avatar-flair").exists("has the tag");assert.dom("svg.d-icon-bars").exists("has the svg icon");@@ -77,7 +77,7 @@ module("Integration | Component | user-avatar-flair", function (hooks) {});setupSiteGroups(this);- await render(<template><UserAvatarFlair @user={{this.args}} /></template>);+ await render(<template><DUserAvatarFlair @user={{this.args}} /></template>);assert.dom(".avatar-flair").exists("has the tag");assert.dom("svg.d-icon-bars").exists("has the svg icon");@@ -96,7 +96,7 @@ module("Integration | Component | user-avatar-flair", function (hooks) {});setupSiteGroups(this);- await render(<template><UserAvatarFlair @user={{this.args}} /></template>);+ await render(<template><DUserAvatarFlair @user={{this.args}} /></template>);assert.dom(".avatar-flair").exists("has the tag");assert.dom("svg.d-icon-dice-two").exists("has the svg icon");@@ -115,7 +115,7 @@ module("Integration | Component | user-avatar-flair", function (hooks) {});setupSiteGroups(this);- await render(<template><UserAvatarFlair @user={{this.args}} /></template>);+ await render(<template><DUserAvatarFlair @user={{this.args}} /></template>);assert.dom(".avatar-flair").doesNotExist("does not render a flair");});@@ -129,7 +129,7 @@ module("Integration | Component | user-avatar-flair", function (hooks) {});setupSiteGroups(this);- await render(<template><UserAvatarFlair @user={{this.args}} /></template>);+ await render(<template><DUserAvatarFlair @user={{this.args}} /></template>);assert.dom(".avatar-flair").exists("has the tag");assert.dom("svg.d-icon-dice-two").exists("has the svg icon");@@ -149,7 +149,7 @@ module("Integration | Component | user-avatar-flair", function (hooks) {// Groups not serialized for anon on login_requiredthis.site.groups = undefined;- await render(<template><UserAvatarFlair @user={{this.args}} /></template>);+ await render(<template><DUserAvatarFlair @user={{this.args}} /></template>);assert.dom(".avatar-flair").doesNotExist("does not render a flair");});@@ -168,7 +168,7 @@ module("Integration | Component | user-avatar-flair", function (hooks) {});setupSiteGroups(this);- await render(<template><UserAvatarFlair @user={{this.args}} /></template>);+ await render(<template><DUserAvatarFlair @user={{this.args}} /></template>);assert.dom(".avatar-flair").exists("has the tag");assert.dom("svg.d-icon-xmark").exists("has the svg icon");@@ -186,7 +186,7 @@ module("Integration | Component | user-avatar-flair", function (hooks) {flair_group_id: 11,});- await render(<template><UserAvatarFlair @user={{this.args}} /></template>);+ await render(<template><DUserAvatarFlair @user={{this.args}} /></template>);assert.dom(".avatar-flair").doesNotExist("does not render a flair");});diff --git a/frontend/discourse/tests/integration/components/user-info-test.gjs b/frontend/discourse/tests/integration/ui-kit/d-user-info-test.gjssimilarity index 84%rename from frontend/discourse/tests/integration/components/user-info-test.gjsrename to frontend/discourse/tests/integration/ui-kit/d-user-info-test.gjsindex 4f9d7c1981a..477cf10ed1f 100644--- a/frontend/discourse/tests/integration/components/user-info-test.gjs+++ b/frontend/discourse/tests/integration/ui-kit/d-user-info-test.gjs@@ -1,17 +1,17 @@import { render, triggerEvent } from "@ember/test-helpers";import { module, test } from "qunit";-import UserInfo from "discourse/components/user-info";import DTooltips from "discourse/float-kit/components/d-tooltips";import { setupRenderingTest } from "discourse/tests/helpers/component-test";+import DUserInfo from "discourse/ui-kit/d-user-info";-module("Integration | Component | user-info", function (hooks) {+module("Integration | ui-kit | DUserInfo", function (hooks) {setupRenderingTest(hooks);test("prioritized name", async function (assert) {this.siteSettings.prioritize_username_in_ux = false;this.currentUser.name = "Evil Trout";- await render(<template><UserInfo @user={{this.currentUser}} /></template>);+ await render(<template><DUserInfo @user={{this.currentUser}} /></template>);assert.dom(".name").hasText("Evil Trout");assert.dom(".username").hasText("eviltrout");@@ -21,7 +21,7 @@ module("Integration | Component | user-info", function (hooks) {this.siteSettings.prioritize_username_in_ux = true;this.currentUser.name = "Evil Trout";- await render(<template><UserInfo @user={{this.currentUser}} /></template>);+ await render(<template><DUserInfo @user={{this.currentUser}} /></template>);assert.dom(".username").hasText("eviltrout");assert.dom(".name").hasText("Evil Trout");@@ -30,7 +30,7 @@ module("Integration | Component | user-info", function (hooks) {test("includeLink", async function (assert) {await render(<template>- <UserInfo+ <DUserInfo@user={{this.currentUser}}@includeLink={{this.includeLink}}/>@@ -49,7 +49,7 @@ module("Integration | Component | user-info", function (hooks) {test("includeAvatar", async function (assert) {await render(<template>- <UserInfo+ <DUserInfo@user={{this.currentUser}}@includeAvatar={{this.includeAvatar}}/>@@ -69,7 +69,7 @@ module("Integration | Component | user-info", function (hooks) {await render(<template>- <UserInfo @user={{this.currentUser}} @showStatus={{true}} />+ <DUserInfo @user={{this.currentUser}} @showStatus={{true}} /></template>);@@ -81,7 +81,7 @@ module("Integration | Component | user-info", function (hooks) {await render(<template>- <UserInfo @user={{this.currentUser}} @showStatus={{true}} />+ <DUserInfo @user={{this.currentUser}} @showStatus={{true}} /></template>);@@ -94,7 +94,7 @@ module("Integration | Component | user-info", function (hooks) {await render(<template>- <UserInfo @user={{this.currentUser}} @showStatus={{false}} />+ <DUserInfo @user={{this.currentUser}} @showStatus={{false}} /></template>);@@ -105,7 +105,7 @@ module("Integration | Component | user-info", function (hooks) {this.currentUser.name = "Evil Trout";this.currentUser.status = { emoji: "tooth", description: "off to dentist" };- await render(<template><UserInfo @user={{this.currentUser}} /></template>);+ await render(<template><DUserInfo @user={{this.currentUser}} /></template>);assert.dom(".user-status-message").doesNotExist();});@@ -116,7 +116,7 @@ module("Integration | Component | user-info", function (hooks) {await render(<template>- <UserInfo @user={{this.currentUser}} @showStatus={{true}} />+ <DUserInfo @user={{this.currentUser}} @showStatus={{true}} /></template>);@@ -131,7 +131,7 @@ module("Integration | Component | user-info", function (hooks) {await render(<template>- <UserInfo+ <DUserInfo@user={{this.currentUser}}@showStatus={{true}}@showStatusDescription={{true}}@@ -150,7 +150,7 @@ module("Integration | Component | user-info", function (hooks) {await render(<template>- <UserInfo @user={{this.currentUser}} @showStatus={{true}} /><DTooltips+ <DUserInfo @user={{this.currentUser}} @showStatus={{true}} /><DTooltips/></template>);diff --git a/frontend/discourse/tests/integration/components/user-status-message-test.gjs b/frontend/discourse/tests/integration/ui-kit/d-user-status-message-test.gjssimilarity index 83%rename from frontend/discourse/tests/integration/components/user-status-message-test.gjsrename to frontend/discourse/tests/integration/ui-kit/d-user-status-message-test.gjsindex f342ad74f8b..9a65b8e9d4d 100644--- a/frontend/discourse/tests/integration/components/user-status-message-test.gjs+++ b/frontend/discourse/tests/integration/ui-kit/d-user-status-message-test.gjs@@ -1,11 +1,11 @@import { render, triggerEvent } from "@ember/test-helpers";import { module, test } from "qunit";-import UserStatusMessage from "discourse/components/user-status-message";import DTooltips from "discourse/float-kit/components/d-tooltips";import { setupRenderingTest } from "discourse/tests/helpers/component-test";import { fakeTime } from "discourse/tests/helpers/qunit-helpers";+import DUserStatusMessage from "discourse/ui-kit/d-user-status-message";-module("Integration | Component | user-status-message", function (hooks) {+module("Integration | ui-kit | DUserStatusMessage", function (hooks) {setupRenderingTest(hooks);hooks.beforeEach(function () {@@ -21,7 +21,7 @@ module("Integration | Component | user-status-message", function (hooks) {test("it renders user status emoji", async function (assert) {await render(- <template><UserStatusMessage @status={{this.status}} /></template>+ <template><DUserStatusMessage @status={{this.status}} /></template>);assert.dom("img.emoji[alt='tooth']").exists("the status emoji is shown");});@@ -29,7 +29,7 @@ module("Integration | Component | user-status-message", function (hooks) {test("it renders status description if enabled", async function (assert) {await render(<template>- <UserStatusMessage @status={{this.status}} @showDescription={{true}} />+ <DUserStatusMessage @status={{this.status}} @showDescription={{true}} /></template>);@@ -48,7 +48,7 @@ module("Integration | Component | user-status-message", function (hooks) {await render(<template>- <UserStatusMessage @status={{this.status}} /><DTooltips />+ <DUserStatusMessage @status={{this.status}} /><DTooltips /></template>);await triggerEvent(".user-status-message", "pointermove");@@ -68,7 +68,7 @@ module("Integration | Component | user-status-message", function (hooks) {await render(<template>- <UserStatusMessage @status={{this.status}} /><DTooltips />+ <DUserStatusMessage @status={{this.status}} /><DTooltips /></template>);await triggerEvent(".user-status-message", "pointermove");@@ -88,7 +88,7 @@ module("Integration | Component | user-status-message", function (hooks) {await render(<template>- <UserStatusMessage @status={{this.status}} /><DTooltips />+ <DUserStatusMessage @status={{this.status}} /><DTooltips /></template>);await triggerEvent(".user-status-message", "pointermove");@@ -103,7 +103,7 @@ module("Integration | Component | user-status-message", function (hooks) {test("it shows tooltip by default", async function (assert) {await render(<template>- <UserStatusMessage @status={{this.status}} /><DTooltips />+ <DUserStatusMessage @status={{this.status}} /><DTooltips /></template>);await triggerEvent(".user-status-message", "pointermove");@@ -118,7 +118,7 @@ module("Integration | Component | user-status-message", function (hooks) {this.status.ends_at = "2100-02-02T12:30:00.000Z";await render(- <template><UserStatusMessage @status={{this.status}} /></template>+ <template><DUserStatusMessage @status={{this.status}} /></template>);assert@@ -130,7 +130,7 @@ module("Integration | Component | user-status-message", function (hooks) {const status = { emoji: "tooth", description: "off to dentist" };await render(- <template><UserStatusMessage @status={{status}} class="foo" /></template>+ <template><DUserStatusMessage @status={{status}} class="foo" /></template>);assertdiff --git a/frontend/discourse/tests/integration/helpers/category-badge-test.gjs b/frontend/discourse/tests/integration/ui-kit/helpers/d-category-badge-test.gjssimilarity index 68%rename from frontend/discourse/tests/integration/helpers/category-badge-test.gjsrename to frontend/discourse/tests/integration/ui-kit/helpers/d-category-badge-test.gjsindex 4db6d136cb4..929ac72c296 100644--- a/frontend/discourse/tests/integration/helpers/category-badge-test.gjs+++ b/frontend/discourse/tests/integration/ui-kit/helpers/d-category-badge-test.gjs@@ -1,16 +1,16 @@import { render } from "@ember/test-helpers";import { module, test } from "qunit";-import categoryBadge from "discourse/helpers/category-badge";import Category from "discourse/models/category";import { setupRenderingTest } from "discourse/tests/helpers/component-test";+import dCategoryBadge from "discourse/ui-kit/helpers/d-category-badge";-module("Integration | Helper | category-badge", function (hooks) {+module("Integration | ui-kit | Helper | dCategoryBadge", function (hooks) {setupRenderingTest(hooks);test("displays category", async function (assert) {const category = Category.findById(1);- await render(<template>{{categoryBadge category}}</template>);+ await render(<template>{{dCategoryBadge category}}</template>);assert.dom(".badge-category__name").hasText(category.displayName);});@@ -18,7 +18,7 @@ module("Integration | Helper | category-badge", function (hooks) {test("options.link", async function (assert) {const category = Category.findById(1);- await render(<template>{{categoryBadge category link=true}}</template>);+ await render(<template>{{dCategoryBadge category link=true}}</template>);assert.dom(diff --git a/frontend/discourse/tests/integration/helpers/category-link-test.gjs b/frontend/discourse/tests/integration/ui-kit/helpers/d-category-link-test.gjssimilarity index 68%rename from frontend/discourse/tests/integration/helpers/category-link-test.gjsrename to frontend/discourse/tests/integration/ui-kit/helpers/d-category-link-test.gjsindex 043ac682cd3..fd189c2f808 100644--- a/frontend/discourse/tests/integration/helpers/category-link-test.gjs+++ b/frontend/discourse/tests/integration/ui-kit/helpers/d-category-link-test.gjs@@ -1,14 +1,14 @@import { hash } from "@ember/helper";import { render } from "@ember/test-helpers";import { module, test } from "qunit";-import categoryLink from "discourse/helpers/category-link";import { setupRenderingTest } from "discourse/tests/helpers/component-test";+import dCategoryLink from "discourse/ui-kit/helpers/d-category-link";-module("Integration | Helper | category-link", function (hooks) {+module("Integration | ui-kit | Helper | dCategoryLink", function (hooks) {setupRenderingTest(hooks);test("name", async function (assert) {- await render(<template>{{categoryLink (hash name="foo")}}</template>);+ await render(<template>{{dCategoryLink (hash name="foo")}}</template>);assert.dom(".badge-category__name").hasText("foo");});@@ -16,7 +16,7 @@ module("Integration | Helper | category-link", function (hooks) {test("description_text", async function (assert) {await render(<template>- {{categoryLink (hash name="foo" description_text="bar")}}+ {{dCategoryLink (hash name="foo" description_text="bar")}}</template>);@@ -26,7 +26,7 @@ module("Integration | Helper | category-link", function (hooks) {test("styleType option", async function (assert) {await render(<template>- {{categoryLink (hash name="test-cat") styleType="icon" icon="user"}}+ {{dCategoryLink (hash name="test-cat") styleType="icon" icon="user"}}</template>);@@ -37,7 +37,7 @@ module("Integration | Helper | category-link", function (hooks) {test("category.style_type auto-detection", async function (assert) {await render(<template>- {{categoryLink (hash name="icon-cat" style_type="icon" icon="user")}}+ {{dCategoryLink (hash name="icon-cat" style_type="icon" icon="user")}}</template>);@@ -47,7 +47,7 @@ module("Integration | Helper | category-link", function (hooks) {test("style falls back to square", async function (assert) {await render(- <template>{{categoryLink (hash name="square-cat")}}</template>+ <template>{{dCategoryLink (hash name="square-cat")}}</template>);assert.dom(".badge-category").hasClass("--style-square");diff --git a/frontend/discourse/tests/integration/helpers/concat-class-test.gjs b/frontend/discourse/tests/integration/ui-kit/helpers/d-concat-class-test.gjssimilarity index 67%rename from frontend/discourse/tests/integration/helpers/concat-class-test.gjsrename to frontend/discourse/tests/integration/ui-kit/helpers/d-concat-class-test.gjsindex 6e856b8e3dd..df4e5522c0c 100644--- a/frontend/discourse/tests/integration/helpers/concat-class-test.gjs+++ b/frontend/discourse/tests/integration/ui-kit/helpers/d-concat-class-test.gjs@@ -1,14 +1,14 @@import { array } from "@ember/helper";import { render } from "@ember/test-helpers";import { module, test } from "qunit";-import concatClass from "discourse/helpers/concat-class";import { setupRenderingTest } from "discourse/tests/helpers/component-test";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";-module("Integration | Helper | concat-class", function (hooks) {+module("Integration | ui-kit | Helper | dConcatClass", function (hooks) {setupRenderingTest(hooks);test("One class given", async function (assert) {- await render(<template><button class={{concatClass "foo"}} /></template>);+ await render(<template><button class={{dConcatClass "foo"}} /></template>);assert.dom("button").hasAttribute("class", "foo");});@@ -17,7 +17,7 @@ module("Integration | Helper | concat-class", function (hooks) {const bar = "bar";await render(- <template><button class={{concatClass "foo" bar}} /></template>+ <template><button class={{dConcatClass "foo" bar}} /></template>);assert.dom("button").hasAttribute("class", "foo bar");@@ -25,7 +25,7 @@ module("Integration | Helper | concat-class", function (hooks) {test("One undefined class given", async function (assert) {await render(- <template><button class={{concatClass "foo" undefined}} /></template>+ <template><button class={{dConcatClass "foo" undefined}} /></template>);assert.dom("button").hasAttribute("class", "foo");@@ -35,7 +35,7 @@ module("Integration | Helper | concat-class", function (hooks) {const bar = null;await render(- <template><button class={{concatClass null bar}} /></template>+ <template><button class={{dConcatClass null bar}} /></template>);assert.dom("button").doesNotHaveAttribute("class");@@ -44,7 +44,7 @@ module("Integration | Helper | concat-class", function (hooks) {test("Helpers used", async function (assert) {await render(<template>- <button class={{concatClass (if true "foo") (if true "bar")}} />+ <button class={{dConcatClass (if true "foo") (if true "bar")}} /></template>);@@ -55,7 +55,7 @@ module("Integration | Helper | concat-class", function (hooks) {await render(<template><button- class={{concatClass (array) (array "foo" "bar") (array null)}}+ class={{dConcatClass (array) (array "foo" "bar") (array null)}}/></template>);diff --git a/frontend/discourse/tests/integration/helpers/emoji-test.gjs b/frontend/discourse/tests/integration/ui-kit/helpers/d-emoji-test.gjssimilarity index 64%rename from frontend/discourse/tests/integration/helpers/emoji-test.gjsrename to frontend/discourse/tests/integration/ui-kit/helpers/d-emoji-test.gjsindex 0e1709fe446..c942d11ded5 100644--- a/frontend/discourse/tests/integration/helpers/emoji-test.gjs+++ b/frontend/discourse/tests/integration/ui-kit/helpers/d-emoji-test.gjs@@ -1,20 +1,20 @@import { render } from "@ember/test-helpers";import { module, test } from "qunit";-import emoji from "discourse/helpers/emoji";import { setupRenderingTest } from "discourse/tests/helpers/component-test";+import dEmoji from "discourse/ui-kit/helpers/d-emoji";-module("Integration | Helper | emoji", function (hooks) {+module("Integration | ui-kit | Helper | dEmoji", function (hooks) {setupRenderingTest(hooks);test("it renders", async function (assert) {- await render(<template>{{emoji "tada"}}</template>);+ await render(<template>{{dEmoji "tada"}}</template>);assert.dom(`.emoji[title="tada"]`).exists();});test("it renders custom title", async function (assert) {const title = "custom title";- await render(<template>{{emoji "tada" title=title}}</template>);+ await render(<template>{{dEmoji "tada" title=title}}</template>);assert.dom(`.emoji[title="${title}"]`).exists();});diff --git a/frontend/discourse/tests/integration/helpers/d-icon-test.gjs b/frontend/discourse/tests/integration/ui-kit/helpers/d-icon-test.gjssimilarity index 80%rename from frontend/discourse/tests/integration/helpers/d-icon-test.gjsrename to frontend/discourse/tests/integration/ui-kit/helpers/d-icon-test.gjsindex 89ccd27be6f..c24fb77b263 100644--- a/frontend/discourse/tests/integration/helpers/d-icon-test.gjs+++ b/frontend/discourse/tests/integration/ui-kit/helpers/d-icon-test.gjs@@ -1,15 +1,15 @@import { render } from "@ember/test-helpers";import { module, test } from "qunit";-import icon from "discourse/helpers/d-icon";import { setupRenderingTest } from "discourse/tests/helpers/component-test";+import dIcon from "discourse/ui-kit/helpers/d-icon";-module("Integration | Helper | d-icon", function (hooks) {+module("Integration | ui-kit | Helper | dIcon", function (hooks) {setupRenderingTest(hooks);test("default", async function (assert) {await render(<template>- <div class="test">{{icon "bars"}}</div>+ <div class="test">{{dIcon "bars"}}</div></template>);@@ -23,7 +23,7 @@ module("Integration | Helper | d-icon", function (hooks) {test("with replacement", async function (assert) {await render(<template>- <div class="test">{{icon "d-watching"}}</div>+ <div class="test">{{dIcon "d-watching"}}</div></template>);diff --git a/frontend/discourse/tests/integration/helpers/replace-emoji-test.gjs b/frontend/discourse/tests/integration/ui-kit/helpers/d-replace-emoji-test.gjssimilarity index 70%rename from frontend/discourse/tests/integration/helpers/replace-emoji-test.gjsrename to frontend/discourse/tests/integration/ui-kit/helpers/d-replace-emoji-test.gjsindex 9f3ad8f566c..5fe2867734f 100644--- a/frontend/discourse/tests/integration/helpers/replace-emoji-test.gjs+++ b/frontend/discourse/tests/integration/ui-kit/helpers/d-replace-emoji-test.gjs@@ -1,16 +1,16 @@import { trustHTML } from "@ember/template";import { render } from "@ember/test-helpers";import { module, test } from "qunit";-import replaceEmoji from "discourse/helpers/replace-emoji";import { setupRenderingTest } from "discourse/tests/helpers/component-test";+import dReplaceEmoji from "discourse/ui-kit/helpers/d-replace-emoji";-module("Integration | Helper | replace-emoji", function (hooks) {+module("Integration | ui-kit | Helper | dReplaceEmoji", function (hooks) {setupRenderingTest(hooks);test("it replaces the emoji", async function (assert) {await render(<template>- <span>{{replaceEmoji "some text :heart:"}}</span>+ <span>{{dReplaceEmoji "some text :heart:"}}</span></template>);@@ -21,7 +21,7 @@ module("Integration | Helper | replace-emoji", function (hooks) {test("it escapes the text", async function (assert) {await render(<template>- <span>{{replaceEmoji "<style>body: {background: red;}</style>"}}</span>+ <span>{{dReplaceEmoji "<style>body: {background: red;}</style>"}}</span></template>);@@ -31,7 +31,7 @@ module("Integration | Helper | replace-emoji", function (hooks) {test("it renders html-safe text", async function (assert) {await render(<template>- <span>{{replaceEmoji (trustHTML "safe text")}}</span>+ <span>{{dReplaceEmoji (trustHTML "safe text")}}</span></template>);diff --git a/frontend/discourse/tests/integration/modifiers/tab-to-sibling-test.gjs b/frontend/discourse/tests/integration/ui-kit/modifiers/d-tab-to-sibling-test.gjssimilarity index 84%rename from frontend/discourse/tests/integration/modifiers/tab-to-sibling-test.gjsrename to frontend/discourse/tests/integration/ui-kit/modifiers/d-tab-to-sibling-test.gjsindex 01f944cc682..a18c77b3039 100644--- a/frontend/discourse/tests/integration/modifiers/tab-to-sibling-test.gjs+++ b/frontend/discourse/tests/integration/ui-kit/modifiers/d-tab-to-sibling-test.gjs@@ -1,16 +1,16 @@import { focus, render, triggerKeyEvent } from "@ember/test-helpers";import { module, test } from "qunit";-import tabToSibling from "discourse/modifiers/tab-to-sibling";import { setupRenderingTest } from "discourse/tests/helpers/component-test";+import dTabToSibling from "discourse/ui-kit/modifiers/d-tab-to-sibling";-module("Integration | Modifier | tabToSibling", function (hooks) {+module("Integration | ui-kit | Modifier | dTabToSibling", function (hooks) {setupRenderingTest(hooks);test("focuses next sibling when Tab is pressed", async function (assert) {await render(<template><div class="container">- <div class="first-item" {{tabToSibling}} tabindex="0">First</div>+ <div class="first-item" {{dTabToSibling}} tabindex="0">First</div><div class="second-item" tabindex="0">Second</div><div class="third-item" tabindex="0">Third</div></div>@@ -35,7 +35,7 @@ module("Integration | Modifier | tabToSibling", function (hooks) {<template><div class="container"><div class="first-item" tabindex="0">First</div>- <div class="second-item" {{tabToSibling}} tabindex="0">Second</div>+ <div class="second-item" {{dTabToSibling}} tabindex="0">Second</div><div class="third-item" tabindex="0">Third</div></div></template>@@ -58,7 +58,7 @@ module("Integration | Modifier | tabToSibling", function (hooks) {await render(<template><div class="container">- <div class="first-item" {{tabToSibling}} tabindex="0">First</div>+ <div class="first-item" {{dTabToSibling}} tabindex="0">First</div><div class="non-focusable">Non-focusable</div><div class="disabled-item" tabindex="-1">Disabled</div><div class="third-item" tabindex="0">Third</div>@@ -78,7 +78,7 @@ module("Integration | Modifier | tabToSibling", function (hooks) {await render(<template><div class="container">- <button class="first-button" {{tabToSibling}}>First Button</button>+ <button class="first-button" {{dTabToSibling}}>First Button</button><input class="input-field" type="text" /><a href="#" class="link-element">Link</a></div>@@ -97,7 +97,7 @@ module("Integration | Modifier | tabToSibling", function (hooks) {await render(<template><div class="container">- <div class="first-item" {{tabToSibling}} tabindex="0">First</div>+ <div class="first-item" {{dTabToSibling}} tabindex="0">First</div><div class="second-item" tabindex="0">Second</div></div></template>diff --git a/frontend/discourse/tests/setup-tests.js b/frontend/discourse/tests/setup-tests.jsindex e5e1cd5a5cf..82494fe5b3a 100644--- a/frontend/discourse/tests/setup-tests.js+++ b/frontend/discourse/tests/setup-tests.js@@ -21,7 +21,7 @@ import { resetSettings as resetThemeSettings } from "discourse/lib/theme-settingimport {disableLoadMoreObserver,enableLoadMoreObserver,-} from "discourse/components/load-more";+} from "discourse/ui-kit/d-load-more";import Session from "discourse/models/session";import User from "discourse/models/user";import { resetCategoryCache } from "discourse/models/category";diff --git a/frontend/discourse/tests/unit/lib/category-badge-test.js b/frontend/discourse/tests/unit/lib/category-badge-test.jsindex d17530c3033..4e479275ed4 100644--- a/frontend/discourse/tests/unit/lib/category-badge-test.js+++ b/frontend/discourse/tests/unit/lib/category-badge-test.js@@ -3,8 +3,8 @@ import { getOwner } from "@ember/owner";import { setupTest } from "ember-qunit";import $ from "jquery";import { module, test } from "qunit";-import { categoryBadgeHTML } from "discourse/helpers/category-link";import { helperContext } from "discourse/lib/helpers";+import { categoryBadgeHTML } from "discourse/ui-kit/helpers/d-category-link";module("Unit | Utility | category-badge", function (hooks) {setupTest(hooks);diff --git a/frontend/discourse/tests/unit/lib/user-search-test.js b/frontend/discourse/tests/unit/lib/user-search-test.jsindex 367f883594f..34496319204 100644--- a/frontend/discourse/tests/unit/lib/user-search-test.js+++ b/frontend/discourse/tests/unit/lib/user-search-test.js@@ -1,8 +1,8 @@import { setupTest } from "ember-qunit";import { module, test } from "qunit";import userSearch from "discourse/lib/user-search";-import { CANCELLED_STATUS } from "discourse/modifiers/d-autocomplete";import pretender, { response } from "discourse/tests/helpers/create-pretender";+import { CANCELLED_STATUS } from "discourse/ui-kit/modifiers/d-autocomplete";module("Unit | Utility | user-search", function (hooks) {setupTest(hooks);diff --git a/frontend/discourse/tests/unit/utils/dom-utils-test.gjs b/frontend/discourse/tests/unit/utils/dom-utils-test.gjsindex a28da5191d2..0e8f1bc328e 100644--- a/frontend/discourse/tests/unit/utils/dom-utils-test.gjs+++ b/frontend/discourse/tests/unit/utils/dom-utils-test.gjs@@ -1,8 +1,8 @@import { render } from "@ember/test-helpers";import { module, test } from "qunit";-import DButton from "discourse/components/d-button";import domUtils from "discourse/lib/dom-utils";import { setupRenderingTest } from "discourse/tests/helpers/component-test";+import DButton from "discourse/ui-kit/d-button";module("Unit | Utils | dom-utils", function (hooks) {setupRenderingTest(hooks);diff --git a/package.json b/package.jsonindex a1dd247da81..178e4a84551 100644--- a/package.json+++ b/package.json@@ -5,7 +5,7 @@"license": "GPL-2.0-only","devDependencies": {"@babel/plugin-proposal-decorators": "^7.29.0",- "@discourse/lint-configs": "^2.45.0",+ "@discourse/lint-configs": "^2.46.0","@discourse/moment-timezone-names-translations": "^1.0.0","@fortawesome/fontawesome-free": "7.2.0","@glint/ember-tsc": "^1.2.3",diff --git a/plugins/automation/admin/assets/javascripts/admin/components/automation-enabled-toggle.gjs b/plugins/automation/admin/assets/javascripts/admin/components/automation-enabled-toggle.gjsindex 9b24ca5312d..3450799e22c 100644--- a/plugins/automation/admin/assets/javascripts/admin/components/automation-enabled-toggle.gjs+++ b/plugins/automation/admin/assets/javascripts/admin/components/automation-enabled-toggle.gjs@@ -1,6 +1,6 @@import { on } from "@ember/modifier";-import DToggleSwitch from "discourse/components/d-toggle-switch";import DTooltip from "discourse/float-kit/components/d-tooltip";+import DToggleSwitch from "discourse/ui-kit/d-toggle-switch";import { i18n } from "discourse-i18n";const AutomationEnabledToggle = <template>diff --git a/plugins/automation/admin/assets/javascripts/admin/components/automation-list.gjs b/plugins/automation/admin/assets/javascripts/admin/components/automation-list.gjsindex d9fba417336..b97fd76b483 100644--- a/plugins/automation/admin/assets/javascripts/admin/components/automation-list.gjs+++ b/plugins/automation/admin/assets/javascripts/admin/components/automation-list.gjs@@ -5,15 +5,15 @@ import { action } from "@ember/object";import { LinkTo } from "@ember/routing";import { service } from "@ember/service";import AdminConfigAreaEmptyList from "discourse/admin/components/admin-config-area-empty-list";-import DButton from "discourse/components/d-button";-import DPageSubheader from "discourse/components/d-page-subheader";-import avatar from "discourse/helpers/avatar";-import formatDate from "discourse/helpers/format-date";import { popupAjaxError } from "discourse/lib/ajax-error";import { removeValueFromArray } from "discourse/lib/array-tools";import getURL from "discourse/lib/get-url";import { escapeExpression } from "discourse/lib/utilities";import { or } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DPageSubheader from "discourse/ui-kit/d-page-subheader";+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 AutomationEnabledToggle from "discourse/plugins/automation/admin/components/automation-enabled-toggle";@@ -172,9 +172,9 @@ export default class AutomationList extends Component {href={{automation.last_updated_by.userPath}}data-user-card={{automation.last_updated_by.username}}>- {{avatar automation.last_updated_by imageSize="small"}}+ {{dAvatar automation.last_updated_by imageSize="small"}}</a>- {{formatDate automation.updated_at leaveAgo="true"}}+ {{dFormatDate automation.updated_at leaveAgo="true"}}</div></td><td class="d-table__cell --detail automations__runs">@@ -206,7 +206,7 @@ export default class AutomationList extends Component {}}</div>{{#if automation.stats.last_run_at}}- {{formatDate+ {{dFormatDateautomation.stats.last_run_atleaveAgo="true"}}diff --git a/plugins/automation/admin/assets/javascripts/admin/components/fields/da-date-time-field.gjs b/plugins/automation/admin/assets/javascripts/admin/components/fields/da-date-time-field.gjsindex d35ebfee393..0793847ab8e 100644--- a/plugins/automation/admin/assets/javascripts/admin/components/fields/da-date-time-field.gjs+++ b/plugins/automation/admin/assets/javascripts/admin/components/fields/da-date-time-field.gjs@@ -1,7 +1,7 @@import { Input } from "@ember/component";import { on } from "@ember/modifier";import { action } from "@ember/object";-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";import BaseField from "./da-base-field";import DAFieldDescription from "./da-field-description";import DAFieldLabel from "./da-field-label";diff --git a/plugins/automation/admin/assets/javascripts/admin/components/fields/da-key-value-field.gjs b/plugins/automation/admin/assets/javascripts/admin/components/fields/da-key-value-field.gjsindex d8ec0a1cae1..f642ae71ad0 100644--- a/plugins/automation/admin/assets/javascripts/admin/components/fields/da-key-value-field.gjs+++ b/plugins/automation/admin/assets/javascripts/admin/components/fields/da-key-value-field.gjs@@ -1,8 +1,8 @@import { tracked } from "@glimmer/tracking";import { hash } from "@ember/helper";import { action } from "@ember/object";-import DButton from "discourse/components/d-button";import ModalJsonSchemaEditor from "discourse/components/modal/json-schema-editor";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";import BaseField from "./da-base-field";import DAFieldDescription from "./da-field-description";diff --git a/plugins/automation/admin/assets/javascripts/admin/components/fields/da-message-field.gjs b/plugins/automation/admin/assets/javascripts/admin/components/fields/da-message-field.gjsindex 114db076006..597761922cf 100644--- a/plugins/automation/admin/assets/javascripts/admin/components/fields/da-message-field.gjs+++ b/plugins/automation/admin/assets/javascripts/admin/components/fields/da-message-field.gjs@@ -1,5 +1,5 @@import { action } from "@ember/object";-import TextArea from "discourse/components/textarea";+import DTextarea from "discourse/ui-kit/d-textarea";import PlaceholdersList from "../placeholders-list";import BaseField from "./da-base-field";import DAFieldDescription from "./da-field-description";@@ -13,7 +13,7 @@ export default class MessageField extends BaseField {<div class="controls"><div class="field-wrapper">- <TextArea+ <DTextarea@value={{@field.metadata.value}}@input={{this.updateValue}}@disabled={{@field.isDisabled}}diff --git a/plugins/automation/admin/assets/javascripts/admin/components/fields/da-pms-field.gjs b/plugins/automation/admin/assets/javascripts/admin/components/fields/da-pms-field.gjsindex a34c85d015b..a71215d5a88 100644--- a/plugins/automation/admin/assets/javascripts/admin/components/fields/da-pms-field.gjs+++ b/plugins/automation/admin/assets/javascripts/admin/components/fields/da-pms-field.gjs@@ -5,9 +5,9 @@ import { action } from "@ember/object";import { trackedArray, trackedObject } from "@ember/reactive/collections";import { next } from "@ember/runloop";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import DEditor from "discourse/components/d-editor";import { removeValueFromArray } from "discourse/lib/array-tools";+import DButton from "discourse/ui-kit/d-button";+import DEditor from "discourse/ui-kit/d-editor";import { i18n } from "discourse-i18n";import PlaceholdersList from "../placeholders-list";import BaseField from "./da-base-field";diff --git a/plugins/automation/admin/assets/javascripts/admin/components/fields/da-post-field.gjs b/plugins/automation/admin/assets/javascripts/admin/components/fields/da-post-field.gjsindex 44306dd387c..31a77e114c1 100644--- a/plugins/automation/admin/assets/javascripts/admin/components/fields/da-post-field.gjs+++ b/plugins/automation/admin/assets/javascripts/admin/components/fields/da-post-field.gjs@@ -1,4 +1,4 @@-import DEditor from "discourse/components/d-editor";+import DEditor from "discourse/ui-kit/d-editor";import PlaceholdersList from "../placeholders-list";import BaseField from "./da-base-field";import DAFieldDescription from "./da-field-description";diff --git a/plugins/automation/admin/assets/javascripts/admin/components/fields/da-relative-time-field.gjs b/plugins/automation/admin/assets/javascripts/admin/components/fields/da-relative-time-field.gjsindex 536f7d9b876..4d3303599d7 100644--- a/plugins/automation/admin/assets/javascripts/admin/components/fields/da-relative-time-field.gjs+++ b/plugins/automation/admin/assets/javascripts/admin/components/fields/da-relative-time-field.gjs@@ -1,4 +1,4 @@-import RelativeTimePicker from "discourse/components/relative-time-picker";+import DRelativeTimePicker from "discourse/ui-kit/d-relative-time-picker";import BaseField from "./da-base-field";import DAFieldDescription from "./da-field-description";import DAFieldLabel from "./da-field-label";@@ -11,7 +11,7 @@ export default class RelativeTimeField extends BaseField {<div class="controls"><div class="field-wrapper">- <RelativeTimePicker+ <DRelativeTimePicker@durationMinutes={{@field.metadata.value}}@onChange={{this.mutValue}}/>diff --git a/plugins/automation/admin/assets/javascripts/admin/components/placeholders-list.gjs b/plugins/automation/admin/assets/javascripts/admin/components/placeholders-list.gjsindex 2fca8d7679c..3b65ae73763 100644--- a/plugins/automation/admin/assets/javascripts/admin/components/placeholders-list.gjs+++ b/plugins/automation/admin/assets/javascripts/admin/components/placeholders-list.gjs@@ -1,7 +1,7 @@import Component from "@glimmer/component";import { fn } from "@ember/helper";import { action } from "@ember/object";-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";export default class PlaceholdersList extends Component {<template>diff --git a/plugins/automation/admin/assets/javascripts/discourse/templates/admin-plugins/show/automation/edit.gjs b/plugins/automation/admin/assets/javascripts/discourse/templates/admin-plugins/show/automation/edit.gjsindex 2dd2ae3f935..150c6783d0f 100644--- a/plugins/automation/admin/assets/javascripts/discourse/templates/admin-plugins/show/automation/edit.gjs+++ b/plugins/automation/admin/assets/javascripts/discourse/templates/admin-plugins/show/automation/edit.gjs@@ -1,11 +1,11 @@import { fn, hash } from "@ember/helper";import AdminConfigAreaCard from "discourse/admin/components/admin-config-area-card";import BackButton from "discourse/components/back-button";-import DButton from "discourse/components/d-button";-import TextField from "discourse/components/text-field";import withEventValue from "discourse/helpers/with-event-value";import ComboBox from "discourse/select-kit/components/combo-box";import { and, not } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DTextField from "discourse/ui-kit/d-text-field";import { i18n } from "discourse-i18n";import AutomationEnabledToggle from "discourse/plugins/automation/admin/components/automation-enabled-toggle";import AutomationField from "discourse/plugins/automation/admin/components/automation-field";@@ -51,7 +51,7 @@ export default <template></label><div class="controls">- <TextField+ <DTextField@value={{@controller.automationForm.name}}@type="text"@autofocus={{true}}diff --git a/plugins/chat/admin/assets/javascripts/admin/components/admin-chat-incoming-webhooks-list.gjs b/plugins/chat/admin/assets/javascripts/admin/components/admin-chat-incoming-webhooks-list.gjsindex 63358f2460a..3d07d85328e 100644--- a/plugins/chat/admin/assets/javascripts/admin/components/admin-chat-incoming-webhooks-list.gjs+++ b/plugins/chat/admin/assets/javascripts/admin/components/admin-chat-incoming-webhooks-list.gjs@@ -5,11 +5,11 @@ import { action } from "@ember/object";import { LinkTo } from "@ember/routing";import { service } from "@ember/service";import { compare } from "@ember/utils";-import DButton from "discourse/components/d-button";-import replaceEmoji from "discourse/helpers/replace-emoji";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import { removeValueFromArray } from "discourse/lib/array-tools";+import DButton from "discourse/ui-kit/d-button";+import dReplaceEmoji from "discourse/ui-kit/helpers/d-replace-emoji";import { i18n } from "discourse-i18n";import ChannelTitle from "discourse/plugins/chat/discourse/components/channel-title";@@ -76,7 +76,7 @@ export default class AdminChatIncomingWebhooksList extends Component {<div class="d-table__mobile-label">{{i18n "chat.incoming_webhooks.emoji"}}</div>- {{replaceEmoji webhook.emoji}}+ {{dReplaceEmoji webhook.emoji}}</td><td class="d-table__cell --detail"><div class="d-table__mobile-label">diff --git a/plugins/chat/admin/assets/javascripts/admin/components/chat-incoming-webhook-edit-form.gjs b/plugins/chat/admin/assets/javascripts/admin/components/chat-incoming-webhook-edit-form.gjsindex 3ea15724ef2..37f51f5b058 100644--- a/plugins/chat/admin/assets/javascripts/admin/components/chat-incoming-webhook-edit-form.gjs+++ b/plugins/chat/admin/assets/javascripts/admin/components/chat-incoming-webhook-edit-form.gjs@@ -2,13 +2,13 @@ import Component from "@glimmer/component";import { fn } from "@ember/helper";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import EmojiPicker from "discourse/components/emoji-picker";import Form from "discourse/components/form";-import replaceEmoji from "discourse/helpers/replace-emoji";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import { not } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import dReplaceEmoji from "discourse/ui-kit/helpers/d-replace-emoji";import { i18n } from "discourse-i18n";import ChatChannelChooser from "discourse/plugins/chat/discourse/components/chat-channel-chooser";@@ -138,7 +138,7 @@ export default class ChatIncomingWebhookEditForm extends Component {{{i18n "chat.incoming_webhooks.current_emoji"}}<span class="incoming-chat-webhooks-current-emoji">- {{replaceEmoji field.value}}+ {{dReplaceEmoji field.value}}</span>{{/if}}diff --git a/plugins/chat/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-chat-incoming-webhooks/edit.gjs b/plugins/chat/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-chat-incoming-webhooks/edit.gjsindex 3859115682e..bbb4242ab84 100644--- a/plugins/chat/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-chat-incoming-webhooks/edit.gjs+++ b/plugins/chat/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-chat-incoming-webhooks/edit.gjs@@ -1,6 +1,6 @@import BackButton from "discourse/components/back-button";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";import { not } from "discourse/truth-helpers";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";import ChatIncomingWebhookEditForm from "discourse/plugins/chat/admin/components/chat-incoming-webhook-edit-form";export default <template>@@ -11,11 +11,11 @@ export default <template>class="incoming-chat-webhooks-back"/>- <ConditionalLoadingSpinner @condition={{not @controller.model.webhook}}>+ <DConditionalLoadingSpinner @condition={{not @controller.model.webhook}}><ChatIncomingWebhookEditForm@webhook={{@controller.model.webhook}}@chatChannels={{@controller.model.chat_channels}}/>- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner></div></template>diff --git a/plugins/chat/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-chat-incoming-webhooks/index.gjs b/plugins/chat/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-chat-incoming-webhooks/index.gjsindex df997120d79..34b22b73bc0 100644--- a/plugins/chat/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-chat-incoming-webhooks/index.gjs+++ b/plugins/chat/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-chat-incoming-webhooks/index.gjs@@ -1,5 +1,5 @@-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DPageSubheader from "discourse/components/d-page-subheader";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DPageSubheader from "discourse/ui-kit/d-page-subheader";import { i18n } from "discourse-i18n";import AdminChatIncomingWebhooksList from "discourse/plugins/chat/admin/components/admin-chat-incoming-webhooks-list";diff --git a/plugins/chat/assets/javascripts/discourse/components/browse-channels.gjs b/plugins/chat/assets/javascripts/discourse/components/browse-channels.gjsindex ff91387308d..33d4277ba89 100644--- a/plugins/chat/assets/javascripts/discourse/components/browse-channels.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/browse-channels.gjs@@ -6,11 +6,11 @@ import didInsert from "@ember/render-modifiers/modifiers/did-insert";import { LinkTo } from "@ember/routing";import { schedule } from "@ember/runloop";import { service } from "@ember/service";-import EmptyState from "discourse/components/empty-state";-import FilterInput from "discourse/components/filter-input";import discourseDebounce from "discourse/lib/debounce";import { INPUT_DELAY } from "discourse/lib/environment";import { eq } from "discourse/truth-helpers";+import DEmptyState from "discourse/ui-kit/d-empty-state";+import DFilterInput from "discourse/ui-kit/d-filter-input";import { i18n } from "discourse-i18n";import List from "discourse/plugins/chat/discourse/components/chat/list";import ChatModalNewMessage from "discourse/plugins/chat/discourse/components/chat/modal/new-message";@@ -89,7 +89,7 @@ export default class BrowseChannels extends Component {</ul></nav>- <FilterInput+ <DFilterInput{{didInsert this.focusFilterInput}}@filterAction={{this.setFilter}}@icons={{hash right="magnifying-glass"}}@@ -109,7 +109,7 @@ export default class BrowseChannels extends Component {</list.Item><list.EmptyState>- <EmptyState+ <DEmptyState@title={{i18n "chat.empty_state.title"}}@body={{i18n "chat.empty_state.direct_message"}}@ctaLabel={{i18n "chat.empty_state.direct_message_cta"}}diff --git a/plugins/chat/assets/javascripts/discourse/components/channel-icon/index.gjs b/plugins/chat/assets/javascripts/discourse/components/channel-icon/index.gjsindex e5da8a175b9..2674a999d86 100644--- a/plugins/chat/assets/javascripts/discourse/components/channel-icon/index.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/channel-icon/index.gjs@@ -1,8 +1,8 @@import Component from "@glimmer/component";import { trustHTML } from "@ember/template";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";-import replaceEmoji from "discourse/helpers/replace-emoji";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";+import dReplaceEmoji from "discourse/ui-kit/helpers/d-replace-emoji";import ChatUserAvatar from "discourse/plugins/chat/discourse/components/chat-user-avatar";export default class ChatChannelIcon extends Component {@@ -27,19 +27,19 @@ export default class ChatChannelIcon extends Component {get categoryChannelIcon() {const { emoji } = this.args.channel;- return emoji ? replaceEmoji(`:${emoji}:`) : icon("d-chat");+ return emoji ? dReplaceEmoji(`:${emoji}:`) : dIcon("d-chat");}get directChannelIcon() {const { emoji, membershipsCount } = this.args.channel;- return emoji ? replaceEmoji(`:${emoji}:`) : membershipsCount;+ return emoji ? dReplaceEmoji(`:${emoji}:`) : membershipsCount;}<template>{{#if @channel.isDirectMessageChannel}}{{#if this.groupDirectMessage}}<div- class={{concatClass+ class={{dConcatClass"chat-channel-icon"(unless @channel.emoji "--users-count" "--emoji")}}@@ -55,7 +55,7 @@ export default class ChatChannelIcon extends Component {<div class="chat-channel-icon --icon" style={{this.channelColorStyle}}>{{this.categoryChannelIcon}}{{#if @channel.chatable.read_restricted}}- {{icon "lock" class="chat-channel-icon__restricted-category-icon"}}+ {{dIcon "lock" class="chat-channel-icon__restricted-category-icon"}}{{/if}}</div>{{else if this.isThreadsList}}@@ -66,7 +66,7 @@ export default class ChatChannelIcon extends Component {@showPresence={{false}}/><div class="avatar-flair --threads">- {{icon "discourse-threads"}}+ {{dIcon "discourse-threads"}}</div></div>{{/if}}diff --git a/plugins/chat/assets/javascripts/discourse/components/channel-name/index.gjs b/plugins/chat/assets/javascripts/discourse/components/channel-name/index.gjsindex 40ef663ee5a..c57bc7c0ea9 100644--- a/plugins/chat/assets/javascripts/discourse/components/channel-name/index.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/channel-name/index.gjs@@ -3,9 +3,9 @@ import { get } from "@ember/helper";import { service } from "@ember/service";import { trustHTML } from "@ember/template";import PluginOutlet from "discourse/components/plugin-outlet";-import UserStatusMessage from "discourse/components/user-status-message";import lazyHash from "discourse/helpers/lazy-hash";-import replaceEmoji from "discourse/helpers/replace-emoji";+import DUserStatusMessage from "discourse/ui-kit/d-user-status-message";+import dReplaceEmoji from "discourse/ui-kit/helpers/d-replace-emoji";import ChatChannelUnreadIndicator from "../chat-channel-unread-indicator";export default class ChatChannelName extends Component {@@ -68,10 +68,10 @@ export default class ChatChannelName extends Component {<template><div class="chat-channel-name"><div class="chat-channel-name__label">- {{replaceEmoji this.channelTitle}}+ {{dReplaceEmoji this.channelTitle}}{{#if this.showUserStatus}}- <UserStatusMessage+ <DUserStatusMessage@status={{get this.users "0.status"}}@showDescription={{if this.site.mobileView "true"}}class="chat-channel__user-status-message"diff --git a/plugins/chat/assets/javascripts/discourse/components/channel-title/index.gjs b/plugins/chat/assets/javascripts/discourse/components/channel-title/index.gjsindex a3364699d5c..5f938063a7f 100644--- a/plugins/chat/assets/javascripts/discourse/components/channel-title/index.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/channel-title/index.gjs@@ -1,10 +1,10 @@-import concatClass from "discourse/helpers/concat-class";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import ChannelIcon from "discourse/plugins/chat/discourse/components/channel-icon";import ChannelName from "discourse/plugins/chat/discourse/components/channel-name";const ChatChannelTitle = <template><div- class={{concatClass+ class={{dConcatClass"chat-channel-title"(if @channel.isDirectMessageChannel "is-dm" "is-category")}}diff --git a/plugins/chat/assets/javascripts/discourse/components/channels-list-direct.gjs b/plugins/chat/assets/javascripts/discourse/components/channels-list-direct.gjsindex 85fe430b786..182fb023215 100644--- a/plugins/chat/assets/javascripts/discourse/components/channels-list-direct.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/channels-list-direct.gjs@@ -3,13 +3,13 @@ import { fn, hash } from "@ember/helper";import { on } from "@ember/modifier";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import EmptyState from "discourse/components/empty-state";import PluginOutlet from "discourse/components/plugin-outlet";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import lazyHash from "discourse/helpers/lazy-hash";import { and, not, or } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DEmptyState from "discourse/ui-kit/d-empty-state";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";import ChatModalNewMessage from "discourse/plugins/chat/discourse/components/chat/modal/new-message";import ChatChannelRow from "./chat-channel-row";@@ -88,7 +88,7 @@ export default class ChannelsListDirect extends Component {}}data-toggleable="direct-message-channels">- {{icon "angle-up"}}+ {{dIcon "angle-up"}}</span>{{/if}}@@ -107,7 +107,7 @@ export default class ChannelsListDirect extends Component {<divid="direct-message-channels"- class={{concatClass+ class={{dConcatClass"channels-list-container""direct-message-channels"(if this.inSidebar "collapsible-sidebar-section")@@ -115,7 +115,7 @@ export default class ChannelsListDirect extends Component {}}>{{#if this.directMessageChannelsEmpty}}- <EmptyState+ <DEmptyState@identifier="empty-channels-list"@svgContent={{ChatZero}}@title={{i18n "chat.no_direct_message_channels"}}diff --git a/plugins/chat/assets/javascripts/discourse/components/channels-list-public.gjs b/plugins/chat/assets/javascripts/discourse/components/channels-list-public.gjsindex 48830d40446..bc198d87936 100644--- a/plugins/chat/assets/javascripts/discourse/components/channels-list-public.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/channels-list-public.gjs@@ -4,12 +4,12 @@ import { on } from "@ember/modifier";import { action } from "@ember/object";import { LinkTo } from "@ember/routing";import { service } from "@ember/service";-import EmptyState from "discourse/components/empty-state";import PluginOutlet from "discourse/components/plugin-outlet";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import lazyHash from "discourse/helpers/lazy-hash";import { and } from "discourse/truth-helpers";+import DEmptyState from "discourse/ui-kit/d-empty-state";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";import ChatChannelRow from "./chat-channel-row";import ChatZero from "./svg/chat-zero";@@ -54,7 +54,7 @@ export default class ChannelsListPublic extends Component {{{#if (and this.site.desktopView this.inSidebar this.shouldShowMyThreads)}}<LinkTo @route="chat.threads" class="chat-channel-row --threads"><span class="chat-channel-title">- {{icon "discourse-threads" class="chat-user-threads__icon"}}+ {{dIcon "discourse-threads" class="chat-user-threads__icon"}}{{i18n "chat.my_threads.title"}}</span>{{#if this.hasUnreadThreads}}@@ -78,7 +78,7 @@ export default class ChannelsListPublic extends Component {{{on "click" (fn this.toggleChannelSection "public-channels")}}data-toggleable="public-channels">- {{icon "angle-up"}}+ {{dIcon "angle-up"}}</span>{{/if}}@@ -89,21 +89,21 @@ export default class ChannelsListPublic extends Component {class="btn no-text btn-flat open-browse-page-btn title-action"title={{i18n "chat.channels_list_popup.browse"}}>- {{icon "pencil"}}+ {{dIcon "pencil"}}</LinkTo></div>{{/if}}<divid="public-channels"- class={{concatClass+ class={{dConcatClass"channels-list-container""public-channels"(if this.inSidebar "collapsible-sidebar-section")}}>{{#if this.chatChannelsManager.publicMessageChannelsEmpty}}- <EmptyState+ <DEmptyState@identifier="empty-channels-list"@svgContent={{ChatZero}}@title={{i18n "chat.no_public_channels"}}diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel-archive-status.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-channel-archive-status.gjsindex ee61cef66db..d90210d88cf 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat-channel-archive-status.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat-channel-archive-status.gjs@@ -3,10 +3,10 @@ import { action } from "@ember/object";import { service } from "@ember/service";import { trustHTML } from "@ember/template";import { isPresent } from "@ember/utils";-import DButton from "discourse/components/d-button";-import concatClass from "discourse/helpers/concat-class";import { popupAjaxError } from "discourse/lib/ajax-error";import getURL from "discourse/lib/get-url";+import DButton from "discourse/ui-kit/d-button";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";export default class ChatChannelArchiveStatus extends Component {@@ -57,7 +57,7 @@ export default class ChatChannelArchiveStatus extends Component {{{#if this.shouldRender}}{{#if @channel.archive.failed}}<div- class={{concatClass+ class={{dConcatClass"alert alert-warn chat-channel-retry-archive"@channel.status}}@@ -75,7 +75,7 @@ export default class ChatChannelArchiveStatus extends Component {</div>{{else if @channel.archive.completed}}<div- class={{concatClass "chat-channel-archive-status" @channel.status}}+ class={{dConcatClass "chat-channel-archive-status" @channel.status}}>{{this.channelArchiveCompletedMessage}}</div>diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel-card.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-channel-card.gjsindex c48d0298f09..a0d770253d7 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat-channel-card.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat-channel-card.gjs@@ -1,17 +1,17 @@import { concat, hash } from "@ember/helper";import { LinkTo } from "@ember/routing";import { trustHTML } from "@ember/template";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";-import replaceEmoji from "discourse/helpers/replace-emoji";import { gt } from "discourse/truth-helpers";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";+import dReplaceEmoji from "discourse/ui-kit/helpers/d-replace-emoji";import { i18n } from "discourse-i18n";import ToggleChannelMembershipButton from "./toggle-channel-membership-button";<template>{{#if @channel}}<div- class={{concatClass+ class={{dConcatClass"chat-channel-card"(if @channel.isClosed "--closed")(if @channel.isArchived "--archived")@@ -28,17 +28,17 @@ import ToggleChannelMembershipButton from "./toggle-channel-membership-button";class="chat-channel-card__name-container"><span class="chat-channel-card__name">- {{replaceEmoji @channel.title}}+ {{dReplaceEmoji @channel.title}}</span>{{#if @channel.chatable.read_restricted}}- {{icon "lock" class="chat-channel-card__read-restricted"}}+ {{dIcon "lock" class="chat-channel-card__read-restricted"}}{{/if}}{{#if @channel.currentUserMembership.muted}}<spanclass="chat-channel-card__muted"aria-label={{i18n "chat.muted"}}title={{i18n "chat.muted"}}- >{{icon "d-muted"}}</span>+ >{{dIcon "d-muted"}}</span>{{/if}}</LinkTo></div>@@ -79,7 +79,7 @@ import ToggleChannelMembershipButton from "./toggle-channel-membership-button";{{#if @channel.description}}<div class="chat-channel-card__description">- {{replaceEmoji @channel.description}}+ {{dReplaceEmoji @channel.description}}</div>{{/if}}</div>diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel-chooser-header.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-channel-chooser-header.gjsindex d18662a7e08..1bddf391f3b 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat-channel-chooser-header.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat-channel-chooser-header.gjs@@ -1,5 +1,5 @@-import icon from "discourse/helpers/d-icon";import ComboBoxSelectBoxHeaderComponent from "discourse/select-kit/components/combo-box/combo-box-header";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";import ChannelTitle from "discourse/plugins/chat/discourse/components/channel-title";@@ -12,7 +12,7 @@ export default class ChatChannelChooserHeader extends ComboBoxSelectBoxHeaderCom{{i18n "chat.incoming_webhooks.channel_placeholder"}}{{/if}}- {{icon this.caretIcon class="angle-icon"}}+ {{dIcon this.caretIcon class="angle-icon"}}</div></template>}diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel-filter.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-channel-filter.gjsindex 17cd279398e..221e22387ff 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat-channel-filter.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat-channel-filter.gjs@@ -5,15 +5,15 @@ import didInsert from "@ember/render-modifiers/modifiers/did-insert";import { cancel } from "@ember/runloop";import { service } from "@ember/service";import { isBlank } from "@ember/utils";-import DButton from "discourse/components/d-button";-import FilterInput from "discourse/components/filter-input";import closeOnEscape from "discourse/float-kit/modifiers/close-on-escape";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import discourseDebounce from "discourse/lib/debounce";import { INPUT_DELAY } from "discourse/lib/environment";-import autoFocus from "discourse/modifiers/auto-focus";import { gt } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DFilterInput from "discourse/ui-kit/d-filter-input";+import dAutoFocus from "discourse/ui-kit/modifiers/d-auto-focus";import { i18n } from "discourse-i18n";export default class ChatChannelFilter extends Component {@@ -149,8 +149,8 @@ export default class ChatChannelFilter extends Component {{{didInsert this.clearFilteringState}}><div>- <FilterInput- {{autoFocus}}+ <DFilterInput+ {{dAutoFocus}}{{closeOnEscape @onToggleFilter}}@value={{this.currentChannelFilter}}placeholder={{i18n "chat.search.title"}}diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel-leave-btn.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-channel-leave-btn.gjsindex 6c1ad8a8208..914e8d5632d 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat-channel-leave-btn.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat-channel-leave-btn.gjs@@ -1,7 +1,7 @@import Component from "@glimmer/component";import { service } from "@ember/service";import { isPresent } from "@ember/utils";-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";export default class ChatChannelLeaveBtn extends Component {@service site;diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel-preview-card.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-channel-preview-card.gjsindex a2c926d4dff..f232491998d 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat-channel-preview-card.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat-channel-preview-card.gjs@@ -2,7 +2,7 @@ import Component from "@glimmer/component";import { hash } from "@ember/helper";import { LinkTo } from "@ember/routing";import { isEmpty } from "@ember/utils";-import concatClass from "discourse/helpers/concat-class";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";import ChannelTitle from "./channel-title";import ToggleChannelMembershipButton from "./toggle-channel-membership-button";@@ -18,7 +18,7 @@ export default class ChatChannelPreviewCard extends Component {<template><div- class={{concatClass+ class={{dConcatClass"chat-channel-preview-card"(unless this.hasDescription "-no-description")(unless this.showJoinButton "-no-button")diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel-row.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-channel-row.gjsindex 1a2661a91d7..a39f47e082c 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat-channel-row.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat-channel-row.gjs@@ -8,12 +8,12 @@ import { LinkTo } from "@ember/routing";import { service } from "@ember/service";import { trustHTML } from "@ember/template";import { modifier as modifierFn } from "ember-modifier";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";-import replaceEmoji from "discourse/helpers/replace-emoji";import { popupAjaxError } from "discourse/lib/ajax-error";import { bind } from "discourse/lib/decorators";import { and, eq } from "discourse/truth-helpers";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";+import dReplaceEmoji from "discourse/ui-kit/helpers/d-replace-emoji";import { i18n } from "discourse-i18n";import ChannelIcon from "discourse/plugins/chat/discourse/components/channel-icon";import ChannelName from "discourse/plugins/chat/discourse/components/channel-name";@@ -168,7 +168,7 @@ export default class ChatChannelRow extends Component {<LinkTo@route="chat.channel"@models={{@channel.routeModels}}- class={{concatClass+ class={{dConcatClass"chat-channel-row"(if @channel.focused "focused")(if @channel.currentUserMembership.muted "muted")@@ -183,7 +183,7 @@ export default class ChatChannelRow extends Component {{{(if this.shouldRemoveChannel (modifier this.onRemoveChannel))}}><div- class={{concatClass+ class={{dConcatClass"chat-channel-row__content"(if @channel.isCategoryChannel "is-category" "is-dm")(if this.shouldReset "-animate-reset")@@ -201,7 +201,7 @@ export default class ChatChannelRow extends Component {<ChatChannelMetadata @channel={{@channel}} />{{#if this.shouldRenderLastMessage}}<div class="chat-channel__last-message">- {{replaceEmoji (trustHTML @channel.lastMessage.excerpt)}}+ {{dReplaceEmoji (trustHTML @channel.lastMessage.excerpt)}}</div>{{/if}}</div>@@ -227,12 +227,12 @@ export default class ChatChannelRow extends Component {{{#if this.showRemoveButton}}<div- class={{concatClass+ class={{dConcatClass"chat-channel-row__action-btn"(if this.isAtThreshold "-at-threshold" "-not-at-threshold")}}>- {{icon "circle-xmark"}}+ {{dIcon "circle-xmark"}}</div>{{/if}}</LinkTo>diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel-sidebar-context-menu.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-channel-sidebar-context-menu.gjsindex 7640bf1ea7c..6ba16d0747c 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat-channel-sidebar-context-menu.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat-channel-sidebar-context-menu.gjs@@ -2,9 +2,9 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import DropdownMenu from "discourse/components/dropdown-menu";import { popupAjaxError } from "discourse/lib/ajax-error";+import DButton from "discourse/ui-kit/d-button";+import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";import ChatChannelSidebarContextNotificationSubmenu from "./chat-channel-sidebar-context-notification-submenu";export default class ChatChannelSidebarContextMenu extends Component {@@ -123,7 +123,7 @@ export default class ChatChannelSidebarContextMenu extends Component {}<template>- <DropdownMenu class="chat-channel-sidebar-link-menu" as |dropdown|>+ <DDropdownMenu class="chat-channel-sidebar-link-menu" as |dropdown|><dropdown.item><DButton@action={{this.openNotificationSettings}}@@ -163,6 +163,6 @@ export default class ChatChannelSidebarContextMenu extends Component {class="chat-channel-sidebar-link-menu__leave-channel --danger"/></dropdown.item>- </DropdownMenu>+ </DDropdownMenu></template>}diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel-sidebar-context-notification-submenu.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-channel-sidebar-context-notification-submenu.gjsindex 35d054c75ec..b88d83bc447 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat-channel-sidebar-context-notification-submenu.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat-channel-sidebar-context-notification-submenu.gjs@@ -1,10 +1,10 @@import Component from "@glimmer/component";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import DropdownMenu from "discourse/components/dropdown-menu";-import concatClass from "discourse/helpers/concat-class";import { popupAjaxError } from "discourse/lib/ajax-error";+import DButton from "discourse/ui-kit/d-button";+import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";export default class ChatChannelSidebarContextNotificationSubmenu extends Component {@service chatApi;@@ -58,13 +58,13 @@ export default class ChatChannelSidebarContextNotificationSubmenu extends Compon}<template>- <DropdownMenu as |dropdown|>+ <DDropdownMenu as |dropdown|><dropdown.item><DButton@action={{this.changePushNotifications "never"}}@label="chat.notification_levels.never"@title="chat.notification_levels.never"- class={{concatClass+ class={{dConcatClass"chat-channel-sidebar-link-menu__notification-level-never"(if (this.isItemSelected "never") "-selected")}}@@ -76,7 +76,7 @@ export default class ChatChannelSidebarContextNotificationSubmenu extends Compon@action={{this.changePushNotifications "mention"}}@label="chat.notification_levels.mention"@title="chat.notification_levels.mention"- class={{concatClass+ class={{dConcatClass"chat-channel-sidebar-link-menu__notification-level-mention"(if (this.isItemSelected "mention") "-selected")}}@@ -88,7 +88,7 @@ export default class ChatChannelSidebarContextNotificationSubmenu extends Compon@action={{this.changePushNotifications "always"}}@label="chat.notification_levels.always"@title="chat.notification_levels.always"- class={{concatClass+ class={{dConcatClass"chat-channel-sidebar-link-menu__notification-level-always"(if (this.isItemSelected "always") "-selected")}}@@ -115,12 +115,12 @@ export default class ChatChannelSidebarContextNotificationSubmenu extends Compon"chat.settings.unmute""chat.settings.mute"}}- class={{concatClass+ class={{dConcatClass"chat-channel-sidebar-link-menu__mute-channel"(if (this.isItemSelected "muted") "-selected")}}/></dropdown.item>- </DropdownMenu>+ </DDropdownMenu></template>}diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel-status.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-channel-status.gjsindex e09c7e29b10..b8d730b833d 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat-channel-status.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat-channel-status.gjs@@ -1,5 +1,5 @@import Component from "@glimmer/component";-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";import {CHANNEL_STATUSES,@@ -66,7 +66,7 @@ export default class ChatChannelStatus extends Component {<template>{{#if this.shouldRender}}<div class="chat-channel-status">- {{icon this.channelStatusIcon}}+ {{dIcon this.channelStatusIcon}}<span>{{this.channelStatusMessage}}</span><ChatChannelArchiveStatus @channel={{@channel}} /></div>diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel-unread-indicator.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-channel-unread-indicator.gjsindex 72f8d7d9062..d3b63c647b3 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat-channel-unread-indicator.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat-channel-unread-indicator.gjs@@ -1,5 +1,5 @@import Component from "@glimmer/component";-import concatClass from "discourse/helpers/concat-class";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";const MAX_UNREAD_COUNT = 99;@@ -46,7 +46,7 @@ export default class ChatChannelUnreadIndicator extends Component {<template>{{#if this.showUnreadIndicator}}<div- class={{concatClass+ class={{dConcatClass"chat-channel-unread-indicator"(if this.isUrgent "-urgent")}}diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-channel.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-channel.gjsindex ef1a3ef88ea..70edcb41d2b 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat-channel.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat-channel.gjs@@ -7,12 +7,12 @@ import didUpdate from "@ember/render-modifiers/modifiers/did-update";import willDestroy from "@ember/render-modifiers/modifiers/will-destroy";import { cancel, next, schedule } from "@ember/runloop";import { service } from "@ember/service";-import concatClass from "discourse/helpers/concat-class";import { popupAjaxError } from "discourse/lib/ajax-error";import discourseDebounce from "discourse/lib/debounce";import { bind } from "discourse/lib/decorators";import DiscourseURL from "discourse/lib/url";import { and, not } from "discourse/truth-helpers";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";import ChatChannelStatus from "discourse/plugins/chat/discourse/components/chat-channel-status";import firstVisibleMessageId from "discourse/plugins/chat/discourse/helpers/first-visible-message-id";@@ -703,7 +703,7 @@ export default class ChatChannel extends Component {<template><div- class={{concatClass+ class={{dConcatClass"chat-channel"(if this.messagesLoader.loading "loading")(if this.pane.sending "chat-channel--sending")diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-composer-dropdown.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-composer-dropdown.gjsindex eaf5d79b9e6..3e9ce659fee 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat-composer-dropdown.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat-composer-dropdown.gjs@@ -2,9 +2,9 @@ import Component from "@glimmer/component";import { array, fn } from "@ember/helper";import { on } from "@ember/modifier";import { action } from "@ember/object";-import DButton from "discourse/components/d-button";import DMenu from "discourse/float-kit/components/d-menu";-import concatClass from "discourse/helpers/concat-class";+import DButton from "discourse/ui-kit/d-button";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";export default class ChatComposerDropdown extends Component {@@ -37,7 +37,7 @@ export default class ChatComposerDropdown extends Component {<template>{{#if @buttons.length}}<DMenu- class={{concatClass+ class={{dConcatClass"chat-composer-dropdown__trigger-btn""btn-flat"(if @hasActivePanel "has-active-panel")@@ -55,12 +55,12 @@ export default class ChatComposerDropdown extends Component {><ul class="chat-composer-dropdown__list">{{#each @buttons as |button|}}- <li class={{concatClass "chat-composer-dropdown__item" button.id}}>+ <li class={{dConcatClass "chat-composer-dropdown__item" button.id}}><DButton@icon={{button.icon}}@action={{fn this.onButtonClick button menu.close}}@label={{button.label}}- class={{concatClass+ class={{dConcatClass"chat-composer-dropdown__action-btn""btn-transparent"button.iddiff --git a/plugins/chat/assets/javascripts/discourse/components/chat-composer-message-details.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-composer-message-details.gjsindex d69639bc2bf..96ccfca39fd 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat-composer-message-details.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat-composer-message-details.gjs@@ -1,7 +1,7 @@import { trustHTML } from "@ember/template";-import DButton from "discourse/components/d-button";-import icon from "discourse/helpers/d-icon";-import replaceEmoji from "discourse/helpers/replace-emoji";+import DButton from "discourse/ui-kit/d-button";+import dIcon from "discourse/ui-kit/helpers/d-icon";+import dReplaceEmoji from "discourse/ui-kit/helpers/d-replace-emoji";import ChatUserAvatar from "./chat-user-avatar";const ChatComposerMessageDetails = <template>@@ -11,11 +11,11 @@ const ChatComposerMessageDetails = <template>data-action={{if @message.editing "edit" "reply"}}><div class="chat-reply">- {{icon (if @message.editing "pencil" "reply")}}+ {{dIcon (if @message.editing "pencil" "reply")}}<ChatUserAvatar @user={{@message.user}} /><span class="chat-reply__username">{{@message.user.username}}</span><span class="chat-reply__excerpt">- {{replaceEmoji (trustHTML @message.excerpt)}}+ {{dReplaceEmoji (trustHTML @message.excerpt)}}</span></div>diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-composer-upload.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-composer-upload.gjsindex 13b6d7ceee2..8852b448700 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat-composer-upload.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat-composer-upload.gjs@@ -1,9 +1,9 @@import Component from "@glimmer/component";-import DButton from "discourse/components/d-button";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import { getURLWithCDN } from "discourse/lib/get-url";import { isAudio, isImage, isVideo } from "discourse/lib/uploads";+import DButton from "discourse/ui-kit/d-button";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class ChatComposerUpload extends Component {@@ -20,7 +20,7 @@ export default class ChatComposerUpload extends Component {<template>{{#if @upload}}<div- class={{concatClass+ class={{dConcatClass"chat-composer-upload"(if (isImage this.fileName) "chat-composer-upload--image")(unless @isDone "chat-composer-upload--in-progress")@@ -31,14 +31,14 @@ export default class ChatComposerUpload extends Component {{{#if @isDone}}<img class="preview-img" src={{this.previewImageSrc}} />{{else}}- {{icon "far-image"}}+ {{dIcon "far-image"}}{{/if}}{{else if (isVideo this.fileName)}}- {{icon "file-video"}}+ {{dIcon "file-video"}}{{else if (isAudio this.fileName)}}- {{icon "file-audio"}}+ {{dIcon "file-audio"}}{{else}}- {{icon "file-lines"}}+ {{dIcon "file-lines"}}{{/if}}</div>diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-composer-uploads.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-composer-uploads.gjsindex b5c79f58fac..2e69bc2d74c 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat-composer-uploads.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat-composer-uploads.gjs@@ -5,7 +5,6 @@ import { action } from "@ember/object";import { getOwner } from "@ember/owner";import { service } from "@ember/service";import { tagName } from "@ember-decorators/component";-import PickFilesButton from "discourse/components/pick-files-button";import { removeValueFromArray } from "discourse/lib/array-tools";import { bind } from "discourse/lib/decorators";import { cloneJSON } from "discourse/lib/object";@@ -13,6 +12,7 @@ import { autoTrackedArray } from "discourse/lib/tracked-tools";import UppyUpload from "discourse/lib/uppy/uppy-upload";import UppyMediaOptimization from "discourse/lib/uppy-media-optimization-plugin";import { clipboardHelpers } from "discourse/lib/utilities";+import DPickFilesButton from "discourse/ui-kit/d-pick-files-button";import ChatComposerUpload from "discourse/plugins/chat/discourse/components/chat-composer-upload";@tagName("")@@ -167,7 +167,7 @@ export default class ChatComposerUploads extends Component {</div>{{/if}}- <PickFilesButton+ <DPickFilesButton@allowMultiple={{true}}@fileInputId={{this.fileUploadElementId}}@fileInputClass="hidden-upload-field"diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-composer.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-composer.gjsindex 1414ed33dc0..48d93253b05 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat-composer.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat-composer.gjs@@ -17,13 +17,11 @@ import {} from "pretty-text/emoji";import { replacements, translations } from "pretty-text/emoji/data";import { Promise } from "rsvp";-import DTextarea from "discourse/components/d-textarea";import EmojiAutocompleteResults from "discourse/components/emoji-autocomplete-results";import EmojiPickerDetached from "discourse/components/emoji-picker/detached";import UpsertHyperlink from "discourse/components/modal/upsert-hyperlink";import PluginOutlet from "discourse/components/plugin-outlet";import UserAutocompleteResults from "discourse/components/user-autocomplete-results";-import concatClass from "discourse/helpers/concat-class";import lazyHash from "discourse/helpers/lazy-hash";import { hashtagAutocompleteOptions } from "discourse/lib/hashtag-autocomplete";import loadEmojiSearchAliases from "discourse/lib/load-emoji-search-aliases";@@ -40,12 +38,12 @@ import {import { optionalRequire } from "discourse/lib/utilities";import virtualElementFromTextRange from "discourse/lib/virtual-element-from-text-range";import { waitForClosedKeyboard } from "discourse/lib/wait-for-keyboard";-import DAutocompleteModifier, {- SKIP,-} from "discourse/modifiers/d-autocomplete";import forceScrollingElementPosition from "discourse/modifiers/force-scrolling-element-position";import preventScrollOnFocus from "discourse/modifiers/prevent-scroll-on-focus";import { not, or } from "discourse/truth-helpers";+import DTextarea from "discourse/ui-kit/d-textarea";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dAutocomplete, { SKIP } from "discourse/ui-kit/modifiers/d-autocomplete";import { i18n } from "discourse-i18n";import DButton from "discourse/plugins/chat/discourse/components/chat/composer/button";import ChatComposerDropdown from "discourse/plugins/chat/discourse/components/chat-composer-dropdown";@@ -123,7 +121,7 @@ export default class ChatComposer extends Component {applyAutocomplete(textarea, options) {const autocompleteHandler = new TextareaAutocompleteHandler(textarea);- return DAutocompleteModifier.setupAutocomplete(+ return dAutocomplete.setupAutocomplete(getOwner(this),textarea,autocompleteHandler,@@ -738,7 +736,7 @@ export default class ChatComposer extends Component {<divrole="region"aria-label={{i18n "chat.aria_roles.composer"}}- class={{concatClass+ class={{dConcatClass"chat-composer"(if this.isFocused "is-focused")(if this.pane.sending "is-sending")diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-drawer.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-drawer.gjsindex a61d4ad93c1..67d1b825657 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat-drawer.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat-drawer.gjs@@ -8,13 +8,13 @@ import { tagName } from "@ember-decorators/component";import { observes } from "@ember-decorators/object";import PluginOutlet from "discourse/components/plugin-outlet";import bodyClass from "discourse/helpers/body-class";-import concatClass from "discourse/helpers/concat-class";import htmlClass from "discourse/helpers/html-class";import lazyHash from "discourse/helpers/lazy-hash";import { bind } from "discourse/lib/decorators";import getURL from "discourse/lib/get-url";import DiscourseURL from "discourse/lib/url";import { escapeExpression } from "discourse/lib/utilities";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import chatResizableNode from "discourse/plugins/chat/discourse/modifiers/chat/resizable-node";@tagName("")@@ -264,7 +264,7 @@ export default class ChatDrawer extends Component {<divdata-chat-channel-id={{this.chatDrawerRouter.model.channel.id}}data-chat-thread-id={{this.chatDrawerRouter.model.channel.activeThread.id}}- class={{concatClass+ class={{dConcatClass"chat-drawer"(ifthis.chatStateManager.isDrawerExpanded "is-expanded" "is-collapsed"diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-emoji-avatar.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-emoji-avatar.gjsindex 0aebc4adf7b..45a788e7081 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat-emoji-avatar.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat-emoji-avatar.gjs@@ -1,9 +1,9 @@-import replaceEmoji from "discourse/helpers/replace-emoji";+import dReplaceEmoji from "discourse/ui-kit/helpers/d-replace-emoji";const ChatEmojiAvatar = <template><div class="chat-emoji-avatar"><div class="chat-emoji-avatar-container">- {{replaceEmoji @emoji}}+ {{dReplaceEmoji @emoji}}</div></div></template>;diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-footer.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-footer.gjsindex 5cd54fb79cd..aea891b0c7a 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat-footer.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat-footer.gjs@@ -1,8 +1,8 @@import Component from "@glimmer/component";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import concatClass from "discourse/helpers/concat-class";import { eq } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";import {UnreadChannelsIndicator,@@ -66,7 +66,7 @@ export default class ChatFooter extends Component {@label="chat.starred"aria-label={{i18n "chat.starred"}}id="c-footer-starred"- class={{concatClass+ class={{dConcatClass"btn-transparent""c-footer__item"(if (eq this.currentRouteName "chat.starred-channels") "--active")@@ -82,7 +82,7 @@ export default class ChatFooter extends Component {@label="chat.channel_list.title"aria-label={{i18n "chat.channel_list.aria_label"}}id="c-footer-channels"- class={{concatClass+ class={{dConcatClass"btn-transparent""c-footer__item"(if (eq this.currentRouteName "chat.channels") "--active")@@ -98,7 +98,7 @@ export default class ChatFooter extends Component {@label="chat.direct_messages.title"aria-label={{i18n "chat.direct_messages.aria_label"}}id="c-footer-direct-messages"- class={{concatClass+ class={{dConcatClass"btn-transparent""c-footer__item"(if (eq this.currentRouteName "chat.direct-messages") "--active")@@ -115,7 +115,7 @@ export default class ChatFooter extends Component {@label="chat.my_threads.title"aria-label={{i18n "chat.my_threads.aria_label"}}id="c-footer-threads"- class={{concatClass+ class={{dConcatClass"btn-transparent""c-footer__item"(if (eq this.currentRouteName "chat.threads") "--active")@@ -132,7 +132,7 @@ export default class ChatFooter extends Component {@label="chat.search.short_title"aria-label={{i18n "chat.search.aria_label"}}id="c-footer-search"- class={{concatClass+ class={{dConcatClass"btn-transparent""c-footer__item"(if (eq this.currentRouteName "chat.search") "--active")diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-header.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-header.gjsindex af929eac64e..68dd5c6b01b 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat-header.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat-header.gjs@@ -2,8 +2,8 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { LinkTo } from "@ember/routing";import { service } from "@ember/service";-import icon from "discourse/helpers/d-icon";import getURL from "discourse/lib/get-url";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class ChatHeader extends Component {@@ -54,7 +54,7 @@ export default class ChatHeader extends Component {class="btn-flat back-to-forum"title={{this.title}}>- {{icon "arrow-left"}}+ {{dIcon "arrow-left"}}{{this.title}}</a>diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-mention-warnings.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-mention-warnings.gjsindex 6cfe8d7f0c5..e150e96467a 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat-mention-warnings.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat-mention-warnings.gjs@@ -1,8 +1,8 @@import Component from "@glimmer/component";import { service } from "@ember/service";import { trustHTML } from "@ember/template";-import icon from "discourse/helpers/d-icon";import getURL from "discourse/lib/get-url";+import dIcon from "discourse/ui-kit/helpers/d-icon";import I18n, { i18n } from "discourse-i18n";export default class ChatMentionWarnings extends Component {@@ -151,7 +151,7 @@ export default class ChatMentionWarnings extends Component {{{#if this.show}}<div class="chat-mention-warnings"><div class="chat-mention-warning__icon">- {{icon "triangle-exclamation"}}+ {{dIcon "triangle-exclamation"}}</div><div class="chat-mention-warning__text"><div class="chat-mention-warning__header">diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-message-actions-desktop.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-message-actions-desktop.gjsindex eea866cc558..976f9464bd2 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat-message-actions-desktop.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat-message-actions-desktop.gjs@@ -17,10 +17,10 @@ import {shift,} from "@floating-ui/dom";import BookmarkIcon from "discourse/components/bookmark-icon";-import DButton from "discourse/components/d-button";-import concatClass from "discourse/helpers/concat-class";import DropdownSelectBox from "discourse/select-kit/components/dropdown-select-box";import { and } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import ChatMessageReaction from "discourse/plugins/chat/discourse/components/chat-message-reaction";import chatMessageContainer from "discourse/plugins/chat/discourse/lib/chat-message-container";import ChatMessageInteractor from "discourse/plugins/chat/discourse/lib/chat-message-interactor";@@ -145,7 +145,7 @@ export default class ChatMessageActionsDesktop extends Component {<div{{didInsert this.setup}}{{didUpdate this.setup this.chat.activeMessage.model.id}}- class={{concatClass+ class={{dConcatClass"chat-message-actions-container"(concat "is-size-" this.size)}}@@ -153,7 +153,7 @@ export default class ChatMessageActionsDesktop extends Component {{{on "wheel" this.redirectScroll}}><div- class={{concatClass+ class={{dConcatClass"chat-message-actions"(unlessthis.messageInteractor.secondaryActions.lengthdiff --git a/plugins/chat/assets/javascripts/discourse/components/chat-message-actions-mobile.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-message-actions-mobile.gjsindex 0939e0aed49..fdcaec72e20 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat-message-actions-mobile.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat-message-actions-mobile.gjs@@ -7,11 +7,11 @@ import { getOwner } from "@ember/owner";import didInsert from "@ember/render-modifiers/modifiers/did-insert";import { service } from "@ember/service";import BookmarkIcon from "discourse/components/bookmark-icon";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";import EmojiPickerDetached from "discourse/components/emoji-picker/detached";-import concatClass from "discourse/helpers/concat-class";import { and, or } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import ChatMessageReaction from "discourse/plugins/chat/discourse/components/chat-message-reaction";import ChatUserAvatar from "discourse/plugins/chat/discourse/components/chat-user-avatar";import ChatMessageInteractor from "discourse/plugins/chat/discourse/lib/chat-message-interactor";@@ -102,7 +102,7 @@ export default class ChatMessageActionsMobile extends Component {<span{{on "touchstart" this.expandReply passive=true}}role="button"- class={{concatClass+ class={{dConcatClass"selected-message-reply"(if this.hasExpandedReply "is-expanded")}}diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-message-collapser.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-message-collapser.gjsindex 98d95fce2a8..cfc882dc011 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat-message-collapser.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat-message-collapser.gjs@@ -3,11 +3,11 @@ import { schedule } from "@ember/runloop";import { service } from "@ember/service";import { trustHTML } from "@ember/template";import { modifier } from "ember-modifier";-import DecoratedHtml from "discourse/components/decorated-html";import domFromString from "discourse/lib/dom-from-string";import applyLightbox from "discourse/lib/lightbox";import { escapeExpression, optionalRequire } from "discourse/lib/utilities";import { and } from "discourse/truth-helpers";+import DDecoratedHtml from "discourse/ui-kit/d-decorated-html";import { i18n } from "discourse-i18n";import ChatUpload from "discourse/plugins/chat/discourse/components/chat-upload";import Collapser from "discourse/plugins/chat/discourse/components/collapser";@@ -183,7 +183,7 @@ export default class ChatMessageCollapser extends Component {<template><div class="chat-message-collapser">{{#if this.hasUploads}}- <DecoratedHtml+ <DDecoratedHtml@html={{trustHTML @cooked}}@decorate={{@decorate}}@className="chat-cooked"@@ -215,7 +215,7 @@ export default class ChatMessageCollapser extends Component {/></div>{{else}}- <DecoratedHtml+ <DDecoratedHtml@html={{trustHTML cooked.body}}@decorate={{@decorate}}@className="chat-cooked"@@ -223,7 +223,7 @@ export default class ChatMessageCollapser extends Component {{{/if}}</Collapser>{{else}}- <DecoratedHtml+ <DDecoratedHtml@html={{trustHTML cooked.body}}@decorate={{@decorate}}@className="chat-cooked"diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-message-in-reply-to-indicator.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-message-in-reply-to-indicator.gjsindex 84e2798dac9..c6b071bfab4 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat-message-in-reply-to-indicator.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat-message-in-reply-to-indicator.gjs@@ -1,8 +1,8 @@import Component from "@glimmer/component";import { LinkTo } from "@ember/routing";import { trustHTML } from "@ember/template";-import icon from "discourse/helpers/d-icon";-import replaceEmoji from "discourse/helpers/replace-emoji";+import dIcon from "discourse/ui-kit/helpers/d-icon";+import dReplaceEmoji from "discourse/ui-kit/helpers/d-replace-emoji";import ChatEmojiAvatar from "./chat-emoji-avatar";import ChatUserAvatar from "./chat-user-avatar";@@ -43,7 +43,7 @@ export default class ChatMessageInReplyToIndicator extends Component {@models={{this.model}}class="chat-reply is-direct-reply">- {{icon "share" title="chat.in_reply_to"}}+ {{dIcon "share" title="chat.in_reply_to"}}{{#if @message.inReplyTo.chatWebhookEvent.emoji}}<ChatEmojiAvatar@@ -54,7 +54,7 @@ export default class ChatMessageInReplyToIndicator extends Component {{{/if}}<span class="chat-reply__excerpt">- {{replaceEmoji (trustHTML @message.inReplyTo.excerpt)}}+ {{dReplaceEmoji (trustHTML @message.inReplyTo.excerpt)}}</span></LinkTo>{{/if}}diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-message-reaction.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-message-reaction.gjsindex 77f1f5d97e8..5caed7b9dcd 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat-message-reaction.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat-message-reaction.gjs@@ -5,9 +5,9 @@ import { action } from "@ember/object";import { service } from "@ember/service";import { trustHTML } from "@ember/template";import { modifier } from "ember-modifier";-import concatClass from "discourse/helpers/concat-class";import { emojiUnescape, emojiUrlFor } from "discourse/lib/text";import { and } from "discourse/truth-helpers";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { getReactionText } from "discourse/plugins/chat/discourse/lib/get-reaction-text";export default class ChatMessageReaction extends Component {@@ -74,7 +74,7 @@ export default class ChatMessageReaction extends Component {title={{this.emojiString}}data-emoji-name={{@reaction.emoji}}tabindex={{if @interactive "0" "-1"}}- class={{concatClass+ class={{dConcatClass"chat-message-reaction"(if @reaction.reacted "reacted")}}diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-message-separator.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-message-separator.gjsindex 2bfd68d9ed4..7fad4ec668e 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat-message-separator.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat-message-separator.gjs@@ -3,7 +3,7 @@ import { cached } from "@glimmer/tracking";import { on } from "@ember/modifier";import { action } from "@ember/object";import { modifier } from "ember-modifier";-import concatClass from "discourse/helpers/concat-class";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";const IS_PINNED_CLASS = "is-pinned";@@ -90,7 +90,7 @@ export default class ChatMessageSeparator extends Component {<template>{{#if this.formattedFirstMessageDate}}<div- class={{concatClass+ class={{dConcatClass"chat-message-separator""chat-message-separator-date"(if this.isNewestMessage "with-last-visit")diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-message-text.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-message-text.gjsindex 3f0704b3a5b..9d0f201747c 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat-message-text.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat-message-text.gjs@@ -1,6 +1,6 @@import Component from "@glimmer/component";import { trustHTML } from "@ember/template";-import DecoratedHtml from "discourse/components/decorated-html";+import DDecoratedHtml from "discourse/ui-kit/d-decorated-html";import { i18n } from "discourse-i18n";import { isCollapsible } from "discourse/plugins/chat/discourse/components/chat-message-collapser";import ChatMessageCollapser from "./chat-message-collapser";@@ -24,7 +24,7 @@ export default class ChatMessageText extends Component {@onToggleCollapse={{@onToggleCollapse}}/>{{else}}- <DecoratedHtml+ <DDecoratedHtml@html={{trustHTML @cooked}}@decorate={{@decorate}}@className="chat-cooked"diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-message-thread-indicator.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-message-thread-indicator.gjsindex f7aedd80d39..56d51ace5d7 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat-message-thread-indicator.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat-message-thread-indicator.gjs@@ -1,8 +1,8 @@import Component from "@glimmer/component";import { LinkTo } from "@ember/routing";import { trustHTML } from "@ember/template";-import formatDate from "discourse/helpers/format-date";-import replaceEmoji from "discourse/helpers/replace-emoji";+import dFormatDate from "discourse/ui-kit/helpers/d-format-date";+import dReplaceEmoji from "discourse/ui-kit/helpers/d-replace-emoji";import { i18n } from "discourse-i18n";import ChatThreadParticipants from "./chat-thread-participants";import ChatUserAvatar from "./chat-user-avatar";@@ -41,7 +41,7 @@ export default class ChatMessageThreadIndicator extends Component {{{@message.thread.preview.lastReplyUser.username}}</span><span class="chat-message-thread-indicator__last-reply-timestamp">- {{formatDate+ {{dFormatDate@message.thread.preview.lastReplyCreatedAtleaveAgo="true"}}@@ -52,7 +52,7 @@ export default class ChatMessageThreadIndicator extends Component {</div><ChatThreadParticipants @thread={{@message.thread}} /><div class="chat-message-thread-indicator__last-reply-excerpt">- {{replaceEmoji (trustHTML @message.thread.preview.lastReplyExcerpt)}}+ {{dReplaceEmoji (trustHTML @message.thread.preview.lastReplyExcerpt)}}</div></LinkTo></template>diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-message.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-message.gjsindex 8f3f17c048b..7a0586e1c78 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat-message.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat-message.gjs@@ -9,9 +9,7 @@ import willDestroy from "@ember/render-modifiers/modifiers/will-destroy";import { cancel, schedule } from "@ember/runloop";import { service } from "@ember/service";import { modifier } from "ember-modifier";-import DButton from "discourse/components/d-button";import EmojiPicker from "discourse/components/emoji-picker";-import concatClass from "discourse/helpers/concat-class";import discourseDebounce from "discourse/lib/debounce";import { bind } from "discourse/lib/decorators";import getURL from "discourse/lib/get-url";@@ -20,6 +18,8 @@ import { applyValueTransformer } from "discourse/lib/transformer";import { updateUserStatusOnMention } from "discourse/lib/update-user-status-on-mention";import isZoomed from "discourse/lib/zoom-check";import { eq, lt, not } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";import ChatMessageAvatar from "discourse/plugins/chat/discourse/components/chat/message/avatar";import ChatMessageError from "discourse/plugins/chat/discourse/components/chat/message/error";@@ -559,7 +559,7 @@ export default class ChatMessage extends Component {{{/if}}<div- class={{concatClass+ class={{dConcatClass"chat-message-container"(if this.pane.selectingMessages "-selectable")(if @message.highlighted "-highlighted")diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-message/blocks/elements/button.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-message/blocks/elements/button.gjsindex 8a4535a5e1c..f3776834ae9 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat-message/blocks/elements/button.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat-message/blocks/elements/button.gjs@@ -2,9 +2,9 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { concat } from "@ember/helper";import { action } from "@ember/object";-import DButton from "discourse/components/d-button";-import concatClass from "discourse/helpers/concat-class";-import replaceEmoji from "discourse/helpers/replace-emoji";+import DButton from "discourse/ui-kit/d-button";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dReplaceEmoji from "discourse/ui-kit/helpers/d-replace-emoji";export default class Button extends Component {@tracked interacting = false;@@ -22,10 +22,10 @@ export default class Button extends Component {<template><DButton@isLoading={{this.interacting}}- @translatedLabel={{replaceEmoji @definition.text.text}}+ @translatedLabel={{dReplaceEmoji @definition.text.text}}@action={{this.createInteraction}}id={{@definition.action_id}}- class={{concatClass+ class={{dConcatClass"block__button"(if @definition.style (concat "btn-" @definition.style))}}diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-messages-container.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-messages-container.gjsindex 7f0bdcb6088..fccad13df41 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat-messages-container.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat-messages-container.gjs@@ -1,10 +1,10 @@import { hash } from "@ember/helper";-import onResize from "discourse/modifiers/on-resize";+import dOnResize from "discourse/ui-kit/modifiers/d-on-resize";const ChatMessagesContainer = <template><divclass="chat-messages-container"- {{onResize @didResizePane (hash delay=100 immediate=true)}}+ {{dOnResize @didResizePane (hash delay=100 immediate=true)}}>{{yield}}</div>diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-notice.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-notice.gjsindex 10aae3bc993..c1ae731e6fa 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat-notice.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat-notice.gjs@@ -2,7 +2,7 @@ import Component from "@glimmer/component";import { action } from "@ember/object";import willDestroy from "@ember/render-modifiers/modifiers/will-destroy";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";import MentionWithoutMembership from "discourse/plugins/chat/discourse/components/chat/notices/mention_without_membership";const COMPONENT_DICT = {diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-pinned-messages-list.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-pinned-messages-list.gjsindex add30eb6d9d..5468ebea042 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat-pinned-messages-list.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat-pinned-messages-list.gjs@@ -3,7 +3,7 @@ import { tracked } from "@glimmer/tracking";import { LinkTo } from "@ember/routing";import { service } from "@ember/service";import { modifier as modifierFn } from "ember-modifier";-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";import ChatMessage from "discourse/plugins/chat/discourse/components/chat-message";@@ -134,7 +134,7 @@ export default class ChatPinnedMessagesList extends Component {<:top><div class="chat-pinned-message__pinned-by">{{#if (this.isUnseen pin)}}- {{icon+ {{dIcon"thumbtack"class="chat-pinned-message__pinned-by-icon"}}diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-replying-indicator.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-replying-indicator.gjsindex 09727688ba9..bf45f4acbca 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat-replying-indicator.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat-replying-indicator.gjs@@ -6,7 +6,7 @@ import didUpdate from "@ember/render-modifiers/modifiers/did-update";import willDestroy from "@ember/render-modifiers/modifiers/will-destroy";import { service } from "@ember/service";import { isPresent } from "@ember/utils";-import concatClass from "discourse/helpers/concat-class";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";export default class ChatReplyingIndicator extends Component {@@ -82,7 +82,7 @@ export default class ChatReplyingIndicator extends Component {<template>{{#if @presenceChannelName}}<div- class={{concatClass+ class={{dConcatClass"chat-replying-indicator"(if this.presenceChannel.subscribed "is-subscribed")}}diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-retention-reminder.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-retention-reminder.gjsindex 3b1cc535c2f..e69ace31e2b 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat-retention-reminder.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat-retention-reminder.gjs@@ -1,9 +1,9 @@import Component from "@glimmer/component";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";+import DButton from "discourse/ui-kit/d-button";import ChatRetentionReminderText from "discourse/plugins/chat/discourse/components/chat-retention-reminder-text";export default class ChatRetentionReminder extends Component {diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-search.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-search.gjsindex c92da2429dd..931fa5be731 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat-search.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat-search.gjs@@ -7,20 +7,20 @@ import didInsert from "@ember/render-modifiers/modifiers/did-insert";import didUpdate from "@ember/render-modifiers/modifiers/did-update";import { service } from "@ember/service";import { isBlank } from "@ember/utils";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DButton from "discourse/components/d-button";-import DropdownMenu from "discourse/components/dropdown-menu";-import FilterInput from "discourse/components/filter-input";-import LoadMore from "discourse/components/load-more";import DMenu from "discourse/float-kit/components/d-menu";import { ajax } from "discourse/lib/ajax";import discourseDebounce from "discourse/lib/debounce";import { bind } from "discourse/lib/decorators";import { INPUT_DELAY } from "discourse/lib/environment";import DiscourseURL from "discourse/lib/url";-import autoFocus from "discourse/modifiers/auto-focus";-import tabToSibling from "discourse/modifiers/tab-to-sibling";import { not } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";+import DFilterInput from "discourse/ui-kit/d-filter-input";+import DLoadMore from "discourse/ui-kit/d-load-more";+import dAutoFocus from "discourse/ui-kit/modifiers/d-auto-focus";+import dTabToSibling from "discourse/ui-kit/modifiers/d-tab-to-sibling";import { i18n } from "discourse-i18n";import ChatChannelTitle from "discourse/plugins/chat/discourse/components/chat-channel-title";import ChatMessageComponent from "discourse/plugins/chat/discourse/components/chat-message";@@ -182,8 +182,8 @@ export default class ChatSearch extends Component {{{didUpdate this.checkQueryChange @query}}><div class="chat-search__filters">- <FilterInput- {{autoFocus}}+ <DFilterInput+ {{dAutoFocus}}@filterAction={{this.onFilterChange}}@value={{@query}}@icons={{hash left="magnifying-glass"}}@@ -198,7 +198,7 @@ export default class ChatSearch extends Component {@icon="sort"><:content as |menu|>- <DropdownMenu as |dropdown|>+ <DDropdownMenu as |dropdown|><dropdown.item><DButton@translatedLabel={{this.sortLabel "relevance"}}@@ -213,7 +213,7 @@ export default class ChatSearch extends Component {@action={{fn this.setCurrentSorting "latest" menu.close}}/></dropdown.item>- </DropdownMenu>+ </DDropdownMenu></:content></DMenu></div>@@ -235,7 +235,7 @@ export default class ChatSearch extends Component {role="option"{{on "click" (fn this.visitMessage message)}}{{on "keydown" (fn this.handleKeypress message)}}- {{tabToSibling}}+ {{dTabToSibling}}tabindex="0"aria-label={{this.accessibleMessageLabel message}}aria-describedby="chat-search-instructions"@@ -262,11 +262,11 @@ export default class ChatSearch extends Component {</ul><div class="chat-search-loading">- <ConditionalLoadingSpinner @condition={{this.isLoading}} />+ <DConditionalLoadingSpinner @condition={{this.isLoading}} /></div>{{#if this.hasMoreResults}}- <LoadMore @action={{this.loadMore}} />+ <DLoadMore @action={{this.loadMore}} />{{/if}}<br />diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-sidebar-indicators.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-sidebar-indicators.gjsindex 6b816cf0936..c3b520493ff 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat-sidebar-indicators.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat-sidebar-indicators.gjs@@ -1,6 +1,6 @@import Component from "@glimmer/component";-import UserStatusMessage from "discourse/components/user-status-message";-import icon from "discourse/helpers/d-icon";+import DUserStatusMessage from "discourse/ui-kit/d-user-status-message";+import dIcon from "discourse/ui-kit/helpers/d-icon";/*** Displays unread indicators and user status for chat channels in the sidebar.@@ -54,12 +54,12 @@ export default class ChatSidebarIndicators extends Component {<template>{{#if @suffixArgs.userStatus}}- <UserStatusMessage @status={{@suffixArgs.userStatus}} />+ <DUserStatusMessage @status={{@suffixArgs.userStatus}} />{{/if}}{{#if this.hasUnread}}<spanclass="sidebar-section-link-content-badge icon {{this.urgencyClass}}"- >{{icon "circle"}}</span>+ >{{dIcon "circle"}}</span>{{/if}}</template>}diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-thread-heading.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-thread-heading.gjsindex b088ffb4e74..dce5ec982a6 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat-thread-heading.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat-thread-heading.gjs@@ -1,6 +1,6 @@import Component from "@glimmer/component";-import icon from "discourse/helpers/d-icon";-import replaceEmoji from "discourse/helpers/replace-emoji";+import dIcon from "discourse/ui-kit/helpers/d-icon";+import dReplaceEmoji from "discourse/ui-kit/helpers/d-replace-emoji";export default class ChatThreadHeading extends Component {get showHeading() {@@ -11,10 +11,10 @@ export default class ChatThreadHeading extends Component {{{#if this.showHeading}}<div class="chat-thread__heading"><div class="chat-thread__heading-icon">- {{icon "discourse-threads"}}+ {{dIcon "discourse-threads"}}</div><h2 class="chat-thread__heading-title">- {{replaceEmoji @thread.title}}+ {{dReplaceEmoji @thread.title}}</h2></div>{{/if}}diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-thread-list.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-thread-list.gjsindex c0d5b95694b..d6e4e1da18d 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat-thread-list.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat-thread-list.gjs@@ -2,10 +2,10 @@ import Component from "@glimmer/component";import { cached } from "@glimmer/tracking";import { service } from "@ember/service";import { modifier as modifierFn } from "ember-modifier";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";import { bind } from "discourse/lib/decorators";import isElementInViewport from "discourse/lib/is-element-in-viewport";import { eq } from "discourse/truth-helpers";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";import { i18n } from "discourse-i18n";import ChatThreadListItem from "discourse/plugins/chat/discourse/components/chat/thread-list/item";import ChatTrackMessage from "discourse/plugins/chat/discourse/modifiers/chat/track-message";@@ -221,7 +221,7 @@ export default class ChatThreadList extends Component {{{/if}}{{/each}}- <ConditionalLoadingSpinner+ <DConditionalLoadingSpinner@condition={{this.threadsCollection.loading}}/>diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-thread.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-thread.gjsindex eb3e14f96e0..c198d51f9b7 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat-thread.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat-thread.gjs@@ -6,11 +6,11 @@ import didInsert from "@ember/render-modifiers/modifiers/did-insert";import willDestroy from "@ember/render-modifiers/modifiers/will-destroy";import { cancel, next } from "@ember/runloop";import { service } from "@ember/service";-import concatClass from "discourse/helpers/concat-class";import { popupAjaxError } from "discourse/lib/ajax-error";import discourseDebounce from "discourse/lib/debounce";import { bind } from "discourse/lib/decorators";import { NotificationLevels } from "discourse/lib/notification-levels";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";import ChatThreadTitlePrompt from "discourse/plugins/chat/discourse/components/chat-thread-title-prompt";import firstVisibleMessageId from "discourse/plugins/chat/discourse/helpers/first-visible-message-id";@@ -548,7 +548,7 @@ export default class ChatThread extends Component {<template><div- class={{concatClass+ class={{dConcatClass"chat-thread"(if this.messagesLoader.loading "--loading")(if this.messagesLoader.fetchedOnce "--loaded")diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-to-topic-selector.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-to-topic-selector.gjsindex f1581af9ef2..214429cb017 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat-to-topic-selector.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat-to-topic-selector.gjs@@ -5,11 +5,11 @@ import { computed, set } from "@ember/object";import { trustHTML } from "@ember/template";import { tagName } from "@ember-decorators/component";import ChooseTopic from "discourse/components/choose-topic";-import RadioButton from "discourse/components/radio-button";-import TextField from "discourse/components/text-field";import CategoryChooser from "discourse/select-kit/components/category-chooser";import TagChooser from "discourse/select-kit/components/tag-chooser";import { and } from "discourse/truth-helpers";+import DRadioButton from "discourse/ui-kit/d-radio-button";+import DTextField from "discourse/ui-kit/d-text-field";import { i18n } from "discourse-i18n";export const NEW_TOPIC_SELECTION = "new_topic";@@ -82,7 +82,7 @@ export default class ChatToTopicSelector extends Component {<div class="chat-to-topic-selector" ...attributes><div class="radios"><label class="radio-label" for="move-to-new-topic">- <RadioButton+ <DRadioButton@id="move-to-new-topic"@name="move-to-entity"@value={{this.newTopicSelection}}@@ -92,7 +92,7 @@ export default class ChatToTopicSelector extends Component {</label><label class="radio-label" for="move-to-existing-topic">- <RadioButton+ <DRadioButton@id="move-to-existing-topic"@name="move-to-entity"@value={{this.existingTopicSelection}}@@ -103,7 +103,7 @@ export default class ChatToTopicSelector extends Component {{{#if this.allowNewMessage}}<label class="radio-label" for="move-to-new-message">- <RadioButton+ <DRadioButton@id="move-to-new-message"@name="move-to-entity"@value={{this.newMessageSelection}}@@ -122,7 +122,7 @@ export default class ChatToTopicSelector extends Component {{{i18n "topic.split_topic.topic_name"}}</label>- <TextField+ <DTextField@value={{this.topicTitle}}@placeholderKey="composer.title_placeholder"@id="split-topic-name"@@ -166,7 +166,7 @@ export default class ChatToTopicSelector extends Component {{{i18n "topic.move_to_new_message.message_title"}}</label>- <TextField+ <DTextField@value={{this.topicTitle}}@placeholderKey="composer.title_placeholder"@id="split-message-title"diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-user-avatar.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-user-avatar.gjsindex fa00d15e9e8..3291bd4a80a 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat-user-avatar.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat-user-avatar.gjs@@ -1,9 +1,9 @@import Component from "@glimmer/component";import { service } from "@ember/service";import { trustHTML } from "@ember/template";-import concatClass from "discourse/helpers/concat-class";-import { renderAvatar } from "discourse/helpers/user-avatar";import { userPath } from "discourse/lib/url";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import { renderAvatar } from "discourse/ui-kit/helpers/d-user-avatar";export default class ChatUserAvatar extends Component {@service chatStateManager;@@ -49,7 +49,7 @@ export default class ChatUserAvatar extends Component {<template><div- class={{concatClass "chat-user-avatar" (if this.isOnline "is-online")}}+ class={{dConcatClass "chat-user-avatar" (if this.isOnline "is-online")}}data-username={{@user.username}}>{{#if this.interactive}}diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-user-display-name.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-user-display-name.gjsindex 1f8f93c3dca..44809aedb44 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat-user-display-name.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat-user-display-name.gjs@@ -1,7 +1,7 @@import Component from "@glimmer/component";import { service } from "@ember/service";-import concatClass from "discourse/helpers/concat-class";import { formatUsername } from "discourse/lib/utilities";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";export default class ChatUserDisplayName extends Component {@service siteSettings;@@ -33,7 +33,7 @@ export default class ChatUserDisplayName extends Component {{{/if}}<span- class={{concatClass+ class={{dConcatClass"chat-user-display-name__username"(unless this.shouldShowNameFirst "-first")}}diff --git a/plugins/chat/assets/javascripts/discourse/components/chat-user-info.gjs b/plugins/chat/assets/javascripts/discourse/components/chat-user-info.gjsindex 76fa342e91f..3f837fcfa40 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat-user-info.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat-user-info.gjs@@ -1,7 +1,7 @@import Component from "@glimmer/component";import { modifier } from "ember-modifier";-import UserStatusMessage from "discourse/components/user-status-message";import { userPath } from "discourse/lib/url";+import DUserStatusMessage from "discourse/ui-kit/d-user-status-message";import ChatUserAvatar from "discourse/plugins/chat/discourse/components/chat-user-avatar";import ChatUserDisplayName from "discourse/plugins/chat/discourse/components/chat-user-display-name";@@ -52,7 +52,7 @@ export default class ChatUserInfo extends Component {{{#if this.showStatus}}<div class="user-status" {{this.trackUserStatus @user}}>- <UserStatusMessage+ <DUserStatusMessage@status={{@user.status}}@showDescription={{this.showStatusDescription}}/>diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/composer/button.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/composer/button.gjsindex a272c4f96d3..09fb2df6d22 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat/composer/button.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat/composer/button.gjs@@ -1,9 +1,9 @@-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";const ChatComposerButton = <template><div class="chat-composer-button__wrapper"><button type="button" class="chat-composer-button" ...attributes>- {{icon @icon}}+ {{dIcon @icon}}</button></div></template>;diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/direct-message-button.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/direct-message-button.gjsindex 825cda5ead7..4fc389e47a5 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat/direct-message-button.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat/direct-message-button.gjs@@ -1,8 +1,8 @@import Component from "@glimmer/component";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import { popupAjaxError } from "discourse/lib/ajax-error";+import DButton from "discourse/ui-kit/d-button";export default class ChatDirectMessageButton extends Component {@service chat;diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/drawer-routes/channel-pins.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/drawer-routes/channel-pins.gjsindex 7221dce3cca..c5c67f64c8d 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat/drawer-routes/channel-pins.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat/drawer-routes/channel-pins.gjs@@ -1,7 +1,7 @@import Component from "@glimmer/component";import { service } from "@ember/service";import { trustHTML } from "@ember/template";-import replaceEmoji from "discourse/helpers/replace-emoji";+import dReplaceEmoji from "discourse/ui-kit/helpers/d-replace-emoji";import { i18n } from "discourse-i18n";import Navbar from "discourse/plugins/chat/discourse/components/chat/navbar";import ChatPinnedMessagesList from "discourse/plugins/chat/discourse/components/chat-pinned-messages-list";@@ -16,7 +16,7 @@ export default class ChatDrawerRoutesChannelPins extends Component {return trustHTML(i18n("chat.pinned_messages.title") +" - " +- replaceEmoji(this.args.model.channel.escapedTitle)+ dReplaceEmoji(this.args.model.channel.escapedTitle));}diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/drawer-routes/channel-threads.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/drawer-routes/channel-threads.gjsindex 67234639c5a..2f07a49ac0b 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat/drawer-routes/channel-threads.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat/drawer-routes/channel-threads.gjs@@ -1,7 +1,7 @@import Component from "@glimmer/component";import { service } from "@ember/service";import { trustHTML } from "@ember/template";-import replaceEmoji from "discourse/helpers/replace-emoji";+import dReplaceEmoji from "discourse/ui-kit/helpers/d-replace-emoji";import { i18n } from "discourse-i18n";import Navbar from "discourse/plugins/chat/discourse/components/chat/navbar";import ChatThreadList from "discourse/plugins/chat/discourse/components/chat-thread-list";@@ -16,7 +16,7 @@ export default class ChatDrawerRoutesChannelThreads extends Component {return trustHTML(i18n("chat.threads.list") +" - " +- replaceEmoji(this.args.model.channel.escapedTitle)+ dReplaceEmoji(this.args.model.channel.escapedTitle));}diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/form/row.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/form/row.gjsindex dc448c26647..602848232ea 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat/form/row.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat/form/row.gjs@@ -1,21 +1,21 @@import { LinkTo } from "@ember/routing";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";const ChatFormRow = <template>{{#if @route}}<LinkTo@route={{@route}}@models={{@routeModels}}- class={{concatClass "chat-form__row -link" (if @separator "-separator")}}+ class={{dConcatClass "chat-form__row -link" (if @separator "-separator")}}><div class="chat-form__row-content">{{@label}}- {{icon "chevron-right" class="chat-form__row-icon"}}+ {{dIcon "chevron-right" class="chat-form__row-icon"}}</div></LinkTo>{{else}}- <div class={{concatClass "chat-form__row" (if @separator "-separator")}}>+ <div class={{dConcatClass "chat-form__row" (if @separator "-separator")}}><div class="chat-form__row-content">{{#if @label}}<span class="chat-form__row-label">{{@label}}</span>diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/header/icon.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/header/icon.gjsindex ccb7178764a..aed9ba2c5e7 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat/header/icon.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat/header/icon.gjs@@ -1,11 +1,11 @@import Component from "@glimmer/component";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import getURL from "discourse/lib/get-url";import { and } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";import ChatHeaderIconUnreadIndicator from "discourse/plugins/chat/discourse/components/chat/header/icon/unread-indicator";import { getUserChatSeparateSidebarMode } from "discourse/plugins/chat/discourse/lib/get-user-chat-separate-sidebar-mode";@@ -100,10 +100,10 @@ export default class ChatHeaderIcon extends Component {@action={{this.openChat}}@href={{this.href}}tabindex="0"- class={{concatClass "icon" "btn-flat" (if this.isActive "active")}}+ class={{dConcatClass "icon" "btn-flat" (if this.isActive "active")}}title={{this.title}}>- {{~icon this.icon~}}+ {{~dIcon this.icon~}}{{#if this.showUnreadIndicator}}<ChatHeaderIconUnreadIndicator@urgentCount={{@urgentCount}}diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/list/index.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/list/index.gjsindex 2d05226f648..44d08c5ef2b 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat/list/index.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat/list/index.gjs@@ -2,10 +2,10 @@ import Component from "@glimmer/component";import { hash } from "@ember/helper";import { action } from "@ember/object";import { modifier } from "ember-modifier";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";import discourseDebounce from "discourse/lib/debounce";import { INPUT_DELAY } from "discourse/lib/environment";import isElementInViewport from "discourse/lib/is-element-in-viewport";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";import EmptyState from "./empty-state";import Item from "./item";@@ -66,7 +66,7 @@ export default class List extends Component {<br /></div>- <ConditionalLoadingSpinner @condition={{@collection.loading}} />+ <DConditionalLoadingSpinner @condition={{@collection.loading}} /></div></template>}diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/add-members.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/add-members.gjsindex 14496a98644..c4e2e35c887 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/add-members.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/add-members.gjs@@ -1,9 +1,9 @@import Component from "@glimmer/component";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import { popupAjaxError } from "discourse/lib/ajax-error";import { gte } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";import MembersCount from "./members-count";import MembersSelector from "./members-selector";diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/group.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/group.gjsindex 35f21fb9b23..41bcb982f48 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/group.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/group.gjs@@ -1,6 +1,6 @@import Component from "@glimmer/component";import { service } from "@ember/service";-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class ChatableGroup extends Component {@@ -28,7 +28,7 @@ export default class ChatableGroup extends Component {data-disabled={{this.isDisabled}}><div class="chat-message-creator__group-icon">- {{icon "user-group"}}+ {{dIcon "user-group"}}</div><div class="chat-message-creator__group-name">{{@item.model.name}}diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/list-action.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/list-action.gjsindex 50ad8e3fc67..6dcd093b997 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/list-action.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/list-action.gjs@@ -1,4 +1,4 @@-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";const ListAction = <template><DButtondiff --git a/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/list.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/list.gjsindex de510a037c6..f795ea2bd59 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/list.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/list.gjs@@ -2,8 +2,8 @@ import Component from "@glimmer/component";import { fn } from "@ember/helper";import { on } from "@ember/modifier";import { action } from "@ember/object";-import concatClass from "discourse/helpers/concat-class";import { eq } from "discourse/truth-helpers";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";import Channel from "./channel";import Group from "./group";@@ -61,7 +61,7 @@ export default class List extends Component {<ul class="chat-message-creator__list">{{#each @items as |item|}}<li- class={{concatClass+ class={{dConcatClass"chat-message-creator__list-item"(if(eq item.identifier @highlightedItem.identifier)diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/member.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/member.gjsindex 1282580eaec..0b67bcf708c 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/member.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/member.gjs@@ -1,13 +1,13 @@import { fn } from "@ember/helper";-import DButton from "discourse/components/d-button";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import { eq } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import ChatUserAvatar from "discourse/plugins/chat/discourse/components/chat-user-avatar";const Member = <template><DButton- class={{concatClass+ class={{dConcatClass"chat-message-creator__member btn-default"(if @highlighted "-highlighted")}}@@ -24,14 +24,14 @@ const Member = <template></span>{{else if (eq @member.type "group")}}<div class="chat-message-creator__group-icon">- {{icon "user-group"}}+ {{dIcon "user-group"}}</div><span class="chat-message-creator__member-group">{{@member.model.name}}</span>{{/if}}- {{icon "xmark"}}+ {{dIcon "xmark"}}</DButton></template>;diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/members-count.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/members-count.gjsindex e8cc2733fa4..c1985d65b2b 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/members-count.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/members-count.gjs@@ -1,6 +1,6 @@import Component from "@glimmer/component";-import concatClass from "discourse/helpers/concat-class";import { gte } from "discourse/truth-helpers";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";export default class MembersCount extends Component {@@ -13,7 +13,7 @@ export default class MembersCount extends Component {<template><div- class={{concatClass+ class={{dConcatClass"chat-message-creator__members-count"(if (gte @count @max) "-reached-limit")}}diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/members-selector.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/members-selector.gjsindex e2e2a4a67d6..288a025e160 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/members-selector.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/members-selector.gjs@@ -2,9 +2,9 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import discourseDebounce from "discourse/lib/debounce";import { INPUT_DELAY } from "discourse/lib/environment";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";import ChatablesLoader from "./lib/chatables-loader";import List from "./list";diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/members.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/members.gjsindex 8b6ea30d73d..b0a2f425867 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/members.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/members.gjs@@ -3,8 +3,8 @@ import { Input } from "@ember/component";import { on } from "@ember/modifier";import { action } from "@ember/object";import didInsert from "@ember/render-modifiers/modifiers/did-insert";-import icon from "discourse/helpers/d-icon";import { eq } from "discourse/truth-helpers";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";import { getNext, getPrevious } from "./lib/iterate-list";import Member from "./member";@@ -73,7 +73,7 @@ export default class Members extends Component {<template><div class="chat-message-creator__members-container"><div class="chat-message-creator__members">- {{icon "magnifying-glass"}}+ {{dIcon "magnifying-glass"}}{{#each @members as |member|}}<Memberdiff --git a/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/new-group.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/new-group.gjsindex 193ca30a5f2..99682a348ff 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/new-group.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/new-group.gjs@@ -3,9 +3,9 @@ import { tracked } from "@glimmer/tracking";import { Input } from "@ember/component";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import { popupAjaxError } from "discourse/lib/ajax-error";import { gte } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";import MembersCount from "./members-count";import MembersSelector from "./members-selector";diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/search-input.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/search-input.gjsindex 5a04f6e8059..f3acf5f71e1 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/search-input.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/search-input.gjs@@ -1,7 +1,7 @@import Component from "@glimmer/component";import { Input } from "@ember/component";import { on } from "@ember/modifier";-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class ChatMessageCreatorSearchInput extends Component {@@ -10,7 +10,7 @@ export default class ChatMessageCreatorSearchInput extends Component {<template><div class="chat-message-creator__search-input-container"><div class="chat-message-creator__search-input">- {{icon+ {{dIcon"magnifying-glass"class="chat-message-creator__search-input__search-icon"}}diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/search.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/search.gjsindex b872e003436..c623b8c5ea4 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/search.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/search.gjs@@ -4,10 +4,10 @@ import { fn } from "@ember/helper";import { action } from "@ember/object";import didInsert from "@ember/render-modifiers/modifiers/did-insert";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import { popupAjaxError } from "discourse/lib/ajax-error";import discourseDebounce from "discourse/lib/debounce";import { INPUT_DELAY } from "discourse/lib/environment";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";import { MODES } from "./constants";import ChatablesLoader from "./lib/chatables-loader";diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/user.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/user.gjsindex dcdad103263..131e811029b 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/user.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/user.gjs@@ -1,10 +1,10 @@import Component from "@glimmer/component";import { service } from "@ember/service";import { modifier } from "ember-modifier";-import UserStatusMessage from "discourse/components/user-status-message";-import concatClass from "discourse/helpers/concat-class";import userStatus from "discourse/helpers/user-status";import { not } from "discourse/truth-helpers";+import DUserStatusMessage from "discourse/ui-kit/d-user-status-message";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";import ChatUserAvatar from "discourse/plugins/chat/discourse/components/chat-user-avatar";import ChatUserDisplayName from "discourse/plugins/chat/discourse/components/chat-user-display-name";@@ -48,14 +48,14 @@ export default class ChatableUser extends Component {{{#if this.showIndicator}}<div- class={{concatClass "unread-indicator" (if this.isUrgent "-urgent")}}+ class={{dConcatClass "unread-indicator" (if this.isUrgent "-urgent")}}></div>{{/if}}{{userStatus @item.model currentUser=this.currentUser}}<div class="user-status" {{this.trackUserStatus @item.model}}>- <UserStatusMessage+ <DUserStatusMessage@status={{@item.model.status}}@showDescription={{true}}/>diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/message/error.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/message/error.gjsindex ca418ade517..eb08180f9a6 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat/message/error.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat/message/error.gjs@@ -1,6 +1,6 @@import { fn } from "@ember/helper";-import DButton from "discourse/components/d-button";import { eq } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";const Error = <template>diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/message/info.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/message/info.gjsindex aa0508fdd6b..1f6fa8b9dd4 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat/message/info.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat/message/info.gjs@@ -5,12 +5,12 @@ import willDestroy from "@ember/render-modifiers/modifiers/will-destroy";import { LinkTo } from "@ember/routing";import { service } from "@ember/service";import BookmarkIcon from "discourse/components/bookmark-icon";-import UserStatusMessage from "discourse/components/user-status-message";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import { bind } from "discourse/lib/decorators";import { prioritizeNameInUx } from "discourse/lib/settings";import { and, eq, not } from "discourse/truth-helpers";+import DUserStatusMessage from "discourse/ui-kit/d-user-status-message";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";import ChannelTitle from "discourse/plugins/chat/discourse/components/channel-title";import formatChatDate from "../../../helpers/format-chat-date";@@ -111,7 +111,7 @@ export default class ChatMessageInfo extends Component {{{#if @message.chatWebhookEvent}}{{#if @message.chatWebhookEvent.username}}<span- class={{concatClass+ class={{dConcatClass"chat-message-info__username"this.usernameClasses}}@@ -126,7 +126,7 @@ export default class ChatMessageInfo extends Component {{{else}}<spanrole="button"- class={{concatClass+ class={{dConcatClass"chat-message-info__username"this.usernameClasses"clickable"@@ -136,7 +136,7 @@ export default class ChatMessageInfo extends Component {<span class="chat-message-info__username__name">{{this.name}}</span>{{#if this.showStatus}}<span class="chat-message-info__status">- <UserStatusMessage @status={{@message.user.status}} />+ <DUserStatusMessage @status={{@message.user.status}} /></span>{{/if}}</span>@@ -161,7 +161,7 @@ export default class ChatMessageInfo extends Component {class="chat-message-info__pinned"title={{i18n "chat.pinned"}}>- {{icon "thumbtack"}}+ {{dIcon "thumbtack"}}</span>{{/if}}{{/if}}@@ -170,10 +170,10 @@ export default class ChatMessageInfo extends Component {<span class="chat-message-info__flag">{{#if @message.reviewableId}}<LinkTo @route="review.show" @model={{@message.reviewableId}}>- {{icon "flag" title="chat.flagged"}}+ {{dIcon "flag" title="chat.flagged"}}</LinkTo>{{else}}- {{icon "flag" title="chat.you_flagged"}}+ {{dIcon "flag" title="chat.you_flagged"}}{{/if}}</span>{{/if}}diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/message/left-gutter.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/message/left-gutter.gjsindex 1686fec63d1..14330923096 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat/message/left-gutter.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat/message/left-gutter.gjs@@ -3,8 +3,8 @@ import { hash } from "@ember/helper";import { LinkTo } from "@ember/routing";import { service } from "@ember/service";import BookmarkIcon from "discourse/components/bookmark-icon";-import icon from "discourse/helpers/d-icon";import { eq } from "discourse/truth-helpers";+import dIcon from "discourse/ui-kit/helpers/d-icon";import formatChatDate from "../../../helpers/format-chat-date";export default class ChatMessageLeftGutter extends Component {@@ -18,11 +18,11 @@ export default class ChatMessageLeftGutter extends Component {@model={{@message.reviewableId}}class="chat-message-left-gutter__flag">- {{icon "flag" title="chat.flagged"}}+ {{dIcon "flag" title="chat.flagged"}}</LinkTo>{{else if (eq @message.userFlagStatus 0)}}<div class="chat-message-left-gutter__flag">- {{icon "flag" title="chat.you_flagged"}}+ {{dIcon "flag" title="chat.you_flagged"}}</div>{{else if this.site.desktopView}}<span class="chat-message-left-gutter__date">diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/modal/archive-channel.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/modal/archive-channel.gjsindex 570e9b3bd5c..603750a565e 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat/modal/archive-channel.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat/modal/archive-channel.gjs@@ -4,10 +4,10 @@ import { action } from "@ember/object";import { service } from "@ember/service";import { trustHTML } from "@ember/template";import { isEmpty } from "@ember/utils";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";import { popupAjaxError } from "discourse/lib/ajax-error";import discourseLater from "discourse/lib/later";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";import {EXISTING_TOPIC_SELECTION,diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/modal/create-channel.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/modal/create-channel.gjsindex fad0ed8fd8d..6936efb6f5b 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat/modal/create-channel.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat/modal/create-channel.gjs@@ -8,12 +8,8 @@ import { cancel } from "@ember/runloop";import { service } from "@ember/service";import { trustHTML } from "@ember/template";import { isBlank, isPresent } from "@ember/utils";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";import EmojiPicker from "discourse/components/emoji-picker";import DTooltip from "discourse/float-kit/components/d-tooltip";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import withEventValue from "discourse/helpers/with-event-value";import { ajax } from "discourse/lib/ajax";import { extractError } from "discourse/lib/ajax-error";@@ -22,6 +18,10 @@ import { escapeExpression } from "discourse/lib/utilities";import Category from "discourse/models/category";import CategoryChooser from "discourse/select-kit/components/category-chooser";import { not } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import I18n, { i18n } from "discourse-i18n";const DEFAULT_HINT = trustHTML(@@ -303,7 +303,7 @@ export default class ChatModalCreateChannel extends Component {<label for="slug" class="chat-modal-create-channel__label">{{i18n "chat.create_channel.slug"}} <span>- {{icon "circle-info"}}+ {{dIcon "circle-info"}}<DTooltip>{{i18n "chat.channel_edit_name_slug_modal.slug_description"}}</DTooltip>@@ -345,7 +345,7 @@ export default class ChatModalCreateChannel extends Component {{{#if this.categoryPermissionsHint}}<div- class={{concatClass+ class={{dConcatClass"chat-modal-create-channel__hint"(if this.loadingPermissionHint "loading-permissions")}}diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/modal/delete-channel.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/modal/delete-channel.gjsindex 92a5b684bcc..9994d7c97d2 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat/modal/delete-channel.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat/modal/delete-channel.gjs@@ -6,11 +6,11 @@ import { action } from "@ember/object";import { service } from "@ember/service";import { trustHTML } from "@ember/template";import { isEmpty } from "@ember/utils";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";import withEventValue from "discourse/helpers/with-event-value";import { popupAjaxError } from "discourse/lib/ajax-error";import discourseLater from "discourse/lib/later";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";export default class ChatModalDeleteChannel extends Component {diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/modal/delete-messages-confirm.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/modal/delete-messages-confirm.gjsindex 5baab85241b..3ad3b090a0b 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat/modal/delete-messages-confirm.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat/modal/delete-messages-confirm.gjs@@ -1,10 +1,10 @@import Component from "@glimmer/component";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";-import DModalCancel from "discourse/components/d-modal-cancel";import { popupAjaxError } from "discourse/lib/ajax-error";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";+import DModalCancel from "discourse/ui-kit/d-modal-cancel";import { i18n } from "discourse-i18n";export default class DeleteMessagesConfirm extends Component {diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/modal/edit-channel-description.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/modal/edit-channel-description.gjsindex 13c1130fdda..86783a2483d 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat/modal/edit-channel-description.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat/modal/edit-channel-description.gjs@@ -3,12 +3,12 @@ import { tracked } from "@glimmer/tracking";import { on } from "@ember/modifier";import { action } from "@ember/object";import { service } from "@ember/service";-import CharCounter from "discourse/components/char-counter";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";-import DModalCancel from "discourse/components/d-modal-cancel";import withEventValue from "discourse/helpers/with-event-value";import { extractError } from "discourse/lib/ajax-error";+import DButton from "discourse/ui-kit/d-button";+import DCharCounter from "discourse/ui-kit/d-char-counter";+import DModal from "discourse/ui-kit/d-modal";+import DModalCancel from "discourse/ui-kit/d-modal-cancel";import { i18n } from "discourse-i18n";const DESCRIPTION_MAX_LENGTH = 280;@@ -65,7 +65,7 @@ export default class ChatModalEditChannelDescription extends Component {<span class="chat-modal-edit-channel-description__description">{{i18n"chat.channel_edit_description_modal.description"}}</span>- <CharCounter+ <DCharCounter@value={{this.editedDescription}}@max={{this.descriptionMaxLength}}>@@ -76,7 +76,7 @@ export default class ChatModalEditChannelDescription extends Component {"chat.channel_edit_description_modal.input_placeholder"}}>{{this.editedDescription}}</textarea>- </CharCounter>+ </DCharCounter></:body><:footer><DButtondiff --git a/plugins/chat/assets/javascripts/discourse/components/chat/modal/edit-channel-name.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/modal/edit-channel-name.gjsindex 39b91ab8cfa..f47a9eb8bac 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat/modal/edit-channel-name.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat/modal/edit-channel-name.gjs@@ -5,15 +5,15 @@ import { on } from "@ember/modifier";import { action } from "@ember/object";import { cancel } from "@ember/runloop";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";-import DModalCancel from "discourse/components/d-modal-cancel";import EmojiPicker from "discourse/components/emoji-picker";import DTooltip from "discourse/float-kit/components/d-tooltip";import { ajax } from "discourse/lib/ajax";import { extractError } from "discourse/lib/ajax-error";import discourseDebounce from "discourse/lib/debounce";import { not } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";+import DModalCancel from "discourse/ui-kit/d-modal-cancel";import { i18n } from "discourse-i18n";import slugifyChannel from "discourse/plugins/chat/discourse/lib/slugify-channel";diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/modal/move-message-to-channel.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/modal/move-message-to-channel.gjsindex 9d6ebf2b85e..9a6487bfcce 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat/modal/move-message-to-channel.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat/modal/move-message-to-channel.gjs@@ -4,9 +4,9 @@ import { action } from "@ember/object";import { service } from "@ember/service";import { trustHTML } from "@ember/template";import { isBlank } from "@ember/utils";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";import { popupAjaxError } from "discourse/lib/ajax-error";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";import ChatChannelChooser from "../../chat-channel-chooser";diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/modal/new-message.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/modal/new-message.gjsindex 4e787f2b546..161663e20d1 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat/modal/new-message.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat/modal/new-message.gjs@@ -1,6 +1,6 @@import Component from "@glimmer/component";import { service } from "@ember/service";-import DModal from "discourse/components/d-modal";+import DModal from "discourse/ui-kit/d-modal";import MessageCreator from "discourse/plugins/chat/discourse/components/chat/message-creator";export default class ChatModalNewMessage extends Component {diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/modal/thread-settings.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/modal/thread-settings.gjsindex b02e1bfd78f..230ada0e6f9 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat/modal/thread-settings.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat/modal/thread-settings.gjs@@ -4,10 +4,10 @@ import { Input } from "@ember/component";import { action } from "@ember/object";import { service } from "@ember/service";import { trustHTML } from "@ember/template";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";-import icon from "discourse/helpers/d-icon";import { popupAjaxError } from "discourse/lib/ajax-error";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class ChatModalThreadSettings extends Component {@@ -77,7 +77,7 @@ export default class ChatModalThreadSettings extends Component {{{#if this.currentUser.admin}}<div class="discourse-ai-cta">- <p class="discourse-ai-cta__title">{{icon "circle-info"}}+ <p class="discourse-ai-cta__title">{{dIcon "circle-info"}}{{i18n "chat.thread_title_modal.discourse_ai.title"}}</p><p class="discourse-ai-cta__description">{{trustHTML(i18ndiff --git a/plugins/chat/assets/javascripts/discourse/components/chat/modal/toggle-channel-status.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/modal/toggle-channel-status.gjsindex e931e8e2e23..e37ac5ca231 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat/modal/toggle-channel-status.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat/modal/toggle-channel-status.gjs@@ -2,9 +2,9 @@ import Component from "@glimmer/component";import { action } from "@ember/object";import { service } from "@ember/service";import { trustHTML } from "@ember/template";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";import { popupAjaxError } from "discourse/lib/ajax-error";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";import { CHANNEL_STATUSES } from "discourse/plugins/chat/discourse/models/chat-channel";diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/back-button.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/back-button.gjsindex 1dce216f8b1..5e591aa87e2 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/back-button.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/back-button.gjs@@ -1,7 +1,7 @@import Component from "@glimmer/component";import { LinkTo } from "@ember/routing";import { service } from "@ember/service";-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";import ChatHeaderIconUnreadIndicator from "discourse/plugins/chat/discourse/components/chat/header/icon/unread-indicator";@@ -40,7 +40,7 @@ export default class ChatNavbarBackButton extends Component {{{#if (has-block)}}{{yield}}{{else}}- {{icon this.icon}}+ {{dIcon this.icon}}{{/if}}{{#if this.site.mobileView}}<ChatHeaderIconUnreadIndicator@@ -61,7 +61,7 @@ export default class ChatNavbarBackButton extends Component {{{#if (has-block)}}{{yield}}{{else}}- {{icon this.icon}}+ {{dIcon this.icon}}{{/if}}{{#if this.site.mobileView}}<ChatHeaderIconUnreadIndicatordiff --git a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/browse-channels-button.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/browse-channels-button.gjsindex 566aa4d6c8d..dac1d4d3232 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/browse-channels-button.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/browse-channels-button.gjs@@ -1,7 +1,7 @@import Component from "@glimmer/component";import { LinkTo } from "@ember/routing";import { service } from "@ember/service";-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class ChatNavbarBrowseChannelsButton extends Component {@@ -20,7 +20,7 @@ export default class ChatNavbarBrowseChannelsButton extends Component {class="btn no-text btn-flat c-navbar__browse-button"title={{this.browseChannelsLabel}}>- {{icon "pencil"}}+ {{dIcon "pencil"}}</LinkTo>{{/if}}</template>diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/channel-title.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/channel-title.gjsindex 717d48bb1f2..c8c79dfb3fc 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/channel-title.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/channel-title.gjs@@ -3,9 +3,9 @@ import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";import { LinkTo } from "@ember/routing";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import DTooltip from "discourse/float-kit/components/d-tooltip";-import concatClass from "discourse/helpers/concat-class";+import DButton from "discourse/ui-kit/d-button";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";import ChannelTitle from "discourse/plugins/chat/discourse/components/channel-title";@@ -86,7 +86,7 @@ export default class ChatNavbarChannelTitle extends Component {@action={{this.toggleStarred}}@icon={{this.starIcon}}@disabled={{this.isTogglingStarred}}- class={{concatClass+ class={{dConcatClass"btn-transparent""c-navbar__star-channel-button"(if this.isStarred "--starred")diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/close-drawer-button.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/close-drawer-button.gjsindex 7415c36172e..8d09d0ee5b9 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/close-drawer-button.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/close-drawer-button.gjs@@ -1,7 +1,7 @@import Component from "@glimmer/component";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";export default class ChatNavbarCloseDrawerButton extends Component {@service chat;diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/close-pins-button.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/close-pins-button.gjsindex cbf199f0b5e..ea63068ba1d 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/close-pins-button.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/close-pins-button.gjs@@ -1,7 +1,7 @@import Component from "@glimmer/component";import { LinkTo } from "@ember/routing";import { service } from "@ember/service";-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class ChatNavbarClosePinsButton extends Component {@@ -17,7 +17,7 @@ export default class ChatNavbarClosePinsButton extends Component {@models={{@channel.routeModels}}title={{this.closeButtonTitle}}>- {{icon "xmark"}}+ {{dIcon "xmark"}}</LinkTo>{{/if}}</template>diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/close-thread-button.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/close-thread-button.gjsindex d18dbeafec5..c80f444e439 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/close-thread-button.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/close-thread-button.gjs@@ -1,7 +1,7 @@import Component from "@glimmer/component";import { LinkTo } from "@ember/routing";import { service } from "@ember/service";-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class ChatNavbarCloseThreadButton extends Component {@@ -15,7 +15,7 @@ export default class ChatNavbarCloseThreadButton extends Component {@models={{@thread.channel.routeModels}}title={{i18n "chat.thread.close"}}>- {{icon "xmark"}}+ {{dIcon "xmark"}}</LinkTo>{{/if}}</template>diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/close-threads-button.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/close-threads-button.gjsindex 3ce7874c626..a2307dbff77 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/close-threads-button.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/close-threads-button.gjs@@ -1,7 +1,7 @@import Component from "@glimmer/component";import { LinkTo } from "@ember/routing";import { service } from "@ember/service";-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class ChatNavbarCloseThreadsButton extends Component {@@ -17,7 +17,7 @@ export default class ChatNavbarCloseThreadsButton extends Component {@models={{@channel.routeModels}}title={{this.closeButtonTitle}}>- {{icon "xmark"}}+ {{dIcon "xmark"}}</LinkTo>{{/if}}</template>diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/filter.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/filter.gjsindex 076c3a7d837..f4d768cb3bd 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/filter.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/filter.gjs@@ -1,11 +1,11 @@-import DButton from "discourse/components/d-button";-import concatClass from "discourse/helpers/concat-class";+import DButton from "discourse/ui-kit/d-button";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";const ChatNavbarFilter = <template><DButton@icon="discourse-chat-search"@action={{@onToggleFilter}}- class={{concatClass+ class={{dConcatClass"btn-transparent c-navbar__filter"(if @isFiltering "active")}}diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/full-page-button.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/full-page-button.gjsindex 59956aa58c1..eb486803627 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/full-page-button.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/full-page-button.gjs@@ -2,8 +2,8 @@ import Component from "@glimmer/component";import { action } from "@ember/object";import { next } from "@ember/runloop";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import DiscourseURL from "discourse/lib/url";+import DButton from "discourse/ui-kit/d-button";export default class ChatNavbarFullPageButton extends Component {@service chat;diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/index.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/index.gjsindex e8ace0fa333..e904afff74c 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/index.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/index.gjs@@ -2,9 +2,9 @@ import Component from "@glimmer/component";import { hash } from "@ember/helper";import { on } from "@ember/modifier";import { action } from "@ember/object";-import concatClass from "discourse/helpers/concat-class";import noop from "discourse/helpers/noop";-import onResize from "discourse/modifiers/on-resize";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dOnResize from "discourse/ui-kit/modifiers/d-on-resize";import Actions from "./actions";import BackButton from "./back-button";import ChannelTitle from "./channel-title";@@ -28,9 +28,9 @@ export default class ChatNavbar extends Component {<template>{{! template-lint-disable no-invalid-interactive }}<div- class={{concatClass "c-navbar-container" (if @onClick "-clickable")}}+ class={{dConcatClass "c-navbar-container" (if @onClick "-clickable")}}{{on "click" (if @onClick @onClick (noop))}}- {{onResize this.handleResize}}+ {{dOnResize this.handleResize}}><nav class="c-navbar">{{yielddiff --git a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/new-channel-button.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/new-channel-button.gjsindex 38ad775b929..a359bf592b0 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/new-channel-button.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/new-channel-button.gjs@@ -1,7 +1,7 @@import Component from "@glimmer/component";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";import CreateChannelModal from "discourse/plugins/chat/discourse/components/chat/modal/create-channel";export default class ChatNavbarNewChannelButton extends Component {diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/new-direct-message-button.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/new-direct-message-button.gjsindex c3ad75f8d58..2a08ba6d61c 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/new-direct-message-button.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/new-direct-message-button.gjs@@ -1,7 +1,7 @@import Component from "@glimmer/component";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";import ChatModalNewMessage from "discourse/plugins/chat/discourse/components/chat/modal/new-message";diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/open-drawer-button.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/open-drawer-button.gjsindex 0cab402ad12..00100630d52 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/open-drawer-button.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/open-drawer-button.gjs@@ -1,8 +1,8 @@import Component from "@glimmer/component";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import DiscourseURL from "discourse/lib/url";+import DButton from "discourse/ui-kit/d-button";export default class ChatNavbarOpenDrawerButton extends Component {@service chatStateManager;diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/pinned-messages-button.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/pinned-messages-button.gjsindex c899f54b8ad..6704ab4fe9a 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/pinned-messages-button.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/pinned-messages-button.gjs@@ -2,7 +2,7 @@ import Component from "@glimmer/component";import { on } from "@ember/modifier";import { LinkTo } from "@ember/routing";import { service } from "@ember/service";-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class ChatNavbarPinnedMessagesButton extends Component {@@ -32,7 +32,7 @@ export default class ChatNavbarPinnedMessagesButton extends Component {class="c-navbar__pinned-messages-btn btn no-text btn-transparent"{{on "click" this.handleClick}}>- {{icon "thumbtack"}}+ {{dIcon "thumbtack"}}{{#if @channel.hasUnseenPins}}<span class="c-navbar__pinned-messages-btn__unread-indicator"></span>{{/if}}diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/thread-settings-button.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/thread-settings-button.gjsindex 72b9927f31e..43e567477be 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/thread-settings-button.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/thread-settings-button.gjs@@ -1,7 +1,7 @@import Component from "@glimmer/component";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";import ThreadSettingsModal from "discourse/plugins/chat/discourse/components/chat/modal/thread-settings";export default class ChatNavbarThreadSettingsButton extends Component {diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/thread-tracking-dropdown.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/thread-tracking-dropdown.gjsindex eae9dbc2f8f..83b43ecc13b 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/thread-tracking-dropdown.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/thread-tracking-dropdown.gjs@@ -2,9 +2,9 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";import { service } from "@ember/service";-import concatClass from "discourse/helpers/concat-class";import { popupAjaxError } from "discourse/lib/ajax-error";import { NotificationLevels } from "discourse/lib/notification-levels";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import ThreadNotificationsTracking from "discourse/plugins/chat/discourse/components/thread-notifications-tracking";import UserChatThreadMembership from "discourse/plugins/chat/discourse/models/user-chat-thread-membership";@@ -57,7 +57,7 @@ export default class ChatNavbarThreadTrackingDropdown extends Component {<ThreadNotificationsTracking@levelId={{this.threadNotificationLevel}}@onChange={{this.updateThreadNotificationLevel}}- class={{concatClass+ class={{dConcatClass"c-navbar__thread-tracking-dropdown"(if this.persistedNotificationLevel "-persisted")}}diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/threads-list-button.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/threads-list-button.gjsindex 469928312df..f4aab73cedb 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/threads-list-button.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/threads-list-button.gjs@@ -1,8 +1,8 @@import Component from "@glimmer/component";import { LinkTo } from "@ember/routing";import { service } from "@ember/service";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";import ThreadHeaderUnreadIndicator from "discourse/plugins/chat/discourse/components/chat/thread/header-unread-indicator";@@ -26,7 +26,7 @@ export default class ChatNavbarThreadsListButton extends Component {@route="chat.channel.threads"@models={{@channel.routeModels}}title={{this.threadsListLabel}}- class={{concatClass+ class={{dConcatClass"c-navbar__threads-list-button""btn""no-text"@@ -34,7 +34,7 @@ export default class ChatNavbarThreadsListButton extends Component {(if @channel.threadsManager.unreadThreadCount "has-unreads")}}>- {{icon "discourse-threads"}}+ {{dIcon "discourse-threads"}}<ThreadHeaderUnreadIndicator @channel={{@channel}} /></LinkTo>{{/if}}diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/title.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/title.gjsindex c2b791951ec..d59ebfdb39c 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/title.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/title.gjs@@ -1,16 +1,16 @@import { hash } from "@ember/helper";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import SubTitle from "./sub-title";const ChatNavbarTitle = <template><divtitle={{@title}}- class={{concatClass "c-navbar__title" (if @showFullTitle "full-title")}}+ class={{dConcatClass "c-navbar__title" (if @showFullTitle "full-title")}}...attributes><span class="c-navbar__title-text">- {{if @icon (icon @icon)}}+ {{if @icon (dIcon @icon)}}{{@title}}</span>diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/toggle-drawer-button.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/toggle-drawer-button.gjsindex a5ffea4507e..57f6acc8d94 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat/navbar/toggle-drawer-button.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat/navbar/toggle-drawer-button.gjs@@ -1,6 +1,6 @@import Component from "@glimmer/component";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";export default class ChatNavbarToggleDrawerButton extends Component {@service chat;diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/notices/mention_without_membership.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/notices/mention_without_membership.gjsindex 56e0978e952..8a22745d537 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat/notices/mention_without_membership.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat/notices/mention_without_membership.gjs@@ -3,8 +3,8 @@ import { tracked } from "@glimmer/tracking";import { on } from "@ember/modifier";import { action } from "@ember/object";import { service } from "@ember/service";-import icon from "discourse/helpers/d-icon";import { popupAjaxError } from "discourse/lib/ajax-error";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";import laterFn from "../../../modifiers/chat/later-fn";@@ -40,7 +40,7 @@ export default class MentionWithoutMembership extends Component {class="mention-without-membership-notice__invitation-sent"{{laterFn @clearNotice 3000}}>- {{icon "check"}}+ {{dIcon "check"}}<span>{{i18n"chat.mention_warning.invitations_sent"diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/pinned-messages-list/header.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/pinned-messages-list/header.gjsindex 998aea3f464..50cc03bd159 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat/pinned-messages-list/header.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat/pinned-messages-list/header.gjs@@ -1,7 +1,7 @@import Component from "@glimmer/component";import { service } from "@ember/service";import { trustHTML } from "@ember/template";-import replaceEmoji from "discourse/helpers/replace-emoji";+import dReplaceEmoji from "discourse/ui-kit/helpers/d-replace-emoji";import { i18n } from "discourse-i18n";import Navbar from "discourse/plugins/chat/discourse/components/chat/navbar";@@ -11,10 +11,10 @@ export default class ChatPinnedMessagesListHeader extends Component {pinnedMessagesTitle = i18n("chat.pinned_messages.title");get title() {- let title = replaceEmoji(this.pinnedMessagesTitle);+ let title = dReplaceEmoji(this.pinnedMessagesTitle);if (this.site.mobileView) {- title += " - " + replaceEmoji(this.args.channel.escapedTitle);+ title += " - " + dReplaceEmoji(this.args.channel.escapedTitle);}return trustHTML(title);diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/routes/channel-info-members.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/routes/channel-info-members.gjsindex dafb024c10a..f0c6fa14ec6 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat/routes/channel-info-members.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat/routes/channel-info-members.gjs@@ -6,15 +6,15 @@ import { action } from "@ember/object";import { LinkTo } from "@ember/routing";import { service } from "@ember/service";import { modifier } from "ember-modifier";-import DButton from "discourse/components/d-button";-import FilterInput from "discourse/components/filter-input";-import icon from "discourse/helpers/d-icon";import discourseDebounce from "discourse/lib/debounce";import { bind } from "discourse/lib/decorators";import { INPUT_DELAY } from "discourse/lib/environment";import isElementInViewport from "discourse/lib/is-element-in-viewport";import DiscourseURL, { userPath } from "discourse/lib/url";-import autoFocus from "discourse/modifiers/auto-focus";+import DButton from "discourse/ui-kit/d-button";+import DFilterInput from "discourse/ui-kit/d-filter-input";+import dIcon from "discourse/ui-kit/helpers/d-icon";+import dAutoFocus from "discourse/ui-kit/modifiers/d-auto-focus";import { i18n } from "discourse-i18n";import MessageCreator from "discourse/plugins/chat/discourse/components/chat/message-creator";import { MODES } from "discourse/plugins/chat/discourse/components/chat/message-creator/constants";@@ -163,7 +163,7 @@ export default class ChatRouteChannelInfoMembers extends Component {@route="chat.channel.info.settings"@model={{@channel}}>- {{icon "chevron-left"}}+ {{dIcon "chevron-left"}}{{i18n "chat.members_view.back_to_settings"}}</LinkTo>{{/if}}@@ -176,8 +176,8 @@ export default class ChatRouteChannelInfoMembers extends Component {/>{{else}}<div class="c-channel-members">- <FilterInput- {{autoFocus}}+ <DFilterInput+ {{dAutoFocus}}@filterAction={{this.mutFilter}}@icons={{hash right="magnifying-glass"}}@containerClass="c-channel-members__filter"@@ -193,7 +193,7 @@ export default class ChatRouteChannelInfoMembers extends Component {{{this.onEnter this.addMember}}tabindex="0">- {{icon "plus"}}+ {{dIcon "plus"}}<span>{{this.addMemberLabel}}</span></li>{{/if}}diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/routes/channel-info-settings.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/routes/channel-info-settings.gjsindex 0ada93d45d5..00743362fc6 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat/routes/channel-info-settings.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat/routes/channel-info-settings.gjs@@ -4,14 +4,14 @@ import { on } from "@ember/modifier";import { action } from "@ember/object";import { LinkTo } from "@ember/routing";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import DToggleSwitch from "discourse/components/d-toggle-switch";import DTooltip from "discourse/float-kit/components/d-tooltip";-import categoryBadge from "discourse/helpers/category-badge";-import icon from "discourse/helpers/d-icon";-import replaceEmoji from "discourse/helpers/replace-emoji";import { popupAjaxError } from "discourse/lib/ajax-error";import ComboBox from "discourse/select-kit/components/combo-box";+import DButton from "discourse/ui-kit/d-button";+import DToggleSwitch from "discourse/ui-kit/d-toggle-switch";+import dCategoryBadge from "discourse/ui-kit/helpers/d-category-badge";+import dIcon from "discourse/ui-kit/helpers/d-icon";+import dReplaceEmoji from "discourse/ui-kit/helpers/d-replace-emoji";import { i18n } from "discourse-i18n";import ChatForm from "discourse/plugins/chat/discourse/components/chat/form";import ChatModalArchiveChannel from "discourse/plugins/chat/discourse/components/chat/modal/archive-channel";@@ -352,7 +352,7 @@ export default class ChatRouteChannelInfoSettings extends Component {<section.row><:default><div class="c-channel-settings__name">- {{replaceEmoji @channel.title}}+ {{dReplaceEmoji @channel.title}}</div>{{#if @channel.isCategoryChannel}}@@ -477,7 +477,7 @@ export default class ChatRouteChannelInfoSettings extends Component {<form.section @title={{this.channelInfoSectionTitle}} as |section|>{{#if @channel.isCategoryChannel}}<section.row @label={{this.categoryLabel}}>- {{categoryBadge+ {{dCategoryBadge@channel.chatablelink=trueallowUncategorized=true@@ -624,7 +624,7 @@ export default class ChatRouteChannelInfoSettings extends Component {<form.section class="--leave-channel" as |section|>{{#if @channel.chatable.group}}<div class="c-channel-settings__leave-info">- {{icon "triangle-exclamation"}}+ {{dIcon "triangle-exclamation"}}{{i18n "chat.channel_settings.leave_groupchat_info"}}</div>{{/if}}diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/scroll-to-bottom-arrow.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/scroll-to-bottom-arrow.gjsindex bfc8953117f..40c44d03468 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat/scroll-to-bottom-arrow.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat/scroll-to-bottom-arrow.gjs@@ -1,9 +1,9 @@import Component from "@glimmer/component";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import { and } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class ScrollToBottomArrow extends Component {@@ -23,7 +23,7 @@ export default class ScrollToBottomArrow extends Component {<template><div class="chat-scroll-to-bottom"><DButton- class={{concatClass+ class={{dConcatClass"btn-flat""chat-scroll-to-bottom__button"(if @isVisible "visible")@@ -31,7 +31,7 @@ export default class ScrollToBottomArrow extends Component {@action={{@onScrollToBottom}}><span class="chat-scroll-to-bottom__arrow">- {{icon "arrow-down"}}+ {{dIcon "arrow-down"}}</span>{{#if (and @isVisible this.newMessageCount)}}<span class="chat-scroll-to-bottom__new-messages">diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/selection-manager.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/selection-manager.gjsindex a264f17c0be..2976311f918 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat/selection-manager.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat/selection-manager.gjs@@ -2,12 +2,12 @@ import Component from "@glimmer/component";import { action } from "@ember/object";import { getOwner } from "@ember/owner";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import { popupAjaxError } from "discourse/lib/ajax-error";import { bind } from "discourse/lib/decorators";import { isTesting } from "discourse/lib/environment";import { clipboardCopyAsync } from "discourse/lib/utilities";import { not, or } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";import DeleteMessagesConfirm from "discourse/plugins/chat/discourse/components/chat/modal/delete-messages-confirm";import ChatModalMoveMessageToChannel from "discourse/plugins/chat/discourse/components/chat/modal/move-message-to-channel";diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/thread-list/header.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/thread-list/header.gjsindex 1031dc34d99..3933a1b227c 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat/thread-list/header.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat/thread-list/header.gjs@@ -1,7 +1,7 @@import Component from "@glimmer/component";import { service } from "@ember/service";import { trustHTML } from "@ember/template";-import replaceEmoji from "discourse/helpers/replace-emoji";+import dReplaceEmoji from "discourse/ui-kit/helpers/d-replace-emoji";import { i18n } from "discourse-i18n";import Navbar from "discourse/plugins/chat/discourse/components/chat/navbar";@@ -11,10 +11,10 @@ export default class ChatThreadListHeader extends Component {threadListTitle = i18n("chat.threads.list");get title() {- let title = replaceEmoji(this.threadListTitle);+ let title = dReplaceEmoji(this.threadListTitle);if (this.site.mobileView) {- title += " - " + replaceEmoji(this.args.channel.escapedTitle);+ title += " - " + dReplaceEmoji(this.args.channel.escapedTitle);}return trustHTML(title);diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/thread-list/item.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/thread-list/item.gjsindex ee937bca1d7..dc03c619c6d 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat/thread-list/item.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat/thread-list/item.gjs@@ -3,10 +3,10 @@ import { fn } from "@ember/helper";import { on } from "@ember/modifier";import { action } from "@ember/object";import { service } from "@ember/service";-import concatClass from "discourse/helpers/concat-class";-import formatDate from "discourse/helpers/format-date";-import replaceEmoji from "discourse/helpers/replace-emoji";import { gt } from "discourse/truth-helpers";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dFormatDate from "discourse/ui-kit/helpers/d-format-date";+import dReplaceEmoji from "discourse/ui-kit/helpers/d-replace-emoji";import { i18n } from "discourse-i18n";import ThreadUnreadIndicator from "discourse/plugins/chat/discourse/components/thread-unread-indicator";import ChatThreadParticipants from "../../chat-thread-participants";@@ -22,7 +22,7 @@ export default class ChatThreadListItem extends Component {<template><div- class={{concatClass+ class={{dConcatClass"chat-thread-list-item"(if (gt @thread.tracking.unreadCount 0) "-is-unread")(if (gt @thread.tracking.watchedThreadsUnreadCount 0) "-is-urgent")@@ -40,9 +40,9 @@ export default class ChatThreadListItem extends Component {<div class="chat-thread-list-item__header"><div class="chat-thread-list-item__title">{{#if @thread.title}}- {{replaceEmoji @thread.title}}+ {{dReplaceEmoji @thread.title}}{{else}}- {{replaceEmoji @thread.originalMessage.excerpt}}+ {{dReplaceEmoji @thread.originalMessage.excerpt}}{{/if}}</div><div class="chat-thread-list-item__unread-indicator">@@ -66,7 +66,7 @@ export default class ChatThreadListItem extends Component {<div class="chat-thread-list-item__last-reply-timestamp">{{#if @thread.preview.lastReplyCreatedAt}}- {{formatDate+ {{dFormatDate@thread.preview.lastReplyCreatedAtleaveAgo="true"}}diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/thread/header.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/thread/header.gjsindex ac9de614dba..ba28b52b62f 100644--- a/plugins/chat/assets/javascripts/discourse/components/chat/thread/header.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/chat/thread/header.gjs@@ -1,10 +1,10 @@import Component from "@glimmer/component";import { on } from "@ember/modifier";import { service } from "@ember/service";-import icon from "discourse/helpers/d-icon";import noop from "discourse/helpers/noop";-import replaceEmoji from "discourse/helpers/replace-emoji";import { and, or } from "discourse/truth-helpers";+import dIcon from "discourse/ui-kit/helpers/d-icon";+import dReplaceEmoji from "discourse/ui-kit/helpers/d-replace-emoji";import { i18n } from "discourse-i18n";import ThreadSettingsModal from "discourse/plugins/chat/discourse/components/chat/modal/thread-settings";import Navbar from "discourse/plugins/chat/discourse/components/chat/navbar";@@ -84,12 +84,12 @@ export default class ChatThreadHeader extends Component {{{#if this.showThreadUnreadIndicator}}<ChatThreadHeaderUnreadIndicator @channel={{this.channel}} />{{/if}}- {{icon "chevron-left"}}+ {{dIcon "chevron-left"}}</navbar.BackButton>{{/if}}<navbar.Title- @title={{replaceEmoji this.headerTitle}}+ @title={{dReplaceEmoji this.headerTitle}}{{on "click" (or this.openThreadTitleModal noop)}}role={{if this.openThreadTitleModal "button"}}class={{if this.openThreadTitleModal "clickable"}}diff --git a/plugins/chat/assets/javascripts/discourse/components/collapser.gjs b/plugins/chat/assets/javascripts/discourse/components/collapser.gjsindex 59794f91b94..c02a9546ced 100644--- a/plugins/chat/assets/javascripts/discourse/components/collapser.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/collapser.gjs@@ -2,8 +2,8 @@import Component from "@ember/component";import { action } from "@ember/object";import { tagName } from "@ember-decorators/component";-import DButton from "discourse/components/d-button";-import concatClass from "discourse/helpers/concat-class";+import DButton from "discourse/ui-kit/d-button";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";@tagName("")export default class Collapser extends Component {@@ -43,7 +43,7 @@ export default class Collapser extends Component {</div><div- class={{concatClass+ class={{dConcatClass"chat-message-collapser-body"(if this.collapsed "hidden")}}diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-composer-message-details.gjs b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-composer-message-details.gjsindex 28c0032d5de..24b9b3ebee4 100644--- a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-composer-message-details.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-composer-message-details.gjs@@ -3,8 +3,8 @@ import { cached } from "@glimmer/tracking";import { action } from "@ember/object";import { getOwner } from "@ember/owner";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import { optionalRequire } from "discourse/lib/utilities";+import DButton from "discourse/ui-kit/d-button";import ChatComposerMessageDetails from "discourse/plugins/chat/discourse/components/chat-composer-message-details";import ChatFabricators from "discourse/plugins/chat/discourse/lib/fabricators";diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-composer.gjs b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-composer.gjsindex b7547c08625..ef8bc6947ed 100644--- a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-composer.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-composer.gjs@@ -3,8 +3,8 @@ import { on } from "@ember/modifier";import { action } from "@ember/object";import { getOwner } from "@ember/owner";import { service } from "@ember/service";-import DToggleSwitch from "discourse/components/d-toggle-switch";import { optionalRequire } from "discourse/lib/utilities";+import DToggleSwitch from "discourse/ui-kit/d-toggle-switch";import Channel from "discourse/plugins/chat/discourse/components/chat/composer/channel";import ChatFabricators from "discourse/plugins/chat/discourse/lib/fabricators";import { CHANNEL_STATUSES } from "discourse/plugins/chat/discourse/models/chat-channel";diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-header-icon.gjs b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-header-icon.gjsindex e7e7d355c50..82ccd6de982 100644--- a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-header-icon.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-header-icon.gjs@@ -2,9 +2,9 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { on } from "@ember/modifier";import { action } from "@ember/object";-import DToggleSwitch from "discourse/components/d-toggle-switch";import { optionalRequire } from "discourse/lib/utilities";import ComboBox from "discourse/select-kit/components/combo-box";+import DToggleSwitch from "discourse/ui-kit/d-toggle-switch";import Icon from "discourse/plugins/chat/discourse/components/chat/header/icon";import {HEADER_INDICATOR_PREFERENCE_ALL_NEW,diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-message.gjs b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-message.gjsindex 1a04a1859cc..a599a6afda3 100644--- a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-message.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-message.gjs@@ -3,9 +3,9 @@ import { on } from "@ember/modifier";import { action } from "@ember/object";import { getOwner } from "@ember/owner";import { service } from "@ember/service";-import DToggleSwitch from "discourse/components/d-toggle-switch";import { optionalRequire } from "discourse/lib/utilities";import { not } from "discourse/truth-helpers";+import DToggleSwitch from "discourse/ui-kit/d-toggle-switch";import ChatMessage from "discourse/plugins/chat/discourse/components/chat-message";import ChatMessagesManager from "discourse/plugins/chat/discourse/lib/chat-messages-manager";import ChatFabricators from "discourse/plugins/chat/discourse/lib/fabricators";diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-archive-channel.gjs b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-archive-channel.gjsindex d315bcb3c27..9e567e3bf7c 100644--- a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-archive-channel.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-archive-channel.gjs@@ -2,8 +2,8 @@ import Component from "@glimmer/component";import { action } from "@ember/object";import { getOwner } from "@ember/owner";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import { optionalRequire } from "discourse/lib/utilities";+import DButton from "discourse/ui-kit/d-button";import ChatModalArchiveChannel from "discourse/plugins/chat/discourse/components/chat/modal/archive-channel";import ChatFabricators from "discourse/plugins/chat/discourse/lib/fabricators";diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-create-channel.gjs b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-create-channel.gjsindex 82bddb49e8e..8899a3a10be 100644--- a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-create-channel.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-create-channel.gjs@@ -1,8 +1,8 @@import Component from "@glimmer/component";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import { optionalRequire } from "discourse/lib/utilities";+import DButton from "discourse/ui-kit/d-button";import ChatModalCreateChannel from "discourse/plugins/chat/discourse/components/chat/modal/create-channel";const Row = optionalRequire(diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-delete-channel.gjs b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-delete-channel.gjsindex a2e93a0072d..e2c29919f35 100644--- a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-delete-channel.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-delete-channel.gjs@@ -2,8 +2,8 @@ import Component from "@glimmer/component";import { action } from "@ember/object";import { getOwner } from "@ember/owner";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import { optionalRequire } from "discourse/lib/utilities";+import DButton from "discourse/ui-kit/d-button";import ChatModalDeleteChannel from "discourse/plugins/chat/discourse/components/chat/modal/delete-channel";import ChatFabricators from "discourse/plugins/chat/discourse/lib/fabricators";diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-edit-channel-description.gjs b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-edit-channel-description.gjsindex 2e6112d9a3c..8bcff194f11 100644--- a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-edit-channel-description.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-edit-channel-description.gjs@@ -2,8 +2,8 @@ import Component from "@glimmer/component";import { action } from "@ember/object";import { getOwner } from "@ember/owner";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import { optionalRequire } from "discourse/lib/utilities";+import DButton from "discourse/ui-kit/d-button";import ChatModalEditChannelDescription from "discourse/plugins/chat/discourse/components/chat/modal/edit-channel-description";import ChatFabricators from "discourse/plugins/chat/discourse/lib/fabricators";diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-edit-channel-name.gjs b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-edit-channel-name.gjsindex 6aa0dca15c4..1f252f41e31 100644--- a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-edit-channel-name.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-edit-channel-name.gjs@@ -2,8 +2,8 @@ import Component from "@glimmer/component";import { action } from "@ember/object";import { getOwner } from "@ember/owner";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import { optionalRequire } from "discourse/lib/utilities";+import DButton from "discourse/ui-kit/d-button";import ChatModalEditChannelName from "discourse/plugins/chat/discourse/components/chat/modal/edit-channel-name";import ChatFabricators from "discourse/plugins/chat/discourse/lib/fabricators";diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-move-message-to-channel.gjs b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-move-message-to-channel.gjsindex 94a41fbc33b..f200124b27a 100644--- a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-move-message-to-channel.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-move-message-to-channel.gjs@@ -2,8 +2,8 @@ import Component from "@glimmer/component";import { action } from "@ember/object";import { getOwner } from "@ember/owner";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import { optionalRequire } from "discourse/lib/utilities";+import DButton from "discourse/ui-kit/d-button";import ChatModalMoveMessageToChannel from "discourse/plugins/chat/discourse/components/chat/modal/move-message-to-channel";import ChatFabricators from "discourse/plugins/chat/discourse/lib/fabricators";diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-new-message.gjs b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-new-message.gjsindex 1e35e0d4327..991543423da 100644--- a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-new-message.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-new-message.gjs@@ -1,8 +1,8 @@import Component from "@glimmer/component";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import { optionalRequire } from "discourse/lib/utilities";+import DButton from "discourse/ui-kit/d-button";import ChatModalNewMessage from "discourse/plugins/chat/discourse/components/chat/modal/new-message";const Row = optionalRequire(diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-thread-settings.gjs b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-thread-settings.gjsindex 1ba29f4e3d6..b95b7839d76 100644--- a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-thread-settings.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-thread-settings.gjs@@ -2,8 +2,8 @@ import Component from "@glimmer/component";import { action } from "@ember/object";import { getOwner } from "@ember/owner";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import { optionalRequire } from "discourse/lib/utilities";+import DButton from "discourse/ui-kit/d-button";import ChatModalThreadSettings from "discourse/plugins/chat/discourse/components/chat/modal/thread-settings";import ChatFabricators from "discourse/plugins/chat/discourse/lib/fabricators";diff --git a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-toggle-channel-status.gjs b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-toggle-channel-status.gjsindex 2bffcd43241..0b211af2a0f 100644--- a/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-toggle-channel-status.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/styleguide/chat-modal-toggle-channel-status.gjs@@ -2,8 +2,8 @@ import Component from "@glimmer/component";import { action } from "@ember/object";import { getOwner } from "@ember/owner";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import { optionalRequire } from "discourse/lib/utilities";+import DButton from "discourse/ui-kit/d-button";import ChatModalToggleChannelStatus from "discourse/plugins/chat/discourse/components/chat/modal/toggle-channel-status";import ChatFabricators from "discourse/plugins/chat/discourse/lib/fabricators";diff --git a/plugins/chat/assets/javascripts/discourse/components/thread-title/index.gjs b/plugins/chat/assets/javascripts/discourse/components/thread-title/index.gjsindex f56374798a6..ab85253f630 100644--- a/plugins/chat/assets/javascripts/discourse/components/thread-title/index.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/thread-title/index.gjs@@ -2,8 +2,8 @@ import Component from "@glimmer/component";import { LinkTo } from "@ember/routing";import { service } from "@ember/service";import { trustHTML } from "@ember/template";-import replaceEmoji from "discourse/helpers/replace-emoji";import { escapeExpression } from "discourse/lib/utilities";+import dReplaceEmoji from "discourse/ui-kit/helpers/d-replace-emoji";import ThreadUnreadIndicator from "discourse/plugins/chat/discourse/components/thread-unread-indicator";export default class ChatThreadTitle extends Component {@@ -11,9 +11,9 @@ export default class ChatThreadTitle extends Component {get title() {if (this.args.thread.title) {- return replaceEmoji(trustHTML(escapeExpression(this.args.thread.title)));+ return dReplaceEmoji(trustHTML(escapeExpression(this.args.thread.title)));} else {- return replaceEmoji(trustHTML(this.args.thread.originalMessage.excerpt));+ return dReplaceEmoji(trustHTML(this.args.thread.originalMessage.excerpt));}}diff --git a/plugins/chat/assets/javascripts/discourse/components/toggle-channel-membership-button.gjs b/plugins/chat/assets/javascripts/discourse/components/toggle-channel-membership-button.gjsindex 353c9fae144..8f07da27202 100644--- a/plugins/chat/assets/javascripts/discourse/components/toggle-channel-membership-button.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/toggle-channel-membership-button.gjs@@ -2,11 +2,11 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import PluginOutlet from "discourse/components/plugin-outlet";-import concatClass from "discourse/helpers/concat-class";import lazyHash from "discourse/helpers/lazy-hash";import { popupAjaxError } from "discourse/lib/ajax-error";+import DButton from "discourse/ui-kit/d-button";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";export default class ToggleChannelMembershipButton extends Component {@@ -100,7 +100,7 @@ export default class ToggleChannelMembershipButton extends Component {@translatedTitle={{this.options.leaveTitle}}@icon={{this.options.leaveIcon}}@disabled={{this.isLoading}}- class={{concatClass+ class={{dConcatClass"toggle-channel-membership-button -leave"this.options.leaveClass}}@@ -124,7 +124,7 @@ export default class ToggleChannelMembershipButton extends Component {@translatedTitle={{this.options.joinTitle}}@icon={{this.options.joinIcon}}@disabled={{this.isLoading}}- class={{concatClass+ class={{dConcatClass"toggle-channel-membership-button -join"this.options.joinClass}}diff --git a/plugins/chat/assets/javascripts/discourse/components/upsert-category/chat.gjs b/plugins/chat/assets/javascripts/discourse/components/upsert-category/chat.gjsindex 0e58ae4c4d0..a38c54fd1c6 100644--- a/plugins/chat/assets/javascripts/discourse/components/upsert-category/chat.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/upsert-category/chat.gjs@@ -6,16 +6,16 @@ import { action } from "@ember/object";import didInsert from "@ember/render-modifiers/modifiers/did-insert";import { LinkTo } from "@ember/routing";import { trustHTML } from "@ember/template";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DToggleSwitch from "discourse/components/d-toggle-switch";-import EmptyState from "discourse/components/empty-state";-import categoryBadge from "discourse/helpers/category-badge";-import icon from "discourse/helpers/d-icon";-import replaceEmoji from "discourse/helpers/replace-emoji";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import getURL from "discourse/lib/get-url";import { or } from "discourse/truth-helpers";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DEmptyState from "discourse/ui-kit/d-empty-state";+import DToggleSwitch from "discourse/ui-kit/d-toggle-switch";+import dCategoryBadge from "discourse/ui-kit/helpers/d-category-badge";+import dIcon from "discourse/ui-kit/helpers/d-icon";+import dReplaceEmoji from "discourse/ui-kit/helpers/d-replace-emoji";import { i18n } from "discourse-i18n";function channelColorStyle(channel) {@@ -23,7 +23,7 @@ function channelColorStyle(channel) {}function channelIcon(channel) {- return channel.emoji ? replaceEmoji(`:${channel.emoji}:`) : icon("d-chat");+ return channel.emoji ? dReplaceEmoji(`:${channel.emoji}:`) : dIcon("d-chat");}function isSubcategoryChannel(channel, categoryId) {@@ -83,7 +83,7 @@ export default class EditCategoryChat extends Component {<template><section class="edit-category-chat" {{didInsert this.loadChannels}}>- <ConditionalLoadingSpinner @condition={{this.loading}}>+ <DConditionalLoadingSpinner @condition={{this.loading}}>{{#if this.displayedChannels.length}}{{#if this.hasSubcategoryChannels}}<div class="edit-category-chat__subcategory-toggle">@@ -119,7 +119,7 @@ export default class EditCategoryChat extends Component {<span>{{channel.title}}</span>{{#if (isSubcategoryChannel channel @category.id)}}<div>- {{categoryBadge channel.chatable link=true}}+ {{dCategoryBadge channel.chatable link=true}}</div>{{/if}}</td>@@ -144,7 +144,7 @@ export default class EditCategoryChat extends Component {</tbody></table>{{else}}- <EmptyState+ <DEmptyState@title={{i18n "chat.edit_category.no_channels"}}@body={{trustHTML(i18n@@ -154,7 +154,7 @@ export default class EditCategoryChat extends Component {}}/>{{/if}}- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner></section></template>}diff --git a/plugins/chat/assets/javascripts/discourse/components/user-menu/chat-notifications-list-empty-state.gjs b/plugins/chat/assets/javascripts/discourse/components/user-menu/chat-notifications-list-empty-state.gjsindex 12da33a356c..223134cffc6 100644--- a/plugins/chat/assets/javascripts/discourse/components/user-menu/chat-notifications-list-empty-state.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/user-menu/chat-notifications-list-empty-state.gjs@@ -1,10 +1,10 @@import { trustHTML } from "@ember/template";-import EmptyState from "discourse/components/empty-state";import getUrl from "discourse/lib/get-url";+import DEmptyState from "discourse/ui-kit/d-empty-state";import { i18n } from "discourse-i18n";const ChatNotificationsListEmptyState = <template>- <EmptyState+ <DEmptyState@title={{i18n "user_menu.no_chat_notifications_title"}}@body={{trustHTML(i18ndiff --git a/plugins/chat/assets/javascripts/discourse/components/user-threads/preview.gjs b/plugins/chat/assets/javascripts/discourse/components/user-threads/preview.gjsindex 3b2f07732f9..d76f82455ce 100644--- a/plugins/chat/assets/javascripts/discourse/components/user-threads/preview.gjs+++ b/plugins/chat/assets/javascripts/discourse/components/user-threads/preview.gjs@@ -1,11 +1,13 @@import Component from "@glimmer/component";import { trustHTML } from "@ember/template";-import formatDate from "discourse/helpers/format-date";-import replaceEmoji from "discourse/helpers/replace-emoji";+import dFormatDate from "discourse/ui-kit/helpers/d-format-date";+import dReplaceEmoji from "discourse/ui-kit/helpers/d-replace-emoji";export default class ThreadPreview extends Component {get lastReplyDate() {- return formatDate(this.args.preview.lastReplyCreatedAt, { leaveAgo: true });+ return dFormatDate(this.args.preview.lastReplyCreatedAt, {+ leaveAgo: true,+ });}<template>@@ -18,7 +20,7 @@ export default class ThreadPreview extends Component {</span><span>:</span><span class="c-user-thread__excerpt-text">- {{replaceEmoji (trustHTML @preview.lastReplyExcerpt)}}+ {{dReplaceEmoji (trustHTML @preview.lastReplyExcerpt)}}</span></span></template>diff --git a/plugins/chat/assets/javascripts/discourse/connectors/user-preferences-nav/chat-preferences.gjs b/plugins/chat/assets/javascripts/discourse/connectors/user-preferences-nav/chat-preferences.gjsindex f434f9c8585..87dbfa29a4f 100644--- a/plugins/chat/assets/javascripts/discourse/connectors/user-preferences-nav/chat-preferences.gjs+++ b/plugins/chat/assets/javascripts/discourse/connectors/user-preferences-nav/chat-preferences.gjs@@ -1,6 +1,6 @@import Component from "@glimmer/component";import { LinkTo } from "@ember/routing";-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class ChatPreferences extends Component {@@ -11,7 +11,7 @@ export default class ChatPreferences extends Component {<template><li class="user-nav__preferences-chat"><LinkTo @route="preferences.chat">- {{icon "d-chat"}}+ {{dIcon "d-chat"}}<span>{{i18n "chat.title_capitalized"}}</span></LinkTo></li>diff --git a/plugins/chat/assets/javascripts/discourse/lib/hashtag-types/channel.js b/plugins/chat/assets/javascripts/discourse/lib/hashtag-types/channel.jsindex b4f7a52dd6e..a78d3c545a9 100644--- a/plugins/chat/assets/javascripts/discourse/lib/hashtag-types/channel.js+++ b/plugins/chat/assets/javascripts/discourse/lib/hashtag-types/channel.js@@ -1,7 +1,7 @@import { service } from "@ember/service";-import replaceEmoji from "discourse/helpers/replace-emoji";import HashtagTypeBase from "discourse/lib/hashtag-types/base";import { iconHTML } from "discourse/lib/icon-library";+import dReplaceEmoji from "discourse/ui-kit/helpers/d-replace-emoji";export default class ChannelHashtagType extends HashtagTypeBase {@service chatChannelsManager;@@ -33,7 +33,7 @@ export default class ChannelHashtagType extends HashtagTypeBase {hashtag.colors ? this.onLoad(hashtag) : this.load(hashtag.id);if (hashtag.emoji) {- return String(replaceEmoji(`:${hashtag.emoji}:`));+ return String(dReplaceEmoji(`:${hashtag.emoji}:`));} else {return iconHTML(hashtag.icon, {class: `hashtag-color--${this.type}-${hashtag.id}`,diff --git a/plugins/chat/assets/javascripts/discourse/templates/chat.gjs b/plugins/chat/assets/javascripts/discourse/templates/chat.gjsindex 02fab9e6a04..46334ed4359 100644--- a/plugins/chat/assets/javascripts/discourse/templates/chat.gjs+++ b/plugins/chat/assets/javascripts/discourse/templates/chat.gjs@@ -1,6 +1,6 @@import bodyClass from "discourse/helpers/body-class";-import concatClass from "discourse/helpers/concat-class";import htmlClass from "discourse/helpers/html-class";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import ChannelsList from "discourse/plugins/chat/discourse/components/channels-list";import ChatFooter from "discourse/plugins/chat/discourse/components/chat-footer";@@ -11,7 +11,7 @@ export default <template><div id="chat-progress-bar-container"></div><div- class={{concatClass+ class={{dConcatClass"full-page-chat"(if @controller.shouldUseCoreSidebar "full-page-chat-sidebar-enabled")}}@@ -22,7 +22,7 @@ export default <template><divid="main-chat-outlet"- class={{concatClass+ class={{dConcatClass"main-chat-outlet"@controller.mainOutletModifierClasses}}diff --git a/plugins/chat/assets/javascripts/lib/rich-editor-extension.js b/plugins/chat/assets/javascripts/lib/rich-editor-extension.jsindex a96cf76deb6..00e1dd5907d 100644--- a/plugins/chat/assets/javascripts/lib/rich-editor-extension.js+++ b/plugins/chat/assets/javascripts/lib/rich-editor-extension.js@@ -1,5 +1,5 @@-import replaceEmoji from "discourse/helpers/replace-emoji";import getURL from "discourse/lib/get-url";+import dReplaceEmoji from "discourse/ui-kit/helpers/d-replace-emoji";import { i18n } from "discourse-i18n";/** @type {RichEditorExtension} */@@ -49,7 +49,7 @@ const extension = {: null;metaElement.innerHTML = i18n("chat.quote.original_channel", {- channel: replaceEmoji(node.attrs.channel),+ channel: dReplaceEmoji(node.attrs.channel),channelLink,});} else {@@ -58,7 +58,7 @@ const extension = {channelLinkElement.href = getURL(`/chat/c/-/${node.attrs.channelId}`);- channelLinkElement.innerHTML = `#${replaceEmoji(+ channelLinkElement.innerHTML = `#${dReplaceEmoji(node.attrs.channel)}`;}@@ -104,7 +104,7 @@ const extension = {"chat-transcript-thread-header__title");threadTitleElement.innerHTML = node.attrs.threadTitle- ? replaceEmoji(node.attrs.threadTitle)+ ? dReplaceEmoji(node.attrs.threadTitle): i18n("chat.quote.default_thread_title");threadHeaderElement.appendChild(threadTitleElement);diff --git a/plugins/discourse-adplugin/admin/assets/javascripts/admin/components/house-ads-list-setting.gjs b/plugins/discourse-adplugin/admin/assets/javascripts/admin/components/house-ads-list-setting.gjsindex 2b34df64402..74df669831a 100644--- a/plugins/discourse-adplugin/admin/assets/javascripts/admin/components/house-ads-list-setting.gjs+++ b/plugins/discourse-adplugin/admin/assets/javascripts/admin/components/house-ads-list-setting.gjs@@ -1,7 +1,7 @@import { action, computed } from "@ember/object";import { tagName } from "@ember-decorators/component";-import DButton from "discourse/components/d-button";import { makeArray } from "discourse/lib/helpers";+import DButton from "discourse/ui-kit/d-button";import HouseAdsChooser from "./house-ads-chooser";import HouseAdsSetting from "./house-ads-setting";diff --git a/plugins/discourse-adplugin/admin/assets/javascripts/admin/components/house-ads-setting.gjs b/plugins/discourse-adplugin/admin/assets/javascripts/admin/components/house-ads-setting.gjsindex 846d9dd8592..b333d90faf3 100644--- a/plugins/discourse-adplugin/admin/assets/javascripts/admin/components/house-ads-setting.gjs+++ b/plugins/discourse-adplugin/admin/assets/javascripts/admin/components/house-ads-setting.gjs@@ -2,11 +2,11 @@import Component from "@ember/component";import { action, computed } from "@ember/object";import { tagName } from "@ember-decorators/component";-import DButton from "discourse/components/d-button";-import TextField from "discourse/components/text-field";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import { deepEqual } from "discourse/lib/object";+import DButton from "discourse/ui-kit/d-button";+import DTextField from "discourse/ui-kit/d-text-field";import { i18n } from "discourse-i18n";@tagName("")@@ -78,7 +78,7 @@ export default class HouseAdsSetting extends Component {<template><div class="house-ads-setting" ...attributes><label for={{this.name}}>{{this.title}}</label>- <TextField @value={{this.adValue}} @classNames="house-ads-text-input" />+ <DTextField @value={{this.adValue}} @classNames="house-ads-text-input" /><div class="setting-controls">{{#if this.changed}}<DButton class="ok" @action={{this.save}} @icon="check" />diff --git a/plugins/discourse-adplugin/admin/assets/javascripts/admin/components/house-ads-settings-panel.gjs b/plugins/discourse-adplugin/admin/assets/javascripts/admin/components/house-ads-settings-panel.gjsindex 928e1620eb7..72c8af01a77 100644--- a/plugins/discourse-adplugin/admin/assets/javascripts/admin/components/house-ads-settings-panel.gjs+++ b/plugins/discourse-adplugin/admin/assets/javascripts/admin/components/house-ads-settings-panel.gjs@@ -1,4 +1,4 @@-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";import HouseAdsListSetting from "./house-ads-list-setting";const HouseAdsSettingsPanel = <template>diff --git a/plugins/discourse-adplugin/admin/assets/javascripts/admin/components/modal/preview.gjs b/plugins/discourse-adplugin/admin/assets/javascripts/admin/components/modal/preview.gjsindex b95f8a4e546..7a55209f4eb 100644--- a/plugins/discourse-adplugin/admin/assets/javascripts/admin/components/modal/preview.gjs+++ b/plugins/discourse-adplugin/admin/assets/javascripts/admin/components/modal/preview.gjs@@ -1,5 +1,5 @@import { trustHTML } from "@ember/template";-import DModal from "discourse/components/d-modal";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";const Preview = <template>diff --git a/plugins/discourse-adplugin/admin/assets/javascripts/discourse/templates/admin-plugins/show/house-ads/index.gjs b/plugins/discourse-adplugin/admin/assets/javascripts/discourse/templates/admin-plugins/show/house-ads/index.gjsindex ac990e4d468..e50a03e0e4a 100644--- a/plugins/discourse-adplugin/admin/assets/javascripts/discourse/templates/admin-plugins/show/house-ads/index.gjs+++ b/plugins/discourse-adplugin/admin/assets/javascripts/discourse/templates/admin-plugins/show/house-ads/index.gjs@@ -1,9 +1,9 @@import { fn } from "@ember/helper";import { on } from "@ember/modifier";import AdminConfigAreaEmptyList from "discourse/admin/components/admin-config-area-empty-list";-import DPageSubheader from "discourse/components/d-page-subheader";-import HorizontalOverflowNav from "discourse/components/horizontal-overflow-nav";import { eq } from "discourse/truth-helpers";+import DHorizontalOverflowNav from "discourse/ui-kit/d-horizontal-overflow-nav";+import DPageSubheader from "discourse/ui-kit/d-page-subheader";import { i18n } from "discourse-i18n";import HouseAdsList from "../../../../../admin/components/house-ads-list";import HouseAdsSettingsPanel from "../../../../../admin/components/house-ads-settings-panel";@@ -25,7 +25,7 @@ const HouseAdsIndex = <template></DPageSubheader>{{#if @controller.houseAds.length}}- <HorizontalOverflowNav>+ <DHorizontalOverflowNav><li><ahref="#"@@ -40,7 +40,7 @@ const HouseAdsIndex = <template>{{on "click" (fn @controller.onTabChange "settings")}}>{{i18n "admin.adplugin.house_ads.tabs.settings"}}</a></li>- </HorizontalOverflowNav>+ </DHorizontalOverflowNav>{{#if (eq @controller.currentTab "ads")}}<HouseAdsList @houseAds={{@controller.houseAds}} />diff --git a/plugins/discourse-adplugin/assets/javascripts/discourse/components/google-adsense.gjs b/plugins/discourse-adplugin/assets/javascripts/discourse/components/google-adsense.gjsindex 0fac9720045..f1549618003 100644--- a/plugins/discourse-adplugin/assets/javascripts/discourse/components/google-adsense.gjs+++ b/plugins/discourse-adplugin/assets/javascripts/discourse/components/google-adsense.gjs@@ -3,9 +3,9 @@ import { scheduleOnce } from "@ember/runloop";import { trustHTML } from "@ember/template";import { tagName } from "@ember-decorators/component";import RSVP from "rsvp";-import concatClass from "discourse/helpers/concat-class";import { isTesting } from "discourse/lib/environment";import loadScript from "discourse/lib/load-script";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";import AdComponent from "./ad-component";@@ -258,7 +258,7 @@ export default class GoogleAdsense extends AdComponent {<template><div- class={{concatClass+ class={{dConcatClass"google-adsense"this.classForSlot(if this.isResponsive "adsense-responsive")diff --git a/plugins/discourse-adplugin/assets/javascripts/discourse/components/google-dfp-ad.gjs b/plugins/discourse-adplugin/assets/javascripts/discourse/components/google-dfp-ad.gjsindex fedd1128c3f..b8c43e8c1c5 100644--- a/plugins/discourse-adplugin/assets/javascripts/discourse/components/google-dfp-ad.gjs+++ b/plugins/discourse-adplugin/assets/javascripts/discourse/components/google-dfp-ad.gjs@@ -3,9 +3,9 @@ import { trustHTML } from "@ember/template";import { tagName } from "@ember-decorators/component";import { on } from "@ember-decorators/object";import RSVP from "rsvp";-import concatClass from "discourse/helpers/concat-class";import { isTesting } from "discourse/lib/environment";import loadScript from "discourse/lib/load-script";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";import AdComponent from "./ad-component";@@ -450,7 +450,7 @@ export default class GoogleDfpAd extends AdComponent {}<template>- <div class={{concatClass "google-dfp-ad" this.adUnitClass}} ...attributes>+ <div class={{dConcatClass "google-dfp-ad" this.adUnitClass}} ...attributes>{{#if this.showAd}}{{#if this.site.mobileView}}<div class="google-dfp-ad-label" style={{this.adTitleStyleMobile}}><h2diff --git a/plugins/discourse-adplugin/assets/javascripts/discourse/components/house-ad.gjs b/plugins/discourse-adplugin/assets/javascripts/discourse/components/house-ad.gjsindex 14020803afa..74599df89d3 100644--- a/plugins/discourse-adplugin/assets/javascripts/discourse/components/house-ad.gjs+++ b/plugins/discourse-adplugin/assets/javascripts/discourse/components/house-ad.gjs@@ -2,7 +2,7 @@ import { computed } from "@ember/object";import { trustHTML } from "@ember/template";import { isBlank } from "@ember/utils";import { tagName } from "@ember-decorators/component";-import concatClass from "discourse/helpers/concat-class";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import AdComponent from "./ad-component";const adIndex = {@@ -188,7 +188,7 @@ export default class HouseAd extends AdComponent {}<template>- <div class={{concatClass "house-creative" this.adUnitClass}} ...attributes>+ <div class={{dConcatClass "house-creative" this.adUnitClass}} ...attributes>{{#if this.showAd}}{{trustHTML this.adHtml}}{{/if}}diff --git a/plugins/discourse-ai/admin/assets/javascripts/discourse/components/admin-report-sentiment-analysis.gjs b/plugins/discourse-ai/admin/assets/javascripts/discourse/components/admin-report-sentiment-analysis.gjsindex 2ebc7d3bfa2..efa7a6945c8 100644--- a/plugins/discourse-ai/admin/assets/javascripts/discourse/components/admin-report-sentiment-analysis.gjs+++ b/plugins/discourse-ai/admin/assets/javascripts/discourse/components/admin-report-sentiment-analysis.gjs@@ -8,14 +8,9 @@ import { trackedArray } from "@ember/reactive/collections";import didInsert from "@ember/render-modifiers/modifiers/did-insert";import { service } from "@ember/service";import { modifier } from "ember-modifier";-import DButton from "discourse/components/d-button";-import HorizontalOverflowNav from "discourse/components/horizontal-overflow-nav";import PostList from "discourse/components/post-list";import DTooltip from "discourse/float-kit/components/d-tooltip";import bodyClass from "discourse/helpers/body-class";-import categoryBadge from "discourse/helpers/category-badge";-import icon from "discourse/helpers/d-icon";-import replaceEmoji from "discourse/helpers/replace-emoji";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import { getAbsoluteURL } from "discourse/lib/get-url";@@ -24,6 +19,11 @@ import { clipboardCopy } from "discourse/lib/utilities";import Category from "discourse/models/category";import Post from "discourse/models/post";import { and } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DHorizontalOverflowNav from "discourse/ui-kit/d-horizontal-overflow-nav";+import dCategoryBadge from "discourse/ui-kit/helpers/d-category-badge";+import dIcon from "discourse/ui-kit/helpers/d-icon";+import dReplaceEmoji from "discourse/ui-kit/helpers/d-replace-emoji";import { i18n } from "discourse-i18n";import AiSentimentHorizontalBar from "./ai-sentiment-horizontal-bar";import DoughnutChart from "./doughnut-chart";@@ -144,7 +144,7 @@ export default class AdminReportSentimentAnalysis extends Component {list = [];} else {list = this.posts.filter((post) => {- post.topic_title = replaceEmoji(post.topic_title);+ post.topic_title = dReplaceEmoji(post.topic_title);post.category = Category.findById(post.category_id);if (this.activeFilter === "all") {@@ -352,7 +352,7 @@ export default class AdminReportSentimentAnalysis extends Component {><td class="sentiment-analysis-table__title">{{#if data.category}}- {{categoryBadge data.category}}+ {{dCategoryBadge data.category}}{{else}}{{data.title}}{{/if}}@@ -403,7 +403,7 @@ export default class AdminReportSentimentAnalysis extends Component {><td class="sentiment-analysis-table__title">{{#if data.category}}- {{categoryBadge data.category}}+ {{dCategoryBadge data.category}}{{else}}{{data.title}}{{/if}}@@ -468,7 +468,7 @@ export default class AdminReportSentimentAnalysis extends Component {</div><div class="admin-report-sentiment-analysis-details">- <HorizontalOverflowNav+ <DHorizontalOverflowNav{{this.setActiveFilter}}class="admin-report-sentiment-analysis-details__filters">@@ -482,7 +482,7 @@ export default class AdminReportSentimentAnalysis extends Component {/></li>{{/each}}- </HorizontalOverflowNav>+ </DHorizontalOverflowNav><PostList@posts={{this.filteredPosts}}@@ -499,7 +499,7 @@ export default class AdminReportSentimentAnalysis extends Component {class="admin-report-sentiment-analysis-details__post-score"data-sentiment-score={{sentiment.id}}>- {{icon sentiment.icon}}+ {{dIcon sentiment.icon}}{{sentiment.text}}</span>{{/let}}diff --git a/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-agent-editor.gjs b/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-agent-editor.gjsindex 5debb54d14c..6d8c9a38dfa 100644--- a/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-agent-editor.gjs+++ b/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-agent-editor.gjs@@ -10,10 +10,7 @@ import { service } from "@ember/service";import { trustHTML } from "@ember/template";import AdminUser from "discourse/admin/models/admin-user";import BackButton from "discourse/components/back-button";-import DButton from "discourse/components/d-button";import Form from "discourse/components/form";-import Avatar from "discourse/helpers/bound-avatar-template";-import icon from "discourse/helpers/d-icon";import { popupAjaxError } from "discourse/lib/ajax-error";import {addUniqueValueToArray,@@ -24,6 +21,9 @@ import getURL from "discourse/lib/get-url";import Group from "discourse/models/group";import GroupChooser from "discourse/select-kit/components/group-chooser";import { and, eq, gt, not, or } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import dBoundAvatarTemplate from "discourse/ui-kit/helpers/d-bound-avatar-template";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";import AiAgentMcpToolSelectorModal from "../components/modal/ai-agent-mcp-tool-selector-modal";import AiAgentResponseFormatEditor from "../components/modal/ai-agent-response-format-editor";@@ -899,7 +899,7 @@ export default class AgentEditor extends Component {totalSelectedToolTokens}}>- {{icon "caret-down"}}+ {{dIcon "caret-down"}}</span><spanclass="ai-agent-editor__tool-context-cost-bar-indicator --count"@@ -907,14 +907,14 @@ export default class AgentEditor extends Component {totalSelectedToolCount}}>- {{icon "caret-up"}}+ {{dIcon "caret-up"}}</span></div><span class="ai-agent-editor__tool-context-cost-legend"><spanclass="ai-agent-editor__tool-context-cost-legend-item --token">- {{icon "caret-down"}}+ {{dIcon "caret-down"}}{{i18n "discourse_ai.ai_agent.token_usage"}}:<spanclass="ai-agent-editor__tool-context-cost-value@@ -929,7 +929,7 @@ export default class AgentEditor extends Component {<spanclass="ai-agent-editor__tool-context-cost-legend-item --count">- {{icon "caret-up"}}+ {{dIcon "caret-up"}}{{i18n "discourse_ai.ai_agent.tool_count"}}:<spanclass="ai-agent-editor__tool-context-cost-value@@ -1190,7 +1190,7 @@ export default class AgentEditor extends Component {href={{data.user.path}}data-user-card={{data.user.username}}>- {{Avatar data.user.avatar_template "small"}}+ {{dBoundAvatarTemplate data.user.avatar_template "small"}}</a><LinkTo @route="adminUser" @model={{this.adminUser}}>{{data.user.username}}diff --git a/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-agent-list-editor.gjs b/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-agent-list-editor.gjsindex cda3918f665..3dd98a8d8e5 100644--- a/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-agent-list-editor.gjs+++ b/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-agent-list-editor.gjs@@ -6,18 +6,18 @@ import { LinkTo } from "@ember/routing";import { service } from "@ember/service";import AdminConfigAreaEmptyList from "discourse/admin/components/admin-config-area-empty-list";import AdminFilterControls from "discourse/admin/components/admin-filter-controls";-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DButton from "discourse/components/d-button";-import DPageSubheader from "discourse/components/d-page-subheader";-import DropdownMenu from "discourse/components/dropdown-menu";import DMenu from "discourse/float-kit/components/d-menu";-import avatar from "discourse/helpers/avatar";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import { removeValueFromArray } from "discourse/lib/array-tools";import { gt } from "discourse/truth-helpers";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DButton from "discourse/ui-kit/d-button";+import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";+import DPageSubheader from "discourse/ui-kit/d-page-subheader";+import dAvatar from "discourse/ui-kit/helpers/d-avatar";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";import AiAgent from "../admin/models/ai-agent";import AiAgentEditor from "./ai-agent-editor";@@ -238,10 +238,10 @@ export default class AiAgentListEditor extends Component {@triggerClass="btn-default btn-icon"><:trigger>- {{icon this.currentLayout.icon}}+ {{dIcon this.currentLayout.icon}}</:trigger><:content>- <DropdownMenu as |dropdown|>+ <DDropdownMenu as |dropdown|>{{#each LAYOUT_BUTTONS as |button|}}<dropdown.item><DButton@@ -252,14 +252,14 @@ export default class AiAgentListEditor extends Component {/></dropdown.item>{{/each}}- </DropdownMenu>+ </DDropdownMenu></:content></DMenu>{{/if}}</:actions><:content as |filteredAgents|><table- class={{concatClass+ class={{dConcatClass"content-list ai-agent-list-editor d-table"(concat "--layout-" this.currentLayout.id)}}@@ -275,7 +275,7 @@ export default class AiAgentListEditor extends Component {{{#each filteredAgents as |agent|}}<trdata-agent-id={{agent.id}}- class={{concatClass+ class={{dConcatClass"ai-agent-list__row d-table__row"(if agent.priority "--priority")(if agent.enabled "--enabled")@@ -285,7 +285,7 @@ export default class AiAgentListEditor extends Component {<div class="ai-agent-list__name-with-description"><h3 class="ai-agent-list__name">{{#if agent.user}}- {{avatar agent.user imageSize="tiny"}}+ {{dAvatar agent.user imageSize="tiny"}}{{/if}}{{agent.name}}</h3>diff --git a/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-default-llm-selector.gjs b/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-default-llm-selector.gjsindex 326b8057a33..0fd2c0411de 100644--- a/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-default-llm-selector.gjs+++ b/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-default-llm-selector.gjs@@ -3,10 +3,10 @@ import { tracked } from "@glimmer/tracking";import { hash } from "@ember/helper";import { action } from "@ember/object";import { service } from "@ember/service";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import ComboBox from "discourse/select-kit/components/combo-box";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";import { i18n } from "discourse-i18n";export default class AiDefaultLlmSelector extends Component {@@ -104,7 +104,10 @@ export default class AiDefaultLlmSelector extends Component {@nameProperty="name"@options={{hash disabled=this.isSaving}}/>- <ConditionalLoadingSpinner @condition={{this.isSaving}} @size="small" />+ <DConditionalLoadingSpinner+ @condition={{this.isSaving}}+ @size="small"+ /></div></div></template>diff --git a/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-embedding-editor.gjs b/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-embedding-editor.gjsindex 3a8a6f04dd0..5728fe6953e 100644--- a/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-embedding-editor.gjs+++ b/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-embedding-editor.gjs@@ -8,16 +8,16 @@ import { service } from "@ember/service";import AdminSectionLandingItem from "discourse/admin/components/admin-section-landing-item";import AdminSectionLandingWrapper from "discourse/admin/components/admin-section-landing-wrapper";import BackButton from "discourse/components/back-button";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DButton from "discourse/components/d-button";import Form from "discourse/components/form";-import icon from "discourse/helpers/d-icon";import { popupAjaxError } from "discourse/lib/ajax-error";import {addUniqueValueToArray,removeValueFromArray,} from "discourse/lib/array-tools";import { eq, not } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";import AiSecretSelector from "./ai-secret-selector";@@ -592,22 +592,22 @@ export default class AiEmbeddingEditor extends Component {{{#if this.displayTestResult}}<form.Container @format="full" class="ai-embedding-editor-tests">- <ConditionalLoadingSpinner+ <DConditionalLoadingSpinner@size="small"@condition={{this.testRunning}}>{{#if this.testResult}}<div class="ai-embedding-editor-tests__success">- {{icon "check"}}+ {{dIcon "check"}}{{i18n "discourse_ai.embeddings.tests.success"}}</div>{{else}}<div class="ai-embedding-editor-tests__failure">- {{icon "xmark"}}+ {{dIcon "xmark"}}{{this.testErrorMessage}}</div>{{/if}}- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner></form.Container>{{/if}}</Form>diff --git a/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-embeddings-list-editor.gjs b/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-embeddings-list-editor.gjsindex e159ae16d20..d6cb6a23260 100644--- a/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-embeddings-list-editor.gjs+++ b/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-embeddings-list-editor.gjs@@ -2,10 +2,10 @@ import Component from "@glimmer/component";import { concat } from "@ember/helper";import { service } from "@ember/service";import AdminConfigAreaEmptyList from "discourse/admin/components/admin-config-area-empty-list";-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DButton from "discourse/components/d-button";-import DPageSubheader from "discourse/components/d-page-subheader";import DTooltip from "discourse/float-kit/components/d-tooltip";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DButton from "discourse/ui-kit/d-button";+import DPageSubheader from "discourse/ui-kit/d-page-subheader";import { i18n } from "discourse-i18n";import AiEmbeddingEditor from "./ai-embedding-editor";diff --git a/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-features.gjs b/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-features.gjsindex 21ef0b70891..c78f59c24ab 100644--- a/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-features.gjs+++ b/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-features.gjs@@ -3,11 +3,11 @@ import { tracked } from "@glimmer/tracking";import { hash } from "@ember/helper";import { action } from "@ember/object";import { service } from "@ember/service";-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DButton from "discourse/components/d-button";-import DPageSubheader from "discourse/components/d-page-subheader";-import DSelect from "discourse/components/d-select";-import FilterInput from "discourse/components/filter-input";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DButton from "discourse/ui-kit/d-button";+import DFilterInput from "discourse/ui-kit/d-filter-input";+import DPageSubheader from "discourse/ui-kit/d-page-subheader";+import DSelect from "discourse/ui-kit/d-select";import { i18n } from "discourse-i18n";import AiDefaultLlmSelector from "./ai-default-llm-selector";import AiFeaturesList from "./ai-features-list";@@ -194,7 +194,7 @@ export default class AiFeatures extends Component {{{/each}}</DSelect>- <FilterInput+ <DFilterInputplaceholder={{i18n "discourse_ai.features.filters.text"}}@filterAction={{this.onFilterChange}}@value={{this.filterValue}}diff --git a/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-llm-editor-form.gjs b/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-llm-editor-form.gjsindex 54a9fe45770..7b7f1fd7637 100644--- a/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-llm-editor-form.gjs+++ b/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-llm-editor-form.gjs@@ -6,16 +6,16 @@ import { LinkTo } from "@ember/routing";import { later } from "@ember/runloop";import { service } from "@ember/service";import AdminUser from "discourse/admin/models/admin-user";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";import Form from "discourse/components/form";-import Avatar from "discourse/helpers/bound-avatar-template";-import icon from "discourse/helpers/d-icon";import { popupAjaxError } from "discourse/lib/ajax-error";import {addUniqueValueToArray,removeValueFromArray,} from "discourse/lib/array-tools";import { eq, gt, not } from "discourse/truth-helpers";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import dBoundAvatarTemplate from "discourse/ui-kit/helpers/d-bound-avatar-template";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";import AiLlmAttachmentTypes from "discourse/plugins/discourse-ai/discourse/components/ai-llm-attachment-types";import {@@ -560,7 +560,7 @@ export default class AiLlmEditorForm extends Component {href={{@model.user.path}}data-user-card={{@model.user.username}}>- {{Avatar @model.user.avatar_template "small"}}+ {{dBoundAvatarTemplate @model.user.avatar_template "small"}}</a><LinkTo @route="adminUser" @model={{this.adminUser}}>{{@model.user.username}}@@ -703,18 +703,18 @@ export default class AiLlmEditorForm extends Component {{{#if this.displayTestResult}}<form.Container @format="full">- <ConditionalLoadingSpinner+ <DConditionalLoadingSpinner@size="small"@condition={{this.testRunning}}>{{#if this.testResult}}<div class="ai-llm-editor-tests__success">- {{icon "check"}}+ {{dIcon "check"}}{{i18n "discourse_ai.llms.tests.success"}}</div>{{else}}<div class="ai-llm-editor-tests__failure">- {{icon "xmark"}}+ {{dIcon "xmark"}}{{this.testErrorMessage}}<ul>{{#each this.testValidationErrors as |error|}}@@ -723,7 +723,7 @@ export default class AiLlmEditorForm extends Component {</ul></div>{{/if}}- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner></form.Container>{{/if}}</Form>diff --git a/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-llms-list-editor.gjs b/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-llms-list-editor.gjsindex b6aea76e1ff..ec259d47b8a 100644--- a/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-llms-list-editor.gjs+++ b/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-llms-list-editor.gjs@@ -5,10 +5,10 @@ import { service } from "@ember/service";import { trustHTML } from "@ember/template";import AdminSectionLandingItem from "discourse/admin/components/admin-section-landing-item";import AdminSectionLandingWrapper from "discourse/admin/components/admin-section-landing-wrapper";-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DButton from "discourse/components/d-button";-import DPageSubheader from "discourse/components/d-page-subheader";-import icon from "discourse/helpers/d-icon";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DButton from "discourse/ui-kit/d-button";+import DPageSubheader from "discourse/ui-kit/d-page-subheader";+import dIcon from "discourse/ui-kit/helpers/d-icon";import I18n, { i18n } from "discourse-i18n";import AiCreditBar from "./ai-credit-bar";import AiDefaultLlmSelector from "./ai-default-llm-selector";@@ -199,7 +199,7 @@ export default class AiLlmsListEditor extends Component {/>{{#if llm.llm_credit_allocation.hard_limit_reached}}<div class="alert alert-danger ai-credit-warning">- {{icon "circle-info"}}+ {{dIcon "circle-info"}}{{trustHTML(i18n"discourse_ai.llms.credit_allocation.hard_limit_warning"@@ -213,7 +213,7 @@ export default class AiLlmsListEditor extends Component {llm.llm_credit_allocation.soft_limit_reached}}<div class="alert alert-warning ai-credit-warning">- {{icon "circle-info"}}+ {{dIcon "circle-info"}}{{trustHTML(i18n"discourse_ai.llms.credit_allocation.soft_limit_warning"diff --git a/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-secrets-list-editor.gjs b/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-secrets-list-editor.gjsindex d72551f74f0..73dcfbf2466 100644--- a/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-secrets-list-editor.gjs+++ b/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-secrets-list-editor.gjs@@ -2,10 +2,10 @@ import Component from "@glimmer/component";import { LinkTo } from "@ember/routing";import { service } from "@ember/service";import AdminConfigAreaEmptyList from "discourse/admin/components/admin-config-area-empty-list";-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DButton from "discourse/components/d-button";-import DPageSubheader from "discourse/components/d-page-subheader";import { eq } from "discourse/truth-helpers";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DButton from "discourse/ui-kit/d-button";+import DPageSubheader from "discourse/ui-kit/d-page-subheader";import { i18n } from "discourse-i18n";import AiSecretEditorForm from "./ai-secret-editor-form";diff --git a/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-spam.gjs b/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-spam.gjsindex 6cc378f0ddc..087a0ac3fd6 100644--- a/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-spam.gjs+++ b/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-spam.gjs@@ -6,18 +6,18 @@ import { action } from "@ember/object";import { LinkTo } from "@ember/routing";import { service } from "@ember/service";import AdminConfigAreaCard from "discourse/admin/components/admin-config-area-card";-import DButton from "discourse/components/d-button";-import DPageSubheader from "discourse/components/d-page-subheader";-import DStatTiles from "discourse/components/d-stat-tiles";-import DToggleSwitch from "discourse/components/d-toggle-switch";import DTooltip from "discourse/float-kit/components/d-tooltip";-import icon from "discourse/helpers/d-icon";import withEventValue from "discourse/helpers/with-event-value";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import getURL from "discourse/lib/get-url";import { autoTrackedArray } from "discourse/lib/tracked-tools";import ComboBox from "discourse/select-kit/components/combo-box";+import DButton from "discourse/ui-kit/d-button";+import DPageSubheader from "discourse/ui-kit/d-page-subheader";+import DStatTiles from "discourse/ui-kit/d-stat-tiles";+import DToggleSwitch from "discourse/ui-kit/d-toggle-switch";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";import SpamTestModal from "./modal/spam-test-modal";@@ -222,7 +222,7 @@ export default class AiSpam extends Component {<div class="ai-spam__errors">{{#each this.errors as |e|}}<div class="alert alert-error">- {{icon "triangle-exclamation"}}+ {{dIcon "triangle-exclamation"}}<p>{{e.message}}</p><DButton@action={{e.button.action}}diff --git a/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-tool-list-editor.gjs b/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-tool-list-editor.gjsindex cb9b06a01bc..d68e5a686b9 100644--- a/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-tool-list-editor.gjs+++ b/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-tool-list-editor.gjs@@ -6,16 +6,16 @@ import { action } from "@ember/object";import { LinkTo } from "@ember/routing";import { service } from "@ember/service";import AdminConfigAreaEmptyList from "discourse/admin/components/admin-config-area-empty-list";-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DButton from "discourse/components/d-button";-import DPageSubheader from "discourse/components/d-page-subheader";-import DropdownMenu from "discourse/components/dropdown-menu";import DMenu from "discourse/float-kit/components/d-menu";-import icon from "discourse/helpers/d-icon";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import { removeValueFromArray } from "discourse/lib/array-tools";import { eq } from "discourse/truth-helpers";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DButton from "discourse/ui-kit/d-button";+import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";+import DPageSubheader from "discourse/ui-kit/d-page-subheader";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";import AiTool from "../admin/models/ai-tool";import AiMcpServerToolsModal from "./modal/ai-mcp-server-tools-modal";@@ -249,7 +249,7 @@ export default class AiToolListEditor extends Component {@onClose={{this.resetMenuState}}><:content>- <DropdownMenu as |dropdown|>+ <DDropdownMenu as |dropdown|>{{#if this.expandedCategory}}<dropdown.item><DButton@@ -312,7 +312,7 @@ export default class AiToolListEditor extends Component {</dropdown.item>{{/each}}{{/if}}- </DropdownMenu>+ </DDropdownMenu></:content></DMenu>@@ -358,9 +358,9 @@ export default class AiToolListEditor extends Component {}}">{{#if cred.bound}}- {{icon "check"}}+ {{dIcon "check"}}{{else}}- {{icon "triangle-exclamation"}}+ {{dIcon "triangle-exclamation"}}{{/if}}{{cred.alias}}{{#unless cred.bound}}@@ -473,7 +473,7 @@ export default class AiToolListEditor extends Component {@onClose={{this.resetMenuState}}><:content>- <DropdownMenu as |dropdown|>+ <DDropdownMenu as |dropdown|>{{#if this.expandedCategory}}<dropdown.item><DButton@@ -536,7 +536,7 @@ export default class AiToolListEditor extends Component {</dropdown.item>{{/each}}{{/if}}- </DropdownMenu>+ </DDropdownMenu></:content></DMenu>diff --git a/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-translations.gjs b/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-translations.gjsindex ca2cabcbcc6..8dfd121e167 100644--- a/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-translations.gjs+++ b/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-translations.gjs@@ -7,16 +7,16 @@ import { service } from "@ember/service";import { trustHTML } from "@ember/template";import AdminConfigAreaCard from "discourse/admin/components/admin-config-area-card";import Chart from "discourse/admin/components/chart";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DButton from "discourse/components/d-button";-import DPageSubheader from "discourse/components/d-page-subheader";-import DToggleSwitch from "discourse/components/d-toggle-switch";-import icon from "discourse/helpers/d-icon";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import Category from "discourse/models/category";import CategorySelector from "discourse/select-kit/components/category-selector";import MultiSelect from "discourse/select-kit/components/multi-select";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DPageSubheader from "discourse/ui-kit/d-page-subheader";+import DToggleSwitch from "discourse/ui-kit/d-toggle-switch";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class AiTranslations extends Component {@@ -518,7 +518,7 @@ export default class AiTranslations extends Component {{{#if this.creditLimitReached}}<div class="alert alert-warning ai-translations__credit-warning">- {{icon "triangle-exclamation"}}+ {{dIcon "triangle-exclamation"}}<span>{{this.creditLimitWarningMessage}}</span></div>{{/if}}@@ -630,7 +630,7 @@ export default class AiTranslations extends Component {</div>{{#if this.enabled}}- <ConditionalLoadingSpinner @condition={{this.loadingProgress}}>+ <DConditionalLoadingSpinner @condition={{this.loadingProgress}}>{{#if this.data}}<AdminConfigAreaCard class="ai-translations__charts"><:header>@@ -656,7 +656,7 @@ export default class AiTranslations extends Component {</:content></AdminConfigAreaCard>{{/if}}- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner>{{/if}}</div>diff --git a/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-usage.gjs b/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-usage.gjsindex ec34cb3cefd..9f4d88dc581 100644--- a/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-usage.gjs+++ b/plugins/discourse-ai/admin/assets/javascripts/discourse/components/ai-usage.gjs@@ -10,20 +10,20 @@ import { service } from "@ember/service";import AdminConfigAreaCard from "discourse/admin/components/admin-config-area-card";import AdminConfigAreaEmptyList from "discourse/admin/components/admin-config-area-empty-list";import Chart from "discourse/admin/components/chart";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DButton from "discourse/components/d-button";-import DPageSubheader from "discourse/components/d-page-subheader";-import DStatTiles from "discourse/components/d-stat-tiles";-import DateTimeInputRange from "discourse/components/date-time-input-range";import DTooltip from "discourse/float-kit/components/d-tooltip";-import avatar from "discourse/helpers/avatar";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import { ajax } from "discourse/lib/ajax";import { bind } from "discourse/lib/decorators";import { number } from "discourse/lib/formatter";import ComboBox from "discourse/select-kit/components/combo-box";import { eq, gt } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DDateTimeInputRange from "discourse/ui-kit/d-date-time-input-range";+import DPageSubheader from "discourse/ui-kit/d-page-subheader";+import DStatTiles from "discourse/ui-kit/d-stat-tiles";+import dAvatar from "discourse/ui-kit/helpers/d-avatar";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";import AiCreditBar from "./ai-credit-bar";@@ -557,7 +557,7 @@ export default class AiUsage extends Component {{{#if this.isCustomDateActive}}<div class="ai-usage__custom-date-pickers">- <DateTimeInputRange+ <DDateTimeInputRange@from={{this.fromDate}}@to={{this.toDate}}@onChange={{this.onChangeDateRange}}@@ -588,7 +588,7 @@ export default class AiUsage extends Component {/></div>- <ConditionalLoadingSpinner @condition={{this.loadingData}}>+ <DConditionalLoadingSpinner @condition={{this.loadingData}}><AdminConfigAreaCard@heading="discourse_ai.usage.summary"class="ai-usage__summary"@@ -699,7 +699,7 @@ export default class AiUsage extends Component {@maxWidth={{600}}><:trigger>- {{icon+ {{dIcon"circle-question"class="ai-usage__info-icon"}}@@ -955,7 +955,7 @@ export default class AiUsage extends Component {{{#if this.data.users.length}}<div- class={{concatClass+ class={{dConcatClass"ai-usage__users-table-wrapper"(if (gt this.data.users.length 24) "-multi-column")}}@@ -984,7 +984,7 @@ export default class AiUsage extends Component {@model={{user.username}}class="username">- {{avatar user imageSize="tiny"}}+ {{dAvatar user imageSize="tiny"}}{{user.username}}</LinkTo></div></td>@@ -1050,7 +1050,7 @@ export default class AiUsage extends Component {@model={{user.username}}class="username">- {{avatar user imageSize="tiny"}}+ {{dAvatar user imageSize="tiny"}}{{user.username}}</LinkTo></div></td>@@ -1092,7 +1092,7 @@ export default class AiUsage extends Component {</:content></AdminConfigAreaCard></div>- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner></div></div></template>diff --git a/plugins/discourse-ai/admin/assets/javascripts/discourse/templates/admin/dashboard-sentiment.gjs b/plugins/discourse-ai/admin/assets/javascripts/discourse/templates/admin/dashboard-sentiment.gjsindex 657794b17dd..657b6435478 100644--- a/plugins/discourse-ai/admin/assets/javascripts/discourse/templates/admin/dashboard-sentiment.gjs+++ b/plugins/discourse-ai/admin/assets/javascripts/discourse/templates/admin/dashboard-sentiment.gjs@@ -2,7 +2,7 @@ import { LinkTo } from "@ember/routing";import AdminReport from "discourse/admin/components/admin-report";import DashboardPeriodSelector from "discourse/admin/components/dashboard-period-selector";import DTooltip from "discourse/float-kit/components/d-tooltip";-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default <template>@@ -39,7 +39,7 @@ export default <template></LinkTo><DTooltip @interactive="true"><:trigger>- {{icon "circle-question"}}+ {{dIcon "circle-question"}}</:trigger><:content><span>{{i18n "admin.dashboard.emotion.description"}}</span>diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/admin-report-emotion.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/admin-report-emotion.gjsindex 5477c1c1fc3..e55169f2512 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/components/admin-report-emotion.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/admin-report-emotion.gjs@@ -1,9 +1,9 @@/* eslint-disable ember/no-classic-components */import Component from "@ember/component";import { tagName } from "@ember-decorators/component";-import icon from "discourse/helpers/d-icon";-import number from "discourse/helpers/number";import getURL from "discourse/lib/get-url";+import dIcon from "discourse/ui-kit/helpers/d-icon";+import dNumber from "discourse/ui-kit/helpers/d-number";@tagName("")export default class AdminReportEmotion extends Component {@@ -47,14 +47,14 @@ export default class AdminReportEmotion extends Component {><div class="cell title">{{#if this.model.icon}}- {{icon this.model.icon}}+ {{dIcon this.model.icon}}{{/if}}{{this.model.title}}</div><div class="cell value today-count"><a href={{this.todayLink}}>- {{number this.model.todayCount}}+ {{dNumber this.model.todayCount}}</a></div>@@ -63,9 +63,9 @@ export default class AdminReportEmotion extends Component {title={{this.model.yesterdayCountTitle}}><a href={{this.yesterdayLink}}>- {{number this.model.yesterdayCount}}+ {{dNumber this.model.yesterdayCount}}</a>- {{icon this.model.yesterdayTrendIcon}}+ {{dIcon this.model.yesterdayTrendIcon}}</div><div@@ -73,9 +73,9 @@ export default class AdminReportEmotion extends Component {title={{this.model.sevenDaysCountTitle}}><a href={{this.lastSevenDaysLink}}>- {{number this.model.lastSevenDaysCount}}+ {{dNumber this.model.lastSevenDaysCount}}</a>- {{icon this.model.sevenDaysTrendIcon}}+ {{dIcon this.model.sevenDaysTrendIcon}}</div><div@@ -84,10 +84,10 @@ export default class AdminReportEmotion extends Component {><a href={{this.lastThirtyDaysLink}}>- {{number this.model.lastThirtyDaysCount}}+ {{dNumber this.model.lastThirtyDaysCount}}</a>{{#if this.model.canDisplayTrendIcon}}- {{icon this.model.thirtyDaysTrendIcon}}+ {{dIcon this.model.thirtyDaysTrendIcon}}{{/if}}</div></div>diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-agent-example.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-agent-example.gjsindex da7c56c585f..8607c8bea70 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-agent-example.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-agent-example.gjs@@ -3,8 +3,8 @@ import { tracked } from "@glimmer/tracking";import { concat } from "@ember/helper";import { on } from "@ember/modifier";import { action } from "@ember/object";-import icon from "discourse/helpers/d-icon";import { eq } from "discourse/truth-helpers";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class AiAgentCollapsableExample extends Component {@@ -33,7 +33,7 @@ export default class AiAgentCollapsableExample extends Component {<template><div role="button" {{on "click" this.toggleExample}}>- <span>{{icon this.caretIcon}}</span>+ <span>{{dIcon this.caretIcon}}</span>{{this.exampleTitle}}</div>{{#unless this.collapsed}}diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-artifact.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-artifact.gjsindex 4b939437f2a..2446e4293cc 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-artifact.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-artifact.gjs@@ -4,9 +4,9 @@ import { action } from "@ember/object";import didInsert from "@ember/render-modifiers/modifiers/did-insert";import { service } from "@ember/service";import { trustHTML } from "@ember/template";-import DButton from "discourse/components/d-button";import htmlClass from "discourse/helpers/html-class";import getURL from "discourse/lib/get-url";+import DButton from "discourse/ui-kit/d-button";export default class AiArtifactComponent extends Component {@service siteSettings;diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-blinking-animation.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-blinking-animation.gjsindex 5c57f2df221..baa035f9690 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-blinking-animation.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-blinking-animation.gjs@@ -6,8 +6,8 @@ import didInsert from "@ember/render-modifiers/modifiers/did-insert";import didUpdate from "@ember/render-modifiers/modifiers/did-update";import willDestroy from "@ember/render-modifiers/modifiers/will-destroy";import { cancel } from "@ember/runloop";-import concatClass from "discourse/helpers/concat-class";import discourseLater from "discourse/lib/later";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";class Block {@tracked show = false;@@ -99,7 +99,7 @@ export default class AiBlinkingAnimation extends Component {<ul class="ai-blinking-animation" {{didInsert this.setupAnimation}}>{{#each this.blocks as |block|}}<li- class={{concatClass+ class={{dConcatClass"ai-blinking-animation__list-item"(if block.show "show")(if block.shown "is-shown")diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-bot-conversations.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-bot-conversations.gjsindex 509c058c811..288cd2c0790 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-bot-conversations.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-bot-conversations.gjs@@ -12,11 +12,9 @@ import { service } from "@ember/service";import { trustHTML } from "@ember/template";import { tagName } from "@ember-decorators/component";import { modifier } from "ember-modifier";-import DButton from "discourse/components/d-button";import PluginOutlet from "discourse/components/plugin-outlet";import UserAutocompleteResults from "discourse/components/user-autocomplete-results";import bodyClass from "discourse/helpers/body-class";-import concatClass from "discourse/helpers/concat-class";import lazyHash from "discourse/helpers/lazy-hash";import { popupAjaxError } from "discourse/lib/ajax-error";import { hashtagAutocompleteOptions } from "discourse/lib/hashtag-autocomplete";@@ -30,7 +28,9 @@ import {renderUserStatusHtml,} from "discourse/lib/user-status-on-autocomplete";import { clipboardHelpers } from "discourse/lib/utilities";-import DAutocompleteModifier from "discourse/modifiers/d-autocomplete";+import DButton from "discourse/ui-kit/d-button";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dAutocomplete from "discourse/ui-kit/modifiers/d-autocomplete";import { i18n } from "discourse-i18n";import AiAgentLlmSelector from "discourse/plugins/discourse-ai/discourse/components/ai-agent-llm-selector";@@ -253,7 +253,7 @@ export default class AiBotConversations extends Component {}const autocompleteHandler = new TextareaAutocompleteHandler(textarea);- DAutocompleteModifier.setupAutocomplete(+ dAutocomplete.setupAutocomplete(getOwner(this),textarea,autocompleteHandler,@@ -295,7 +295,7 @@ export default class AiBotConversations extends Component {const hashtagConfig = this.site.hashtag_configurations["topic-composer"];const autocompleteHandler = new TextareaAutocompleteHandler(textarea);- DAutocompleteModifier.setupAutocomplete(+ dAutocomplete.setupAutocomplete(getOwner(this),textarea,autocompleteHandler,@@ -394,7 +394,7 @@ export default class AiBotConversations extends Component {<div{{this.creditLimitTooltipModifier}}- class={{concatClass+ class={{dConcatClass"ai-bot-conversations__input-wrapper"(if this.isSubmitDisabled "--disabled")}}diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-bot-docked-composer.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-bot-docked-composer.gjsindex 0dca4122f35..5f440df7ef6 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-bot-docked-composer.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-bot-docked-composer.gjs@@ -6,13 +6,13 @@ import didInsert from "@ember/render-modifiers/modifiers/did-insert";import willDestroy from "@ember/render-modifiers/modifiers/will-destroy";import { schedule } from "@ember/runloop";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import DockedComposer from "discourse/components/docked-composer";-import avatar from "discourse/helpers/avatar";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import { ajax } from "discourse/lib/ajax";import { buildQuote } from "discourse/lib/quote";+import DButton from "discourse/ui-kit/d-button";+import dAvatar from "discourse/ui-kit/helpers/d-avatar";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";const DRAFT_KEY_PREFIX = "ai-bot-docked-draft-";@@ -296,7 +296,7 @@ export default class AiBotDockedComposer extends Component {{{#if this.editingPost}}<div class="ai-bot-docked-composer__editing"><span class="ai-bot-docked-composer__editing-text">- {{avatar this.editingPost imageSize="tiny"}}+ {{dAvatar this.editingPost imageSize="tiny"}}{{i18n "discourse_ai.ai_bot.conversations.editing_post"}}</span><DButton@@ -345,7 +345,7 @@ export default class AiBotDockedComposer extends Component {(i18n "discourse_ai.ai_bot.conversations.streaming_below")(i18n "discourse_ai.ai_bot.conversations.scroll_to_bottom")}}- class={{concatClass+ class={{dConcatClass"ai-bot-scroll-indicator"(if this.isStreaming "ai-bot-scroll-indicator--streaming")}}@@ -358,7 +358,7 @@ export default class AiBotDockedComposer extends Component {></span><span class="ai-bot-scroll-indicator__dot"></span></span>{{else}}- {{icon "chevron-down"}}+ {{dIcon "chevron-down"}}{{/if}}</button>{{/if}}diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-bot-header-icon.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-bot-header-icon.gjsindex c04256dcf23..99487a0c322 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-bot-header-icon.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-bot-header-icon.gjs@@ -1,10 +1,10 @@import Component from "@glimmer/component";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import PluginOutlet from "discourse/components/plugin-outlet";import lazyHash from "discourse/helpers/lazy-hash";import getURL from "discourse/lib/get-url";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";import { AI_CONVERSATIONS_PANEL } from "../services/ai-conversations-sidebar-manager";diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-bot-sidebar-new-conversation.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-bot-sidebar-new-conversation.gjsindex 59e219e7ef9..bbb152eef01 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-bot-sidebar-new-conversation.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-bot-sidebar-new-conversation.gjs@@ -1,9 +1,9 @@import Component from "@glimmer/component";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import BackToForum from "discourse/components/sidebar/back-to-forum";import getURL from "discourse/lib/get-url";+import DButton from "discourse/ui-kit/d-button";import { AI_CONVERSATIONS_PANEL } from "../services/ai-conversations-sidebar-manager";const TEXTAREA_ID = "ai-bot-conversations-input";diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-credit-bar.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-credit-bar.gjsindex 3b7a1bbc627..af3f2a93256 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-credit-bar.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-credit-bar.gjs@@ -1,8 +1,8 @@import Component from "@glimmer/component";import { trustHTML } from "@ember/template";import DTooltip from "discourse/float-kit/components/d-tooltip";-import concatClass from "discourse/helpers/concat-class";import { number } from "discourse/lib/formatter";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";/**@@ -71,7 +71,7 @@ export default class AiCreditBar extends Component {{{#if this.shouldShowTooltip}}<DTooltip @content={{this.tooltipText}}><:trigger>- <div class={{concatClass "ai-credit-bar" this.barClass}}>+ <div class={{dConcatClass "ai-credit-bar" this.barClass}}><div class="ai-credit-bar__progress"><div class="ai-credit-bar__fill" style={{this.fillStyle}}></div></div>@@ -82,7 +82,7 @@ export default class AiCreditBar extends Component {</:trigger></DTooltip>{{else}}- <div class={{concatClass "ai-credit-bar" this.barClass}}>+ <div class={{dConcatClass "ai-credit-bar" this.barClass}}><div class="ai-credit-bar__progress"><div class="ai-credit-bar__fill" style={{this.fillStyle}}></div></div>diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-feature-card.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-feature-card.gjsindex 4eea816bc22..4be5ddf8b7a 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-feature-card.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-feature-card.gjs@@ -3,7 +3,7 @@ import { tracked } from "@glimmer/tracking";import { concat } from "@ember/helper";import { action } from "@ember/object";import { LinkTo } from "@ember/routing";-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";class ExpandableList extends Component {diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-features-list.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-features-list.gjsindex d931d016eca..80f0d44af72 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-features-list.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-features-list.gjs@@ -2,8 +2,8 @@ import Component from "@glimmer/component";import { concat } from "@ember/helper";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import { and, eq, not } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";import AiFeatureCard from "./ai-feature-card";diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-full-page-search.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-full-page-search.gjsindex 114ac59e6ba..704609bb298 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-full-page-search.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-full-page-search.gjs@@ -5,14 +5,14 @@ import { on } from "@ember/modifier";import { action } from "@ember/object";import didUpdate from "@ember/render-modifiers/modifiers/did-update";import { service } from "@ember/service";-import DToggleSwitch from "discourse/components/d-toggle-switch";import { SEARCH_TYPE_DEFAULT } from "discourse/controllers/full-page-search";import DTooltip from "discourse/float-kit/components/d-tooltip";import bodyClass from "discourse/helpers/body-class";-import concatClass from "discourse/helpers/concat-class";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import { isValidSearchTerm, translateResults } from "discourse/lib/search";+import DToggleSwitch from "discourse/ui-kit/d-toggle-switch";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";const AI_RESULTS_TOGGLED = "full-page-search:ai-results-toggled";@@ -291,7 +291,7 @@ export default class AiFullPageSearch extends Component {<DTooltip @identifier={{this.tooltipIdentifier}}><:trigger><div- class={{concatClass+ class={{dConcatClass"semantic-search__searching"this.searchClass}}@@ -308,7 +308,7 @@ export default class AiFullPageSearch extends Component {<div class="spinner small"></div>{{else if this.hasCompletedSearch}}<span- class={{concatClass+ class={{dConcatClass"badge-notification"(if this.AiResults.length "--has-results")}}@@ -321,7 +321,7 @@ export default class AiFullPageSearch extends Component {</DTooltip>{{else}}<div- class={{concatClass "semantic-search__searching" this.searchClass}}+ class={{dConcatClass "semantic-search__searching" this.searchClass}}><DToggleSwitchdisabled={{this.disableToggleSwitch}}@@ -335,7 +335,7 @@ export default class AiFullPageSearch extends Component {<div class="spinner small"></div>{{else if this.hasCompletedSearch}}<span- class={{concatClass+ class={{dConcatClass"badge-notification"(if this.AiResults.length "--has-results")}}diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-gist-toggle.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-gist-toggle.gjsindex f360b6bc480..6f6edb38c42 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-gist-toggle.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-gist-toggle.gjs@@ -2,11 +2,11 @@ import Component from "@glimmer/component";import { fn } from "@ember/helper";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import DropdownMenu from "discourse/components/dropdown-menu";import DMenu from "discourse/float-kit/components/d-menu";-import icon from "discourse/helpers/d-icon";import { eq } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";import { TABLE_AI_LAYOUT, TABLE_LAYOUT } from "../services/gists";@@ -62,10 +62,10 @@ export default class AiGistToggle extends Component {@triggerClass="btn-default btn-icon"><:trigger>- {{icon this.currentButton.icon}}+ {{dIcon this.currentButton.icon}}</:trigger><:content>- <DropdownMenu as |dropdown|>+ <DDropdownMenu as |dropdown|>{{#each this.buttons as |button|}}<dropdown.itemclass={{if (eq this.currentButton.id button.id) "--selected"}}@@ -85,7 +85,7 @@ export default class AiGistToggle extends Component {</DButton></dropdown.item>{{/each}}- </DropdownMenu>+ </DDropdownMenu></:content></DMenu>{{/if}}diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-helper-custom-prompt.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-helper-custom-prompt.gjsindex 23d3d039b9a..c3049e48dac 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-helper-custom-prompt.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-helper-custom-prompt.gjs@@ -2,9 +2,9 @@ import Component from "@glimmer/component";import { fn } from "@ember/helper";import { on } from "@ember/modifier";import { action } from "@ember/object";-import DButton from "discourse/components/d-button";import withEventValue from "discourse/helpers/with-event-value";import { not } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";export default class AiHelperCustomPrompt extends Component {diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-helper-loading.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-helper-loading.gjsindex a44d4767a7a..4d04138273e 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-helper-loading.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-helper-loading.gjs@@ -1,4 +1,4 @@-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";const AiHelperLoading = <template>diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-helper-options-list.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-helper-options-list.gjsindex fc3cc0ce173..6ef783468dc 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-helper-options-list.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-helper-options-list.gjs@@ -1,10 +1,10 @@import Component from "@glimmer/component";import { fn } from "@ember/helper";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import { translateModKey } from "discourse/lib/utilities";import { PLATFORM_KEY_MODIFIER } from "discourse/services/keyboard-shortcuts";import { and, eq } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";import AiHelperCustomPrompt from "../components/ai-helper-custom-prompt";export default class AiHelperOptionsList extends Component {diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-post-helper-menu.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-post-helper-menu.gjsindex a4a681ee6f3..c95b766aa6c 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-post-helper-menu.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-post-helper-menu.gjs@@ -4,17 +4,17 @@ import { action } from "@ember/object";import willDestroy from "@ember/render-modifiers/modifiers/will-destroy";import { service } from "@ember/service";import { modifier } from "ember-modifier";-import CookText from "discourse/components/cook-text";-import DButton from "discourse/components/d-button";import FastEdit from "discourse/components/fast-edit";import FastEditModal from "discourse/components/modal/fast-edit";-import concatClass from "discourse/helpers/concat-class";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import { bind } from "discourse/lib/decorators";import { sanitize } from "discourse/lib/text";import { clipboardCopy } from "discourse/lib/utilities";import { and, eq } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DCookText from "discourse/ui-kit/d-cook-text";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";import AiHelperLoading from "../components/ai-helper-loading";import AiHelperOptionsList from "../components/ai-helper-options-list";@@ -368,14 +368,14 @@ export default class AiPostHelperMenu extends Component {>{{#if this.suggestion}}<div- class={{concatClass+ class={{dConcatClass(if this.smoothStreamer.isStreaming "streaming")"streamable-content""ai-post-helper__suggestion__text"}}dir="auto">- <CookText+ <DCookText@rawText={{this.smoothStreamer.renderedText}}class="cooked"/>diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-regen-summaries-buttons.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-regen-summaries-buttons.gjsindex 0d4008b02e4..a7f39d8853b 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-regen-summaries-buttons.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-regen-summaries-buttons.gjs@@ -1,8 +1,8 @@import Component from "@glimmer/component";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import { ajax } from "discourse/lib/ajax";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";export default class AiRegenSummariesButtons extends Component {diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-search-discoveries-tooltip.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-search-discoveries-tooltip.gjsindex 8824f5aaf96..982df8a9fd3 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-search-discoveries-tooltip.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-search-discoveries-tooltip.gjs@@ -1,8 +1,8 @@import Component from "@glimmer/component";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import DTooltip from "discourse/float-kit/components/d-tooltip";-import icon from "discourse/helpers/d-icon";+import DButton from "discourse/ui-kit/d-button";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class AiSearchDiscoveriesTooltip extends Component {@@ -12,7 +12,7 @@ export default class AiSearchDiscoveriesTooltip extends Component {<span class="ai-search-discoveries-tooltip"><DTooltip @placement="top-end" @interactive={{true}}><:trigger>- {{icon "circle-info"}}+ {{dIcon "circle-info"}}</:trigger><:content><div class="ai-search-discoveries-tooltip__content">diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-search-discoveries.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-search-discoveries.gjsindex af4f0ff132e..b9b93ab7b53 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-search-discoveries.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-search-discoveries.gjs@@ -6,15 +6,15 @@ import didInsert from "@ember/render-modifiers/modifiers/did-insert";import didUpdate from "@ember/render-modifiers/modifiers/did-update";import willDestroy from "@ember/render-modifiers/modifiers/will-destroy";import { service } from "@ember/service";-import CookText from "discourse/components/cook-text";-import DButton from "discourse/components/d-button";-import concatClass from "discourse/helpers/concat-class";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import { bind } from "discourse/lib/decorators";import { wantsNewWindow } from "discourse/lib/intercept-click";import DiscourseURL from "discourse/lib/url";import Topic from "discourse/models/topic";+import DButton from "discourse/ui-kit/d-button";+import DCookText from "discourse/ui-kit/d-cook-text";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";import AiBlinkingAnimation from "./ai-blinking-animation";import AiIndicatorWave from "./ai-indicator-wave";@@ -220,7 +220,7 @@ export default class AiSearchDiscoveries extends Component {{{else}}{{! template-lint-disable no-invalid-interactive }}<article- class={{concatClass+ class={{dConcatClass"ai-search-discoveries__discovery"(if this.renderPreviewOnly "preview")(if this.discobotDiscoveries.isStreaming "streaming")@@ -228,7 +228,7 @@ export default class AiSearchDiscoveries extends Component {}}{{on "click" this.handleDiscoveryClick}}>- <CookText+ <DCookText@rawText={{this.discobotDiscoveries.streamedText}}class="cooked"/>diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-secret-selector.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-secret-selector.gjsindex 19bbb61a50a..1cfd795221c 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-secret-selector.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-secret-selector.gjs@@ -3,8 +3,8 @@ import { tracked } from "@glimmer/tracking";import { hash } from "@ember/helper";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import ComboBox from "discourse/select-kit/components/combo-box";+import DButton from "discourse/ui-kit/d-button";import AiSecretCreateModal from "./modal/ai-secret-create-modal";export default class AiSecretSelector extends Component {diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-split-topic-suggester.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-split-topic-suggester.gjsindex ab86e91f6da..9e50e2f051a 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/components/ai-split-topic-suggester.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/ai-split-topic-suggester.gjs@@ -4,13 +4,13 @@ import { fn } from "@ember/helper";import { on } from "@ember/modifier";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import DMenu from "discourse/float-kit/components/d-menu";-import categoryBadge from "discourse/helpers/category-badge";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import { uniqueItemsFromArray } from "discourse/lib/array-tools";import { eq } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import dCategoryBadge from "discourse/ui-kit/helpers/d-category-badge";export default class AiSplitTopicSuggester extends Component {@service site;@@ -140,7 +140,7 @@ export default class AiSplitTopicSuggester extends Component {role="button"{{on "click" (fn this.applySuggestion suggestion menu)}}>- {{categoryBadge suggestion}}+ {{dCategoryBadge suggestion}}<span class="topic-count">x{{suggestion.totalTopicCount}}</span></li>diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/modal/ai-agent-mcp-tool-selector-modal.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/modal/ai-agent-mcp-tool-selector-modal.gjsindex 202e49c1b41..ac585e64a35 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/components/modal/ai-agent-mcp-tool-selector-modal.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/modal/ai-agent-mcp-tool-selector-modal.gjs@@ -3,9 +3,9 @@ import { cached, tracked } from "@glimmer/tracking";import { fn } from "@ember/helper";import { on } from "@ember/modifier";import { action } from "@ember/object";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";-import DModalCancel from "discourse/components/d-modal-cancel";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";+import DModalCancel from "discourse/ui-kit/d-modal-cancel";import { i18n } from "discourse-i18n";export default class AiAgentMcpToolSelectorModal extends Component {diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/modal/ai-llm-quota-modal.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/modal/ai-llm-quota-modal.gjsindex 859ad30afa3..ce7df452600 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/components/modal/ai-llm-quota-modal.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/modal/ai-llm-quota-modal.gjs@@ -3,10 +3,10 @@ import { cached } from "@glimmer/tracking";import { fn, hash } from "@ember/helper";import { action } from "@ember/object";import { service } from "@ember/service";-import DModal from "discourse/components/d-modal";import Form from "discourse/components/form";import { AUTO_GROUPS } from "discourse/lib/constants";import GroupChooser from "discourse/select-kit/components/group-chooser";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";import DurationSelector from "../ai-quota-duration-selector";diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/modal/ai-mcp-server-tools-modal.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/modal/ai-mcp-server-tools-modal.gjsindex 184d296dfc2..a41bfceb9f5 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/components/modal/ai-mcp-server-tools-modal.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/modal/ai-mcp-server-tools-modal.gjs@@ -1,4 +1,4 @@-import DModal from "discourse/components/d-modal";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";<template>diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/modal/ai-regen-summaries-modal.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/modal/ai-regen-summaries-modal.gjsindex 2491df875f2..8d6796a471a 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/components/modal/ai-regen-summaries-modal.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/modal/ai-regen-summaries-modal.gjs@@ -1,7 +1,7 @@import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";-import DModal from "discourse/components/d-modal";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";import AiRegenSummariesButtons from "../ai-regen-summaries-buttons";diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/modal/ai-secret-create-modal.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/modal/ai-secret-create-modal.gjsindex 8e1af668f51..f62374f16ff 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/components/modal/ai-secret-create-modal.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/modal/ai-secret-create-modal.gjs@@ -1,10 +1,10 @@import Component from "@glimmer/component";import { cached } from "@glimmer/tracking";import { action } from "@ember/object";-import DModal from "discourse/components/d-modal";import Form from "discourse/components/form";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";export default class AiSecretCreateModal extends Component {diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/modal/ai-summary-modal.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/modal/ai-summary-modal.gjsindex 969b5ecabde..b96084ce457 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/components/modal/ai-summary-modal.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/modal/ai-summary-modal.gjs@@ -6,17 +6,17 @@ import didInsert from "@ember/render-modifiers/modifiers/did-insert";import didUpdate from "@ember/render-modifiers/modifiers/did-update";import willDestroy from "@ember/render-modifiers/modifiers/will-destroy";import { service } from "@ember/service";-import CookText from "discourse/components/cook-text";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";import DTooltip from "discourse/float-kit/components/d-tooltip";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import htmlClass from "discourse/helpers/html-class";import { ajax } from "discourse/lib/ajax";import { bind } from "discourse/lib/decorators";import { smartShortDate } from "discourse/lib/formatter";import { not } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DCookText from "discourse/ui-kit/d-cook-text";+import DModal from "discourse/ui-kit/d-modal";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";import AiSummarySkeleton from "../../components/ai-summary-skeleton";import {@@ -206,7 +206,7 @@ export default class AiSummaryModal extends Component {{{htmlClass "scrollable-modal"}}<div class="ai-summary-container" {{didInsert this.generateSummary}}><article- class={{concatClass+ class={{dConcatClass"ai-summary-box""streamable-content"(if this.smoothStreamer.isStreaming "streaming")@@ -216,7 +216,7 @@ export default class AiSummaryModal extends Component {<AiSummarySkeleton />{{else}}<div class="generated-summary cooked">- <CookText @rawText={{this.smoothStreamer.renderedText}} />+ <DCookText @rawText={{this.smoothStreamer.renderedText}} /></div>{{/if}}</article>@@ -227,7 +227,7 @@ export default class AiSummaryModal extends Component {{{i18n "summary.summarized_on" date=this.summarizedOn}}<DTooltip @placements={{array "top-end"}}><:trigger>- {{icon "circle-info"}}+ {{dIcon "circle-info"}}</:trigger><:content>{{i18n "summary.model_used" model=this.summarizedBy}}diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/modal/ai-tool-test-modal.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/modal/ai-tool-test-modal.gjsindex 306d3d83455..4072f27fff8 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/components/modal/ai-tool-test-modal.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/modal/ai-tool-test-modal.gjs@@ -3,11 +3,11 @@ import { tracked } from "@glimmer/tracking";import { fn } from "@ember/helper";import { on } from "@ember/modifier";import { action } from "@ember/object";-import CookText from "discourse/components/cook-text";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";+import DButton from "discourse/ui-kit/d-button";+import DCookText from "discourse/ui-kit/d-cook-text";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";import { jsonToHtml } from "../../lib/utilities";@@ -76,7 +76,7 @@ export default class AiToolTestModal extends Component {{{#if this.customRaw}}<div class="ai-tool-test-modal__custom-raw">- <CookText @rawText={{this.customRaw}} />+ <DCookText @rawText={{this.customRaw}} /></div>{{/if}}</:body>diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/modal/chat-modal-channel-summary.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/modal/chat-modal-channel-summary.gjsindex 86ccd2fdd13..e41fbf10000 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/components/modal/chat-modal-channel-summary.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/modal/chat-modal-channel-summary.gjs@@ -1,12 +1,12 @@import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";-import ConditionalLoadingSection from "discourse/components/conditional-loading-section";-import DModal from "discourse/components/d-modal";-import DModalCancel from "discourse/components/d-modal-cancel";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import ComboBox from "discourse/select-kit/components/combo-box";+import DConditionalLoadingSection from "discourse/ui-kit/d-conditional-loading-section";+import DModal from "discourse/ui-kit/d-modal";+import DModalCancel from "discourse/ui-kit/d-modal-cancel";import { i18n } from "discourse-i18n";import {isAiCreditLimitError,@@ -80,9 +80,9 @@ export default class ChatModalChannelSummary extends Component {@valueProperty="value"class="summarization-since"/>- <ConditionalLoadingSection @isLoading={{this.loading}}>+ <DConditionalLoadingSection @isLoading={{this.loading}}><p class="summary-area">{{this.summary}}</p>- </ConditionalLoadingSection>+ </DConditionalLoadingSection></:body><:footer><DModalCancel @close={{@closeModal}} />diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/modal/debug-ai-modal.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/modal/debug-ai-modal.gjsindex c8f27088b2d..e5f3dc64da7 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/components/modal/debug-ai-modal.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/modal/debug-ai-modal.gjs@@ -4,12 +4,12 @@ import { on } from "@ember/modifier";import { action } from "@ember/object";import { next } from "@ember/runloop";import { trustHTML } from "@ember/template";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import discourseLater from "discourse/lib/later";import { clipboardCopy, escapeExpression } from "discourse/lib/utilities";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";import { jsonToHtml } from "../../lib/utilities";diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/modal/diff-modal.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/modal/diff-modal.gjsindex ba3a3b93bfe..2bc4861dede 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/components/modal/diff-modal.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/modal/diff-modal.gjs@@ -5,15 +5,15 @@ import didUpdate from "@ember/render-modifiers/modifiers/did-update";import willDestroy from "@ember/render-modifiers/modifiers/will-destroy";import { service } from "@ember/service";import { trustHTML } from "@ember/template";-import CookText from "discourse/components/cook-text";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";-import concatClass from "discourse/helpers/concat-class";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import { bind } from "discourse/lib/decorators";import { escapeExpression } from "discourse/lib/utilities";import { or } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DCookText from "discourse/ui-kit/d-cook-text";+import DModal from "discourse/ui-kit/d-modal";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";import {isAiCreditLimitError,@@ -212,7 +212,7 @@ export default class ModalDiffModal extends Component {<:body><div {{willDestroy this.cleanup}} class="text-preview"><div- class={{concatClass+ class={{dConcatClass"composer-ai-helper-modal__suggestion""streamable-content"(if this.isStreaming "streaming")@@ -225,7 +225,7 @@ export default class ModalDiffModal extends Component {<span class="diff-inner">{{trustHTML this.diffResult}}</span>{{else}}{{#if (or this.loading this.smoothStreamer.isStreaming)}}- <CookText+ <DCookText@rawText={{this.smoothStreamerResult}}class="cooked"/>@@ -234,7 +234,7 @@ export default class ModalDiffModal extends Component {{{~this.escapedSelectedText~}}</div><div class="composer-ai-helper-modal__new-value">- <CookText+ <DCookText@rawText={{this.smoothStreamerResult}}class="cooked"/>diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/modal/share-full-topic-modal.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/modal/share-full-topic-modal.gjsindex 92a4ffefa23..bf51a71debd 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/components/modal/share-full-topic-modal.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/modal/share-full-topic-modal.gjs@@ -4,12 +4,12 @@ import { on } from "@ember/modifier";import { action } from "@ember/object";import { service } from "@ember/service";import { trustHTML } from "@ember/template";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import { getAbsoluteURL } from "discourse/lib/get-url";import { clipboardCopyAsync } from "discourse/lib/utilities";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";export default class ShareModal extends Component {diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/modal/share-modal.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/modal/share-modal.gjsindex eb3651c139b..851ca9da8ec 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/components/modal/share-modal.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/modal/share-modal.gjs@@ -5,9 +5,9 @@ import { on } from "@ember/modifier";import { action } from "@ember/object";import { service } from "@ember/service";import { trustHTML } from "@ember/template";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";import discourseLater from "discourse/lib/later";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";import { showShareConversationModal } from "../../lib/ai-bot-helper";import copyConversation from "../../lib/copy-conversation";diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/modal/spam-test-modal.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/modal/spam-test-modal.gjsindex 97311fe4e43..5cbbb0aeec8 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/components/modal/spam-test-modal.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/modal/spam-test-modal.gjs@@ -3,11 +3,11 @@ import { tracked } from "@glimmer/tracking";import { fn } from "@ember/helper";import { on } from "@ember/modifier";import { action } from "@ember/object";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";import withEventValue from "discourse/helpers/with-event-value";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";import AiIndicatorWave from "../ai-indicator-wave";diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/modal/thumbnail-suggestions.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/modal/thumbnail-suggestions.gjsindex 90ee7e498bf..00033c61086 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/components/modal/thumbnail-suggestions.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/modal/thumbnail-suggestions.gjs@@ -1,12 +1,12 @@import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";-import DModalCancel from "discourse/components/d-modal-cancel";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DModal from "discourse/ui-kit/d-modal";+import DModalCancel from "discourse/ui-kit/d-modal-cancel";import { i18n } from "discourse-i18n";import {isAiCreditLimitError,@@ -99,7 +99,7 @@ export default class ThumbnailSuggestions extends Component {@closeModal={{@closeModal}}><:body>- <ConditionalLoadingSpinner @condition={{this.loading}}>+ <DConditionalLoadingSpinner @condition={{this.loading}}><div class="ai-thumbnail-suggestions">{{#each this.thumbnails as |thumbnail|}}<ThumbnailSuggestionItem@@ -109,7 +109,7 @@ export default class ThumbnailSuggestions extends Component {/>{{/each}}</div>- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner></:body><:footer>diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/post-menu/ai-cancel-streaming-button.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/post-menu/ai-cancel-streaming-button.gjsindex 3fa2170e8ee..a6ee739f13c 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/components/post-menu/ai-cancel-streaming-button.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/post-menu/ai-cancel-streaming-button.gjs@@ -1,8 +1,8 @@import Component from "@glimmer/component";import { action } from "@ember/object";-import DButton from "discourse/components/d-button";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";+import DButton from "discourse/ui-kit/d-button";export default class AiCancelStreamingButton extends Component {@actiondiff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/post-menu/ai-debug-button.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/post-menu/ai-debug-button.gjsindex 5ee57f4e4b4..35950a82144 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/components/post-menu/ai-debug-button.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/post-menu/ai-debug-button.gjs@@ -1,7 +1,7 @@import Component from "@glimmer/component";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";import { isPostFromAiBot } from "../../lib/ai-bot-helper";import DebugAiModal from "../modal/debug-ai-modal";diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/post-menu/ai-retry-streaming-button.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/post-menu/ai-retry-streaming-button.gjsindex 21f64e3d411..391de4aae57 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/components/post-menu/ai-retry-streaming-button.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/post-menu/ai-retry-streaming-button.gjs@@ -1,9 +1,9 @@import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";-import DButton from "discourse/components/d-button";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";+import DButton from "discourse/ui-kit/d-button";/*** @component AiRetryStreamingButtondiff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/post-menu/ai-share-button.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/post-menu/ai-share-button.gjsindex 28704e32354..09eae430d37 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/components/post-menu/ai-share-button.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/post-menu/ai-share-button.gjs@@ -1,7 +1,7 @@import Component from "@glimmer/component";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";import { isPostFromAiBot } from "../../lib/ai-bot-helper";import copyConversation from "../../lib/copy-conversation";import ShareModal from "../modal/share-modal";diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/post/meta-data/ai-cancel-streaming.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/post/meta-data/ai-cancel-streaming.gjsindex 117f24e4470..954cd603eca 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/components/post/meta-data/ai-cancel-streaming.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/post/meta-data/ai-cancel-streaming.gjs@@ -1,8 +1,8 @@import Component from "@glimmer/component";import { action } from "@ember/object";-import DButton from "discourse/components/d-button";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";+import DButton from "discourse/ui-kit/d-button";/*** @component AiCancelStreamingdiff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/rag-upload-progress.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/rag-upload-progress.gjsindex d64810185b6..901df53c98b 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/components/rag-upload-progress.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/rag-upload-progress.gjs@@ -3,8 +3,8 @@ import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";import didInsert from "@ember/render-modifiers/modifiers/did-insert";import { service } from "@ember/service";-import icon from "discourse/helpers/d-icon";import { bind } from "discourse/lib/decorators";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class RagUploadProgress extends Component {@@ -67,12 +67,12 @@ export default class RagUploadProgress extends Component {{{#if this.progress}}{{#if this.fullyIndexed}}<span class="indexed">- {{icon "check"}}+ {{dIcon "check"}}{{i18n "discourse_ai.rag.uploads.indexed"}}</span>{{else}}<span class="indexing">- {{icon "robot"}}+ {{dIcon "robot"}}{{i18n "discourse_ai.rag.uploads.indexing"}}{{this.calculateProgress}}%</span>diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/rag-uploader.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/rag-uploader.gjsindex d0c16924b9e..86bf2eff808 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/components/rag-uploader.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/rag-uploader.gjs@@ -8,13 +8,13 @@ import { getOwner } from "@ember/owner";import didInsert from "@ember/render-modifiers/modifiers/did-insert";import { service } from "@ember/service";import { tagName } from "@ember-decorators/component";-import DButton from "discourse/components/d-button";-import icon from "discourse/helpers/d-icon";import { ajax } from "discourse/lib/ajax";import { removeValueFromArray } from "discourse/lib/array-tools";import discourseDebounce from "discourse/lib/debounce";import { autoTrackedArray } from "discourse/lib/tracked-tools";import UppyUpload from "discourse/lib/uppy/uppy-upload";+import DButton from "discourse/ui-kit/d-button";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";import RagUploadProgress from "./rag-upload-progress";@@ -140,7 +140,7 @@ export default class RagUploader extends Component {{{#if this.ragUploads}}<div class="rag-uploader__search-input-container"><div class="rag-uploader__search-input">- {{icon+ {{dIcon"magnifying-glass"class="rag-uploader__search-input__search-icon"}}@@ -159,7 +159,9 @@ export default class RagUploader extends Component {{{#each this.filteredUploads as |upload|}}<tr><td>- <span class="rag-uploader__rag-file-icon">{{icon "file"}}</span>+ <span class="rag-uploader__rag-file-icon">{{dIcon+ "file"+ }}</span>{{upload.original_filename}}</td><RagUploadProgress@@ -178,7 +180,7 @@ export default class RagUploader extends Component {{{/each}}{{#each this.uppyUpload.inProgressUploads as |upload|}}<tr>- <td><span class="rag-uploader__rag-file-icon">{{icon+ <td><span class="rag-uploader__rag-file-icon">{{dIcon"file"}}</span>{{upload.original_filename}}</td>diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/reviewable/ai-tool-action.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/reviewable/ai-tool-action.gjsindex 4c6fe0cd417..3c77f9d1201 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/components/reviewable/ai-tool-action.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/reviewable/ai-tool-action.gjs@@ -1,6 +1,6 @@import Component from "@glimmer/component";import { trustHTML } from "@ember/template";-import DecoratedHtml from "discourse/components/decorated-html";+import DDecoratedHtml from "discourse/ui-kit/d-decorated-html";import { i18n } from "discourse-i18n";export default class ReviewableAiToolAction extends Component {@@ -46,7 +46,7 @@ export default class ReviewableAiToolAction extends Component {{{#if @reviewable.cooked}}<div class="review-item__post"><div class="review-item__post-content-wrapper">- <DecoratedHtml+ <DDecoratedHtml@className="review-item__post-content"@html={{trustHTML @reviewable.cooked}}@model={{@reviewable}}diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/suggestion-menus/ai-category-suggester.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/suggestion-menus/ai-category-suggester.gjsindex 7c157210a65..87707a6125f 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/components/suggestion-menus/ai-category-suggester.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/suggestion-menus/ai-category-suggester.gjs@@ -4,12 +4,12 @@ import { array, fn } from "@ember/helper";import { on } from "@ember/modifier";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import DropdownMenu from "discourse/components/dropdown-menu";import DMenu from "discourse/float-kit/components/d-menu";-import categoryBadge from "discourse/helpers/category-badge";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";+import DButton from "discourse/ui-kit/d-button";+import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";+import dCategoryBadge from "discourse/ui-kit/helpers/d-category-badge";import { i18n } from "discourse-i18n";import {MIN_CHARACTER_COUNT,@@ -132,7 +132,7 @@ export default class AiCategorySuggester extends Component {><:content>{{#if this.showDropdown}}- <DropdownMenu as |dropdown|>+ <DDropdownMenu as |dropdown|>{{#each this.suggestions as |suggestion index|}}<dropdown.item><DButton@@ -143,14 +143,14 @@ export default class AiCategorySuggester extends Component {@action={{fn this.applySuggestion suggestion}}><div class="category-status">- {{categoryBadge suggestion}}+ {{dCategoryBadge suggestion}}<span class="topic-count">x{{suggestion.topicCount}}</span></div></DButton></dropdown.item>{{/each}}- </DropdownMenu>+ </DDropdownMenu>{{/if}}</:content></DMenu>diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/suggestion-menus/ai-tag-suggester.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/suggestion-menus/ai-tag-suggester.gjsindex cef17ebc013..1f0295cc1f3 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/components/suggestion-menus/ai-tag-suggester.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/suggestion-menus/ai-tag-suggester.gjs@@ -4,12 +4,12 @@ import { array, fn } from "@ember/helper";import { on } from "@ember/modifier";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import DropdownMenu from "discourse/components/dropdown-menu";import DMenu from "discourse/float-kit/components/d-menu";-import discourseTag from "discourse/helpers/discourse-tag";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";+import DButton from "discourse/ui-kit/d-button";+import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";+import dDiscourseTag from "discourse/ui-kit/helpers/d-discourse-tag";import { i18n } from "discourse-i18n";import {MIN_CHARACTER_COUNT,@@ -175,7 +175,7 @@ export default class AiTagSuggester extends Component {><:content>{{#if this.showDropdown}}- <DropdownMenu as |dropdown|>+ <DDropdownMenu as |dropdown|>{{#each this.suggestions as |suggestion index|}}<dropdown.item><DButton@@ -187,7 +187,7 @@ export default class AiTagSuggester extends Component {@disabled={{suggestion.disabled}}@action={{fn this.applySuggestion suggestion}}>- {{discourseTag+ {{dDiscourseTagsuggestion.namecount=suggestion.countnoHref=true@@ -195,7 +195,7 @@ export default class AiTagSuggester extends Component {</DButton></dropdown.item>{{/each}}- </DropdownMenu>+ </DDropdownMenu>{{/if}}</:content></DMenu>diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/suggestion-menus/ai-title-suggester.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/suggestion-menus/ai-title-suggester.gjsindex 684696aa8b7..fea66aa48ab 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/components/suggestion-menus/ai-title-suggester.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/suggestion-menus/ai-title-suggester.gjs@@ -3,11 +3,11 @@ import { tracked } from "@glimmer/tracking";import { array, fn } from "@ember/helper";import { on } from "@ember/modifier";import { action } from "@ember/object";-import DButton from "discourse/components/d-button";-import DropdownMenu from "discourse/components/dropdown-menu";import DMenu from "discourse/float-kit/components/d-menu";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";+import DButton from "discourse/ui-kit/d-button";+import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";import { i18n } from "discourse-i18n";import {isAiCreditLimitError,@@ -135,7 +135,7 @@ export default class AiTitleSuggester extends Component {><:content>{{#if this.showDropdown}}- <DropdownMenu as |dropdown|>+ <DDropdownMenu as |dropdown|>{{#each this.suggestions as |suggestion index|}}<dropdown.item><DButton@@ -147,7 +147,7 @@ export default class AiTitleSuggester extends Component {/></dropdown.item>{{/each}}- </DropdownMenu>+ </DDropdownMenu>{{/if}}</:content></DMenu>diff --git a/plugins/discourse-ai/assets/javascripts/discourse/components/thumbnail-suggestion-item.gjs b/plugins/discourse-ai/assets/javascripts/discourse/components/thumbnail-suggestion-item.gjsindex 8a6f9325296..7d78a950090 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/components/thumbnail-suggestion-item.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/components/thumbnail-suggestion-item.gjs@@ -2,7 +2,7 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { fn } from "@ember/helper";import { action } from "@ember/object";-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";export default class ThumbnailSuggestionItem extends Component {@tracked selected = false;diff --git a/plugins/discourse-ai/assets/javascripts/discourse/connectors/admin-customize-theme-translation-selector/ai-theme-translate.gjs b/plugins/discourse-ai/assets/javascripts/discourse/connectors/admin-customize-theme-translation-selector/ai-theme-translate.gjsindex 3e02ca9a69b..036d59f9c27 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/connectors/admin-customize-theme-translation-selector/ai-theme-translate.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/connectors/admin-customize-theme-translation-selector/ai-theme-translate.gjs@@ -1,9 +1,9 @@import Component from "@glimmer/component";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import { ajax } from "discourse/lib/ajax";import { extractError } from "discourse/lib/ajax-error";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";export default class AiThemeTranslate extends Component {diff --git a/plugins/discourse-ai/assets/javascripts/discourse/connectors/after-search-result-entry/search-result-decoration.gjs b/plugins/discourse-ai/assets/javascripts/discourse/connectors/after-search-result-entry/search-result-decoration.gjsindex f226ef118c7..76e530f2026 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/connectors/after-search-result-entry/search-result-decoration.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/connectors/after-search-result-entry/search-result-decoration.gjs@@ -1,4 +1,4 @@-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";const SearchResultDecoration = <template>@@ -6,7 +6,7 @@ const SearchResultDecoration = <template>class="ai-result__icon"title={{i18n "discourse_ai.embeddings.ai_generated_result"}}>- {{icon "discourse-sparkles"}}+ {{dIcon "discourse-sparkles"}}</div></template>;diff --git a/plugins/discourse-ai/assets/javascripts/discourse/connectors/editor-preview/ai-image-caption-container.gjs b/plugins/discourse-ai/assets/javascripts/discourse/connectors/editor-preview/ai-image-caption-container.gjsindex e686074109a..dcb11bf17f8 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/connectors/editor-preview/ai-image-caption-container.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/connectors/editor-preview/ai-image-caption-container.gjs@@ -5,11 +5,11 @@ import didInsert from "@ember/render-modifiers/modifiers/did-insert";import didUpdate from "@ember/render-modifiers/modifiers/did-update";import willDestroy from "@ember/render-modifiers/modifiers/will-destroy";import { service } from "@ember/service";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DButton from "discourse/components/d-button";-import DTextarea from "discourse/components/d-textarea";-import icon from "discourse/helpers/d-icon";-import autoFocus from "discourse/modifiers/auto-focus";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DTextarea from "discourse/ui-kit/d-textarea";+import dIcon from "discourse/ui-kit/helpers/d-icon";+import dAutoFocus from "discourse/ui-kit/modifiers/d-auto-focus";import { i18n } from "discourse-i18n";export default class AiImageCaptionContainer extends Component {@@ -58,7 +58,7 @@ export default class AiImageCaptionContainer extends Component {class="composer-popup education-message ai-caption-popup"{{willDestroy this.hidePopup}}>- <ConditionalLoadingSpinner+ <DConditionalLoadingSpinner@condition={{this.imageCaptionPopup.loading}}><DTextarea@@ -66,9 +66,9 @@ export default class AiImageCaptionContainer extends Component {{{didUpdate this.resizeTextarea this.imageCaptionPopup.newCaption}}@value={{this.imageCaptionPopup.newCaption}}{{on "change" this.updateCaption}}- {{autoFocus}}+ {{dAutoFocus}}/>- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner><div class="actions"><DButton@@ -84,7 +84,7 @@ export default class AiImageCaptionContainer extends Component {/><span class="credits">- {{icon "discourse-sparkles"}}+ {{dIcon "discourse-sparkles"}}<span>{{i18n "discourse_ai.ai_helper.image_caption.credits"}}</span></span></div>diff --git a/plugins/discourse-ai/assets/javascripts/discourse/connectors/fast-edit-footer-after/ai-edit-suggestion-button.gjs b/plugins/discourse-ai/assets/javascripts/discourse/connectors/fast-edit-footer-after/ai-edit-suggestion-button.gjsindex f5388d0ebf3..b7653bbe38d 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/connectors/fast-edit-footer-after/ai-edit-suggestion-button.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/connectors/fast-edit-footer-after/ai-edit-suggestion-button.gjs@@ -2,9 +2,9 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";+import DButton from "discourse/ui-kit/d-button";import { showPostAIHelper } from "../../lib/show-ai-helper";export default class AiEditSuggestionButton extends Component {diff --git a/plugins/discourse-ai/assets/javascripts/discourse/connectors/full-page-search-below-search-header/ai-full-page-discobot-discoveries.gjs b/plugins/discourse-ai/assets/javascripts/discourse/connectors/full-page-search-below-search-header/ai-full-page-discobot-discoveries.gjsindex 1c6635fdecb..420a26c5424 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/connectors/full-page-search-below-search-header/ai-full-page-discobot-discoveries.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/connectors/full-page-search-below-search-header/ai-full-page-discobot-discoveries.gjs@@ -2,8 +2,8 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { service } from "@ember/service";import bodyClass from "discourse/helpers/body-class";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";import AiSearchDiscoveries from "../../components/ai-search-discoveries";import AiSearchDiscoveriesTooltip from "../../components/ai-search-discoveries-tooltip";@@ -56,7 +56,7 @@ export default class AiFullPageDiscobotDiscoveries extends Component {{{#if this.shouldShow}}{{bodyClass "has-discoveries"}}<div- class={{concatClass+ class={{dConcatClass"ai-search-discoveries__discoveries-wrapper"(if this.discobotDiscoveries.showDiscoveryTitle "--has-content")}}@@ -66,7 +66,7 @@ export default class AiFullPageDiscobotDiscoveries extends Component {class="ai-search-discoveries__discoveries-title full-page-discoveries"><span>- {{icon "discobot"}}+ {{dIcon "discobot"}}{{i18n "discourse_ai.discobot_discoveries.main_title"}}</span><AiSearchDiscoveriesTooltip />diff --git a/plugins/discourse-ai/assets/javascripts/discourse/connectors/post-menu-translations-dropdown/ai-post-menu-translation-extras.gjs b/plugins/discourse-ai/assets/javascripts/discourse/connectors/post-menu-translations-dropdown/ai-post-menu-translation-extras.gjsindex 9e61c262d0c..267f0e0a84d 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/connectors/post-menu-translations-dropdown/ai-post-menu-translation-extras.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/connectors/post-menu-translations-dropdown/ai-post-menu-translation-extras.gjs@@ -1,9 +1,9 @@import Component from "@glimmer/component";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";export default class AiPostMenuTranslationExtras extends Component {diff --git a/plugins/discourse-ai/assets/javascripts/discourse/connectors/post-text-buttons/ai-post-helper-trigger.gjs b/plugins/discourse-ai/assets/javascripts/discourse/connectors/post-text-buttons/ai-post-helper-trigger.gjsindex 0d5bd4281f6..f737289d06d 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/connectors/post-text-buttons/ai-post-helper-trigger.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/connectors/post-text-buttons/ai-post-helper-trigger.gjs@@ -2,8 +2,8 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import { selectedRange } from "discourse/lib/utilities";+import DButton from "discourse/ui-kit/d-button";import AiPostHelperMenu from "../../components/ai-post-helper-menu";import { showPostAIHelper } from "../../lib/show-ai-helper";diff --git a/plugins/discourse-ai/assets/javascripts/discourse/connectors/search-menu-before-advanced-search/ai-quick-search-loader.gjs b/plugins/discourse-ai/assets/javascripts/discourse/connectors/search-menu-before-advanced-search/ai-quick-search-loader.gjsindex 84668acbc30..cef173e3ee5 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/connectors/search-menu-before-advanced-search/ai-quick-search-loader.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/connectors/search-menu-before-advanced-search/ai-quick-search-loader.gjs@@ -1,6 +1,6 @@import Component from "@glimmer/component";import { service } from "@ember/service";-import loadingSpinner from "discourse/helpers/loading-spinner";+import dLoadingSpinner from "discourse/ui-kit/helpers/d-loading-spinner";export default class AiQuickSearchLoader extends Component {@service quickSearch;@@ -8,7 +8,7 @@ export default class AiQuickSearchLoader extends Component {<template>{{#if this.quickSearch.loading}}<div class="ai-quick-search-spinner">- {{loadingSpinner}}+ {{dLoadingSpinner}}</div>{{/if}}</template>diff --git a/plugins/discourse-ai/assets/javascripts/discourse/connectors/search-menu-results-top/ai-discobot-discoveries.gjs b/plugins/discourse-ai/assets/javascripts/discourse/connectors/search-menu-results-top/ai-discobot-discoveries.gjsindex e3e966ddf06..b9d019b584b 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/connectors/search-menu-results-top/ai-discobot-discoveries.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/connectors/search-menu-results-top/ai-discobot-discoveries.gjs@@ -1,7 +1,7 @@import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { service } from "@ember/service";-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";import AiSearchDiscoveries from "../../components/ai-search-discoveries";import AiSearchDiscoveriesTooltip from "../../components/ai-search-discoveries-tooltip";@@ -48,7 +48,7 @@ export default class AiDiscobotDiscoveries extends Component {{{#if this.discobotDiscoveries.showDiscoveryTitle}}<h3 class="ai-search-discoveries__discoveries-title"><span>- {{icon "discobot"}}+ {{dIcon "discobot"}}{{i18n "discourse_ai.discobot_discoveries.main_title"}}</span>@@ -64,7 +64,7 @@ export default class AiDiscobotDiscoveries extends Component {{{#if this.search.results.topics.length}}<h3 class="ai-search-discoveries__regular-results-title">- {{icon "bars-staggered"}}+ {{dIcon "bars-staggered"}}{{i18n "discourse_ai.discobot_discoveries.regular_results"}}</h3>{{/if}}diff --git a/plugins/discourse-ai/assets/javascripts/discourse/connectors/topic-map-expanded-after/ai-summary-trigger.gjs b/plugins/discourse-ai/assets/javascripts/discourse/connectors/topic-map-expanded-after/ai-summary-trigger.gjsindex af1dfb58d19..2121cf3d763 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/connectors/topic-map-expanded-after/ai-summary-trigger.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/connectors/topic-map-expanded-after/ai-summary-trigger.gjs@@ -6,8 +6,8 @@ import didUpdate from "@ember/render-modifiers/modifiers/did-update";import { service } from "@ember/service";import { trustHTML } from "@ember/template";import { modifier } from "ember-modifier";-import DButton from "discourse/components/d-button";import EmbedMode from "discourse/lib/embed-mode";+import DButton from "discourse/ui-kit/d-button";import AiSummaryModal from "../../components/modal/ai-summary-modal";export default class AiSummaryTrigger extends Component {diff --git a/plugins/discourse-ai/assets/javascripts/discourse/connectors/topic-map-participants-after/ai-conversation-invite.gjs b/plugins/discourse-ai/assets/javascripts/discourse/connectors/topic-map-participants-after/ai-conversation-invite.gjsindex b657eae580e..0316c12f4a8 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/connectors/topic-map-participants-after/ai-conversation-invite.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/connectors/topic-map-participants-after/ai-conversation-invite.gjs@@ -1,10 +1,10 @@import Component from "@glimmer/component";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import Participant from "discourse/components/header/topic/participant";import AddPmParticipants from "discourse/components/modal/add-pm-participants";import { or } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";export default class AiConversationInvite extends Component {static shouldRender(args) {diff --git a/plugins/discourse-ai/assets/javascripts/discourse/initializers/related-topics.gjs b/plugins/discourse-ai/assets/javascripts/discourse/initializers/related-topics.gjsindex 0dcce5772f8..14780f182d3 100644--- a/plugins/discourse-ai/assets/javascripts/discourse/initializers/related-topics.gjs+++ b/plugins/discourse-ai/assets/javascripts/discourse/initializers/related-topics.gjs@@ -1,7 +1,7 @@import { tracked } from "@glimmer/tracking";import BasicTopicList from "discourse/components/basic-topic-list";-import icon from "discourse/helpers/d-icon";import { withPluginApi } from "discourse/lib/plugin-api";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";const RelatedTopics = <template>@@ -12,7 +12,7 @@ const RelatedTopics = <template>class="more-topics__list"><h3 id="related-topics-title" class="more-topics__list-title">- {{icon "discourse-sparkles"}}{{i18n "discourse_ai.related_topics.title"}}+ {{dIcon "discourse-sparkles"}}{{i18n "discourse_ai.related_topics.title"}}</h3><div class="topics"><BasicTopicList @topics={{@topic.relatedTopics}} @listContext="related" />diff --git a/plugins/discourse-assign/assets/javascripts/discourse/components/assign-button.gjs b/plugins/discourse-assign/assets/javascripts/discourse/components/assign-button.gjsindex 34ba780cd2b..28d9bc4e497 100644--- a/plugins/discourse-assign/assets/javascripts/discourse/components/assign-button.gjs+++ b/plugins/discourse-assign/assets/javascripts/discourse/components/assign-button.gjs@@ -1,7 +1,7 @@import Component from "@glimmer/component";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";export default class AssignButton extends Component {static shouldRender(args) {diff --git a/plugins/discourse-assign/assets/javascripts/discourse/components/assigned-to-first-post.gjs b/plugins/discourse-assign/assets/javascripts/discourse/components/assigned-to-first-post.gjsindex e8693e344d8..93cdc2fdb2e 100644--- a/plugins/discourse-assign/assets/javascripts/discourse/components/assigned-to-first-post.gjs+++ b/plugins/discourse-assign/assets/javascripts/discourse/components/assigned-to-first-post.gjs@@ -1,9 +1,9 @@import Component from "@glimmer/component";import { service } from "@ember/service";import { trustHTML } from "@ember/template";-import icon from "discourse/helpers/d-icon";import { bind } from "discourse/lib/decorators";import { escapeExpression } from "discourse/lib/utilities";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";import {assignedToGroupPath,@@ -80,7 +80,7 @@ export default class AssignedToFirstPost extends Component {<template>{{#if this.isAssigned}}<p class="assigned-to">- {{icon this.icon}}+ {{dIcon this.icon}}{{#if this.assignedToUser}}<span class="assignee"><span class="assigned-to--user">diff --git a/plugins/discourse-assign/assets/javascripts/discourse/components/assigned-to-post.gjs b/plugins/discourse-assign/assets/javascripts/discourse/components/assigned-to-post.gjsindex 9603f2fe58f..dcab6be4016 100644--- a/plugins/discourse-assign/assets/javascripts/discourse/components/assigned-to-post.gjs+++ b/plugins/discourse-assign/assets/javascripts/discourse/components/assigned-to-post.gjs@@ -1,10 +1,10 @@import Component from "@glimmer/component";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import DropdownMenu from "discourse/components/dropdown-menu";import DMenu from "discourse/float-kit/components/d-menu";-import icon from "discourse/helpers/d-icon";+import DButton from "discourse/ui-kit/d-button";+import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class AssignedToPost extends Component {@@ -31,9 +31,9 @@ export default class AssignedToPost extends Component {<template>{{#if @assignedToUser}}- {{icon "user-plus"}}+ {{dIcon "user-plus"}}{{else}}- {{icon "group-plus"}}+ {{dIcon "group-plus"}}{{/if}}<span class="assign-text">@@ -54,7 +54,7 @@ export default class AssignedToPost extends Component {class="btn-flat more-button"@autofocus={{true}}>- <DropdownMenu as |dropdown|>+ <DDropdownMenu as |dropdown|><dropdown.item><DButton@action={{this.unassign}}@@ -71,7 +71,7 @@ export default class AssignedToPost extends Component {class="btn-transparent edit-assignment-btn"/></dropdown.item>- </DropdownMenu>+ </DDropdownMenu></DMenu></template>}diff --git a/plugins/discourse-assign/assets/javascripts/discourse/components/assigned-to.gjs b/plugins/discourse-assign/assets/javascripts/discourse/components/assigned-to.gjsindex a5e0a9d3564..94b3082a68b 100644--- a/plugins/discourse-assign/assets/javascripts/discourse/components/assigned-to.gjs+++ b/plugins/discourse-assign/assets/javascripts/discourse/components/assigned-to.gjs@@ -1,8 +1,8 @@-import avatar from "discourse/helpers/avatar";+import dAvatar from "discourse/ui-kit/helpers/d-avatar";const AssignedTo = <template><div class="assigned-to-user">- {{avatar @user imageSize="small"}}+ {{dAvatar @user imageSize="small"}}<span class="assigned-username">{{@user.username}}diff --git a/plugins/discourse-assign/assets/javascripts/discourse/components/assignment.gjs b/plugins/discourse-assign/assets/javascripts/discourse/components/assignment.gjsindex a0ffb141bb9..19a392167a0 100644--- a/plugins/discourse-assign/assets/javascripts/discourse/components/assignment.gjs+++ b/plugins/discourse-assign/assets/javascripts/discourse/components/assignment.gjs@@ -3,11 +3,11 @@ import { hash } from "@ember/helper";import { on } from "@ember/modifier";import { action } from "@ember/object";import { service } from "@ember/service";-import TextArea from "discourse/components/textarea";-import icon from "discourse/helpers/d-icon";import ComboBox from "discourse/select-kit/components/combo-box";import EmailGroupUserChooser from "discourse/select-kit/components/email-group-user-chooser";import { not } from "discourse/truth-helpers";+import DTextarea from "discourse/ui-kit/d-textarea";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class Assignment extends Component {@@ -98,7 +98,7 @@ export default class Assignment extends Component {{{#if this.showAssigneeIeEmptyError}}<span class="error-label">- {{icon "triangle-exclamation"}}+ {{dIcon "triangle-exclamation"}}{{i18n "discourse_assign.assign_modal.choose_assignee"}}</span>{{/if}}@@ -123,7 +123,7 @@ export default class Assignment extends Component {>{{i18n "discourse_assign.assign_modal.optional_label"}}</span></label>- <TextArea+ <DTextareaid="assign-modal-note"@value={{@assignment.note}}{{on "keydown" this.handleTextAreaKeydown}}diff --git a/plugins/discourse-assign/assets/javascripts/discourse/components/bulk-actions/assign-user.gjs b/plugins/discourse-assign/assets/javascripts/discourse/components/bulk-actions/assign-user.gjsindex 6a21ec9afd3..48293ac295a 100644--- a/plugins/discourse-assign/assets/javascripts/discourse/components/bulk-actions/assign-user.gjs+++ b/plugins/discourse-assign/assets/javascripts/discourse/components/bulk-actions/assign-user.gjs@@ -1,7 +1,7 @@import Component from "@glimmer/component";import { action } from "@ember/object";import { trackedObject } from "@ember/reactive/collections";-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";import AssignUserForm from "../assign-user-form";export default class AssignUser extends Component {diff --git a/plugins/discourse-assign/assets/javascripts/discourse/components/group-assigned-filter.gjs b/plugins/discourse-assign/assets/javascripts/discourse/components/group-assigned-filter.gjsindex 1c8110b99c9..1266192ac12 100644--- a/plugins/discourse-assign/assets/javascripts/discourse/components/group-assigned-filter.gjs+++ b/plugins/discourse-assign/assets/javascripts/discourse/components/group-assigned-filter.gjs@@ -1,8 +1,8 @@import { hash } from "@ember/helper";import { LinkTo } from "@ember/routing";-import avatar from "discourse/helpers/avatar";-import icon from "discourse/helpers/d-icon";import formatUsername from "discourse/helpers/format-username";+import dAvatar from "discourse/ui-kit/helpers/d-avatar";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";const GroupAssignedFilter = <template>@@ -15,7 +15,7 @@ const GroupAssignedFilter = <template>><div class="assign-image"><a href={{@filter.userPath}} data-user-card={{@filter.username}}>- {{avatar @filter imageSize="small"}}+ {{dAvatar @filter imageSize="small"}}</a></div>@@ -35,7 +35,7 @@ const GroupAssignedFilter = <template>@query={{hash order=@order ascending=@ascending search=@search}}><div class="assign-image">- {{icon "group-plus"}}+ {{dIcon "group-plus"}}</div><div class="assign-names"><div class="assign-username">{{@groupName}}</div>diff --git a/plugins/discourse-assign/assets/javascripts/discourse/components/group-assigned-menu-item.gjs b/plugins/discourse-assign/assets/javascripts/discourse/components/group-assigned-menu-item.gjsindex 9bd557df199..b02fd56808e 100644--- a/plugins/discourse-assign/assets/javascripts/discourse/components/group-assigned-menu-item.gjs+++ b/plugins/discourse-assign/assets/javascripts/discourse/components/group-assigned-menu-item.gjs@@ -1,10 +1,10 @@import { LinkTo } from "@ember/routing";-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";const GroupAssignedMenuItem = <template><LinkTo @route="group.assigned">- {{icon "group-plus" class="glyph"}}{{i18n "discourse_assign.assigned"}}+ {{dIcon "group-plus" class="glyph"}}{{i18n "discourse_assign.assigned"}}{{#if @group.assignment_count}}({{@group.assignment_count}}){{/if}}</LinkTo></template>;diff --git a/plugins/discourse-assign/assets/javascripts/discourse/components/modal/assign-user.gjs b/plugins/discourse-assign/assets/javascripts/discourse/components/modal/assign-user.gjsindex 7d5073d0248..7748db5c989 100644--- a/plugins/discourse-assign/assets/javascripts/discourse/components/modal/assign-user.gjs+++ b/plugins/discourse-assign/assets/javascripts/discourse/components/modal/assign-user.gjs@@ -2,9 +2,9 @@ import Component from "@glimmer/component";import { action } from "@ember/object";import { trackedObject } from "@ember/reactive/collections";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";-import DModalCancel from "discourse/components/d-modal-cancel";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";+import DModalCancel from "discourse/ui-kit/d-modal-cancel";import { i18n } from "discourse-i18n";import AssignUserForm from "../assign-user-form";diff --git a/plugins/discourse-assign/assets/javascripts/discourse/components/modal/edit-topic-assignments.gjs b/plugins/discourse-assign/assets/javascripts/discourse/components/modal/edit-topic-assignments.gjsindex 08650095321..d861aba0fcc 100644--- a/plugins/discourse-assign/assets/javascripts/discourse/components/modal/edit-topic-assignments.gjs+++ b/plugins/discourse-assign/assets/javascripts/discourse/components/modal/edit-topic-assignments.gjs@@ -1,10 +1,10 @@import Component from "@glimmer/component";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";-import DModalCancel from "discourse/components/d-modal-cancel";import { popupAjaxError } from "discourse/lib/ajax-error";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";+import DModalCancel from "discourse/ui-kit/d-modal-cancel";import { i18n } from "discourse-i18n";import TopicAssignments from "../topic-assignments";diff --git a/plugins/discourse-assign/assets/javascripts/discourse/components/topic-level-assign-menu.js b/plugins/discourse-assign/assets/javascripts/discourse/components/topic-level-assign-menu.jsindex 9069ece2cd3..f5ec028f01a 100644--- a/plugins/discourse-assign/assets/javascripts/discourse/components/topic-level-assign-menu.js+++ b/plugins/discourse-assign/assets/javascripts/discourse/components/topic-level-assign-menu.js@@ -1,8 +1,8 @@import { getOwner } from "@ember/owner";import { trustHTML } from "@ember/template";-import { renderAvatar } from "discourse/helpers/user-avatar";import { iconHTML } from "discourse/lib/icon-library";import { escapeExpression } from "discourse/lib/utilities";+import { renderAvatar } from "discourse/ui-kit/helpers/d-user-avatar";import { i18n } from "discourse-i18n";import EditTopicAssignments from "../components/modal/edit-topic-assignments";diff --git a/plugins/discourse-assign/assets/javascripts/discourse/components/user-menu/assigns-list-empty-state.gjs b/plugins/discourse-assign/assets/javascripts/discourse/components/user-menu/assigns-list-empty-state.gjsindex f28046b2f4b..d8655655467 100644--- a/plugins/discourse-assign/assets/javascripts/discourse/components/user-menu/assigns-list-empty-state.gjs+++ b/plugins/discourse-assign/assets/javascripts/discourse/components/user-menu/assigns-list-empty-state.gjs@@ -1,6 +1,6 @@import { trustHTML } from "@ember/template";-import icon from "discourse/helpers/d-icon";import getUrl from "discourse/lib/get-url";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";const AssignsListEmptyState = <template>@@ -13,7 +13,7 @@ const AssignsListEmptyState = <template>{{trustHTML(i18n"user.no_assignments_body"- icon=(icon "user-plus")+ icon=(dIcon "user-plus")preferencesUrl=(getUrl "/my/preferences/notifications"))}}diff --git a/plugins/discourse-assign/assets/javascripts/discourse/connectors/user-activity-bottom/assigned-list.gjs b/plugins/discourse-assign/assets/javascripts/discourse/connectors/user-activity-bottom/assigned-list.gjsindex f2355d46618..f1103484fff 100644--- a/plugins/discourse-assign/assets/javascripts/discourse/connectors/user-activity-bottom/assigned-list.gjs+++ b/plugins/discourse-assign/assets/javascripts/discourse/connectors/user-activity-bottom/assigned-list.gjs@@ -2,7 +2,7 @@import Component from "@ember/component";import { LinkTo } from "@ember/routing";import { tagName } from "@ember-decorators/component";-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";@tagName("")@@ -11,7 +11,7 @@ export default class AssignedList extends Component {<li class="user-activity-bottom-outlet assigned-list" ...attributes>{{#if this.currentUser.can_assign}}<LinkTo @route="userActivity.assigned">- {{icon "user-plus"}}+ {{dIcon "user-plus"}}{{i18n "discourse_assign.assigned"}}</LinkTo>{{/if}}diff --git a/plugins/discourse-assign/assets/javascripts/discourse/initializers/extend-for-assigns.js b/plugins/discourse-assign/assets/javascripts/discourse/initializers/extend-for-assigns.jsindex 9997e8d1138..58fb6632b7c 100644--- a/plugins/discourse-assign/assets/javascripts/discourse/initializers/extend-for-assigns.js+++ b/plugins/discourse-assign/assets/javascripts/discourse/initializers/extend-for-assigns.js@@ -1,13 +1,13 @@import { computed } from "@ember/object";import { getOwner } from "@ember/owner";import { trustHTML } from "@ember/template";-import { renderAvatar } from "discourse/helpers/user-avatar";import getURL from "discourse/lib/get-url";import { iconHTML } from "discourse/lib/icon-library";import { withPluginApi } from "discourse/lib/plugin-api";import { registerTopicFooterDropdown } from "discourse/lib/register-topic-footer-dropdown";import { applyValueTransformer } from "discourse/lib/transformer";import { escapeExpression } from "discourse/lib/utilities";+import { renderAvatar } from "discourse/ui-kit/helpers/d-user-avatar";import { i18n } from "discourse-i18n";import AssignButton from "../components/assign-button";import BulkActionsAssignUser from "../components/bulk-actions/bulk-assign-user";diff --git a/plugins/discourse-assign/assets/javascripts/discourse/templates/group/assigned.gjs b/plugins/discourse-assign/assets/javascripts/discourse/templates/group/assigned.gjsindex 33b736fac07..666c9553124 100644--- a/plugins/discourse-assign/assets/javascripts/discourse/templates/group/assigned.gjs+++ b/plugins/discourse-assign/assets/javascripts/discourse/templates/group/assigned.gjs@@ -1,10 +1,10 @@import { Input } from "@ember/component";import { on } from "@ember/modifier";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import LoadMore from "discourse/components/load-more";import MobileNav from "discourse/components/mobile-nav";import bodyClass from "discourse/helpers/body-class";import withEventValue from "discourse/helpers/with-event-value";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DLoadMore from "discourse/ui-kit/d-load-more";import { i18n } from "discourse-i18n";import GroupAssignedFilter from "../../components/group-assigned-filter";@@ -29,7 +29,7 @@ export default <template></div>{{/if}}- <LoadMore @selector=".activity-nav li" @action={{@controller.loadMore}}>+ <DLoadMore @selector=".activity-nav li" @action={{@controller.loadMore}}><GroupAssignedFilter@showAvatar={{false}}@filter="everyone"@@ -62,8 +62,8 @@ export default <template>/>{{/each}}- <ConditionalLoadingSpinner @condition={{@controller.loading}} />- </LoadMore>+ <DConditionalLoadingSpinner @condition={{@controller.loading}} />+ </DLoadMore></MobileNav></section>diff --git a/plugins/discourse-assign/assets/javascripts/discourse/templates/group/assigned/show.gjs b/plugins/discourse-assign/assets/javascripts/discourse/templates/group/assigned/show.gjsindex e18cae40577..57515855c86 100644--- a/plugins/discourse-assign/assets/javascripts/discourse/templates/group/assigned/show.gjs+++ b/plugins/discourse-assign/assets/javascripts/discourse/templates/group/assigned/show.gjs@@ -1,10 +1,10 @@import { Input } from "@ember/component";import { on } from "@ember/modifier";import BasicTopicList from "discourse/components/basic-topic-list";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import EmptyState from "discourse/components/empty-state";-import LoadMore from "discourse/components/load-more";import withEventValue from "discourse/helpers/with-event-value";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DEmptyState from "discourse/ui-kit/d-empty-state";+import DLoadMore from "discourse/ui-kit/d-load-more";import { i18n } from "discourse-i18n";export default <template>@@ -22,7 +22,7 @@ export default <template></div></div>- <LoadMore+ <DLoadMore@selector=".paginated-topics-list .topic-list tr"@action={{@controller.loadMore}}class="paginated-topics-list"@@ -49,10 +49,12 @@ export default <template>@listContext="assigned"/>- <ConditionalLoadingSpinner @condition={{@controller.model.loadingMore}} />- </LoadMore>+ <DConditionalLoadingSpinner+ @condition={{@controller.model.loadingMore}}+ />+ </DLoadMore>{{else}}- <EmptyState+ <DEmptyState@title={{i18n "discourse_assign.group_no_assignments_title"}}@body={{i18n "discourse_assign.group_no_assignments_body"}}/>diff --git a/plugins/discourse-assign/assets/javascripts/discourse/templates/modal/bulk-assign.gjs b/plugins/discourse-assign/assets/javascripts/discourse/templates/modal/bulk-assign.gjsindex d89688a222f..9cbb60501ee 100644--- a/plugins/discourse-assign/assets/javascripts/discourse/templates/modal/bulk-assign.gjs+++ b/plugins/discourse-assign/assets/javascripts/discourse/templates/modal/bulk-assign.gjs@@ -1,4 +1,4 @@-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";import AssignUserForm from "../../components/assign-user-form";export default <template>diff --git a/plugins/discourse-assign/assets/javascripts/discourse/templates/user-activity/assigned.gjs b/plugins/discourse-assign/assets/javascripts/discourse/templates/user-activity/assigned.gjsindex 70e8f361c45..e6114bb7b37 100644--- a/plugins/discourse-assign/assets/javascripts/discourse/templates/user-activity/assigned.gjs+++ b/plugins/discourse-assign/assets/javascripts/discourse/templates/user-activity/assigned.gjs@@ -1,15 +1,15 @@import { Input } from "@ember/component";import { on } from "@ember/modifier";import BasicTopicList from "discourse/components/basic-topic-list";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import EmptyState from "discourse/components/empty-state";-import LoadMore from "discourse/components/load-more";import withEventValue from "discourse/helpers/with-event-value";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DEmptyState from "discourse/ui-kit/d-empty-state";+import DLoadMore from "discourse/ui-kit/d-load-more";import { i18n } from "discourse-i18n";export default <template>{{#if @controller.doesntHaveAssignments}}- <EmptyState+ <DEmptyState@title={{i18n "user.no_assignments_title"}}@body={{@controller.emptyStateBody}}/>@@ -27,7 +27,7 @@ export default <template></div></div>- <LoadMore+ <DLoadMore@selector=".paginated-topics-list .topic-list tr"@action={{@controller.loadMore}}class="paginated-topics-list"@@ -50,7 +50,9 @@ export default <template>@listContext="assigned"/>- <ConditionalLoadingSpinner @condition={{@controller.model.loadingMore}} />- </LoadMore>+ <DConditionalLoadingSpinner+ @condition={{@controller.model.loadingMore}}+ />+ </DLoadMore>{{/if}}</template>diff --git a/plugins/discourse-assign/assets/javascripts/discourse/templates/user-private-messages/assigned.gjs b/plugins/discourse-assign/assets/javascripts/discourse/templates/user-private-messages/assigned.gjsindex ff29a179e5f..4a56fd2f6c8 100644--- a/plugins/discourse-assign/assets/javascripts/discourse/templates/user-private-messages/assigned.gjs+++ b/plugins/discourse-assign/assets/javascripts/discourse/templates/user-private-messages/assigned.gjs@@ -1,13 +1,13 @@import { LinkTo } from "@ember/routing";import MessagesSecondaryNav from "discourse/components/user-nav/messages-secondary-nav";-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default <template><MessagesSecondaryNav><li class="messages-assigned-latest"><LinkTo @route="userPrivateMessages.assigned.index">- {{icon "envelope"}}+ {{dIcon "envelope"}}<span>{{i18n "categories.latest"}}</span></LinkTo></li>diff --git a/plugins/discourse-cakeday/assets/javascripts/discourse/components/emoji-images.gjs b/plugins/discourse-cakeday/assets/javascripts/discourse/components/emoji-images.gjsindex 900fdae55c1..a2a4e6ae7cb 100644--- a/plugins/discourse-cakeday/assets/javascripts/discourse/components/emoji-images.gjs+++ b/plugins/discourse-cakeday/assets/javascripts/discourse/components/emoji-images.gjs@@ -3,8 +3,8 @@ import Component from "@ember/component";import { computed } from "@ember/object";import { trustHTML } from "@ember/template";import { tagName } from "@ember-decorators/component";-import icon from "discourse/helpers/d-icon";import { emojiUnescape } from "discourse/lib/text";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";@tagName("")@@ -30,7 +30,7 @@ export default class EmojiImages extends Component {{{/each}}</div>{{else}}- {{icon "cake-candles" title=this.titleText}}+ {{dIcon "cake-candles" title=this.titleText}}{{/if}}</div></template>diff --git a/plugins/discourse-cakeday/assets/javascripts/discourse/components/user-info-list.gjs b/plugins/discourse-cakeday/assets/javascripts/discourse/components/user-info-list.gjsindex fe1b0a15dfb..cae00993c74 100644--- a/plugins/discourse-cakeday/assets/javascripts/discourse/components/user-info-list.gjs+++ b/plugins/discourse-cakeday/assets/javascripts/discourse/components/user-info-list.gjs@@ -1,4 +1,4 @@-import UserInfo from "discourse/components/user-info";+import DUserInfo from "discourse/ui-kit/d-user-info";import { i18n } from "discourse-i18n";function cakedayDate(val, { isBirthday }) {@@ -15,9 +15,9 @@ const UserInfoList = <template><ul class="user-info-list">{{#each @users.content as |user|}}<li class="user-info-item">- <UserInfo @user={{user}}>+ <DUserInfo @user={{user}}><div>{{cakedayDate user.cakedate isBirthday=@isBirthday}}</div>- </UserInfo>+ </DUserInfo></li>{{else}}<div class="user-info-empty-message"><p>{{yield}}</p></div>diff --git a/plugins/discourse-cakeday/assets/javascripts/discourse/templates/cakeday/anniversaries/all.gjs b/plugins/discourse-cakeday/assets/javascripts/discourse/templates/cakeday/anniversaries/all.gjsindex e55f63b83e2..70b3531e1cd 100644--- a/plugins/discourse-cakeday/assets/javascripts/discourse/templates/cakeday/anniversaries/all.gjs+++ b/plugins/discourse-cakeday/assets/javascripts/discourse/templates/cakeday/anniversaries/all.gjs@@ -1,11 +1,11 @@-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import LoadMore from "discourse/components/load-more";import ComboBox from "discourse/select-kit/components/combo-box";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DLoadMore from "discourse/ui-kit/d-load-more";import { i18n } from "discourse-i18n";import UserInfoList from "../../../components/user-info-list";export default <template>- <LoadMore @selector=".user-info" @action={{@controller.loadMore}}>+ <DLoadMore @selector=".user-info" @action={{@controller.loadMore}}><div class="cakeday-months"><h2 class="cakeday-header">{{i18n "anniversaries.month.title"}}</h2><ComboBox@@ -16,12 +16,12 @@ export default <template>/></div>- <ConditionalLoadingSpinner @condition={{@controller.model.loading}}>+ <DConditionalLoadingSpinner @condition={{@controller.model.loading}}><UserInfoList @users={{@controller.model}}>{{i18n "anniversaries.month.empty"}}</UserInfoList>- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner>- <ConditionalLoadingSpinner @condition={{@controller.model.loadingMore}} />- </LoadMore>+ <DConditionalLoadingSpinner @condition={{@controller.model.loadingMore}} />+ </DLoadMore></template>diff --git a/plugins/discourse-cakeday/assets/javascripts/discourse/templates/cakeday/anniversaries/today.gjs b/plugins/discourse-cakeday/assets/javascripts/discourse/templates/cakeday/anniversaries/today.gjsindex 18d8c3b4f21..f97b4b8cd55 100644--- a/plugins/discourse-cakeday/assets/javascripts/discourse/templates/cakeday/anniversaries/today.gjs+++ b/plugins/discourse-cakeday/assets/javascripts/discourse/templates/cakeday/anniversaries/today.gjs@@ -1,18 +1,18 @@-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import LoadMore from "discourse/components/load-more";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DLoadMore from "discourse/ui-kit/d-load-more";import { i18n } from "discourse-i18n";import UserInfoList from "../../../components/user-info-list";export default <template><h2 class="cakeday-header">{{@controller.title}}</h2>- <LoadMore @selector=".user-info" @action={{@controller.loadMore}}>- <ConditionalLoadingSpinner @condition={{@controller.model.loading}}>+ <DLoadMore @selector=".user-info" @action={{@controller.loadMore}}>+ <DConditionalLoadingSpinner @condition={{@controller.model.loading}}><UserInfoList @users={{@controller.model}}>{{i18n "anniversaries.today.empty"}}</UserInfoList>- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner>- <ConditionalLoadingSpinner @condition={{@controller.model.loadingMore}} />- </LoadMore>+ <DConditionalLoadingSpinner @condition={{@controller.model.loadingMore}} />+ </DLoadMore></template>diff --git a/plugins/discourse-cakeday/assets/javascripts/discourse/templates/cakeday/anniversaries/tomorrow.gjs b/plugins/discourse-cakeday/assets/javascripts/discourse/templates/cakeday/anniversaries/tomorrow.gjsindex 9a0a4d3f00f..027969a30a8 100644--- a/plugins/discourse-cakeday/assets/javascripts/discourse/templates/cakeday/anniversaries/tomorrow.gjs+++ b/plugins/discourse-cakeday/assets/javascripts/discourse/templates/cakeday/anniversaries/tomorrow.gjs@@ -1,18 +1,18 @@-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import LoadMore from "discourse/components/load-more";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DLoadMore from "discourse/ui-kit/d-load-more";import { i18n } from "discourse-i18n";import UserInfoList from "../../../components/user-info-list";export default <template><h2 class="cakeday-header">{{@controller.title}}</h2>- <LoadMore @selector=".user-info" @action={{@controller.loadMore}}>- <ConditionalLoadingSpinner @condition={{@controller.model.loading}}>+ <DLoadMore @selector=".user-info" @action={{@controller.loadMore}}>+ <DConditionalLoadingSpinner @condition={{@controller.model.loading}}><UserInfoList @users={{@controller.model}}>{{i18n "anniversaries.tomorrow.empty"}}</UserInfoList>- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner>- <ConditionalLoadingSpinner @condition={{@controller.model.loadingMore}} />- </LoadMore>+ <DConditionalLoadingSpinner @condition={{@controller.model.loadingMore}} />+ </DLoadMore></template>diff --git a/plugins/discourse-cakeday/assets/javascripts/discourse/templates/cakeday/anniversaries/upcoming.gjs b/plugins/discourse-cakeday/assets/javascripts/discourse/templates/cakeday/anniversaries/upcoming.gjsindex aba00023a5a..ec5bc9794c0 100644--- a/plugins/discourse-cakeday/assets/javascripts/discourse/templates/cakeday/anniversaries/upcoming.gjs+++ b/plugins/discourse-cakeday/assets/javascripts/discourse/templates/cakeday/anniversaries/upcoming.gjs@@ -1,18 +1,18 @@-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import LoadMore from "discourse/components/load-more";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DLoadMore from "discourse/ui-kit/d-load-more";import { i18n } from "discourse-i18n";import UserInfoList from "../../../components/user-info-list";export default <template><h2 class="cakeday-header">{{@controller.title}}</h2>- <LoadMore @selector=".user-info" @action={{@controller.loadMore}}>- <ConditionalLoadingSpinner @condition={{@controller.model.loading}}>+ <DLoadMore @selector=".user-info" @action={{@controller.loadMore}}>+ <DConditionalLoadingSpinner @condition={{@controller.model.loading}}><UserInfoList @users={{@controller.model}}>{{i18n "anniversaries.upcoming.empty"}}</UserInfoList>- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner>- <ConditionalLoadingSpinner @condition={{@controller.model.loadingMore}} />- </LoadMore>+ <DConditionalLoadingSpinner @condition={{@controller.model.loadingMore}} />+ </DLoadMore></template>diff --git a/plugins/discourse-cakeday/assets/javascripts/discourse/templates/cakeday/birthdays/all.gjs b/plugins/discourse-cakeday/assets/javascripts/discourse/templates/cakeday/birthdays/all.gjsindex bb93a4ce77d..4921ec8e8b0 100644--- a/plugins/discourse-cakeday/assets/javascripts/discourse/templates/cakeday/birthdays/all.gjs+++ b/plugins/discourse-cakeday/assets/javascripts/discourse/templates/cakeday/birthdays/all.gjs@@ -1,11 +1,11 @@-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import LoadMore from "discourse/components/load-more";import ComboBox from "discourse/select-kit/components/combo-box";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DLoadMore from "discourse/ui-kit/d-load-more";import { i18n } from "discourse-i18n";import UserInfoList from "../../../components/user-info-list";export default <template>- <LoadMore @selector=".user-info" @action={{@controller.loadMore}}>+ <DLoadMore @selector=".user-info" @action={{@controller.loadMore}}><div class="cakeday-months"><h2 class="cakeday-header">{{i18n "birthdays.month.title"}}</h2><ComboBox@@ -16,12 +16,12 @@ export default <template>/></div>- <ConditionalLoadingSpinner @condition={{@controller.model.loading}}>+ <DConditionalLoadingSpinner @condition={{@controller.model.loading}}><UserInfoList @users={{@controller.model}} @isBirthday={{true}}>{{i18n "birthdays.month.empty"}}</UserInfoList>- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner>- <ConditionalLoadingSpinner @condition={{@controller.model.loadingMore}} />- </LoadMore>+ <DConditionalLoadingSpinner @condition={{@controller.model.loadingMore}} />+ </DLoadMore></template>diff --git a/plugins/discourse-cakeday/assets/javascripts/discourse/templates/cakeday/birthdays/today.gjs b/plugins/discourse-cakeday/assets/javascripts/discourse/templates/cakeday/birthdays/today.gjsindex 0bf88e24d2c..a02293098b0 100644--- a/plugins/discourse-cakeday/assets/javascripts/discourse/templates/cakeday/birthdays/today.gjs+++ b/plugins/discourse-cakeday/assets/javascripts/discourse/templates/cakeday/birthdays/today.gjs@@ -1,18 +1,18 @@-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import LoadMore from "discourse/components/load-more";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DLoadMore from "discourse/ui-kit/d-load-more";import { i18n } from "discourse-i18n";import UserInfoList from "../../../components/user-info-list";export default <template><h2 class="cakeday-header">{{@controller.title}}</h2>- <LoadMore @selector=".user-info" @action={{@controller.loadMore}}>- <ConditionalLoadingSpinner @condition={{@controller.model.loading}}>+ <DLoadMore @selector=".user-info" @action={{@controller.loadMore}}>+ <DConditionalLoadingSpinner @condition={{@controller.model.loading}}><UserInfoList @users={{@controller.model}} @isBirthday={{true}}>{{i18n "birthdays.today.empty"}}</UserInfoList>- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner>- <ConditionalLoadingSpinner @condition={{@controller.model.loadingMore}} />- </LoadMore>+ <DConditionalLoadingSpinner @condition={{@controller.model.loadingMore}} />+ </DLoadMore></template>diff --git a/plugins/discourse-cakeday/assets/javascripts/discourse/templates/cakeday/birthdays/tomorrow.gjs b/plugins/discourse-cakeday/assets/javascripts/discourse/templates/cakeday/birthdays/tomorrow.gjsindex c52719ef3ed..57446147e15 100644--- a/plugins/discourse-cakeday/assets/javascripts/discourse/templates/cakeday/birthdays/tomorrow.gjs+++ b/plugins/discourse-cakeday/assets/javascripts/discourse/templates/cakeday/birthdays/tomorrow.gjs@@ -1,18 +1,18 @@-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import LoadMore from "discourse/components/load-more";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DLoadMore from "discourse/ui-kit/d-load-more";import { i18n } from "discourse-i18n";import UserInfoList from "../../../components/user-info-list";export default <template><h2 class="cakeday-header">{{@controller.title}}</h2>- <LoadMore @selector=".user-info" @action={{@controller.loadMore}}>- <ConditionalLoadingSpinner @condition={{@controller.model.loading}}>+ <DLoadMore @selector=".user-info" @action={{@controller.loadMore}}>+ <DConditionalLoadingSpinner @condition={{@controller.model.loading}}><UserInfoList @users={{@controller.model}} @isBirthday={{true}}>{{i18n "birthdays.tomorrow.empty"}}</UserInfoList>- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner>- <ConditionalLoadingSpinner @condition={{@controller.model.loadingMore}} />- </LoadMore>+ <DConditionalLoadingSpinner @condition={{@controller.model.loadingMore}} />+ </DLoadMore></template>diff --git a/plugins/discourse-cakeday/assets/javascripts/discourse/templates/cakeday/birthdays/upcoming.gjs b/plugins/discourse-cakeday/assets/javascripts/discourse/templates/cakeday/birthdays/upcoming.gjsindex 473d70d257c..9ff3f93202f 100644--- a/plugins/discourse-cakeday/assets/javascripts/discourse/templates/cakeday/birthdays/upcoming.gjs+++ b/plugins/discourse-cakeday/assets/javascripts/discourse/templates/cakeday/birthdays/upcoming.gjs@@ -1,18 +1,18 @@-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import LoadMore from "discourse/components/load-more";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DLoadMore from "discourse/ui-kit/d-load-more";import { i18n } from "discourse-i18n";import UserInfoList from "../../../components/user-info-list";export default <template><h2 class="cakeday-header">{{@controller.title}}</h2>- <LoadMore @selector=".user-info" @action={{@controller.loadMore}}>- <ConditionalLoadingSpinner @condition={{@controller.model.loading}}>+ <DLoadMore @selector=".user-info" @action={{@controller.loadMore}}>+ <DConditionalLoadingSpinner @condition={{@controller.model.loading}}><UserInfoList @users={{@controller.model}} @isBirthday={{true}}>{{i18n "birthdays.upcoming.empty"}}</UserInfoList>- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner>- <ConditionalLoadingSpinner @condition={{@controller.model.loadingMore}} />- </LoadMore>+ <DConditionalLoadingSpinner @condition={{@controller.model.loadingMore}} />+ </DLoadMore></template>diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/admin-holidays-list-item.gjs b/plugins/discourse-calendar/assets/javascripts/discourse/components/admin-holidays-list-item.gjsindex 053f0251abe..abb6360f954 100644--- a/plugins/discourse-calendar/assets/javascripts/discourse/components/admin-holidays-list-item.gjs+++ b/plugins/discourse-calendar/assets/javascripts/discourse/components/admin-holidays-list-item.gjs@@ -1,9 +1,9 @@import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";-import DButton from "discourse/components/d-button";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";+import DButton from "discourse/ui-kit/d-button";export default class AdminHolidaysListItem extends Component {@tracked loading = false;diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/bulk-invite-sample-csv-file.gjs b/plugins/discourse-calendar/assets/javascripts/discourse/components/bulk-invite-sample-csv-file.gjsindex b9b90246565..82195fa6089 100644--- a/plugins/discourse-calendar/assets/javascripts/discourse/components/bulk-invite-sample-csv-file.gjs+++ b/plugins/discourse-calendar/assets/javascripts/discourse/components/bulk-invite-sample-csv-file.gjs@@ -2,7 +2,7 @@import Component from "@ember/component";import { action } from "@ember/object";import { tagName } from "@ember-decorators/component";-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";@tagName("")export default class BulkInviteSampleCsvFile extends Component {diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/csv-uploader.gjs b/plugins/discourse-calendar/assets/javascripts/discourse/components/csv-uploader.gjsindex dc2585d6cef..0cf557bbd80 100644--- a/plugins/discourse-calendar/assets/javascripts/discourse/components/csv-uploader.gjs+++ b/plugins/discourse-calendar/assets/javascripts/discourse/components/csv-uploader.gjs@@ -2,9 +2,9 @@ import Component from "@glimmer/component";import { getOwner } from "@ember/owner";import didInsert from "@ember/render-modifiers/modifiers/did-insert";import { service } from "@ember/service";-import icon from "discourse/helpers/d-icon";import UppyUpload from "discourse/lib/uppy/uppy-upload";import { or } from "discourse/truth-helpers";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class CsvUploader extends Component {@@ -47,7 +47,7 @@ export default class CsvUploader extends Component {<template><span><label class="btn" disabled={{this.uploadButtonDisabled}}>- {{icon "upload"}} {{this.uploadButtonText}}+ {{dIcon "upload"}} {{this.uploadButtonText}}<input{{didInsert this.uppyUpload.setup}}class="hidden-upload-field"diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/creator.gjs b/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/creator.gjsindex 44dc031fd66..999a687f0e6 100644--- a/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/creator.gjs+++ b/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/creator.gjs@@ -1,6 +1,6 @@import Component from "@glimmer/component";-import avatar from "discourse/helpers/avatar";import { formatUsername } from "discourse/lib/utilities";+import dAvatar from "discourse/ui-kit/helpers/d-avatar";import { i18n } from "discourse-i18n";export default class DiscoursePostEventCreator extends Component {@@ -14,7 +14,7 @@ export default class DiscoursePostEventCreator extends Component {<span class="event-creator"><a class="topic-invitee-avatar" data-user-card={{@user.username}}>- {{avatar @user imageSize="tiny"}}+ {{dAvatar @user imageSize="tiny"}}<span class="username">{{this.username}}</span></a></span>diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/dates.gjs b/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/dates.gjsindex 58c856320f7..35772f636af 100644--- a/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/dates.gjs+++ b/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/dates.gjs@@ -5,12 +5,12 @@ import didInsert from "@ember/render-modifiers/modifiers/did-insert";import { schedule } from "@ember/runloop";import { service } from "@ember/service";import { trustHTML } from "@ember/template";-import icon from "discourse/helpers/d-icon";import { bbcodeAttributeEncode } from "discourse/lib/bbcode-attributes";import { generateIcsData } from "discourse/lib/download-calendar";import discourseLater from "discourse/lib/later";import { applyLocalDates } from "discourse/lib/local-dates";import { cook } from "discourse/lib/text";+import dIcon from "discourse/ui-kit/helpers/d-icon";export default class DiscoursePostEventDates extends Component {@service siteSettings;@@ -225,7 +225,7 @@ export default class DiscoursePostEventDates extends Component {class="event__section event-dates"{{didInsert this.computeDates}}>- {{icon "clock"}}+ {{dIcon "clock"}}{{#if @expiredAndRecurring}}-{{else}}diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/description.gjs b/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/description.gjsindex 4a51ccb9d4b..77939242455 100644--- a/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/description.gjs+++ b/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/description.gjs@@ -3,7 +3,7 @@ import { tracked } from "@glimmer/tracking";import { on } from "@ember/modifier";import { trustHTML } from "@ember/template";import { modifier } from "ember-modifier";-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class DiscoursePostEventDescription extends Component {@@ -50,7 +50,7 @@ export default class DiscoursePostEventDescription extends Component {{{if this.clamp 'is-clamped'}}{{if this.expanded 'is-expanded'}}">- {{icon "file-lines"}}+ {{dIcon "file-lines"}}<divclass="event-description__content"diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/index.gjs b/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/index.gjsindex ad97419c931..abb67882b31 100644--- a/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/index.gjs+++ b/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/index.gjs@@ -2,15 +2,15 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { service } from "@ember/service";import { modifier } from "ember-modifier";-import AsyncContent from "discourse/components/async-content";-import DButton from "discourse/components/d-button";import PluginOutlet from "discourse/components/plugin-outlet";-import icon from "discourse/helpers/d-icon";import lazyHash from "discourse/helpers/lazy-hash";-import replaceEmoji from "discourse/helpers/replace-emoji";import routeAction from "discourse/helpers/route-action";import { popupAjaxError } from "discourse/lib/ajax-error";import { bind } from "discourse/lib/decorators";+import DAsyncContent from "discourse/ui-kit/d-async-content";+import DButton from "discourse/ui-kit/d-button";+import dIcon from "discourse/ui-kit/helpers/d-icon";+import dReplaceEmoji from "discourse/ui-kit/helpers/d-replace-emoji";import { i18n } from "discourse-i18n";import ChatChannel from "./chat-channel";import Creator from "./creator";@@ -31,7 +31,7 @@ const StatusSeparator = <template>const InfoSection = <template><section class="event__section" ...attributes>{{#if @icon}}- {{icon @icon}}+ {{dIcon @icon}}{{/if}}{{yield}}@@ -136,7 +136,7 @@ export default class DiscoursePostEvent extends Component {}<template>- <AsyncContent @asyncData={{this.loadEvent}}>+ <DAsyncContent @asyncData={{this.loadEvent}}><:content as |event|><div class="discourse-post-event"><div class="discourse-post-event-widget">@@ -168,9 +168,9 @@ export default class DiscoursePostEvent extends Component {<ahref={{event.post.url}}rel="noopener noreferrer"- >{{replaceEmoji this.eventName}}</a>+ >{{dReplaceEmoji this.eventName}}</a>{{else}}- {{replaceEmoji this.eventName}}+ {{dReplaceEmoji this.eventName}}{{/if}}</span><div class="status-and-creators">@@ -272,6 +272,6 @@ export default class DiscoursePostEvent extends Component {<div class="spinner"></div></div></:loading>- </AsyncContent>+ </DAsyncContent></template>}diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/invitee.gjs b/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/invitee.gjsindex 418f5ff0bb1..3f3a838eb64 100644--- a/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/invitee.gjs+++ b/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/invitee.gjs@@ -1,10 +1,10 @@import Component from "@glimmer/component";import { concat } from "@ember/helper";import { service } from "@ember/service";-import AvatarFlair from "discourse/components/avatar-flair";-import avatar from "discourse/helpers/avatar";-import concatClass from "discourse/helpers/concat-class";import { eq } from "discourse/truth-helpers";+import DAvatarFlair from "discourse/ui-kit/d-avatar-flair";+import dAvatar from "discourse/ui-kit/helpers/d-avatar";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";export default class DiscoursePostEventInvitee extends Component {@@ -30,19 +30,19 @@ export default class DiscoursePostEventInvitee extends Component {<template><li- class={{concatClass+ class={{dConcatClass"event-invitee"(if @invitee.status (concat "status-" @invitee.status))(if (eq this.currentUser.id @invitee.user.id) "is-current-user")}}><a class="topic-invitee-avatar" data-user-card={{@invitee.user.username}}>- {{avatar+ {{dAvatar@invitee.userimageSize=(if this.site.mobileView "tiny" "large")}}{{#if this.statusIcon}}- <AvatarFlair+ <DAvatarFlair@flairName={{this.flairName}}@flairUrl={{this.statusIcon}}/>diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/invitees.gjs b/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/invitees.gjsindex b5924fe6b2e..ad534d8533d 100644--- a/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/invitees.gjs+++ b/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/invitees.gjs@@ -1,8 +1,8 @@import Component from "@glimmer/component";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import icon from "discourse/helpers/d-icon";+import DButton from "discourse/ui-kit/d-button";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";import PostEventInvitees from "../modal/post-event-invitees";import Invitee from "./invitee";@@ -45,7 +45,7 @@ export default class DiscoursePostEventInvitees extends Component {title={{this.inviteesTitle}}@action={{this.showInvitees}}>- {{icon "users"}}+ {{dIcon "users"}}{{#if this.hasAttendees}}<span class="going">{{this.statsInfo}}</span>{{/if}}diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/location.gjs b/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/location.gjsindex a0c48ad00e1..ed355f45f99 100644--- a/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/location.gjs+++ b/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/location.gjs@@ -1,12 +1,12 @@-import CookText from "discourse/components/cook-text";-import icon from "discourse/helpers/d-icon";+import DCookText from "discourse/ui-kit/d-cook-text";+import dIcon from "discourse/ui-kit/helpers/d-icon";const DiscoursePostEventLocation = <template>{{#if @location}}<section class="event__section event-location">- {{icon "location-pin"}}+ {{dIcon "location-pin"}}- <CookText @rawText={{@location}} />+ <DCookText @rawText={{@location}} /></section>{{/if}}</template>;diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/more-menu.gjs b/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/more-menu.gjsindex 5ed00324162..2c08f762d3e 100644--- a/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/more-menu.gjs+++ b/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/more-menu.gjs@@ -3,15 +3,15 @@ import { tracked } from "@glimmer/tracking";import { hash } from "@ember/helper";import EmberObject, { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import DropdownMenu from "discourse/components/dropdown-menu";import DMenu from "discourse/float-kit/components/d-menu";-import concatClass from "discourse/helpers/concat-class";import { popupAjaxError } from "discourse/lib/ajax-error";import { downloadCalendar } from "discourse/lib/download-calendar";import { exportEntity } from "discourse/lib/export-csv";import { cook } from "discourse/lib/text";import { applyValueTransformer } from "discourse/lib/transformer";+import DButton from "discourse/ui-kit/d-button";+import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";import {buildParams,@@ -292,7 +292,7 @@ export default class DiscoursePostEventMoreMenu extends Component {<template><DMenu@identifier="discourse-post-event-more-menu"- @triggerClass={{concatClass+ @triggerClass={{dConcatClass"more-dropdown""btn-small""btn-default"@@ -302,7 +302,7 @@ export default class DiscoursePostEventMoreMenu extends Component {@onRegisterApi={{this.registerMenuApi}}><:content>- <DropdownMenu as |dropdown|>+ <DDropdownMenu as |dropdown|>{{#unless this.expiredOrClosed}}<dropdown.item class="add-to-calendar"><DButton@@ -417,7 +417,7 @@ export default class DiscoursePostEventMoreMenu extends Component {{{/unless}}{{/if}}{{/if}}- </DropdownMenu>+ </DDropdownMenu></:content></DMenu></template>diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/status.gjs b/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/status.gjsindex 9f4b223191b..ba56175d984 100644--- a/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/status.gjs+++ b/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/status.gjs@@ -2,12 +2,12 @@ import Component from "@glimmer/component";import { concat, fn } from "@ember/helper";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import PluginOutlet from "discourse/components/plugin-outlet";-import concatClass from "discourse/helpers/concat-class";import lazyHash from "discourse/helpers/lazy-hash";import { popupAjaxError } from "discourse/lib/ajax-error";import { and, eq, not } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";export default class DiscoursePostEventStatus extends Component {@service appEvents;@@ -111,7 +111,7 @@ export default class DiscoursePostEventStatus extends Component {<template><section- class={{concatClass+ class={{dConcatClass"event__section event-actions event-status"(ifthis.watchingInviteeStatusdiff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/url.gjs b/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/url.gjsindex 57c5f2dba38..606a3cd753f 100644--- a/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/url.gjs+++ b/plugins/discourse-calendar/assets/javascripts/discourse/components/discourse-post-event/url.gjs@@ -1,5 +1,5 @@import Component from "@glimmer/component";-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";export default class DiscoursePostEventUrl extends Component {get url() {@@ -11,7 +11,7 @@ export default class DiscoursePostEventUrl extends Component {<template>{{#if @url}}<section class="event__section event-url">- {{icon "link"}}+ {{dIcon "link"}}<aclass="url"href={{this.url}}diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/event-node-view.gjs b/plugins/discourse-calendar/assets/javascripts/discourse/components/event-node-view.gjsindex 237da6040d1..35a11ace101 100644--- a/plugins/discourse-calendar/assets/javascripts/discourse/components/event-node-view.gjs+++ b/plugins/discourse-calendar/assets/javascripts/discourse/components/event-node-view.gjs@@ -3,10 +3,10 @@ import { on } from "@ember/modifier";import { action } from "@ember/object";import { next } from "@ember/runloop";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import ExpandingTextArea from "discourse/components/expanding-text-area";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";+import DButton from "discourse/ui-kit/d-button";+import DExpandingTextArea from "discourse/ui-kit/d-expanding-text-area";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";import PostEventBuilder from "discourse/plugins/discourse-calendar/discourse/components/modal/post-event-builder";import guessDateFormat from "discourse/plugins/discourse-calendar/discourse/lib/guess-best-date-format";@@ -513,7 +513,7 @@ export default class EventNodeView extends Component {</div><div class="composer-event__info">- <ExpandingTextArea+ <DExpandingTextArearows="1"value={{this.eventName}}class="composer-event__name-input"@@ -538,7 +538,7 @@ export default class EventNodeView extends Component {</header><section class="composer-event__dates">- {{icon "clock"}}+ {{dIcon "clock"}}<divclass="composer-event__date-range{{ifthis.hasAnyDate@@ -567,7 +567,7 @@ export default class EventNodeView extends Component {{{on "focus" this.focusDateInput}}/><span- class={{concatClass+ class={{dConcatClass"composer-event__date-display"(unless this.hasEndDate "--empty")}}@@ -579,7 +579,7 @@ export default class EventNodeView extends Component {</section><section class="composer-event__location">- {{icon this.locationIcon}}+ {{dIcon this.locationIcon}}<div class="composer-event__location-content"><inputtype="text"@@ -599,14 +599,14 @@ export default class EventNodeView extends Component {rel="noopener noreferrer"title="Visit {{this.eventData.location}}">- {{icon "up-right-from-square"}}+ {{dIcon "up-right-from-square"}}</a>{{/if}}</div></section><section class="composer-event__attendees">- {{icon "users"}}+ {{dIcon "users"}}<inputtype="number"inputmode="numeric"@@ -629,7 +629,7 @@ export default class EventNodeView extends Component {</section><section class="composer-event__description">- <ExpandingTextArea+ <DExpandingTextAreaclass="composer-event__description-textarea"placeholder={{i18n"discourse_post_event.composer.description_placeholder"diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/group-timezones/new-day.gjs b/plugins/discourse-calendar/assets/javascripts/discourse/components/group-timezones/new-day.gjsindex 121c7cb931d..3c0124aaad1 100644--- a/plugins/discourse-calendar/assets/javascripts/discourse/components/group-timezones/new-day.gjs+++ b/plugins/discourse-calendar/assets/javascripts/discourse/components/group-timezones/new-day.gjs@@ -1,14 +1,14 @@-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";const NewDay = <template><div class="group-timezone-new-day"><span class="before">- {{icon "chevron-left"}}+ {{dIcon "chevron-left"}}{{@beforeDate}}</span><span class="after">{{@afterDate}}- {{icon "chevron-right"}}+ {{dIcon "chevron-right"}}</span></div></template>;diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/group-timezones/time-traveller.gjs b/plugins/discourse-calendar/assets/javascripts/discourse/components/group-timezones/time-traveller.gjsindex 9aaeddd7be7..a6b6ef37ad0 100644--- a/plugins/discourse-calendar/assets/javascripts/discourse/components/group-timezones/time-traveller.gjs+++ b/plugins/discourse-calendar/assets/javascripts/discourse/components/group-timezones/time-traveller.gjs@@ -1,8 +1,8 @@import Component from "@glimmer/component";import { on } from "@ember/modifier";import { action } from "@ember/object";-import DButton from "discourse/components/d-button";import { not } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";import roundTime from "../../lib/round-time";export default class TimeTraveller extends Component {diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/group-timezones/timezone.gjs b/plugins/discourse-calendar/assets/javascripts/discourse/components/group-timezones/timezone.gjsindex 2e1f854a511..14efaf0094b 100644--- a/plugins/discourse-calendar/assets/javascripts/discourse/components/group-timezones/timezone.gjs+++ b/plugins/discourse-calendar/assets/javascripts/discourse/components/group-timezones/timezone.gjs@@ -1,6 +1,6 @@import Component from "@glimmer/component";-import UserAvatar from "discourse/components/user-avatar";-import concatClass from "discourse/helpers/concat-class";+import DUserAvatar from "discourse/ui-kit/d-user-avatar";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";export default class GroupTimezone extends Component {get formattedTime() {@@ -9,7 +9,7 @@ export default class GroupTimezone extends Component {<template><div- class={{concatClass+ class={{dConcatClass"group-timezone"(if @groupedTimezone.closeToWorkingHours "close-to-working-hours")(if @groupedTimezone.inWorkingHours "in-working-hours")@@ -26,12 +26,12 @@ export default class GroupTimezone extends Component {<ul class="group-timezones-members">{{#each @groupedTimezone.members key="username" as |member|}}<li- class={{concatClass+ class={{dConcatClass"group-timezones-member"(if member.on_holiday "on-holiday" "not-on-holiday")}}>- <UserAvatar+ <DUserAvatar@user={{member}}@size="small"class="group-timezones-member-avatar"diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/modal/post-event-builder.gjs b/plugins/discourse-calendar/assets/javascripts/discourse/components/modal/post-event-builder.gjsindex d686f5ed62d..ab18b98fac1 100644--- a/plugins/discourse-calendar/assets/javascripts/discourse/components/modal/post-event-builder.gjs+++ b/plugins/discourse-calendar/assets/javascripts/discourse/components/modal/post-event-builder.gjs@@ -5,14 +5,8 @@ import { concat, fn, get } from "@ember/helper";import { on } from "@ember/modifier";import { action } from "@ember/object";import { service } from "@ember/service";-import ConditionalLoadingSection from "discourse/components/conditional-loading-section";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";-import DateInput from "discourse/components/date-input";-import DateTimeInputRange from "discourse/components/date-time-input-range";import GroupSelector from "discourse/components/group-selector";import PluginOutlet from "discourse/components/plugin-outlet";-import RadioButton from "discourse/components/radio-button";import UppyImageUploader from "discourse/components/uppy-image-uploader";import lazyHash from "discourse/helpers/lazy-hash";import { extractError } from "discourse/lib/ajax-error";@@ -20,6 +14,12 @@ import Group from "discourse/models/group";import ComboBox from "discourse/select-kit/components/combo-box";import TimezoneInput from "discourse/select-kit/components/timezone-input";import { eq } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSection from "discourse/ui-kit/d-conditional-loading-section";+import DDateInput from "discourse/ui-kit/d-date-input";+import DDateTimeInputRange from "discourse/ui-kit/d-date-time-input-range";+import DModal from "discourse/ui-kit/d-modal";+import DRadioButton from "discourse/ui-kit/d-radio-button";import { i18n } from "discourse-i18n";import { buildParams } from "../../lib/raw-event-helper";import EventField from "../event-field";@@ -414,7 +414,7 @@ export default class PostEventBuilder extends Component {class="post-event-builder-modal"><:body>- <ConditionalLoadingSection @isLoading={{this.isSaving}}>+ <DConditionalLoadingSection @isLoading={{this.isSaving}}><form><PluginOutlet@name="post-event-builder-form"@@ -422,7 +422,7 @@ export default class PostEventBuilder extends Component {@connectorTagName="div"><EventField>- <DateTimeInputRange+ <DDateTimeInputRange@from={{this.startsAt}}@to={{this.endsAt}}@timezone={{@model.event.timezone}}@@ -557,7 +557,7 @@ export default class PostEventBuilder extends Component {@label="discourse_post_event.builder_modal.status.label"><label class="radio-label">- <RadioButton+ <DRadioButton@name="status"@value="public"@selection={{@model.event.status}}@@ -577,7 +577,7 @@ export default class PostEventBuilder extends Component {</span></label><label class="radio-label">- <RadioButton+ <DRadioButton@name="status"@value="private"@selection={{@model.event.status}}@@ -597,7 +597,7 @@ export default class PostEventBuilder extends Component {</span></label><label class="radio-label">- <RadioButton+ <DRadioButton@name="status"@value="standalone"@selection={{@model.event.status}}@@ -724,7 +724,7 @@ export default class PostEventBuilder extends Component {@label="discourse_post_event.builder_modal.recurrence_until.label"class="recurrence-until">- <DateInput+ <DDateInput@date={{this.recurrenceUntil}}@onChange={{this.setRecurrenceUntil}}@timezone={{@model.event.timezone}}@@ -797,7 +797,7 @@ export default class PostEventBuilder extends Component {{{/if}}</PluginOutlet></form>- </ConditionalLoadingSection>+ </DConditionalLoadingSection></:body><:footer>{{#if @model.onUpdate}}diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/modal/post-event-bulk-invite.gjs b/plugins/discourse-calendar/assets/javascripts/discourse/components/modal/post-event-bulk-invite.gjsindex 416a97db026..06437600779 100644--- a/plugins/discourse-calendar/assets/javascripts/discourse/components/modal/post-event-bulk-invite.gjs+++ b/plugins/discourse-calendar/assets/javascripts/discourse/components/modal/post-event-bulk-invite.gjs@@ -4,8 +4,6 @@ import { concat, fn, hash } from "@ember/helper";import EmberObject, { action } from "@ember/object";import { service } from "@ember/service";import { isPresent } from "@ember/utils";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";import GroupSelector from "discourse/components/group-selector";import { ajax } from "discourse/lib/ajax";import { extractError } from "discourse/lib/ajax-error";@@ -14,6 +12,8 @@ import { autoTrackedArray } from "discourse/lib/tracked-tools";import Group from "discourse/models/group";import ComboBox from "discourse/select-kit/components/combo-box";import EmailGroupUserChooser from "discourse/select-kit/components/email-group-user-chooser";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";import BulkInviteSampleCsvFile from "../bulk-invite-sample-csv-file";import CsvUploader from "../csv-uploader";diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/modal/post-event-invite-user-or-group.gjs b/plugins/discourse-calendar/assets/javascripts/discourse/components/modal/post-event-invite-user-or-group.gjsindex aeb1e3a1428..c12ca71fd43 100644--- a/plugins/discourse-calendar/assets/javascripts/discourse/components/modal/post-event-invite-user-or-group.gjs+++ b/plugins/discourse-calendar/assets/javascripts/discourse/components/modal/post-event-invite-user-or-group.gjs@@ -2,11 +2,11 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { hash } from "@ember/helper";import { action } from "@ember/object";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";import { ajax } from "discourse/lib/ajax";import { extractError } from "discourse/lib/ajax-error";import EmailGroupUserChooser from "discourse/select-kit/components/email-group-user-chooser";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";import EventField from "../event-field";diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/modal/post-event-invitees/index.gjs b/plugins/discourse-calendar/assets/javascripts/discourse/components/modal/post-event-invitees/index.gjsindex c83eeeeb96e..0a7855d2f95 100644--- a/plugins/discourse-calendar/assets/javascripts/discourse/components/modal/post-event-invitees/index.gjs+++ b/plugins/discourse-calendar/assets/javascripts/discourse/components/modal/post-event-invitees/index.gjs@@ -4,12 +4,12 @@ import { fn } from "@ember/helper";import { on } from "@ember/modifier";import { action } from "@ember/object";import { service } from "@ember/service";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";-import concatClass from "discourse/helpers/concat-class";import { debounce } from "discourse/lib/decorators";import { or } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DModal from "discourse/ui-kit/d-modal";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";import ToggleInvitees from "../../toggle-invitees";import User from "./user";@@ -92,7 +92,7 @@ export default class PostEventInviteesModal extends Component {<DModal@title={{this.title}}@closeModal={{@closeModal}}- class={{concatClass+ class={{dConcatClass(or @model.extraClass "invited")"post-event-invitees-modal"}}@@ -108,7 +108,7 @@ export default class PostEventInviteesModal extends Component {/><ToggleInvitees @viewType={{this.type}} @toggle={{this.toggleType}} />- <ConditionalLoadingSpinner @condition={{this.isLoading}}>+ <DConditionalLoadingSpinner @condition={{this.isLoading}}>{{#if this.hasResults}}<ul class="invitees">{{#each this.inviteesList.invitees as |invitee|}}@@ -153,7 +153,7 @@ export default class PostEventInviteesModal extends Component {{{i18n "discourse_post_event.models.invitee.no_users"}}</p>{{/if}}- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner></:body></DModal></template>diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/modal/post-event-invitees/user.gjs b/plugins/discourse-calendar/assets/javascripts/discourse/components/modal/post-event-invitees/user.gjsindex 56eef98ef55..3af8187399b 100644--- a/plugins/discourse-calendar/assets/javascripts/discourse/components/modal/post-event-invitees/user.gjs+++ b/plugins/discourse-calendar/assets/javascripts/discourse/components/modal/post-event-invitees/user.gjs@@ -1,11 +1,11 @@-import avatar from "discourse/helpers/avatar";import userPrioritizedName from "discourse/helpers/user-prioritized-name";import { userPath } from "discourse/lib/url";+import dAvatar from "discourse/ui-kit/helpers/d-avatar";const User = <template><a href={{userPath @user.username}} data-user-card={{@user.username}}><span class="user">- {{avatar @user imageSize="medium"}}+ {{dAvatar @user imageSize="medium"}}<span class="username">{{userPrioritizedName @user}}</span>diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/toggle-invitees.gjs b/plugins/discourse-calendar/assets/javascripts/discourse/components/toggle-invitees.gjsindex 88ca9c7372d..7d6ed54f90f 100644--- a/plugins/discourse-calendar/assets/javascripts/discourse/components/toggle-invitees.gjs+++ b/plugins/discourse-calendar/assets/javascripts/discourse/components/toggle-invitees.gjs@@ -1,7 +1,7 @@import { fn } from "@ember/helper";import { on } from "@ember/modifier";-import concatClass from "discourse/helpers/concat-class";import { eq } from "discourse/truth-helpers";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";const ToggleInvitees = <template>@@ -9,7 +9,7 @@ const ToggleInvitees = <template><li><buttontype="button"- class={{concatClass+ class={{dConcatClass"toggle-going"(if (eq @viewType "going") "active")}}@@ -21,7 +21,7 @@ const ToggleInvitees = <template><li><buttontype="button"- class={{concatClass+ class={{dConcatClass"toggle-interested"(if (eq @viewType "interested") "active")}}@@ -33,7 +33,7 @@ const ToggleInvitees = <template><li><buttontype="button"- class={{concatClass+ class={{dConcatClass"toggle-not-going"(if (eq @viewType "not_going") "active")}}diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/components/upcoming-events-list.gjs b/plugins/discourse-calendar/assets/javascripts/discourse/components/upcoming-events-list.gjsindex 4d93a65731a..5357b53c5a5 100644--- a/plugins/discourse-calendar/assets/javascripts/discourse/components/upcoming-events-list.gjs+++ b/plugins/discourse-calendar/assets/javascripts/discourse/components/upcoming-events-list.gjs@@ -3,13 +3,13 @@ import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";import { LinkTo } from "@ember/routing";import { service } from "@ember/service";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DButton from "discourse/components/d-button";import PluginOutlet from "discourse/components/plugin-outlet";-import icon from "discourse/helpers/d-icon";import { ajax } from "discourse/lib/ajax";import { applyValueTransformer } from "discourse/lib/transformer";import { or } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";import { isNotFullDayEvent } from "../lib/guess-best-date-format";@@ -238,7 +238,7 @@ export default class UpcomingEventsList extends Component {</h3><div class="upcoming-events-list__container">- <ConditionalLoadingSpinner @condition={{this.isLoading}} />+ <DConditionalLoadingSpinner @condition={{this.isLoading}} />{{#if this.hasEmptyResponse}}<div class="upcoming-events-list__empty-message">@@ -276,7 +276,7 @@ export default class UpcomingEventsList extends Component {title={{or event.name event.post.topic.title}}>{{#if event.recurrence}}- {{icon "arrows-rotate"}}+ {{dIcon "arrows-rotate"}}{{/if}}{{or event.name event.post.topic.title}}</span>diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/connectors/user-custom-preferences/region.gjs b/plugins/discourse-calendar/assets/javascripts/discourse/connectors/user-custom-preferences/region.gjsindex d7493d5cf39..22eb16002cb 100644--- a/plugins/discourse-calendar/assets/javascripts/discourse/connectors/user-custom-preferences/region.gjs+++ b/plugins/discourse-calendar/assets/javascripts/discourse/connectors/user-custom-preferences/region.gjs@@ -1,6 +1,6 @@import Component from "@glimmer/component";import { action } from "@ember/object";-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";import RegionInput from "../../components/region-input";import { TIME_ZONE_TO_REGION } from "../../lib/regions";diff --git a/plugins/discourse-calendar/assets/javascripts/discourse/templates/admin-plugins/show/discourse-calendar-holidays.gjs b/plugins/discourse-calendar/assets/javascripts/discourse/templates/admin-plugins/show/discourse-calendar-holidays.gjsindex 5b4faaa55e3..cc89760e2ec 100644--- a/plugins/discourse-calendar/assets/javascripts/discourse/templates/admin-plugins/show/discourse-calendar-holidays.gjs+++ b/plugins/discourse-calendar/assets/javascripts/discourse/templates/admin-plugins/show/discourse-calendar-holidays.gjs@@ -1,6 +1,6 @@-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DPageSubheader from "discourse/components/d-page-subheader";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DPageSubheader from "discourse/ui-kit/d-page-subheader";import { i18n } from "discourse-i18n";import AdminHolidaysList from "discourse/plugins/discourse-calendar/discourse/components/admin-holidays-list";import RegionInput from "discourse/plugins/discourse-calendar/discourse/components/region-input";@@ -24,7 +24,7 @@ export default <template>@onChange={{@controller.getHolidays}}/>- <ConditionalLoadingSpinner @condition={{@controller.loading}} />+ <DConditionalLoadingSpinner @condition={{@controller.loading}} />{{#if @controller.holidays}}<AdminHolidaysListdiff --git a/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/components/channel-details.gjs b/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/components/channel-details.gjsindex 064fdab4d3d..d7a5a524e52 100644--- a/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/components/channel-details.gjs+++ b/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/components/channel-details.gjs@@ -3,10 +3,10 @@ import { tracked } from "@glimmer/tracking";import { fn } from "@ember/helper";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import DropdownMenu from "discourse/components/dropdown-menu";import DMenu from "discourse/float-kit/components/d-menu";import { popupAjaxError } from "discourse/lib/ajax-error";+import DButton from "discourse/ui-kit/d-button";+import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";import { i18n } from "discourse-i18n";import ChannelData from "./channel-data";import InlineChannelForm from "./inline-channel-form";@@ -79,7 +79,7 @@ export default class ChannelDetails extends Component {class="btn-default btn-small"><:content>- <DropdownMenu as |dropdown|>+ <DDropdownMenu as |dropdown|><dropdown.item><DButton@icon="pencil"@@ -105,7 +105,7 @@ export default class ChannelDetails extends Component {class="btn-transparent btn-danger delete-channel"/></dropdown.item>- </DropdownMenu>+ </DDropdownMenu></:content></DMenu></div>diff --git a/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/components/channel-param-row.gjs b/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/components/channel-param-row.gjsindex a694f8e1eb1..b88d768f30e 100644--- a/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/components/channel-param-row.gjs+++ b/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/components/channel-param-row.gjs@@ -2,7 +2,7 @@ import Component from "@glimmer/component";import { concat, get } from "@ember/helper";import { on } from "@ember/modifier";import { action } from "@ember/object";-import InputTip from "discourse/components/input-tip";+import DInputTip from "discourse/ui-kit/d-input-tip";import { i18n } from "discourse-i18n";export default class ChannelParamRow extends Component {@@ -58,7 +58,7 @@ export default class ChannelParamRow extends Component {name="param-{{@param.key}}"/>- <InputTip @validation={{this.validation}} />+ <DInputTip @validation={{this.validation}} /></td></tr>diff --git a/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/components/modal/channel-error.gjs b/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/components/modal/channel-error.gjsindex 0a374533d20..dcb3e77b4d3 100644--- a/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/components/modal/channel-error.gjs+++ b/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/components/modal/channel-error.gjs@@ -1,4 +1,4 @@-import DModal from "discourse/components/d-modal";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";const ChannelError = <template>diff --git a/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/components/modal/edit-rule.gjs b/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/components/modal/edit-rule.gjsindex 583d80f1db4..f3b18d706a4 100644--- a/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/components/modal/edit-rule.gjs+++ b/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/components/modal/edit-rule.gjs@@ -3,12 +3,12 @@ import { tracked } from "@glimmer/tracking";import { concat, hash } from "@ember/helper";import { action } from "@ember/object";import { service } from "@ember/service";-import DModal from "discourse/components/d-modal";import Form from "discourse/components/form";import { popupAjaxError } from "discourse/lib/ajax-error";import CategoryChooser from "discourse/select-kit/components/category-chooser";import ComboBox from "discourse/select-kit/components/combo-box";import TagChooser from "discourse/select-kit/components/tag-chooser";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";import getTagName from "../../lib/utilities";import ChannelData from "../channel-data";diff --git a/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/components/modal/setup-provider.gjs b/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/components/modal/setup-provider.gjsindex 1b04371d6c8..65326aea063 100644--- a/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/components/modal/setup-provider.gjs+++ b/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/components/modal/setup-provider.gjs@@ -5,10 +5,10 @@ import { action } from "@ember/object";import { service } from "@ember/service";import { trustHTML } from "@ember/template";import { isEmpty } from "@ember/utils";-import DModal from "discourse/components/d-modal";import Form from "discourse/components/form";import { ajax } from "discourse/lib/ajax";import { extractErrorInfo, popupAjaxError } from "discourse/lib/ajax-error";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";import { PROVIDER_LEARN_MORE_URLS } from "../../lib/utilities";import SlackProviderSetupForm from "../provider-setup-form/slack";diff --git a/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/components/modal/test-integration.gjs b/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/components/modal/test-integration.gjsindex b314d6156c0..27adbac2e85 100644--- a/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/components/modal/test-integration.gjs+++ b/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/components/modal/test-integration.gjs@@ -3,11 +3,11 @@ import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";import { isBlank } from "@ember/utils";import ChooseTopic from "discourse/components/choose-topic";-import DModal from "discourse/components/d-modal";import Form from "discourse/components/form";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import { not } from "discourse/truth-helpers";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";export default class TestIntegration extends Component {diff --git a/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/components/rule-row.gjs b/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/components/rule-row.gjsindex 3cabc0fffac..04558ad0b5e 100644--- a/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/components/rule-row.gjs+++ b/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/components/rule-row.gjs@@ -2,9 +2,9 @@ import Component from "@glimmer/component";import { fn } from "@ember/helper";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import categoryLink from "discourse/helpers/category-link";import { popupAjaxError } from "discourse/lib/ajax-error";+import DButton from "discourse/ui-kit/d-button";+import dCategoryLink from "discourse/ui-kit/helpers/d-category-link";import { i18n } from "discourse-i18n";import getTagName from "../lib/utilities";@@ -57,7 +57,7 @@ export default class RuleRow extends Component {</div>{{#if this.isCategory}}{{#if @rule.category}}- {{categoryLink+ {{dCategoryLink@rule.categoryallowUncategorized="true"link="false"diff --git a/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-chat-integration-providers.gjs b/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-chat-integration-providers.gjsindex 38aec4185e7..b4efb1c3541 100644--- a/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-chat-integration-providers.gjs+++ b/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-chat-integration-providers.gjs@@ -3,14 +3,14 @@ import { concat, fn } from "@ember/helper";import { action } from "@ember/object";import { service } from "@ember/service";import AdminConfigAreaEmptyList from "discourse/admin/components/admin-config-area-empty-list";-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DButton from "discourse/components/d-button";-import DropdownMenu from "discourse/components/dropdown-menu";-import NavItem from "discourse/components/nav-item";import DMenu from "discourse/float-kit/components/d-menu";-import concatClass from "discourse/helpers/concat-class";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DButton from "discourse/ui-kit/d-button";+import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";+import DNavItem from "discourse/ui-kit/d-nav-item";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";import SetupProvider from "../../../components/modal/setup-provider";@@ -138,7 +138,7 @@ export default class DiscourseChatIntegrationProviders extends Component {<div class="admin-nav-submenu"><ul class="nav nav-pills">{{#each this.enabledProviders as |provider|}}- <NavItem+ <DNavItem@route="adminPlugins.show.discourse-chat-integration-providers.show"@routeParam={{provider.name}}@currentWhen={{this.isProviderActive provider.name}}@@ -158,7 +158,7 @@ export default class DiscourseChatIntegrationProviders extends Component {class="btn-default btn-small"><:content as |menu|>- <DropdownMenu as |dropdown|>+ <DDropdownMenu as |dropdown|>{{#each this.disabledProviders as |provider|}}<dropdown.item><DButton@@ -168,7 +168,7 @@ export default class DiscourseChatIntegrationProviders extends Component {)}}@action={{fn this.configureProvider provider menu}}- class={{concatClass+ class={{dConcatClass"btn-transparent""chat-integration-add-provider-button"(concat "--" provider.name)@@ -176,7 +176,7 @@ export default class DiscourseChatIntegrationProviders extends Component {/></dropdown.item>{{/each}}- </DropdownMenu>+ </DDropdownMenu></:content></DMenu>{{/if}}@@ -197,7 +197,7 @@ export default class DiscourseChatIntegrationProviders extends Component {(concat "chat_integration.provider." provider.name ".title")}}@action={{fn this.configureProvider provider}}- class={{concatClass+ class={{dConcatClass"btn-default""chat-integration-popular-provider-setup"(concat "--" provider.name)@@ -212,7 +212,7 @@ export default class DiscourseChatIntegrationProviders extends Component {class="btn-default chat-integration-more-providers-setup"><:content>- <DropdownMenu as |dropdown|>+ <DDropdownMenu as |dropdown|>{{#each this.otherProviders as |provider|}}<dropdown.item><DButton@@ -224,7 +224,7 @@ export default class DiscourseChatIntegrationProviders extends Component {)}}@action={{fn this.configureProvider provider}}- class={{concatClass+ class={{dConcatClass"btn-transparent""chat-integration-more-providers-setup"(concat "--" provider.name)@@ -232,7 +232,7 @@ export default class DiscourseChatIntegrationProviders extends Component {/></dropdown.item>{{/each}}- </DropdownMenu>+ </DDropdownMenu></:content></DMenu>{{/if}}diff --git a/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-chat-integration-providers/show.gjs b/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-chat-integration-providers/show.gjsindex 150d5c0c427..feb60058480 100644--- a/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-chat-integration-providers/show.gjs+++ b/plugins/discourse-chat-integration/admin/assets/javascripts/discourse/templates/admin-plugins/show/discourse-chat-integration-providers/show.gjs@@ -3,9 +3,9 @@ import { fn } from "@ember/helper";import { action } from "@ember/object";import { service } from "@ember/service";import AdminConfigAreaEmptyList from "discourse/admin/components/admin-config-area-empty-list";-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DPageSubheader from "discourse/components/d-page-subheader";-import icon from "discourse/helpers/d-icon";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DPageSubheader from "discourse/ui-kit/d-page-subheader";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";import ChannelDetails from "../../../../components/channel-details";import InlineChannelForm from "../../../../components/inline-channel-form";@@ -41,7 +41,7 @@ export default class extends Component {{{#if @controller.anyErrors}}<div class="alert alert-error chat-integration-error-banner">- {{icon "triangle-exclamation"}}+ {{dIcon "triangle-exclamation"}}<span class="error-message">{{i18n "chat_integration.channels_with_errors"}}</span>diff --git a/plugins/discourse-data-explorer/admin/assets/javascripts/admin/templates/admin-plugins/show/explorer/edit.gjs b/plugins/discourse-data-explorer/admin/assets/javascripts/admin/templates/admin-plugins/show/explorer/edit.gjsindex 5aa2d53cbe0..1a853905ec4 100644--- a/plugins/discourse-data-explorer/admin/assets/javascripts/admin/templates/admin-plugins/show/explorer/edit.gjs+++ b/plugins/discourse-data-explorer/admin/assets/javascripts/admin/templates/admin-plugins/show/explorer/edit.gjs@@ -5,13 +5,13 @@ import { on } from "@ember/modifier";import didInsert from "@ember/render-modifiers/modifiers/did-insert";import AceEditor from "discourse/components/ace-editor";import BackButton from "discourse/components/back-button";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DButton from "discourse/components/d-button";-import DTextarea from "discourse/components/d-textarea";-import TextField from "discourse/components/text-field";-import icon from "discourse/helpers/d-icon";-import draggable from "discourse/modifiers/draggable";import MultiSelect from "discourse/select-kit/components/multi-select";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DTextField from "discourse/ui-kit/d-text-field";+import DTextarea from "discourse/ui-kit/d-textarea";+import dIcon from "discourse/ui-kit/helpers/d-icon";+import dDraggable from "discourse/ui-kit/modifiers/d-draggable";import { i18n } from "discourse-i18n";import CodeView from "discourse/plugins/discourse-data-explorer/discourse/components/code-view";import ExplorerSchema from "discourse/plugins/discourse-data-explorer/discourse/components/explorer-schema";@@ -43,7 +43,7 @@ export default class QueriesEdit extends Component {class="previous"/><div class="name-text-field">- <TextField+ <DTextField@value={{@controller.model.name}}@onChange={{@controller.setDirty}}/>@@ -118,13 +118,13 @@ export default class QueriesEdit extends Component {<divclass="grippie"- {{draggable+ {{dDraggable}}>- {{icon "discourse-expand"}}+ {{dIcon "discourse-expand"}}</div><div class="clear"></div>@@ -268,7 +268,7 @@ export default class QueriesEdit extends Component {</form><hr />- <ConditionalLoadingSpinner @condition={{@controller.loading}} />+ <DConditionalLoadingSpinner @condition={{@controller.loading}} /><QueryResultsWrapper@results={{@controller.results}}diff --git a/plugins/discourse-data-explorer/admin/assets/javascripts/admin/templates/admin-plugins/show/explorer/index.gjs b/plugins/discourse-data-explorer/admin/assets/javascripts/admin/templates/admin-plugins/show/explorer/index.gjsindex 2e49e475499..1a75a2339fa 100644--- a/plugins/discourse-data-explorer/admin/assets/javascripts/admin/templates/admin-plugins/show/explorer/index.gjs+++ b/plugins/discourse-data-explorer/admin/assets/javascripts/admin/templates/admin-plugins/show/explorer/index.gjs@@ -2,14 +2,14 @@ import { fn } from "@ember/helper";import { on } from "@ember/modifier";import { LinkTo } from "@ember/routing";import AdminFilterControls from "discourse/admin/components/admin-filter-controls";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DPageSubheader from "discourse/components/d-page-subheader";-import LoadMore from "discourse/components/load-more";-import PickFilesButton from "discourse/components/pick-files-button";-import TableHeaderToggle from "discourse/components/table-header-toggle";-import ageWithTooltip from "discourse/helpers/age-with-tooltip";-import icon from "discourse/helpers/d-icon";import { not } from "discourse/truth-helpers";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DLoadMore from "discourse/ui-kit/d-load-more";+import DPageSubheader from "discourse/ui-kit/d-page-subheader";+import DPickFilesButton from "discourse/ui-kit/d-pick-files-button";+import DTableHeaderToggle from "discourse/ui-kit/d-table-header-toggle";+import dAgeWithTooltip from "discourse/ui-kit/helpers/d-age-with-tooltip";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";import ShareReport from "discourse/plugins/discourse-data-explorer/discourse/components/share-report";@@ -26,7 +26,7 @@ export default <template>@label="explorer.create"/><actions.Wrapped>- <PickFilesButton+ <DPickFilesButton@label="explorer.import.label"@icon="upload"@acceptedFormatsOverride={{@controller.acceptedImportFileTypes}}@@ -49,7 +49,7 @@ export default <template><:aboveFilters>{{#if @controller.othersDirty}}<div class="warning">- {{icon "triangle-exclamation"}}+ {{dIcon "triangle-exclamation"}}{{i18n "explorer.others_dirty"}}</div>{{/if}}@@ -57,9 +57,9 @@ export default <template><:content as |filteredQueries|>{{#if @controller.model.content.length}}- <ConditionalLoadingSpinner @condition={{@controller.loading}} />+ <DConditionalLoadingSpinner @condition={{@controller.loading}} />- <LoadMore @action={{@controller.loadMore}}>+ <DLoadMore @action={{@controller.loadMore}}><div class="container discourse-data-explorer-query-list"><table class="d-table recent-queries"><thead class="d-table__header heading-container">@@ -72,7 +72,7 @@ export default <template>(fn @controller.updateSortProperty "name")}}>- <TableHeaderToggle+ <DTableHeaderToggle@field="name"@labelKey="explorer.query_name"@order={{@controller.order}}@@ -90,7 +90,7 @@ export default <template>(fn @controller.updateSortProperty "username")}}>- <TableHeaderToggle+ <DTableHeaderToggle@field="username"@labelKey="explorer.query_user"@order={{@controller.order}}@@ -113,7 +113,7 @@ export default <template>(fn @controller.updateSortProperty "last_run_at")}}>- <TableHeaderToggle+ <DTableHeaderToggle@field="last_run_at"@labelKey="explorer.query_time"@order={{@controller.order}}@@ -178,14 +178,14 @@ export default <template></div>{{#if query.last_run_at}}<span>- {{ageWithTooltip+ {{dAgeWithTooltipquery.last_run_atformat="medium"}}</span>{{else if query.created_at}}<span>- {{ageWithTooltip+ {{dAgeWithTooltipquery.created_atformat="medium"}}@@ -217,9 +217,9 @@ export default <template></tbody></table></div>- </LoadMore>+ </DLoadMore>- <ConditionalLoadingSpinner+ <DConditionalLoadingSpinner@condition={{@controller.model.loadingMore}}/>diff --git a/plugins/discourse-data-explorer/admin/assets/javascripts/admin/templates/admin-plugins/show/explorer/new.gjs b/plugins/discourse-data-explorer/admin/assets/javascripts/admin/templates/admin-plugins/show/explorer/new.gjsindex 67007aa87f8..da80fa59a68 100644--- a/plugins/discourse-data-explorer/admin/assets/javascripts/admin/templates/admin-plugins/show/explorer/new.gjs+++ b/plugins/discourse-data-explorer/admin/assets/javascripts/admin/templates/admin-plugins/show/explorer/new.gjs@@ -1,12 +1,12 @@import { on } from "@ember/modifier";import AceEditor from "discourse/components/ace-editor";import BackButton from "discourse/components/back-button";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DButton from "discourse/components/d-button";-import DTextarea from "discourse/components/d-textarea";import Form from "discourse/components/form";-import TextField from "discourse/components/text-field";-import icon from "discourse/helpers/d-icon";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DTextField from "discourse/ui-kit/d-text-field";+import DTextarea from "discourse/ui-kit/d-textarea";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default <template>@@ -22,7 +22,7 @@ export default <template><div class="query-new__ai-section"><label class="query-new__ai-label"><span>{{i18n "explorer.ai.description_title"}}</span>- {{icon "discourse-sparkles"}}+ {{dIcon "discourse-sparkles"}}</label><p class="query-new__ai-hint">@@ -63,7 +63,7 @@ export default <template>{{#if @controller.aiGenerating}}<span class="query-new__generating-indicator">- <ConditionalLoadingSpinner+ <DConditionalLoadingSpinner@condition={{true}}@size="small"/>@@ -91,7 +91,7 @@ export default <template><label class="query-new__field-label">{{i18n "explorer.query_name"}}</label>- <TextField+ <DTextField@value={{@controller.generatedName}}@onChange={{@controller.updateName}}class="query-new__name-input"diff --git a/plugins/discourse-data-explorer/assets/javascripts/discourse/components/explorer-schema.gjs b/plugins/discourse-data-explorer/assets/javascripts/discourse/components/explorer-schema.gjsindex 7ddbf8f8454..c7cd2ac9205 100644--- a/plugins/discourse-data-explorer/assets/javascripts/discourse/components/explorer-schema.gjs+++ b/plugins/discourse-data-explorer/assets/javascripts/discourse/components/explorer-schema.gjs@@ -3,10 +3,10 @@ import { tracked } from "@glimmer/tracking";import { on } from "@ember/modifier";import { action } from "@ember/object";import { isBlank, isEmpty } from "@ember/utils";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DButton from "discourse/components/d-button";import withEventValue from "discourse/helpers/with-event-value";import { debounce } from "discourse/lib/decorators";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";import OneTable from "./explorer-schema/one-table";export default class ExplorerSchema extends Component {@@ -160,13 +160,13 @@ export default class ExplorerSchema extends Component {</div><div class="schema-container">- <ConditionalLoadingSpinner @condition={{this.loading}}>+ <DConditionalLoadingSpinner @condition={{this.loading}}><ul>{{#each this.filteredTables as |table|}}<OneTable @table={{table}} />{{/each}}</ul>- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner></div></div>{{/if}}diff --git a/plugins/discourse-data-explorer/assets/javascripts/discourse/components/explorer-schema/one-table.gjs b/plugins/discourse-data-explorer/assets/javascripts/discourse/components/explorer-schema/one-table.gjsindex cdf0820354f..fa119d5061c 100644--- a/plugins/discourse-data-explorer/assets/javascripts/discourse/components/explorer-schema/one-table.gjs+++ b/plugins/discourse-data-explorer/assets/javascripts/discourse/components/explorer-schema/one-table.gjs@@ -2,8 +2,8 @@import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { on } from "@ember/modifier";-import icon from "discourse/helpers/d-icon";import { bind } from "discourse/lib/decorators";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";import EnumInfo from "./enum-info";@@ -28,9 +28,9 @@ export default class OneTable extends Component {{{on "click" this.toggleOpen}}>{{#if this.open}}- {{icon "angle-down"}}+ {{dIcon "angle-down"}}{{else}}- {{icon "angle-right"}}+ {{dIcon "angle-right"}}{{/if}}{{@table.name}}</div>@@ -45,7 +45,7 @@ export default class OneTable extends Component {title={{if col.sensitive (i18n "explorer.schema.sensitive")}}>{{#if col.sensitive}}- {{icon "triangle-exclamation"}}+ {{dIcon "triangle-exclamation"}}{{/if}}{{col.column_name}}</dt>@@ -55,7 +55,7 @@ export default class OneTable extends Component {<br />{{#if col.havepopup}}<div class="popup-info">- {{icon "info"}}+ {{dIcon "info"}}<div class="popup">{{col.column_desc}}{{#if col.enum}}diff --git a/plugins/discourse-data-explorer/assets/javascripts/discourse/components/modal/query-help.gjs b/plugins/discourse-data-explorer/assets/javascripts/discourse/components/modal/query-help.gjsindex a73597fb497..e92e1f4a3d7 100644--- a/plugins/discourse-data-explorer/assets/javascripts/discourse/components/modal/query-help.gjs+++ b/plugins/discourse-data-explorer/assets/javascripts/discourse/components/modal/query-help.gjs@@ -1,5 +1,5 @@import { trustHTML } from "@ember/template";-import DModal from "discourse/components/d-modal";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";const QueryHelp = <template>diff --git a/plugins/discourse-data-explorer/assets/javascripts/discourse/components/param-input-form.gjs b/plugins/discourse-data-explorer/assets/javascripts/discourse/components/param-input-form.gjsindex 73741e6811e..1effd28b2d9 100644--- a/plugins/discourse-data-explorer/assets/javascripts/discourse/components/param-input-form.gjs+++ b/plugins/discourse-data-explorer/assets/javascripts/discourse/components/param-input-form.gjs@@ -3,9 +3,9 @@ import EmberObject, { action } from "@ember/object";import { service } from "@ember/service";import { dasherize } from "@ember/string";import { isEmpty } from "@ember/utils";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";import Form from "discourse/components/form";import Category from "discourse/models/category";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";import { i18n } from "discourse-i18n";import BooleanThree from "./param-input/boolean-three";import CategoryIdInput from "./param-input/category-id-input";@@ -485,7 +485,7 @@ export default class ParamInputForm extends Component {@field={{field}}@info={{info}}/>- <ConditionalLoadingSpinner+ <DConditionalLoadingSpinner@condition={{info.loading}}@size="small"/>diff --git a/plugins/discourse-data-explorer/assets/javascripts/discourse/components/query-result-download-buttons.gjs b/plugins/discourse-data-explorer/assets/javascripts/discourse/components/query-result-download-buttons.gjsindex 0a64f9eb79e..c62b4d39832 100644--- a/plugins/discourse-data-explorer/assets/javascripts/discourse/components/query-result-download-buttons.gjs+++ b/plugins/discourse-data-explorer/assets/javascripts/discourse/components/query-result-download-buttons.gjs@@ -1,9 +1,9 @@import Component from "@glimmer/component";import { action } from "@ember/object";import { schedule } from "@ember/runloop";-import DButton from "discourse/components/d-button";import { ajax } from "discourse/lib/ajax";import getURL from "discourse/lib/get-url";+import DButton from "discourse/ui-kit/d-button";import { QUERY_RESULT_MAX_LIMIT } from "discourse/plugins/discourse-data-explorer/discourse/lib/constants";export default class QueryResultDownloadButtons extends Component {diff --git a/plugins/discourse-data-explorer/assets/javascripts/discourse/components/query-result.gjs b/plugins/discourse-data-explorer/assets/javascripts/discourse/components/query-result.gjsindex e7ab9a4bfa9..aa7f655127c 100644--- a/plugins/discourse-data-explorer/assets/javascripts/discourse/components/query-result.gjs+++ b/plugins/discourse-data-explorer/assets/javascripts/discourse/components/query-result.gjs@@ -5,11 +5,11 @@ import didInsert from "@ember/render-modifiers/modifiers/did-insert";import { service } from "@ember/service";import { capitalize } from "@ember/string";import moment from "moment";-import DButton from "discourse/components/d-button";-import icon from "discourse/helpers/d-icon";import KeyValueStore from "discourse/lib/key-value-store";import Badge from "discourse/models/badge";import Category from "discourse/models/category";+import DButton from "discourse/ui-kit/d-button";+import dIcon from "discourse/ui-kit/helpers/d-icon";import I18n, { i18n } from "discourse-i18n";import { isNumericColumn, looksLikeDate } from "../lib/chart-helpers";import DataExplorerChart from "./data-explorer-chart";@@ -365,7 +365,7 @@ export default class QueryResult extends Component {</div>{{#if this.cachedResultNotice}}<div class="cached-result-notice">- {{icon "clock-rotate-left"}}+ {{dIcon "clock-rotate-left"}}{{this.cachedResultNotice}}</div>{{/if}}diff --git a/plugins/discourse-data-explorer/assets/javascripts/discourse/components/result-types/category.gjs b/plugins/discourse-data-explorer/assets/javascripts/discourse/components/result-types/category.gjsindex fdbc0430a17..9b4f2487505 100644--- a/plugins/discourse-data-explorer/assets/javascripts/discourse/components/result-types/category.gjs+++ b/plugins/discourse-data-explorer/assets/javascripts/discourse/components/result-types/category.gjs@@ -1,5 +1,5 @@import Component from "@glimmer/component";-import { categoryLinkHTML } from "discourse/helpers/category-link";+import { categoryLinkHTML } from "discourse/ui-kit/helpers/d-category-link";export default class Category extends Component {get categoryBadgeReplacement() {diff --git a/plugins/discourse-data-explorer/assets/javascripts/discourse/components/result-types/json.gjs b/plugins/discourse-data-explorer/assets/javascripts/discourse/components/result-types/json.gjsindex 8677514c4c0..a545b1f3489 100644--- a/plugins/discourse-data-explorer/assets/javascripts/discourse/components/result-types/json.gjs+++ b/plugins/discourse-data-explorer/assets/javascripts/discourse/components/result-types/json.gjs@@ -2,8 +2,8 @@ import Component from "@glimmer/component";import { cached } from "@glimmer/tracking";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import FullscreenCodeModal from "discourse/components/modal/fullscreen-code";+import DButton from "discourse/ui-kit/d-button";export default class Json extends Component {@service modal;diff --git a/plugins/discourse-data-explorer/assets/javascripts/discourse/components/result-types/post.gjs b/plugins/discourse-data-explorer/assets/javascripts/discourse/components/result-types/post.gjsindex 057dd342738..974a6f4ba7c 100644--- a/plugins/discourse-data-explorer/assets/javascripts/discourse/components/result-types/post.gjs+++ b/plugins/discourse-data-explorer/assets/javascripts/discourse/components/result-types/post.gjs@@ -1,5 +1,5 @@import { trustHTML } from "@ember/template";-import avatar from "discourse/helpers/avatar";+import dAvatar from "discourse/ui-kit/helpers/d-avatar";const Post = <template>{{#if @ctx.post}}@@ -23,7 +23,7 @@ const Post = <template>class="result-post-link"href="/t/{{@ctx.post.topic_id}}/{{@ctx.post.post_number}}">- {{avatar @ctx.post imageSize="tiny"}}{{@ctx.post.username}}:+ {{dAvatar @ctx.post imageSize="tiny"}}{{@ctx.post.username}}:</a></div>diff --git a/plugins/discourse-data-explorer/assets/javascripts/discourse/components/result-types/user.gjs b/plugins/discourse-data-explorer/assets/javascripts/discourse/components/result-types/user.gjsindex cba791674f8..29aa3ef4134 100644--- a/plugins/discourse-data-explorer/assets/javascripts/discourse/components/result-types/user.gjs+++ b/plugins/discourse-data-explorer/assets/javascripts/discourse/components/result-types/user.gjs@@ -1,4 +1,4 @@-import avatar from "discourse/helpers/avatar";+import dAvatar from "discourse/ui-kit/helpers/d-avatar";const User = <template>{{#if @ctx.user}}@@ -6,7 +6,7 @@ const User = <template>href="{{@ctx.baseuri}}/u/{{@ctx.user.username}}/activity"data-user-card={{@ctx.user.username}}>- {{avatar @ctx.user imageSize="tiny"}}+ {{dAvatar @ctx.user imageSize="tiny"}}{{@ctx.user.username}}</a>{{else}}diff --git a/plugins/discourse-data-explorer/assets/javascripts/discourse/components/share-report.gjs b/plugins/discourse-data-explorer/assets/javascripts/discourse/components/share-report.gjsindex 28a50d45d76..d1c7f7c4ed5 100644--- a/plugins/discourse-data-explorer/assets/javascripts/discourse/components/share-report.gjs+++ b/plugins/discourse-data-explorer/assets/javascripts/discourse/components/share-report.gjs@@ -4,10 +4,10 @@ import { on } from "@ember/modifier";import { action } from "@ember/object";import didInsert from "@ember/render-modifiers/modifiers/did-insert";import willDestroy from "@ember/render-modifiers/modifiers/will-destroy";-import DButton from "discourse/components/d-button";-import icon from "discourse/helpers/d-icon";import { bind } from "discourse/lib/decorators";import getURL from "discourse/lib/get-url";+import DButton from "discourse/ui-kit/d-button";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class ShareReport extends Component {@@ -70,7 +70,7 @@ export default class ShareReport extends Component {<template><div class="share-report"><a href="#" {{on "click" this.open}} class="share-report-button">- {{icon "link"}}+ {{dIcon "link"}}{{@group}}</a>diff --git a/plugins/discourse-data-explorer/assets/javascripts/discourse/connectors/group-reports-nav-item/nav-item.gjs b/plugins/discourse-data-explorer/assets/javascripts/discourse/connectors/group-reports-nav-item/nav-item.gjsindex 8ef645bc205..c761759dcfa 100644--- a/plugins/discourse-data-explorer/assets/javascripts/discourse/connectors/group-reports-nav-item/nav-item.gjs+++ b/plugins/discourse-data-explorer/assets/javascripts/discourse/connectors/group-reports-nav-item/nav-item.gjs@@ -2,7 +2,7 @@import Component from "@ember/component";import { LinkTo } from "@ember/routing";import { tagName } from "@ember-decorators/component";-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";@tagName("")@@ -14,7 +14,7 @@ export default class NavItem extends Component {<template><li class="group-reports-nav-item-outlet nav-item" ...attributes><LinkTo @route="group.reports">- {{icon "chart-bar"}}{{i18n "group.reports"}}+ {{dIcon "chart-bar"}}{{i18n "group.reports"}}</LinkTo></li></template>diff --git a/plugins/discourse-data-explorer/assets/javascripts/discourse/templates/group/reports/index.gjs b/plugins/discourse-data-explorer/assets/javascripts/discourse/templates/group/reports/index.gjsindex 361a64532e6..1d8f4053c2c 100644--- a/plugins/discourse-data-explorer/assets/javascripts/discourse/templates/group/reports/index.gjs+++ b/plugins/discourse-data-explorer/assets/javascripts/discourse/templates/group/reports/index.gjs@@ -1,6 +1,6 @@import { array } from "@ember/helper";import { LinkTo } from "@ember/routing";-import ageWithTooltip from "discourse/helpers/age-with-tooltip";+import dAgeWithTooltip from "discourse/ui-kit/helpers/d-age-with-tooltip";import { i18n } from "discourse-i18n";export default <template>@@ -31,7 +31,7 @@ export default <template><td>{{query.description}}</td><td>{{#if query.last_run_at}}- {{ageWithTooltip query.last_run_at format="medium"}}+ {{dAgeWithTooltip query.last_run_at format="medium"}}{{/if}}</td></tr>diff --git a/plugins/discourse-data-explorer/assets/javascripts/discourse/templates/group/reports/show.gjs b/plugins/discourse-data-explorer/assets/javascripts/discourse/templates/group/reports/show.gjsindex c0a1d4b34bc..0660c948cf8 100644--- a/plugins/discourse-data-explorer/assets/javascripts/discourse/templates/group/reports/show.gjs+++ b/plugins/discourse-data-explorer/assets/javascripts/discourse/templates/group/reports/show.gjs@@ -1,7 +1,7 @@import { on } from "@ember/modifier";import didInsert from "@ember/render-modifiers/modifiers/did-insert";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";import ParamInputForm from "../../../components/param-input-form";import QueryResult from "../../../components/query-result";import QueryResultDownloadButtons from "../../../components/query-result-download-buttons";@@ -54,7 +54,7 @@ export default <template><hr />- <ConditionalLoadingSpinner @condition={{@controller.loading}} />+ <DConditionalLoadingSpinner @condition={{@controller.loading}} />{{#if @controller.results}}<div class="query-results">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.gjsindex d53217aa34a..2fe9c5872de 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@@ -1,9 +1,9 @@import { concat, fn } from "@ember/helper";import { LinkTo } from "@ember/routing";-import DBreadcrumbsItem from "discourse/components/d-breadcrumbs-item";-import DButton from "discourse/components/d-button";-import DPageSubheader from "discourse/components/d-page-subheader";-import formatDate from "discourse/helpers/format-date";+import DBreadcrumbsItem from "discourse/ui-kit/d-breadcrumbs-item";+import DButton from "discourse/ui-kit/d-button";+import DPageSubheader from "discourse/ui-kit/d-page-subheader";+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";@@ -60,9 +60,9 @@ export default <template></td><td>{{#if leaderboard.fromDate}}- {{formatDate (@controller.parseDate leaderboard.fromDate)}}+ {{dFormatDate (@controller.parseDate leaderboard.fromDate)}}-- {{formatDate (@controller.parseDate leaderboard.toDate)}}+ {{dFormatDate (@controller.parseDate leaderboard.toDate)}}{{else}}{{leaderboard.defaultPeriod}}{{/if}}diff --git a/plugins/discourse-gamification/assets/javascripts/discourse/components/gamification-leaderboard-row.gjs b/plugins/discourse-gamification/assets/javascripts/discourse/components/gamification-leaderboard-row.gjsindex 907c54b2b6f..a11d24bda7a 100644--- a/plugins/discourse-gamification/assets/javascripts/discourse/components/gamification-leaderboard-row.gjs+++ b/plugins/discourse-gamification/assets/javascripts/discourse/components/gamification-leaderboard-row.gjs@@ -1,9 +1,9 @@/* eslint-disable ember/no-classic-components */import Component from "@ember/component";import { tagName } from "@ember-decorators/component";-import avatar from "discourse/helpers/avatar";-import number from "discourse/helpers/number";import { or } from "discourse/truth-helpers";+import dAvatar from "discourse/ui-kit/helpers/d-avatar";+import dNumber from "discourse/ui-kit/helpers/d-number";import fullnumber from "../helpers/fullnumber";@tagName("")@@ -21,7 +21,7 @@ export default class GamificationLeaderboardRow extends Component {role="button"data-user-card={{this.rank.username}}>- {{avatar this.rank imageSize="large"}}+ {{dAvatar this.rank imageSize="large"}}<span class="user__name">{{#if this.siteSettings.prioritize_username_in_ux}}{{this.rank.username}}@@ -32,7 +32,7 @@ export default class GamificationLeaderboardRow extends Component {</div><div class="user__score">{{#if this.site.mobileView}}- {{number this.rank.total_score}}+ {{dNumber this.rank.total_score}}{{else}}{{fullnumber this.rank.total_score}}{{/if}}diff --git a/plugins/discourse-gamification/assets/javascripts/discourse/components/gamification-leaderboard.gjs b/plugins/discourse-gamification/assets/javascripts/discourse/components/gamification-leaderboard.gjsindex 9ef87d38838..2ad02340224 100644--- a/plugins/discourse-gamification/assets/javascripts/discourse/components/gamification-leaderboard.gjs+++ b/plugins/discourse-gamification/assets/javascripts/discourse/components/gamification-leaderboard.gjs@@ -4,16 +4,16 @@ import { hash } from "@ember/helper";import { action, computed } from "@ember/object";import { service } from "@ember/service";import { tagName } from "@ember-decorators/component";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DButton from "discourse/components/d-button";-import LoadMore from "discourse/components/load-more";-import avatar from "discourse/helpers/avatar";-import icon from "discourse/helpers/d-icon";-import number from "discourse/helpers/number";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import PeriodChooser from "discourse/select-kit/components/period-chooser";import { or } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DLoadMore from "discourse/ui-kit/d-load-more";+import dAvatar from "discourse/ui-kit/helpers/d-avatar";+import dIcon from "discourse/ui-kit/helpers/d-icon";+import dNumber from "discourse/ui-kit/helpers/d-number";import { i18n } from "discourse-i18n";import fullnumber from "../helpers/fullnumber";import GamificationLeaderboardRow from "./gamification-leaderboard-row";@@ -166,7 +166,7 @@ export default class GamificationLeaderboard extends Component {/>{{#if this.currentUser.staff}}<a href="/admin/plugins/gamification" class="leaderboard__settings">- {{icon "gear"}}+ {{dIcon "gear"}}{{unlessthis.site.mobileView(i18n "gamification.leaderboard.link_to_settings")@@ -190,13 +190,13 @@ export default class GamificationLeaderboard extends Component {<div class="podium">{{#each this.winners as |winner|}}<div class="winner -position{{winner.position}}">- <div class="winner__crown">{{icon "crown"}}</div>+ <div class="winner__crown">{{dIcon "crown"}}</div><divclass="winner__avatar clickable"role="button"data-user-card={{winner.username}}>- {{avatar winner imageSize="huge"}}+ {{dAvatar winner imageSize="huge"}}<div class="winner__rank"><span>{{winner.position}}</span></div>@@ -219,7 +219,7 @@ export default class GamificationLeaderboard extends Component {<div class="ranking"><div class="ranking-col-names"><span>{{i18n "gamification.leaderboard.rank"}}</span>- <span>{{icon "award"}}{{i18n "gamification.score"}}</span>+ <span>{{dIcon "award"}}{{i18n "gamification.score"}}</span></div><div class="ranking-col-names__sticky-border"></div>{{#if this.currentUserRanking.user}}@@ -228,7 +228,7 @@ export default class GamificationLeaderboard extends Component {<div class="user__name">{{i18n "gamification.you"}}</div><div class="user__score">{{#if this.site.mobileView}}- {{number this.currentUserRanking.user.total_score}}+ {{dNumber this.currentUserRanking.user.total_score}}{{else}}{{fullnumber this.currentUserRanking.user.total_score}}{{/if}}@@ -236,12 +236,12 @@ export default class GamificationLeaderboard extends Component {</div>{{/if}}- <LoadMore @action={{this.loadMore}}>+ <DLoadMore @action={{this.loadMore}}>{{#each this.ranking as |rank index|}}<GamificationLeaderboardRow @rank={{rank}} @index={{index}} />{{/each}}- </LoadMore>- <ConditionalLoadingSpinner @condition={{this.loading}} />+ </DLoadMore>+ <DConditionalLoadingSpinner @condition={{this.loading}} /></div>{{/if}}</div>diff --git a/plugins/discourse-gamification/assets/javascripts/discourse/components/minimal-gamification-leaderboard-row.gjs b/plugins/discourse-gamification/assets/javascripts/discourse/components/minimal-gamification-leaderboard-row.gjsindex fc00cafb72e..d685f14305e 100644--- a/plugins/discourse-gamification/assets/javascripts/discourse/components/minimal-gamification-leaderboard-row.gjs+++ b/plugins/discourse-gamification/assets/javascripts/discourse/components/minimal-gamification-leaderboard-row.gjs@@ -1,10 +1,10 @@import Component from "@glimmer/component";import { service } from "@ember/service";-import avatar from "discourse/helpers/avatar";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";-import number from "discourse/helpers/number";import { or } from "discourse/truth-helpers";+import dAvatar from "discourse/ui-kit/helpers/d-avatar";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";+import dNumber from "discourse/ui-kit/helpers/d-number";import { i18n } from "discourse-i18n";import sum from "../helpers/sum";@@ -14,11 +14,11 @@ export default class MinimalGamificationLeaderboardRow extends Component {<template><divid="leaderboard-user-{{@rank.id}}"- class={{concatClass "user" (if @rank.isCurrentUser "user-highlight")}}+ class={{dConcatClass "user" (if @rank.isCurrentUser "user-highlight")}}>- <div class={{concatClass "user__rank" (if @rank.topRanked "-winner")}}>+ <div class={{dConcatClass "user__rank" (if @rank.topRanked "-winner")}}>{{#if @rank.topRanked}}- {{icon "crown"}}+ {{dIcon "crown"}}{{else}}{{sum @index 1}}{{/if}}@@ -28,7 +28,7 @@ export default class MinimalGamificationLeaderboardRow extends Component {data-user-card={{@rank.username}}class="user__avatar clickable">- {{avatar @rank imageSize="small"}}+ {{dAvatar @rank imageSize="small"}}{{#if @rank.isCurrentUser}}<span class="user__name">{{i18n "gamification.you"}}</span>@@ -44,7 +44,7 @@ export default class MinimalGamificationLeaderboardRow extends Component {</div><div class="user__score">- {{number @rank.total_score}}+ {{dNumber @rank.total_score}}</div></div></template>diff --git a/plugins/discourse-gamification/assets/javascripts/discourse/components/minimal-gamification-leaderboard.gjs b/plugins/discourse-gamification/assets/javascripts/discourse/components/minimal-gamification-leaderboard.gjsindex 0f475110225..80d17b2356e 100644--- a/plugins/discourse-gamification/assets/javascripts/discourse/components/minimal-gamification-leaderboard.gjs+++ b/plugins/discourse-gamification/assets/javascripts/discourse/components/minimal-gamification-leaderboard.gjs@@ -2,9 +2,9 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { LinkTo } from "@ember/routing";import { service } from "@ember/service";-import icon from "discourse/helpers/d-icon";-import number from "discourse/helpers/number";import { ajax } from "discourse/lib/ajax";+import dIcon from "discourse/ui-kit/helpers/d-icon";+import dNumber from "discourse/ui-kit/helpers/d-number";import { i18n } from "discourse-i18n";import fullnumber from "../helpers/fullnumber";import MinimalGamificationLeaderboardRow from "./minimal-gamification-leaderboard-row";@@ -56,7 +56,7 @@ export default class extends Component {<div class="ranking-col-names"><span>{{i18n "gamification.leaderboard.rank"}}</span>- <span>{{icon "award"}}{{i18n "gamification.score"}}</span>+ <span>{{dIcon "award"}}{{i18n "gamification.score"}}</span></div><div class="ranking-col-names__sticky-border"></div>@@ -67,7 +67,7 @@ export default class extends Component {<div class="user__name">{{i18n "gamification.you"}}</div><div class="user__score">{{#if this.site.mobileView}}- {{number this.model.personal.user.total_score}}+ {{dNumber this.model.personal.user.total_score}}{{else}}{{fullnumber this.model.personal.user.total_score}}{{/if}}diff --git a/plugins/discourse-gamification/assets/javascripts/discourse/components/modal/leaderboard-info.gjs b/plugins/discourse-gamification/assets/javascripts/discourse/components/modal/leaderboard-info.gjsindex 3b62147a484..85fc13f177c 100644--- a/plugins/discourse-gamification/assets/javascripts/discourse/components/modal/leaderboard-info.gjs+++ b/plugins/discourse-gamification/assets/javascripts/discourse/components/modal/leaderboard-info.gjs@@ -1,6 +1,6 @@import { trustHTML } from "@ember/template";-import DModal from "discourse/components/d-modal";-import icon from "discourse/helpers/d-icon";+import DModal from "discourse/ui-kit/d-modal";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";const LeaderboardInfo = <template>@@ -10,7 +10,7 @@ const LeaderboardInfo = <template>class="leaderboard-info-modal"><:body>- {{icon "award"}}+ {{dIcon "award"}}{{trustHTML (i18n "gamification.leaderboard.modal.text")}}</:body></DModal>diff --git a/plugins/discourse-gamification/assets/javascripts/discourse/components/modal/recalculate-scores-form.gjs b/plugins/discourse-gamification/assets/javascripts/discourse/components/modal/recalculate-scores-form.gjsindex a4b4d70a4cd..a7baba0e892 100644--- a/plugins/discourse-gamification/assets/javascripts/discourse/components/modal/recalculate-scores-form.gjs+++ b/plugins/discourse-gamification/assets/javascripts/discourse/components/modal/recalculate-scores-form.gjs@@ -4,15 +4,15 @@ import { tracked } from "@glimmer/tracking";import { fn } from "@ember/helper";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";import DatePickerPast from "discourse/components/date-picker-past";-import icon from "discourse/helpers/d-icon";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import { bind } from "discourse/lib/decorators";import ComboBox from "discourse/select-kit/components/combo-box";import { eq } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class RecalculateScoresForm extends Component {@@ -143,7 +143,7 @@ export default class RecalculateScoresForm extends Component {</div>{{else if (eq this.status "complete")}}<div class="recalculate-modal__status is-success">- {{icon "check"}}+ {{dIcon "check"}}{{i18n "gamification.completed"}}</div>{{else}}diff --git a/plugins/discourse-hcaptcha/assets/javascripts/discourse/components/h-captcha.gjs b/plugins/discourse-hcaptcha/assets/javascripts/discourse/components/h-captcha.gjsindex f3a72531e1e..e10f6b672cf 100644--- a/plugins/discourse-hcaptcha/assets/javascripts/discourse/components/h-captcha.gjs+++ b/plugins/discourse-hcaptcha/assets/javascripts/discourse/components/h-captcha.gjs@@ -2,8 +2,8 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { next } from "@ember/runloop";import { service } from "@ember/service";-import InputTip from "discourse/components/input-tip";import loadScript from "discourse/lib/load-script";+import DInputTip from "discourse/ui-kit/d-input-tip";import { i18n } from "discourse-i18n";const HCAPTCHA_SCRIPT_URL = "https://hcaptcha.com/1/api.js?render=explicit";@@ -82,7 +82,7 @@ export default class HCaptcha extends Component {{{/if}}{{#if this.hCaptchaService.submitFailed}}- <InputTip @validation={{this.hCaptchaService.inputValidation}} />+ <DInputTip @validation={{this.hCaptchaService.inputValidation}} />{{/if}}</template>}diff --git a/plugins/discourse-lazy-videos/assets/javascripts/discourse/components/lazy-video.gjs b/plugins/discourse-lazy-videos/assets/javascripts/discourse/components/lazy-video.gjsindex 7e3897ea5ac..31e2d60b9d3 100644--- a/plugins/discourse-lazy-videos/assets/javascripts/discourse/components/lazy-video.gjs+++ b/plugins/discourse-lazy-videos/assets/javascripts/discourse/components/lazy-video.gjs@@ -4,7 +4,7 @@ import { concat } from "@ember/helper";import { on } from "@ember/modifier";import { action } from "@ember/object";import { trustHTML } from "@ember/template";-import concatClass from "discourse/helpers/concat-class";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";import LazyIframe from "./lazy-iframe";@@ -40,7 +40,7 @@ export default class LazyVideo extends Component {data-video-title={{@videoAttributes.title}}data-video-start-time={{@videoAttributes.startTime}}data-provider-name={{@videoAttributes.providerName}}- class={{concatClass+ class={{dConcatClass"lazy-video-container"(concat @videoAttributes.providerName "-onebox")(if this.isLoaded "video-loaded")@@ -64,7 +64,7 @@ export default class LazyVideo extends Component {}}style={{this.thumbnailStyle}}- class={{concatClass "video-thumbnail" @videoAttributes.providerName}}+ class={{dConcatClass "video-thumbnail" @videoAttributes.providerName}}><imgsrc={{@videoAttributes.thumbnail}}@@ -73,7 +73,7 @@ export default class LazyVideo extends Component {class={{concat @videoAttributes.providerName "-thumbnail"}}/><div- class={{concatClass+ class={{dConcatClass"icon"(concat @videoAttributes.providerName "-icon")}}diff --git a/plugins/discourse-local-dates/assets/javascripts/discourse/components/modal/local-dates-create.gjs b/plugins/discourse-local-dates/assets/javascripts/discourse/components/modal/local-dates-create.gjsindex 6a866c700bf..10c78dfb8cd 100644--- a/plugins/discourse-local-dates/assets/javascripts/discourse/components/modal/local-dates-create.gjs+++ b/plugins/discourse-local-dates/assets/javascripts/discourse/components/modal/local-dates-create.gjs@@ -8,11 +8,6 @@ import { trustHTML } from "@ember/template";import { isEmpty } from "@ember/utils";import { tagName } from "@ember-decorators/component";import { observes } from "@ember-decorators/object";-import CalendarDateTimeInput from "discourse/components/calendar-date-time-input";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";-import TextField from "discourse/components/text-field";-import icon from "discourse/helpers/d-icon";import { debounce } from "discourse/lib/decorators";import { INPUT_DELAY } from "discourse/lib/environment";import { applyLocalDates } from "discourse/lib/local-dates";@@ -21,6 +16,11 @@ import { cook } from "discourse/lib/text";import ComboBox from "discourse/select-kit/components/combo-box";import MultiSelect from "discourse/select-kit/components/multi-select";import TimezoneInput from "discourse/select-kit/components/timezone-input";+import DButton from "discourse/ui-kit/d-button";+import DCalendarDateTimeInput from "discourse/ui-kit/d-calendar-date-time-input";+import DModal from "discourse/ui-kit/d-modal";+import DTextField from "discourse/ui-kit/d-text-field";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";import generateDateMarkup from "discourse/plugins/discourse-local-dates/lib/local-date-markup-generator";@@ -445,7 +445,7 @@ export default class LocalDatesCreate extends Component {{{if this.fromSelected 'is-selected'}}{{if this.fromFilled 'is-filled'}}">- {{icon "calendar-days"}}+ {{dIcon "calendar-days"}}<DButton@action={{this.focusFrom}}@translatedLabel={{this.formattedFrom}}@@ -460,7 +460,7 @@ export default class LocalDatesCreate extends Component {{{if this.toSelected 'is-selected'}}{{if this.toFilled 'is-filled'}}">- {{icon "calendar-days"}}+ {{dIcon "calendar-days"}}<DButton@action={{this.focusTo}}@translatedLabel={{this.formattedTo}}@@ -485,7 +485,7 @@ export default class LocalDatesCreate extends Component {</div><div class="picker-panel">- <CalendarDateTimeInput+ <DCalendarDateTimeInput@datePickerId="local-date-create-form"@date={{this.selectedDate}}@time={{this.selectedTime}}@@ -564,11 +564,11 @@ export default class LocalDatesCreate extends Component {href="https://momentjs.com/docs/#/parsing/string-format/"rel="noopener noreferrer">- {{icon "circle-question"}}+ {{dIcon "circle-question"}}</a></p><div class="controls">- <TextField @value={{this.format}} class="format-input" />+ <DTextField @value={{this.format}} class="format-input" /></div></div><div class="control-group">diff --git a/plugins/discourse-math/assets/javascripts/discourse/components/modal/math-edit.gjs b/plugins/discourse-math/assets/javascripts/discourse/components/modal/math-edit.gjsindex 212000d0812..3224ba9021d 100644--- a/plugins/discourse-math/assets/javascripts/discourse/components/modal/math-edit.gjs+++ b/plugins/discourse-math/assets/javascripts/discourse/components/modal/math-edit.gjs@@ -1,9 +1,9 @@import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";import Form from "discourse/components/form";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";export default class MathEditModal extends Component {diff --git a/plugins/discourse-math/assets/javascripts/discourse/components/modal/math-insert.gjs b/plugins/discourse-math/assets/javascripts/discourse/components/modal/math-insert.gjsindex 392ff37726a..a1592055fad 100644--- a/plugins/discourse-math/assets/javascripts/discourse/components/modal/math-insert.gjs+++ b/plugins/discourse-math/assets/javascripts/discourse/components/modal/math-insert.gjs@@ -2,10 +2,10 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { on } from "@ember/modifier";import { action } from "@ember/object";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";-import DToggleSwitch from "discourse/components/d-toggle-switch";import Form from "discourse/components/form";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";+import DToggleSwitch from "discourse/ui-kit/d-toggle-switch";import { i18n } from "discourse-i18n";export default class MathInsertModal extends Component {diff --git a/plugins/discourse-patreon/assets/javascripts/discourse/connectors/admin-user-details/patreon.gjs b/plugins/discourse-patreon/assets/javascripts/discourse/connectors/admin-user-details/patreon.gjsindex d8d9bf9646b..01b5c92d4d3 100644--- a/plugins/discourse-patreon/assets/javascripts/discourse/connectors/admin-user-details/patreon.gjs+++ b/plugins/discourse-patreon/assets/javascripts/discourse/connectors/admin-user-details/patreon.gjs@@ -3,10 +3,10 @@ import Component from "@ember/component";import { action } from "@ember/object";import { trustHTML } from "@ember/template";import { tagName } from "@ember-decorators/component";-import DButton from "discourse/components/d-button";-import icon from "discourse/helpers/d-icon";import { ajax } from "discourse/lib/ajax";import { userPath } from "discourse/lib/url";+import DButton from "discourse/ui-kit/d-button";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";@tagName("")@@ -99,7 +99,7 @@ export default class Patreon extends Component {target="_blank"href={{this.patron_url}}>- {{icon "up-right-from-square"}}+ {{dIcon "up-right-from-square"}}</a></div><div class="controls">diff --git a/plugins/discourse-patreon/assets/javascripts/discourse/connectors/topic-above-footer-buttons/patreon.gjs b/plugins/discourse-patreon/assets/javascripts/discourse/connectors/topic-above-footer-buttons/patreon.gjsindex 4e2144afe50..1b4844d0dc8 100644--- a/plugins/discourse-patreon/assets/javascripts/discourse/connectors/topic-above-footer-buttons/patreon.gjs+++ b/plugins/discourse-patreon/assets/javascripts/discourse/connectors/topic-above-footer-buttons/patreon.gjs@@ -5,8 +5,8 @@ import { action } from "@ember/object";import { trustHTML } from "@ember/template";import { classNames, tagName } from "@ember-decorators/component";import $ from "jquery";-import icon from "discourse/helpers/d-icon";import cookie from "discourse/lib/cookie";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";let numTopicsOpened = 0;@@ -51,7 +51,7 @@ export default class Patreon extends Component {{{#if this.showDonationPrompt}}<div class="patreon-donation-prompt"><span {{on "click" this.close}} role="button" class="close">- {{icon "xmark"}}+ {{dIcon "xmark"}}</span>{{trustHTMLdiff --git a/plugins/discourse-patreon/assets/javascripts/discourse/templates/admin/plugins-patreon.gjs b/plugins/discourse-patreon/assets/javascripts/discourse/templates/admin/plugins-patreon.gjsindex ae3d1c26d86..d922c519069 100644--- a/plugins/discourse-patreon/assets/javascripts/discourse/templates/admin/plugins-patreon.gjs+++ b/plugins/discourse-patreon/assets/javascripts/discourse/templates/admin/plugins-patreon.gjs@@ -1,8 +1,8 @@import { trustHTML } from "@ember/template";-import DButton from "discourse/components/d-button";-import formatDate from "discourse/helpers/format-date";import ComboBox from "discourse/select-kit/components/combo-box";import ListSetting from "discourse/select-kit/components/list-setting";+import DButton from "discourse/ui-kit/d-button";+import dFormatDate from "discourse/ui-kit/helpers/d-format-date";import { i18n } from "discourse-i18n";export default <template>@@ -78,7 +78,7 @@ export default <template>{{#if @controller.last_sync_at}}<span class="last_synced">{{i18n "patreon.last_synced"}}:- {{trustHTML (formatDate @controller.last_sync_at leaveAgo="true")}}+ {{trustHTML (dFormatDate @controller.last_sync_at leaveAgo="true")}}</span>{{/if}}</section>diff --git a/plugins/discourse-policy/assets/javascripts/discourse/components/modal/policy-builder.gjs b/plugins/discourse-policy/assets/javascripts/discourse/components/modal/policy-builder.gjsindex 40aa6efbcda..43cbb74772f 100644--- a/plugins/discourse-policy/assets/javascripts/discourse/components/modal/policy-builder.gjs+++ b/plugins/discourse-policy/assets/javascripts/discourse/components/modal/policy-builder.gjs@@ -2,10 +2,10 @@ import Component from "@glimmer/component";import { cached, tracked } from "@glimmer/tracking";import { action } from "@ember/object";import { isPresent } from "@ember/utils";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";import { ajax } from "discourse/lib/ajax";import { cook } from "discourse/lib/text";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";import PolicyBuilderForm from "../policy-builder-form";diff --git a/plugins/discourse-policy/assets/javascripts/discourse/components/post-policy.gjs b/plugins/discourse-policy/assets/javascripts/discourse/components/post-policy.gjsindex b41c90a920d..cb6a971a403 100644--- a/plugins/discourse-policy/assets/javascripts/discourse/components/post-policy.gjs+++ b/plugins/discourse-policy/assets/javascripts/discourse/components/post-policy.gjs@@ -3,14 +3,14 @@ import { tracked } from "@glimmer/tracking";import { on } from "@ember/modifier";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import avatar from "discourse/helpers/bound-avatar-template";-import icon from "discourse/helpers/d-icon";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import { removeValueFromArray } from "discourse/lib/array-tools";import { bind } from "discourse/lib/decorators";import { and, not } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import dBoundAvatarTemplate from "discourse/ui-kit/helpers/d-bound-avatar-template";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";import PolicyBuilder from "./modal/policy-builder";@@ -283,14 +283,14 @@ export default class PostPolicy extends Component {<span class="user-count">{{this.post.policy_accepted_by_count}}</span>- {{icon "user-check"}}+ {{dIcon "user-check"}}</a>{{#unless this.showNotAccepted}}{{#if this.acceptedUsers.length}}<div class="users accepted">{{#each this.acceptedUsers as |acceptedUser|}}- {{avatar acceptedUser.avatar_template "tiny"}}+ {{dBoundAvatarTemplate acceptedUser.avatar_template "tiny"}}{{/each}}{{#if this.remainingAcceptedUsers}}@@ -301,7 +301,7 @@ export default class PostPolicy extends Component {>+{{this.remainingAcceptedUsers}}- {{icon "user"}}+ {{dIcon "user"}}</a>{{/if}}</div>@@ -321,13 +321,16 @@ export default class PostPolicy extends Component {<span class="user-count">{{this.post.policy_not_accepted_by_count}}</span>- {{icon "user-xmark"}}+ {{dIcon "user-xmark"}}</a>{{#if this.showNotAccepted}}<div class="users not-accepted">{{#each this.notAcceptedUsers as |notAcceptedUser|}}- {{avatar notAcceptedUser.avatar_template "tiny"}}+ {{dBoundAvatarTemplate+ notAcceptedUser.avatar_template+ "tiny"+ }}{{/each}}{{#if this.remainingNotAcceptedUsers}}@@ -338,7 +341,7 @@ export default class PostPolicy extends Component {>+{{this.remainingNotAcceptedUsers}}- {{icon "user"}}+ {{dIcon "user"}}</a>{{/if}}</div>diff --git a/plugins/discourse-post-voting/assets/javascripts/discourse/components/post-voting-answer-button.gjs b/plugins/discourse-post-voting/assets/javascripts/discourse/components/post-voting-answer-button.gjsindex 7383319cb68..3392822db30 100644--- a/plugins/discourse-post-voting/assets/javascripts/discourse/components/post-voting-answer-button.gjs+++ b/plugins/discourse-post-voting/assets/javascripts/discourse/components/post-voting-answer-button.gjs@@ -1,7 +1,7 @@import Component from "@glimmer/component";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import concatClass from "discourse/helpers/concat-class";+import DButton from "discourse/ui-kit/d-button";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";export default class PostVotingAnswerButton extends Component {static shouldRender(args) {@@ -16,7 +16,7 @@ export default class PostVotingAnswerButton extends Component {<template><DButton- class={{concatClass+ class={{dConcatClass"post-action-menu__post-voting-answer""reply"(if this.showLabel "create fade-out")diff --git a/plugins/discourse-post-voting/assets/javascripts/discourse/components/post-voting-answer-header.gjs b/plugins/discourse-post-voting/assets/javascripts/discourse/components/post-voting-answer-header.gjsindex d4e2965b82d..da2c23f1b44 100644--- a/plugins/discourse-post-voting/assets/javascripts/discourse/components/post-voting-answer-header.gjs+++ b/plugins/discourse-post-voting/assets/javascripts/discourse/components/post-voting-answer-header.gjs@@ -1,7 +1,7 @@import Component from "@glimmer/component";import { on } from "@ember/modifier";import { action } from "@ember/object";-import concatClass from "discourse/helpers/concat-class";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";export const ORDER_BY_ACTIVITY_FILTER = "activity";@@ -75,7 +75,7 @@ export default class PostVotingAnswerHeader extends Component {<li><ahref={{this.votesUrl}}- class={{concatClass+ class={{dConcatClass"--votes"(unless this.sortedByActivity "active")}}@@ -88,7 +88,7 @@ export default class PostVotingAnswerHeader extends Component {<li><ahref={{this.activityUrl}}- class={{concatClass+ class={{dConcatClass"--activity"(if this.sortedByActivity "active")}}diff --git a/plugins/discourse-post-voting/assets/javascripts/discourse/components/post-voting-button.gjs b/plugins/discourse-post-voting/assets/javascripts/discourse/components/post-voting-button.gjsindex bf78ab223e5..c398d8939cd 100644--- a/plugins/discourse-post-voting/assets/javascripts/discourse/components/post-voting-button.gjs+++ b/plugins/discourse-post-voting/assets/javascripts/discourse/components/post-voting-button.gjs@@ -1,8 +1,8 @@import Component from "@glimmer/component";import { on } from "@ember/modifier";import { action } from "@ember/object";-import DButton from "discourse/components/d-button";-import concatClass from "discourse/helpers/concat-class";+import DButton from "discourse/ui-kit/d-button";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";export default class PostVotingButton extends Component {get buttonClasses() {@@ -55,7 +55,7 @@ export default class PostVotingButton extends Component {@icon={{this.iconName}}@title={{this.ariaLabel}}@ariaLabel={{this.ariaLabel}}- class={{concatClass+ class={{dConcatClass"btn-transparent post-voting-button"this.buttonClasses}}diff --git a/plugins/discourse-post-voting/assets/javascripts/discourse/components/post-voting-comment-actions.gjs b/plugins/discourse-post-voting/assets/javascripts/discourse/components/post-voting-comment-actions.gjsindex 596692d477f..686f5dff7a5 100644--- a/plugins/discourse-post-voting/assets/javascripts/discourse/components/post-voting-comment-actions.gjs+++ b/plugins/discourse-post-voting/assets/javascripts/discourse/components/post-voting-comment-actions.gjs@@ -1,10 +1,10 @@import Component from "@glimmer/component";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import FlagModal from "discourse/components/modal/flag";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";import PostVotingFlag from "../lib/post-voting-flag";diff --git a/plugins/discourse-post-voting/assets/javascripts/discourse/components/post-voting-comment-editor.gjs b/plugins/discourse-post-voting/assets/javascripts/discourse/components/post-voting-comment-editor.gjsindex 9f280a9d934..e35b12eb829 100644--- a/plugins/discourse-post-voting/assets/javascripts/discourse/components/post-voting-comment-editor.gjs+++ b/plugins/discourse-post-voting/assets/javascripts/discourse/components/post-voting-comment-editor.gjs@@ -3,9 +3,9 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";+import DButton from "discourse/ui-kit/d-button";import PostVotingCommentComposer from "./post-voting-comment-composer";export default class PostVotingCommentEditor extends Component {diff --git a/plugins/discourse-post-voting/assets/javascripts/discourse/components/post-voting-comment.gjs b/plugins/discourse-post-voting/assets/javascripts/discourse/components/post-voting-comment.gjsindex 9a24a6e6402..6a6cbdf9605 100644--- a/plugins/discourse-post-voting/assets/javascripts/discourse/components/post-voting-comment.gjs+++ b/plugins/discourse-post-voting/assets/javascripts/discourse/components/post-voting-comment.gjs@@ -3,12 +3,12 @@ import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";import { service } from "@ember/service";import { trustHTML } from "@ember/template";-import formatDate from "discourse/helpers/format-date";import formatUsername from "discourse/helpers/format-username";import routeAction from "discourse/helpers/route-action";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import { userPath } from "discourse/lib/url";+import dFormatDate from "discourse/ui-kit/helpers/d-format-date";import { i18n } from "discourse-i18n";import PostVotingButton from "./post-voting-button";import PostVotingCommentActions from "./post-voting-comment-actions";@@ -145,7 +145,7 @@ export default class PostVotingComment extends Component {{{/if}}<span class="post-voting-comments__created">- {{formatDate @comment.created_at}}+ {{dFormatDate @comment.created_at}}</span><PostVotingCommentActionsdiff --git a/plugins/discourse-post-voting/assets/javascripts/discourse/components/post-voting-comments-menu-composer.gjs b/plugins/discourse-post-voting/assets/javascripts/discourse/components/post-voting-comments-menu-composer.gjsindex deff714d0de..3e09f8bf4cd 100644--- a/plugins/discourse-post-voting/assets/javascripts/discourse/components/post-voting-comments-menu-composer.gjs+++ b/plugins/discourse-post-voting/assets/javascripts/discourse/components/post-voting-comments-menu-composer.gjs@@ -2,9 +2,9 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";+import DButton from "discourse/ui-kit/d-button";import PostVotingCommentComposer from "./post-voting-comment-composer";export default class PostVotingCommentsMenuComposer extends Component {diff --git a/plugins/discourse-post-voting/assets/javascripts/discourse/components/post-voting-comments-menu.gjs b/plugins/discourse-post-voting/assets/javascripts/discourse/components/post-voting-comments-menu.gjsindex 7715605349f..9ae48bfdfa5 100644--- a/plugins/discourse-post-voting/assets/javascripts/discourse/components/post-voting-comments-menu.gjs+++ b/plugins/discourse-post-voting/assets/javascripts/discourse/components/post-voting-comments-menu.gjs@@ -4,10 +4,10 @@ import { action } from "@ember/object";import { schedule } from "@ember/runloop";import { service } from "@ember/service";import { Promise } from "rsvp";-import DButton from "discourse/components/d-button";import routeAction from "discourse/helpers/route-action";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";import PostVotingCommentsMenuComposer from "./post-voting-comments-menu-composer";diff --git a/plugins/discourse-post-voting/assets/javascripts/discourse/components/post-voting-who-voted-list.gjs b/plugins/discourse-post-voting/assets/javascripts/discourse/components/post-voting-who-voted-list.gjsindex dd642d726f0..88ce75208bc 100644--- a/plugins/discourse-post-voting/assets/javascripts/discourse/components/post-voting-who-voted-list.gjs+++ b/plugins/discourse-post-voting/assets/javascripts/discourse/components/post-voting-who-voted-list.gjs@@ -1,14 +1,14 @@import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { action, get } from "@ember/object";-import AsyncContent from "discourse/components/async-content";-import SmallUserList, {- smallUserAttrs,-} from "discourse/components/small-user-list";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import { bind } from "discourse/lib/decorators";import { eq } from "discourse/truth-helpers";+import DAsyncContent from "discourse/ui-kit/d-async-content";+import DSmallUserList, {+ smallUserAttrs,+} from "discourse/ui-kit/d-small-user-list";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";import { whoVoted } from "../lib/post-voting-utilities";@@ -49,7 +49,7 @@ export default class PostVotingWhoVotedList extends Component {}<template>- <AsyncContent @asyncData={{this.loadWhoVoted}}>+ <DAsyncContent @asyncData={{this.loadWhoVoted}}><:loading>{{i18n "loading"}}</:loading>@@ -75,7 +75,7 @@ export default class PostVotingWhoVotedList extends Component {{{/if}}{{/let}}</:content>- </AsyncContent>+ </DAsyncContent></template>}@@ -83,7 +83,7 @@ const PostVotingSmallUserList = <template>{{#if @list}}<div class="post-voting-popup-content__wrapper"><span- class={{concatClass+ class={{dConcatClass"post-voting-popup-content__icon"(if (eq @direction "up") "--upvote" "--downvote")}}@@ -91,10 +91,10 @@ const PostVotingSmallUserList = <template>(if (eq @direction "up") "vote.upvotes" "vote.downvotes")}}>- {{icon "vote-up-filled"}}+ {{dIcon "vote-up-filled"}}</span><span class="post-voting-popup-content__count">{{@list.length}}</span>- <SmallUserList+ <DSmallUserListclass="post-voting-popup-content__voters"@users={{@list}}/>diff --git a/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.gjs b/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.gjsindex 8a20595b3a7..7811872a9bd 100644--- a/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.gjs+++ b/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.gjs@@ -1,11 +1,11 @@import Component from "@glimmer/component";import { cached, tracked } from "@glimmer/tracking";import { service } from "@ember/service";-import UserLink from "discourse/components/user-link";-import avatar from "discourse/helpers/avatar";import helperFn from "discourse/helpers/helper-fn";import Composer from "discourse/models/composer";import { gt } from "discourse/truth-helpers";+import DUserLink from "discourse/ui-kit/d-user-link";+import dAvatar from "discourse/ui-kit/helpers/d-avatar";import { i18n } from "discourse-i18n";export default class ComposerPresenceDisplay extends Component {@@ -150,9 +150,9 @@ export default class ComposerPresenceDisplay extends Component {<div class="presence-users"><div class="presence-avatars">{{#each this.users as |user|}}- <UserLink @user={{user}}>- {{avatar user imageSize="small"}}- </UserLink>+ <DUserLink @user={{user}}>+ {{dAvatar user imageSize="small"}}+ </DUserLink>{{/each}}</div>diff --git a/plugins/discourse-presence/assets/javascripts/discourse/components/topic-presence-display.gjs b/plugins/discourse-presence/assets/javascripts/discourse/components/topic-presence-display.gjsindex 099ae058ff1..9dd090c694e 100644--- a/plugins/discourse-presence/assets/javascripts/discourse/components/topic-presence-display.gjs+++ b/plugins/discourse-presence/assets/javascripts/discourse/components/topic-presence-display.gjs@@ -1,10 +1,10 @@import Component from "@glimmer/component";import { cached, tracked } from "@glimmer/tracking";import { service } from "@ember/service";-import UserLink from "discourse/components/user-link";-import avatar from "discourse/helpers/avatar";import helperFn from "discourse/helpers/helper-fn";import { gt } from "discourse/truth-helpers";+import DUserLink from "discourse/ui-kit/d-user-link";+import dAvatar from "discourse/ui-kit/helpers/d-avatar";import { i18n } from "discourse-i18n";export default class TopicPresenceDisplay extends Component {@@ -64,9 +64,9 @@ export default class TopicPresenceDisplay extends Component {<div class="presence-users"><div class="presence-avatars">{{#each this.users as |user|}}- <UserLink @user={{user}}>- {{avatar user imageSize=@avatarSize}}- </UserLink>+ <DUserLink @user={{user}}>+ {{dAvatar user imageSize=@avatarSize}}+ </DUserLink>{{/each}}</div>diff --git a/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-actions.gjs b/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-actions.gjsindex d1db429a69c..6e30047ce53 100644--- a/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-actions.gjs+++ b/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-actions.gjs@@ -20,8 +20,8 @@ import { Promise } from "rsvp";import lazyHash from "discourse/helpers/lazy-hash";import { isRailsTesting, isTesting } from "discourse/lib/environment";import { emojiUrlFor } from "discourse/lib/text";-import closeOnClickOutside from "discourse/modifiers/close-on-click-outside";import { and, eq, not } from "discourse/truth-helpers";+import dCloseOnClickOutside from "discourse/ui-kit/modifiers/d-close-on-click-outside";import { i18n } from "discourse-i18n";import CustomReaction from "../models/discourse-reactions-custom-reaction";import DiscourseReactionsCounter from "./discourse-reactions-counter";@@ -779,7 +779,7 @@ export default class DiscourseReactionsActions extends Component {{{on "touchstart" this.touchStart}}{{on "touchmove" this.touchMove}}{{on "touchend" this.touchEnd}}- {{closeOnClickOutside this.clickOutside}}+ {{dCloseOnClickOutside this.clickOutside}}{{didInsert this.registerContainerElement}}>{{#letdiff --git a/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-counter.gjs b/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-counter.gjsindex 7b31d34cfd5..fa272d5d1f8 100644--- a/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-counter.gjs+++ b/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-counter.gjs@@ -3,11 +3,11 @@ import { on } from "@ember/modifier";import { action } from "@ember/object";import { trackedObject } from "@ember/reactive/collections";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import { uniqueItemsFromArray } from "discourse/lib/array-tools";import { bind } from "discourse/lib/decorators";-import closeOnClickOutside from "discourse/modifiers/close-on-click-outside";import { and } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import dCloseOnClickOutside from "discourse/ui-kit/modifiers/d-close-on-click-outside";import { i18n } from "discourse-i18n";import CustomReaction from "../models/discourse-reactions-custom-reaction";import DiscourseReactionsList from "./discourse-reactions-list";@@ -307,7 +307,7 @@ export default class DiscourseReactionsCounter extends Component {aria-label={{this.counterAriaLabel}}{{on "mousedown" this.mouseDown}}{{on "mouseup" this.mouseUp}}- {{closeOnClickOutside this.clickOutside}}+ {{dCloseOnClickOutside this.clickOutside}}{{on "touchstart" this.touchStart}}{{on "pointerover" this.pointerOver}}{{on "pointerout" this.pointerOut}}diff --git a/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-list-emoji.gjs b/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-list-emoji.gjsindex be7b8003bb9..1cd2b953c6d 100644--- a/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-list-emoji.gjs+++ b/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-list-emoji.gjs@@ -11,8 +11,8 @@ import {offset,shift,} from "@floating-ui/dom";-import emoji from "discourse/helpers/emoji";import { bind } from "discourse/lib/decorators";+import dEmoji from "discourse/ui-kit/helpers/d-emoji";import { i18n } from "discourse-i18n";const DISPLAY_MAX_USERS = 19;@@ -108,7 +108,7 @@ export default class DiscourseReactionsListEmoji extends Component {data-reaction-id={{@reaction.id}}>{{#if @reaction.count}}- {{emoji+ {{dEmoji@reaction.idskipTitle=trueclass=(if@@ -126,7 +126,7 @@ export default class DiscourseReactionsListEmoji extends Component {{{on "pointerover" this.pointerOver}}>{{#if @reaction.count}}- {{emoji+ {{dEmoji@reaction.idskipTitle=trueclass=(ifdiff --git a/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-picker.gjs b/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-picker.gjsindex 60ea8b78f1c..002878ed5f5 100644--- a/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-picker.gjs+++ b/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-picker.gjs@@ -3,10 +3,10 @@ import { fn, hash } from "@ember/helper";import { on } from "@ember/modifier";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import EmojiPicker from "discourse/components/emoji-picker";-import concatClass from "discourse/helpers/concat-class";-import emoji from "discourse/helpers/emoji";+import DButton from "discourse/ui-kit/d-button";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dEmoji from "discourse/ui-kit/helpers/d-emoji";import { i18n } from "discourse-i18n";export default class DiscourseReactionsPicker extends Component {@@ -149,7 +149,7 @@ export default class DiscourseReactionsPicker extends Component {<template><div- class={{concatClass+ class={{dConcatClass"discourse-reactions-picker"(if @reactionsPickerExpanded "is-expanded")}}@@ -162,7 +162,7 @@ export default class DiscourseReactionsPicker extends Component {>{{#each this.reactionInfo as |reaction|}}<DButton- class={{concatClass+ class={{dConcatClass"btn-flat""pickable-reaction"reaction.id@@ -178,7 +178,7 @@ export default class DiscourseReactionsPicker extends Component {}}@translatedTitle={{reaction.title}}>- {{emoji reaction.id}}+ {{dEmoji reaction.id}}</DButton>{{/each}}{{#if this.siteSettings.discourse_reactions_allow_any_emoji}}diff --git a/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-reaction-button.gjs b/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-reaction-button.gjsindex 2d1eaec3b1f..68f08b47e02 100644--- a/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-reaction-button.gjs+++ b/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-reaction-button.gjs@@ -4,9 +4,9 @@ import { on } from "@ember/modifier";import { action } from "@ember/object";import { service } from "@ember/service";import { isBlank } from "@ember/utils";-import DButton from "discourse/components/d-button";import { isExistingIconId } from "discourse/lib/icon-library";import { emojiUrlFor } from "discourse/lib/text";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";export default class ReactionsReactionButton extends Component {diff --git a/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-reaction-emoji.gjs b/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-reaction-emoji.gjsindex a58a9712272..522d26aa369 100644--- a/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-reaction-emoji.gjs+++ b/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-reaction-emoji.gjs@@ -1,6 +1,6 @@import Component from "@glimmer/component";-import avatar from "discourse/helpers/avatar";import { emojiUrlFor } from "discourse/lib/text";+import dAvatar from "discourse/ui-kit/helpers/d-avatar";export default class DiscourseReactionsReactionEmoji extends Component {get emojiUrl() {@@ -17,7 +17,7 @@ export default class DiscourseReactionsReactionEmoji extends Component {data-user-card={{@reaction.user.username}}class="avatar-link">- {{avatar+ {{dAvatar@reaction.userimageSize="tiny"extraClasses="actor"diff --git a/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-state-panel-reaction.gjs b/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-state-panel-reaction.gjsindex c2dbf4b952c..30bb8c7dc0b 100644--- a/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-state-panel-reaction.gjs+++ b/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-state-panel-reaction.gjs@@ -1,11 +1,11 @@import Component from "@glimmer/component";import { on } from "@ember/modifier";import { action } from "@ember/object";-import UserAvatar from "discourse/components/user-avatar";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";-import emoji from "discourse/helpers/emoji";import { gt } from "discourse/truth-helpers";+import DUserAvatar from "discourse/ui-kit/d-user-avatar";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dEmoji from "discourse/ui-kit/helpers/d-emoji";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";const MAX_USERS_COUNT = 26;@@ -54,7 +54,7 @@ export default class DiscourseReactionsStatePanelReaction extends Component {<template>{{! template-lint-disable no-invalid-interactive }}<div- class={{concatClass+ class={{dConcatClass"discourse-reactions-state-panel-reaction"(if @isDisplayed "is-displayed")}}@@ -65,7 +65,7 @@ export default class DiscourseReactionsStatePanelReaction extends Component {{{#if @users}}<div class="reaction-wrapper" aria-hidden="true"><div class="emoji-wrapper">- {{emoji @reaction.id}}+ {{dEmoji @reaction.id}}</div><div class="count">{{@reaction.count}}@@ -76,7 +76,7 @@ export default class DiscourseReactionsStatePanelReaction extends Component {<div class="list list-columns-{{this.columnsCount}}">{{#each this.firstLineUsers key="username" as |user|}}<span>- <UserAvatar+ <DUserAvatarclass="trigger-user-card"@size="tiny"@user={{user}}@@ -94,14 +94,14 @@ export default class DiscourseReactionsStatePanelReaction extends Component {(i18n "discourse_reactions.state_panel.show_users")}}>- {{icon (if @isDisplayed "chevron-up" "chevron-down")}}+ {{dIcon (if @isDisplayed "chevron-up" "chevron-down")}}</button>{{/if}}{{#if @isDisplayed}}{{#each this.otherUsers key="username" as |user|}}<span>- <UserAvatar+ <DUserAvatarclass="trigger-user-card"@size="tiny"@user={{user}}diff --git a/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-state-panel.gjs b/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-state-panel.gjsindex 0a406af481e..bdff9972d12 100644--- a/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-state-panel.gjs+++ b/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-state-panel.gjs@@ -4,8 +4,8 @@ import { on } from "@ember/modifier";import { action, get } from "@ember/object";import didInsert from "@ember/render-modifiers/modifiers/did-insert";import { schedule } from "@ember/runloop";-import concatClass from "discourse/helpers/concat-class";import { and, eq } from "discourse/truth-helpers";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import DiscourseReactionsStatePanelReaction from "./discourse-reactions-state-panel-reaction";export default class DiscourseReactionsStatePanel extends Component {@@ -80,7 +80,7 @@ export default class DiscourseReactionsStatePanel extends Component {<template><div- class={{concatClass "discourse-reactions-state-panel" this.classes}}+ class={{dConcatClass "discourse-reactions-state-panel" this.classes}}{{on "pointerout" this.pointerOut}}{{on "pointerover" this.pointerOver}}>diff --git a/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-users-menu.gjs b/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-users-menu.gjsindex 9f9a9bd8f5b..4f36a6563a8 100644--- a/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-users-menu.gjs+++ b/plugins/discourse-reactions/assets/javascripts/discourse/components/discourse-reactions-users-menu.gjs@@ -4,10 +4,10 @@ import { fn } from "@ember/helper";import { on } from "@ember/modifier";import { action } from "@ember/object";import PostUsersMenu from "discourse/components/post/menu/post-users-menu";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";-import emoji from "discourse/helpers/emoji";import { eq } from "discourse/truth-helpers";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dEmoji from "discourse/ui-kit/helpers/d-emoji";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";import CustomReaction from "../models/discourse-reactions-custom-reaction";@@ -107,7 +107,7 @@ export default class DiscourseReactionsUsersMenu extends Component {<div class="post-users-popup__header"><buttontype="button"- class={{concatClass+ class={{dConcatClass"post-users-popup__filter"(unless this.activeFilter "is-active")}}@@ -119,14 +119,14 @@ export default class DiscourseReactionsUsersMenu extends Component {{{#each this.reactions as |reaction|}}<buttontype="button"- class={{concatClass+ class={{dConcatClass"post-users-popup__filter"(if (eq reaction.id this.activeFilter) "is-active")}}data-reaction-filter={{reaction.id}}{{on "click" (fn this.selectFilter reaction.id)}}>- {{emoji reaction.id skipTitle=true}}+ {{dEmoji reaction.id skipTitle=true}}<span>{{reaction.count}}</span></button>{{/each}}@@ -136,13 +136,13 @@ export default class DiscourseReactionsUsersMenu extends Component {<:reaction as |user|>{{#if user.reaction}}- {{emoji+ {{dEmojiuser.reactionskipTitle=trueclass="post-users-popup__reaction"}}{{else}}- {{icon "d-liked" class="post-users-popup__reaction"}}+ {{dIcon "d-liked" class="post-users-popup__reaction"}}{{/if}}</:reaction></PostUsersMenu>diff --git a/plugins/discourse-reactions/assets/javascripts/discourse/connectors/user-activity-bottom/discourse-reactions-user-activity-reactions.gjs b/plugins/discourse-reactions/assets/javascripts/discourse/connectors/user-activity-bottom/discourse-reactions-user-activity-reactions.gjsindex a91ba4e3521..cdd9acccbf7 100644--- a/plugins/discourse-reactions/assets/javascripts/discourse/connectors/user-activity-bottom/discourse-reactions-user-activity-reactions.gjs+++ b/plugins/discourse-reactions/assets/javascripts/discourse/connectors/user-activity-bottom/discourse-reactions-user-activity-reactions.gjs@@ -2,7 +2,7 @@import Component from "@ember/component";import { LinkTo } from "@ember/routing";import { tagName } from "@ember-decorators/component";-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";@tagName("")@@ -14,7 +14,7 @@ export default class DiscourseReactionsUserActivityReactions extends Component {>{{#if this.siteSettings.discourse_reactions_enabled}}<LinkTo @route="userActivity.reactions">- {{icon "far-face-smile"}}+ {{dIcon "far-face-smile"}}<span>{{i18n "discourse_reactions.reactions_title"}}</span></LinkTo>{{/if}}diff --git a/plugins/discourse-reactions/assets/javascripts/discourse/connectors/user-notifications-bottom/discourse-reactions-user-notification-reactions.gjs b/plugins/discourse-reactions/assets/javascripts/discourse/connectors/user-notifications-bottom/discourse-reactions-user-notification-reactions.gjsindex 5c9b3e49b5f..249585ddbdb 100644--- a/plugins/discourse-reactions/assets/javascripts/discourse/connectors/user-notifications-bottom/discourse-reactions-user-notification-reactions.gjs+++ b/plugins/discourse-reactions/assets/javascripts/discourse/connectors/user-notifications-bottom/discourse-reactions-user-notification-reactions.gjs@@ -2,7 +2,7 @@import Component from "@ember/component";import { LinkTo } from "@ember/routing";import { tagName } from "@ember-decorators/component";-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";@tagName("")@@ -14,7 +14,7 @@ export default class DiscourseReactionsUserNotificationReactions extends Compone>{{#if this.siteSettings.discourse_reactions_enabled}}<LinkTo @route="userNotifications.reactionsReceived">- {{icon "far-face-smile"}}+ {{dIcon "far-face-smile"}}<span>{{i18n "discourse_reactions.reactions_title"}}</span></LinkTo>{{/if}}diff --git a/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/activity-calendar.gjs b/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/activity-calendar.gjsindex 749895d1568..2c55c2eb1fa 100644--- a/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/activity-calendar.gjs+++ b/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/activity-calendar.gjs@@ -1,6 +1,6 @@import Component from "@glimmer/component";import { action } from "@ember/object";-import concatClass from "discourse/helpers/concat-class";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";import { i18nForOwner } from "discourse/plugins/discourse-rewind/discourse/lib/rewind-i18n";@@ -139,7 +139,7 @@ export default class ActivityCalendar extends Component {<tddata-date={{cell.date}}title={{this.computeCellTitle cell}}- class={{concatClass+ class={{dConcatClass"rewind-calendar-cell"(this.computeClass cell.post_count)}}diff --git a/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/ai-usage.gjs b/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/ai-usage.gjsindex d80269d7035..57ea15b36c3 100644--- a/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/ai-usage.gjs+++ b/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/ai-usage.gjs@@ -3,7 +3,7 @@ import { get } from "@ember/helper";import { action } from "@ember/object";import didInsert from "@ember/render-modifiers/modifiers/did-insert";import willDestroy from "@ember/render-modifiers/modifiers/will-destroy";-import number from "discourse/helpers/number";+import dNumber from "discourse/ui-kit/helpers/d-number";import { i18n } from "discourse-i18n";export default class AiUsage extends Component {@@ -123,7 +123,7 @@ export default class AiUsage extends Component {{{i18n "discourse_rewind.reports.ai_usage.total_requests"}}</div><div class="matrix-stat__value">- {{number this.totalRequests}}+ {{dNumber this.totalRequests}}</div></div>@@ -131,7 +131,7 @@ export default class AiUsage extends Component {<div class="matrix-stat__label">{{i18n "discourse_rewind.reports.ai_usage.total_tokens"}}</div>- <div class="matrix-stat__value">{{number+ <div class="matrix-stat__value">{{dNumberthis.totalTokens}}</div></div>diff --git a/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/assignments.gjs b/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/assignments.gjsindex 51b62241cce..69d5ac9c30f 100644--- a/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/assignments.gjs+++ b/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/assignments.gjs@@ -1,5 +1,5 @@import Component from "@glimmer/component";-import number from "discourse/helpers/number";+import dNumber from "discourse/ui-kit/helpers/d-number";import { i18n } from "discourse-i18n";import { i18nForOwner } from "discourse/plugins/discourse-rewind/discourse/lib/rewind-i18n";@@ -30,7 +30,7 @@ export default class Assignments extends Component {{{i18n "discourse_rewind.reports.assignments.completed"}}</div><div class="sticky-note__value">- {{number @report.data.completed}}+ {{dNumber @report.data.completed}}</div></div></div>@@ -40,7 +40,7 @@ export default class Assignments extends Component {<div class="sticky-note__title">{{i18n "discourse_rewind.reports.assignments.pending"}}</div>- <div class="sticky-note__value">{{number+ <div class="sticky-note__value">{{dNumber@report.data.pending}}</div></div>@@ -52,7 +52,7 @@ export default class Assignments extends Component {{{this.totalAssignedText}}</div><div class="sticky-note__value">- {{number @report.data.total_assigned}}+ {{dNumber @report.data.total_assigned}}</div></div></div>@@ -63,7 +63,7 @@ export default class Assignments extends Component {{{i18n "discourse_rewind.reports.assignments.assigned_by_user"}}</div><div class="sticky-note__value">- {{number @report.data.assigned_by_user}}+ {{dNumber @report.data.assigned_by_user}}</div></div></div>diff --git a/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/best-posts.gjs b/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/best-posts.gjsindex 043e8d25c68..9ca0c1d1839 100644--- a/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/best-posts.gjs+++ b/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/best-posts.gjs@@ -1,9 +1,9 @@import Component from "@glimmer/component";import { concat } from "@ember/helper";import { trustHTML } from "@ember/template";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import getURL from "discourse/lib/get-url";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";import { i18nForOwner } from "discourse/plugins/discourse-rewind/discourse/lib/rewind-i18n";@@ -31,7 +31,7 @@ export default class BestPosts extends Component {</h2><div class="rewind-report-container">{{#each @report.data as |post idx|}}- <div class={{concatClass "rewind-card" (this.rankClass idx)}}>+ <div class={{dConcatClass "rewind-card" (this.rankClass idx)}}><span class="best-posts --rank"></span><span class="best-posts --rank"></span><div class="best-posts__post">@@ -39,10 +39,10 @@ export default class BestPosts extends Component {</div><div class="best-posts__metadata"><span class="best-posts__likes">- {{icon "heart"}}{{post.like_count}}+ {{dIcon "heart"}}{{post.like_count}}</span><span class="best-posts__replies">- {{icon "comment"}}{{post.reply_count}}+ {{dIcon "comment"}}{{post.reply_count}}</span><ahref={{getURLdiff --git a/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/best-topics.gjs b/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/best-topics.gjsindex 8880610597f..918ccaa27d8 100644--- a/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/best-topics.gjs+++ b/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/best-topics.gjs@@ -1,9 +1,9 @@import Component from "@glimmer/component";import { concat } from "@ember/helper";import { trustHTML } from "@ember/template";-import concatClass from "discourse/helpers/concat-class";-import replaceEmoji from "discourse/helpers/replace-emoji";import getURL from "discourse/lib/get-url";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dReplaceEmoji from "discourse/ui-kit/helpers/d-replace-emoji";import { i18n } from "discourse-i18n";import { i18nForOwner } from "discourse/plugins/discourse-rewind/discourse/lib/rewind-i18n";@@ -33,15 +33,15 @@ export default class BestTopics extends Component {<div class="rewind-card">{{#each @report.data as |topic idx|}}<div- class={{concatClass "best-topics__topic" (this.rankClass idx)}}+ class={{dConcatClass "best-topics__topic" (this.rankClass idx)}}><span class="best-topics --rank"></span><span class="best-topics --rank"></span>- <h2 class="best-topics__header">{{replaceEmoji+ <h2 class="best-topics__header">{{dReplaceEmojitopic.title}}</h2><span class="best-topics__excerpt">- {{replaceEmoji (trustHTML topic.excerpt)}}+ {{dReplaceEmoji (trustHTML topic.excerpt)}}</span><div class="best-topics__metadata">diff --git a/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/chat-usage.gjs b/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/chat-usage.gjsindex ffe5fc09aa3..922e4fcb492 100644--- a/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/chat-usage.gjs+++ b/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/chat-usage.gjs@@ -1,9 +1,9 @@import Component from "@glimmer/component";import { concat } from "@ember/helper";import { trustHTML } from "@ember/template";-import avatar from "discourse/helpers/avatar";-import number from "discourse/helpers/number";import getURL from "discourse/lib/get-url";+import dAvatar from "discourse/ui-kit/helpers/d-avatar";+import dNumber from "discourse/ui-kit/helpers/d-number";import I18n, { i18n } from "discourse-i18n";import { i18nForOwner } from "discourse/plugins/discourse-rewind/discourse/lib/rewind-i18n";@@ -35,7 +35,7 @@ const UserMessage = <template>{{yield}}</div><div class="chat-message__avatar">- {{avatar @user imageSize="small"}}+ {{dAvatar @user imageSize="small"}}</div></template>;@@ -163,7 +163,7 @@ export default class ChatUsage extends Component {class="chat-channel-link__name">#{{channel.channel_slug}}</span><span class="chat-channel-link__count">- {{number channel.message_count}}+ {{dNumber channel.message_count}}</span></a>{{/each}}diff --git a/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/favorite-gifs.gjs b/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/favorite-gifs.gjsindex 2808c9816b3..a01c1775477 100644--- a/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/favorite-gifs.gjs+++ b/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/favorite-gifs.gjs@@ -1,6 +1,6 @@import Component from "@glimmer/component";-import icon from "discourse/helpers/d-icon";-import number from "discourse/helpers/number";+import dIcon from "discourse/ui-kit/helpers/d-icon";+import dNumber from "discourse/ui-kit/helpers/d-number";import { i18n } from "discourse-i18n";import { i18nForOwner } from "discourse/plugins/discourse-rewind/discourse/lib/rewind-i18n";@@ -37,16 +37,16 @@ export default class FavoriteGifs extends Component {/><div class="favorite-gifs__stats"><span class="favorite-gifs__stat">- {{icon "repeat"}}- {{number gif.usage_count}}+ {{dIcon "repeat"}}+ {{dNumber gif.usage_count}}</span><span class="favorite-gifs__stat">- {{icon "heart"}}- {{number gif.likes}}+ {{dIcon "heart"}}+ {{dNumber gif.likes}}</span><span class="favorite-gifs__stat">- {{icon "smile"}}- {{number gif.reactions}}+ {{dIcon "smile"}}+ {{dNumber gif.reactions}}</span></div></div>diff --git a/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/fbff.gjs b/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/fbff.gjsindex ba7ec27af9b..69b2ef23d6b 100644--- a/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/fbff.gjs+++ b/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/fbff.gjs@@ -1,7 +1,7 @@import Component from "@glimmer/component";import { hash } from "@ember/helper";-import avatar from "discourse/helpers/bound-avatar-template";import getURL from "discourse/lib/get-url";+import dBoundAvatarTemplate from "discourse/ui-kit/helpers/d-bound-avatar-template";import { i18nForOwner } from "discourse/plugins/discourse-rewind/discourse/lib/rewind-i18n";export default class FBFF extends Component {@@ -21,7 +21,7 @@ export default class FBFF extends Component {<div class="rewind-report-container"><div class="rewind-card"><div class="fbff-avatar-container">- {{avatar+ {{dBoundAvatarTemplate@report.data.fbff.avatar_template"huge"(hash [email protected])@@ -35,7 +35,7 @@ export default class FBFF extends Component {/></div><div class="fbff-avatar-container">- {{avatar+ {{dBoundAvatarTemplate@report.data.yourself.avatar_template"huge"(hash [email protected])diff --git a/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/header.gjs b/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/header.gjsindex 0d52af91c30..9297e81ee08 100644--- a/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/header.gjs+++ b/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/header.gjs@@ -1,6 +1,6 @@import Component from "@glimmer/component";import { service } from "@ember/service";-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class RewindHeader extends Component {@@ -9,7 +9,7 @@ export default class RewindHeader extends Component {<template><div class="rewind__header"><div class="rewind__header-logo">- {{icon "repeat"}}+ {{dIcon "repeat"}}<div class="rewind__header-title">{{i18n "discourse_rewind.title"}}</div>diff --git a/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/invites.gjs b/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/invites.gjsindex 140e0f73cc3..c7355e1ac15 100644--- a/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/invites.gjs+++ b/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/invites.gjs@@ -1,8 +1,8 @@import Component from "@glimmer/component";import { concat } from "@ember/helper";-import avatar from "discourse/helpers/bound-avatar-template";-import number from "discourse/helpers/number";import getURL from "discourse/lib/get-url";+import dBoundAvatarTemplate from "discourse/ui-kit/helpers/d-bound-avatar-template";+import dNumber from "discourse/ui-kit/helpers/d-number";import { i18n } from "discourse-i18n";import { i18nForOwner } from "discourse/plugins/discourse-rewind/discourse/lib/rewind-i18n";@@ -48,7 +48,7 @@ export default class Invites extends Component {}}</div><div class="guest-book__entry-value">- {{number @report.data.total_invites}}+ {{dNumber @report.data.total_invites}}</div></div>@@ -57,7 +57,7 @@ export default class Invites extends Component {{{i18n "discourse_rewind.reports.invites.label_guests_joined"}}</div><div class="guest-book__entry-value">- {{number @report.data.redeemed_count}}+ {{dNumber @report.data.redeemed_count}}</div></div>@@ -83,7 +83,7 @@ export default class Invites extends Component {{{i18n "discourse_rewind.reports.invites.label_posts_written"}}</div><div class="guest-book__entry-value">- {{number @report.data.invitee_post_count}}+ {{dNumber @report.data.invitee_post_count}}</div></div>@@ -92,7 +92,7 @@ export default class Invites extends Component {{{i18n "discourse_rewind.reports.invites.label_topics_started"}}</div><div class="guest-book__entry-value">- {{number @report.data.invitee_topic_count}}+ {{dNumber @report.data.invitee_topic_count}}</div></div>@@ -101,7 +101,7 @@ export default class Invites extends Component {{{i18n "discourse_rewind.reports.invites.label_likes_given"}}</div><div class="guest-book__entry-value">- {{number @report.data.invitee_like_count}}+ {{dNumber @report.data.invitee_like_count}}</div></div>@@ -116,7 +116,7 @@ export default class Invites extends Component {href={{getURL (concat "/u/" this.mostActiveInvitee.username)}}class="guest-book__signature">- {{avatar+ {{dBoundAvatarTemplatethis.mostActiveInvitee.avatar_template"large"username=this.mostActiveInvitee.usernamediff --git a/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/most-viewed-categories.gjs b/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/most-viewed-categories.gjsindex a0afdfb0531..c2234313e1c 100644--- a/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/most-viewed-categories.gjs+++ b/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/most-viewed-categories.gjs@@ -3,9 +3,9 @@ import { tracked } from "@glimmer/tracking";import { concat, fn } from "@ember/helper";import { on } from "@ember/modifier";import { action } from "@ember/object";-import concatClass from "discourse/helpers/concat-class";import getURL from "discourse/lib/get-url";import { eq } from "discourse/truth-helpers";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18nForOwner } from "discourse/plugins/discourse-rewind/discourse/lib/rewind-i18n";/**@@ -51,7 +51,7 @@ export default class MostViewedCategories extends Component {<div class="rewind-report-container">{{#each @report.data as |data|}}<a- class={{concatClass+ class={{dConcatClass"folder-wrapper"(if (eq this.openedCategoryId data.category_id) "--opened" "")}}diff --git a/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/most-viewed-tags.gjs b/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/most-viewed-tags.gjsindex a323394366f..165588b63d9 100644--- a/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/most-viewed-tags.gjs+++ b/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/most-viewed-tags.gjs@@ -3,9 +3,9 @@ import { tracked } from "@glimmer/tracking";import { concat, fn } from "@ember/helper";import { on } from "@ember/modifier";import { action } from "@ember/object";-import concatClass from "discourse/helpers/concat-class";import getURL from "discourse/lib/get-url";import { eq } from "discourse/truth-helpers";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18nForOwner } from "discourse/plugins/discourse-rewind/discourse/lib/rewind-i18n";export default class MostViewedTags extends Component {@@ -44,7 +44,7 @@ export default class MostViewedTags extends Component {<div class="rewind-report-container">{{#each @report.data as |data|}}<a- class={{concatClass+ class={{dConcatClass"folder-wrapper"(if (eq this.openedTag data.name) "--opened" "")}}diff --git a/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/reactions.gjs b/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/reactions.gjsindex 32101f608b0..4b2ffc24e08 100644--- a/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/reactions.gjs+++ b/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/reactions.gjs@@ -2,7 +2,7 @@ import Component from "@glimmer/component";import { concat, get } from "@ember/helper";import { action } from "@ember/object";import { trustHTML } from "@ember/template";-import replaceEmoji from "discourse/helpers/replace-emoji";+import dReplaceEmoji from "discourse/ui-kit/helpers/d-replace-emoji";import { i18n } from "discourse-i18n";export default class Reactions extends Component {@@ -45,7 +45,7 @@ export default class Reactions extends Component {{{#each-in this.receivedReactions as |emojiName count|}}<div class="rewind-card scale"><span class="rewind-card__emoji">- {{replaceEmoji (concat ":" emojiName ":")}}+ {{dReplaceEmoji (concat ":" emojiName ":")}}</span><span class="rewind-card__data">{{count}}</span></div>@@ -62,7 +62,7 @@ export default class Reactions extends Component {{{#each this.sortedUsedReactions as |reaction|}}<div class="rewind-reactions-row"><span class="emoji">- {{replaceEmoji (concat ":" (get reaction "0") ":")}}+ {{dReplaceEmoji (concat ":" (get reaction "0") ":")}}</span><span class="percentage">{{this.computePercentage(get reaction "1")diff --git a/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/time-of-day-activity.gjs b/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/time-of-day-activity.gjsindex ac313c6af54..4a3812614d9 100644--- a/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/time-of-day-activity.gjs+++ b/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/time-of-day-activity.gjs@@ -2,7 +2,7 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";import { trustHTML } from "@ember/template";-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";import { i18nForOwner } from "discourse/plugins/discourse-rewind/discourse/lib/rewind-i18n";diff --git a/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/top-words/word-card.gjs b/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/top-words/word-card.gjsindex 82fe3bbe500..706f7b25c93 100644--- a/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/top-words/word-card.gjs+++ b/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/top-words/word-card.gjs@@ -3,9 +3,9 @@ import { on } from "@ember/modifier";import { action } from "@ember/object";import didInsert from "@ember/render-modifiers/modifiers/did-insert";import { trustHTML } from "@ember/template";-import concatClass from "discourse/helpers/concat-class";-import emoji from "discourse/helpers/emoji";import discourseLater from "discourse/lib/later";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dEmoji from "discourse/ui-kit/helpers/d-emoji";const MYSTERY_EMOJIS = ["floppy_disk",@@ -77,7 +77,7 @@ export default class WordCard extends Component {<div{{on "click" this.handleClick}}{{on "mouseleave" this.handleLeave}}- class={{concatClass+ class={{dConcatClass"rewind-card__wrapper"(if this.longWord "--long-word")}}@@ -88,13 +88,13 @@ export default class WordCard extends Component {<div class="rewind-card__inner"><div class="rewind-card --front"><span class="rewind-card__image tl">- {{emoji this.mysteryData.emoji}}+ {{dEmoji this.mysteryData.emoji}}</span><span class="rewind-card__image cr">- {{emoji this.mysteryData.emoji}}+ {{dEmoji this.mysteryData.emoji}}</span><span class="rewind-card__image br">- {{emoji this.mysteryData.emoji}}+ {{dEmoji this.mysteryData.emoji}}</span></div><div class="rewind-card --back">diff --git a/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/writing-analysis.gjs b/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/writing-analysis.gjsindex 68d64511515..ced2594cfbf 100644--- a/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/writing-analysis.gjs+++ b/plugins/discourse-rewind/assets/javascripts/discourse/components/reports/writing-analysis.gjs@@ -4,7 +4,7 @@ import { action } from "@ember/object";import didInsert from "@ember/render-modifiers/modifiers/did-insert";import willDestroy from "@ember/render-modifiers/modifiers/will-destroy";import { service } from "@ember/service";-import number from "discourse/helpers/number";+import dNumber from "discourse/ui-kit/helpers/d-number";import { i18n } from "discourse-i18n";export default class WritingAnalysis extends Component {@@ -155,14 +155,14 @@ export default class WritingAnalysis extends Component {<div class="writing-analysis__stats-label">{{i18n"discourse_rewind.reports.writing_analysis.avg_post_length"}}</div>- <div class="writing-analysis__stats-value">{{number+ <div class="writing-analysis__stats-value">{{dNumber@report.data.average_post_length}}</div><div class="writing-analysis__stats-label">{{i18n"discourse_rewind.reports.writing_analysis.readability_score_label"}}</div>- <div class="writing-analysis__stats-value">{{number+ <div class="writing-analysis__stats-value">{{dNumber@report.data.readability_score}}/100</div></div>diff --git a/plugins/discourse-rewind/assets/javascripts/discourse/components/rewind.gjs b/plugins/discourse-rewind/assets/javascripts/discourse/components/rewind.gjsindex ea4430e8fd1..d71f0701156 100644--- a/plugins/discourse-rewind/assets/javascripts/discourse/components/rewind.gjs+++ b/plugins/discourse-rewind/assets/javascripts/discourse/components/rewind.gjs@@ -6,14 +6,14 @@ import didInsert from "@ember/render-modifiers/modifiers/did-insert";import willDestroy from "@ember/render-modifiers/modifiers/will-destroy";import { service } from "@ember/service";import { trustHTML } from "@ember/template";-import DButton from "discourse/components/d-button";-import DToggleSwitch from "discourse/components/d-toggle-switch";-import concatClass from "discourse/helpers/concat-class";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import { getAbsoluteURL } from "discourse/lib/get-url";import { clipboardCopy } from "discourse/lib/utilities";import { eq } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DToggleSwitch from "discourse/ui-kit/d-toggle-switch";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";import ActivityCalendar from "discourse/plugins/discourse-rewind/discourse/components/reports/activity-calendar";import AiUsage from "discourse/plugins/discourse-rewind/discourse/components/reports/ai-usage";@@ -294,7 +294,7 @@ export default class Rewind extends Component {<template><div- class={{concatClass+ class={{dConcatClass"rewind-container"(if this.fullScreen "--fullscreen")}}@@ -390,7 +390,7 @@ export default class Rewind extends Component {as |ReportComponent|}}{{#if ReportComponent}}- <div class={{concatClass "rewind-report" report.identifier}}>+ <div class={{dConcatClass "rewind-report" report.identifier}}><ReportComponent@report={{report}}@user={{@user}}diff --git a/plugins/discourse-rewind/assets/javascripts/discourse/connectors/before-panel-body/rewind-callout.gjs b/plugins/discourse-rewind/assets/javascripts/discourse/connectors/before-panel-body/rewind-callout.gjsindex 07283df7d64..b434a3515df 100644--- a/plugins/discourse-rewind/assets/javascripts/discourse/connectors/before-panel-body/rewind-callout.gjs+++ b/plugins/discourse-rewind/assets/javascripts/discourse/connectors/before-panel-body/rewind-callout.gjs@@ -1,8 +1,8 @@import Component from "@glimmer/component";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import icon from "discourse/helpers/d-icon";+import DButton from "discourse/ui-kit/d-button";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class RewindCallout extends Component {@@ -88,7 +88,7 @@ export default class RewindCallout extends Component {</svg><span class="btn no-text --special-kbd">- {{icon "play"}}+ {{dIcon "play"}}</span></DButton>diff --git a/plugins/discourse-rewind/assets/javascripts/discourse/connectors/user-activity-bottom/rewind-tab.gjs b/plugins/discourse-rewind/assets/javascripts/discourse/connectors/user-activity-bottom/rewind-tab.gjsindex cdd6bd27191..9eeb9c4ee52 100644--- a/plugins/discourse-rewind/assets/javascripts/discourse/connectors/user-activity-bottom/rewind-tab.gjs+++ b/plugins/discourse-rewind/assets/javascripts/discourse/connectors/user-activity-bottom/rewind-tab.gjs@@ -1,7 +1,7 @@import Component from "@glimmer/component";import { service } from "@ember/service";-import DNavigationItem from "discourse/components/d-navigation-item";-import icon from "discourse/helpers/d-icon";+import DNavigationItem from "discourse/ui-kit/d-navigation-item";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class RewindTab extends Component {@@ -18,7 +18,7 @@ export default class RewindTab extends Component {@ariaCurrentContext="subNav"class="user-nav__activity-rewind">- {{icon "repeat"}}+ {{dIcon "repeat"}}<span>{{i18n "discourse_rewind.title"}}</span></DNavigationItem>{{/if}}diff --git a/plugins/discourse-rewind/assets/javascripts/discourse/connectors/user-preferences-nav/rewind-preferences.gjs b/plugins/discourse-rewind/assets/javascripts/discourse/connectors/user-preferences-nav/rewind-preferences.gjsindex 42a87080b6b..05b61058f77 100644--- a/plugins/discourse-rewind/assets/javascripts/discourse/connectors/user-preferences-nav/rewind-preferences.gjs+++ b/plugins/discourse-rewind/assets/javascripts/discourse/connectors/user-preferences-nav/rewind-preferences.gjs@@ -1,6 +1,6 @@import Component from "@glimmer/component";import { LinkTo } from "@ember/routing";-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class RewindPreferencesNav extends Component {@@ -16,7 +16,7 @@ export default class RewindPreferencesNav extends Component {<template><li class="user-nav__preferences-rewind"><LinkTo @route="preferences.rewind">- {{icon "repeat"}}+ {{dIcon "repeat"}}<span>{{i18n "discourse_rewind.title"}}</span></LinkTo></li>diff --git a/plugins/discourse-rewind/assets/javascripts/discourse/templates/preferences/rewind.gjs b/plugins/discourse-rewind/assets/javascripts/discourse/templates/preferences/rewind.gjsindex 5b213f91b9f..e6ebbbbc7b4 100644--- a/plugins/discourse-rewind/assets/javascripts/discourse/templates/preferences/rewind.gjs+++ b/plugins/discourse-rewind/assets/javascripts/discourse/templates/preferences/rewind.gjs@@ -1,5 +1,5 @@import { Input } from "@ember/component";-import SaveControls from "discourse/components/save-controls";+import DSaveControls from "discourse/ui-kit/d-save-controls";import { i18n } from "discourse-i18n";export default <template>@@ -37,7 +37,7 @@ export default <template></label></div>- <SaveControls+ <DSaveControls@model={{@controller.model}}@action={{@controller.save}}@saved={{@controller.saved}}diff --git a/plugins/discourse-rss-polling/assets/javascripts/discourse/templates/admin-plugins/rss-polling.gjs b/plugins/discourse-rss-polling/assets/javascripts/discourse/templates/admin-plugins/rss-polling.gjsindex 7c1d908f660..eec8f472364 100644--- a/plugins/discourse-rss-polling/assets/javascripts/discourse/templates/admin-plugins/rss-polling.gjs+++ b/plugins/discourse-rss-polling/assets/javascripts/discourse/templates/admin-plugins/rss-polling.gjs@@ -1,9 +1,9 @@import { fn, hash } from "@ember/helper";import { on } from "@ember/modifier";-import DButton from "discourse/components/d-button";import CategoryChooser from "discourse/select-kit/components/category-chooser";import EmailGroupUserChooser from "discourse/select-kit/components/email-group-user-chooser";import TagChooser from "discourse/select-kit/components/tag-chooser";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";export default <template>diff --git a/plugins/discourse-solved/assets/javascripts/discourse/components/modal/move-solution-confirmation.gjs b/plugins/discourse-solved/assets/javascripts/discourse/components/modal/move-solution-confirmation.gjsindex afbef934a3e..f0055412ba6 100644--- a/plugins/discourse-solved/assets/javascripts/discourse/components/modal/move-solution-confirmation.gjs+++ b/plugins/discourse-solved/assets/javascripts/discourse/components/modal/move-solution-confirmation.gjs@@ -2,8 +2,8 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { on } from "@ember/modifier";import { action } from "@ember/object";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";export default class MoveSolutionConfirmationModal extends Component {diff --git a/plugins/discourse-solved/assets/javascripts/discourse/components/modal/solved-removal-confirmation.gjs b/plugins/discourse-solved/assets/javascripts/discourse/components/modal/solved-removal-confirmation.gjsindex 88360fdd211..5ee8c47d0fc 100644--- a/plugins/discourse-solved/assets/javascripts/discourse/components/modal/solved-removal-confirmation.gjs+++ b/plugins/discourse-solved/assets/javascripts/discourse/components/modal/solved-removal-confirmation.gjs@@ -2,8 +2,8 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { on } from "@ember/modifier";import { action } from "@ember/object";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";export default class SolvedRemovalConfirmationModal extends Component {diff --git a/plugins/discourse-solved/assets/javascripts/discourse/components/solved-accept-answer-button.gjs b/plugins/discourse-solved/assets/javascripts/discourse/components/solved-accept-answer-button.gjsindex 50fd5bf2d37..96168d4af98 100644--- a/plugins/discourse-solved/assets/javascripts/discourse/components/solved-accept-answer-button.gjs+++ b/plugins/discourse-solved/assets/javascripts/discourse/components/solved-accept-answer-button.gjs@@ -2,9 +2,9 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";+import DButton from "discourse/ui-kit/d-button";import setAcceptedSolution from "../lib/set-accepted-solution";export default class SolvedAcceptAnswerButton extends Component {diff --git a/plugins/discourse-solved/assets/javascripts/discourse/components/solved-accepted-answer.gjs b/plugins/discourse-solved/assets/javascripts/discourse/components/solved-accepted-answer.gjsindex 368432a788c..09d7397452b 100644--- a/plugins/discourse-solved/assets/javascripts/discourse/components/solved-accepted-answer.gjs+++ b/plugins/discourse-solved/assets/javascripts/discourse/components/solved-accepted-answer.gjs@@ -3,14 +3,14 @@ import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";import { service } from "@ember/service";import { trustHTML } from "@ember/template";-import DButton from "discourse/components/d-button";-import InterpolatedTranslation from "discourse/components/interpolated-translation";import PostCookedHtml from "discourse/components/post/cooked-html";-import UserLink from "discourse/components/user-link";-import boundAvatarTemplate from "discourse/helpers/bound-avatar-template";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";-import onResize from "discourse/modifiers/on-resize";+import DButton from "discourse/ui-kit/d-button";+import DInterpolatedTranslation from "discourse/ui-kit/d-interpolated-translation";+import DUserLink from "discourse/ui-kit/d-user-link";+import dBoundAvatarTemplate from "discourse/ui-kit/helpers/d-bound-avatar-template";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";+import dOnResize from "discourse/ui-kit/modifiers/d-on-resize";import { i18n } from "discourse-i18n";const CHARS_PER_LINE = 90;@@ -134,7 +134,7 @@ export default class SolvedAcceptedAnswer extends Component {{{! template-lint-disable no-unnecessary-concat }}{{#if this.acceptedAnswer}}<aside- class={{concatClass+ class={{dConcatClass"quote accepted-answer d-solved-answer"(if this.hasExcerpt "accepted-answer--has-excerpt")(unless this.content "title-only")@@ -148,7 +148,7 @@ export default class SolvedAcceptedAnswer extends Component {><div class="d-solved-answer__header"><h3 class="d-solved-answer__title">- {{icon "far-square-check"}}+ {{dIcon "far-square-check"}}{{i18n "solved.title"}}</h3><div class="d-solved-answer__controls">{{#if this.showToggle}}@@ -173,7 +173,7 @@ export default class SolvedAcceptedAnswer extends Component {</div>{{#if this.content}}- <blockquote id={{this.quoteId}} {{onResize this.checkOverflow}}>+ <blockquote id={{this.quoteId}} {{dOnResize this.checkOverflow}}><PostCookedHtml@post={{@post}}@cooked={{this.content}}@@ -184,10 +184,13 @@ export default class SolvedAcceptedAnswer extends Component {<div class="d-solved-answer__footer">{{#if this.showSolvedBy}}- <UserLink @username={{this.solverUsername}}>- {{boundAvatarTemplate this.acceptedAnswer.avatar_template "tiny"}}- </UserLink>- <InterpolatedTranslation+ <DUserLink @username={{this.solverUsername}}>+ {{dBoundAvatarTemplate+ this.acceptedAnswer.avatar_template+ "tiny"+ }}+ </DUserLink>+ <DInterpolatedTranslation@key="solved.accepted_answer_solver_info"as |Placeholder|>@@ -200,19 +203,19 @@ export default class SolvedAcceptedAnswer extends Component {href={{this.postPath}}>{{this.postNumber}}</a></Placeholder>- </InterpolatedTranslation>+ </DInterpolatedTranslation>{{/if}}{{#if this.showMarkedBy}}<span class="dot-separator"></span>- <InterpolatedTranslation+ <DInterpolatedTranslation@key="solved.marked_solved_by"as |Placeholder|><Placeholder @name="user" @class="d-solved-answer__accepter">{{this.accepterDisplayName}}</Placeholder>- </InterpolatedTranslation>+ </DInterpolatedTranslation>{{/if}}</div>diff --git a/plugins/discourse-solved/assets/javascripts/discourse/components/solved-unaccept-answer-button.gjs b/plugins/discourse-solved/assets/javascripts/discourse/components/solved-unaccept-answer-button.gjsindex 44464dacf7c..da50e85159d 100644--- a/plugins/discourse-solved/assets/javascripts/discourse/components/solved-unaccept-answer-button.gjs+++ b/plugins/discourse-solved/assets/javascripts/discourse/components/solved-unaccept-answer-button.gjs@@ -2,14 +2,14 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import InterpolatedTranslation from "discourse/components/interpolated-translation";-import UserLink from "discourse/components/user-link";import DTooltip from "discourse/float-kit/components/d-tooltip";-import icon from "discourse/helpers/d-icon";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import { and } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DInterpolatedTranslation from "discourse/ui-kit/d-interpolated-translation";+import DUserLink from "discourse/ui-kit/d-user-link";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";import setAcceptedSolution from "../lib/set-accepted-solution";@@ -68,16 +68,16 @@ export default class SolvedUnacceptAnswerButton extends Component {/></:trigger><:content>- <InterpolatedTranslation+ <DInterpolatedTranslation@key="solved.marked_solved_by"as |Placeholder|><Placeholder @name="user">- <UserLink @username={{this.acceptedByUsername}}>+ <DUserLink @username={{this.acceptedByUsername}}>{{this.acceptedByDisplayName}}- </UserLink>+ </DUserLink></Placeholder>- </InterpolatedTranslation>+ </DInterpolatedTranslation></:content></DTooltip>{{else}}@@ -96,7 +96,7 @@ export default class SolvedUnacceptAnswerButton extends Component {class="accepted-text"title={{i18n "solved.accepted_description"}}>- <span>{{icon "check"}}</span>+ <span>{{dIcon "check"}}</span><span class="accepted-label">{{i18n "solved.solution"}}</span>diff --git a/plugins/discourse-solved/assets/javascripts/discourse/connectors/after-topic-status/solved-status.gjs b/plugins/discourse-solved/assets/javascripts/discourse/connectors/after-topic-status/solved-status.gjsindex d8c332e9909..29b7deb1d5a 100644--- a/plugins/discourse-solved/assets/javascripts/discourse/connectors/after-topic-status/solved-status.gjs+++ b/plugins/discourse-solved/assets/javascripts/discourse/connectors/after-topic-status/solved-status.gjs@@ -1,5 +1,5 @@-import icon from "discourse/helpers/d-icon";import { and, eq, or } from "discourse/truth-helpers";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";const SolvedStatus = <template>@@ -9,7 +9,7 @@ const SolvedStatus = <template><spantitle={{i18n "topic_statuses.solved.help"}}class="topic-status --solved"- >{{icon "far-square-check"}}</span>+ >{{dIcon "far-square-check"}}</span>{{~else if(and@outletArgs.topic.can_have_answer (eq @outletArgs.context "topic-list")@@ -18,7 +18,7 @@ const SolvedStatus = <template><spantitle={{i18n "solved.has_no_accepted_answer"}}class="topic-status --unsolved"- >{{icon "far-square"}}</span>+ >{{dIcon "far-square"}}</span>{{~/if~}}</template>;diff --git a/plugins/discourse-solved/assets/javascripts/discourse/connectors/user-activity-bottom/solved-list.gjs b/plugins/discourse-solved/assets/javascripts/discourse/connectors/user-activity-bottom/solved-list.gjsindex 62abd992232..6962c40da84 100644--- a/plugins/discourse-solved/assets/javascripts/discourse/connectors/user-activity-bottom/solved-list.gjs+++ b/plugins/discourse-solved/assets/javascripts/discourse/connectors/user-activity-bottom/solved-list.gjs@@ -1,7 +1,7 @@import Component from "@glimmer/component";import { LinkTo } from "@ember/routing";import { service } from "@ember/service";-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class SolvedList extends Component {@@ -11,7 +11,7 @@ export default class SolvedList extends Component {{{#if this.siteSettings.solved_enabled}}<li class="user-activity-bottom-outlet solved-list"><LinkTo @route="userActivity.solved">- {{icon "square-check"}}+ {{dIcon "square-check"}}{{i18n "solved.title"}}</LinkTo></li>diff --git a/plugins/discourse-solved/assets/javascripts/discourse/connectors/user-summary-stat/solved-count.gjs b/plugins/discourse-solved/assets/javascripts/discourse/connectors/user-summary-stat/solved-count.gjsindex 809112f97c9..8609b2c867a 100644--- a/plugins/discourse-solved/assets/javascripts/discourse/connectors/user-summary-stat/solved-count.gjs+++ b/plugins/discourse-solved/assets/javascripts/discourse/connectors/user-summary-stat/solved-count.gjs@@ -1,8 +1,8 @@import Component from "@glimmer/component";import { LinkTo } from "@ember/routing";import { service } from "@ember/service";-import UserStat from "discourse/components/user-stat";import { and } from "discourse/truth-helpers";+import DUserStat from "discourse/ui-kit/d-user-stat";export default class SolvedCount extends Component {@service siteSettings;@@ -13,7 +13,7 @@ export default class SolvedCount extends Component {}}<li class="user-summary-stat-outlet solved-count linked-stat"><LinkTo @route="userActivity.solved">- <UserStat+ <DUserStat@value={{@outletArgs.model.solved_count}}@label="solved.solution_summary"@icon="square-check"diff --git a/plugins/discourse-solved/assets/javascripts/discourse/templates/user-activity/solved.gjs b/plugins/discourse-solved/assets/javascripts/discourse/templates/user-activity/solved.gjsindex 8d450b6627f..c1104eed4b3 100644--- a/plugins/discourse-solved/assets/javascripts/discourse/templates/user-activity/solved.gjs+++ b/plugins/discourse-solved/assets/javascripts/discourse/templates/user-activity/solved.gjs@@ -1,9 +1,9 @@-import EmptyState from "discourse/components/empty-state";import UserStream from "discourse/components/user-stream";+import DEmptyState from "discourse/ui-kit/d-empty-state";export default <template>{{#if @controller.model.stream.noContent}}- <EmptyState+ <DEmptyState@title={{@controller.model.emptyState.title}}@body={{@controller.model.emptyState.body}}/>diff --git a/plugins/discourse-subscriptions/assets/javascripts/discourse/components/campaign-banner.gjs b/plugins/discourse-subscriptions/assets/javascripts/discourse/components/campaign-banner.gjsindex 53582042082..0a576eac8db 100644--- a/plugins/discourse-subscriptions/assets/javascripts/discourse/components/campaign-banner.gjs+++ b/plugins/discourse-subscriptions/assets/javascripts/discourse/components/campaign-banner.gjs@@ -8,11 +8,11 @@ import { service } from "@ember/service";import { trustHTML } from "@ember/template";import { tagName } from "@ember-decorators/component";import { observes } from "@ember-decorators/object";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DButton from "discourse/components/d-button";-import avatar from "discourse/helpers/avatar";-import icon from "discourse/helpers/d-icon";import { ajax } from "discourse/lib/ajax";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import dAvatar from "discourse/ui-kit/helpers/d-avatar";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";import formatCurrency from "../helpers/format-currency";@@ -293,8 +293,8 @@ export default class CampaignBanner extends Component {@disabled={{this.product.subscribed}}class="btn btn-primary campaign-banner-info-button">- {{icon "far-heart"}}- {{icon "heart" class="hover-heart"}}+ {{dIcon "far-heart"}}+ {{dIcon "heart" class="hover-heart"}}{{i18n "discourse_subscriptions.campaign.button"}}</LinkTo>{{else}}@@ -302,8 +302,8 @@ export default class CampaignBanner extends Component {@route={{this.subscribeRoute}}class="btn btn-primary campaign-banner-info-button">- {{icon "far-heart"}}- {{icon "heart" class="hover-heart"}}+ {{dIcon "far-heart"}}+ {{dIcon "heart" class="hover-heart"}}{{i18n "discourse_subscriptions.campaign.button"}}</LinkTo>{{/if}}@@ -343,7 +343,7 @@ export default class CampaignBanner extends Component {</p>{{#if this.showContributors}}- <ConditionalLoadingSpinner+ <DConditionalLoadingSpinner@condition={{this.loading}}@size="small">@@ -358,7 +358,7 @@ export default class CampaignBanner extends Component {<div class="campaign-banner-progress-users-avatars">{{#each this.contributors as |contributor|}}- {{avatar+ {{dAvatarcontributoravatarTemplatePath="avatar_template"usernamePath="username"@@ -368,7 +368,7 @@ export default class CampaignBanner extends Component {{{/each}}</div></div>- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner>{{/if}}{{/if}}{{else}}@@ -409,7 +409,7 @@ export default class CampaignBanner extends Component {{{/if}}{{#if this.showContributors}}- <ConditionalLoadingSpinner+ <DConditionalLoadingSpinner@condition={{this.loading}}@size="small">@@ -424,7 +424,7 @@ export default class CampaignBanner extends Component {<div class="campaign-banner-progress-users-avatars">{{#each this.contributors as |contributor|}}- {{avatar+ {{dAvatarcontributoravatarTemplatePath="avatar_template"usernamePath="username"@@ -434,7 +434,7 @@ export default class CampaignBanner extends Component {{{/each}}</div></div>- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner>{{/if}}{{/if}}</div>diff --git a/plugins/discourse-subscriptions/assets/javascripts/discourse/components/create-coupon-form.gjs b/plugins/discourse-subscriptions/assets/javascripts/discourse/components/create-coupon-form.gjsindex 33271254fbf..a784fea8481 100644--- a/plugins/discourse-subscriptions/assets/javascripts/discourse/components/create-coupon-form.gjs+++ b/plugins/discourse-subscriptions/assets/javascripts/discourse/components/create-coupon-form.gjs@@ -4,9 +4,9 @@ import { fn } from "@ember/helper";import { on } from "@ember/modifier";import { action, computed } from "@ember/object";import { tagName } from "@ember-decorators/component";-import DButton from "discourse/components/d-button";import withEventValue from "discourse/helpers/with-event-value";import ComboBox from "discourse/select-kit/components/combo-box";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";@tagName("")diff --git a/plugins/discourse-subscriptions/assets/javascripts/discourse/components/login-required.gjs b/plugins/discourse-subscriptions/assets/javascripts/discourse/components/login-required.gjsindex 538dcb1f637..307fec562e5 100644--- a/plugins/discourse-subscriptions/assets/javascripts/discourse/components/login-required.gjs+++ b/plugins/discourse-subscriptions/assets/javascripts/discourse/components/login-required.gjs@@ -1,5 +1,5 @@-import DButton from "discourse/components/d-button";import routeAction from "discourse/helpers/route-action";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";const LoginRequired = <template>diff --git a/plugins/discourse-subscriptions/assets/javascripts/discourse/components/modal/admin-cancel-subscription.gjs b/plugins/discourse-subscriptions/assets/javascripts/discourse/components/modal/admin-cancel-subscription.gjsindex 11f76fd5081..11980a2d072 100644--- a/plugins/discourse-subscriptions/assets/javascripts/discourse/components/modal/admin-cancel-subscription.gjs+++ b/plugins/discourse-subscriptions/assets/javascripts/discourse/components/modal/admin-cancel-subscription.gjs@@ -2,8 +2,8 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { Input } from "@ember/component";import { fn, hash } from "@ember/helper";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";+import DButton from "discourse/ui-kit/d-button";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";export default class AdminCancelSubscription extends Component {diff --git a/plugins/discourse-subscriptions/assets/javascripts/discourse/components/payment-plan.gjs b/plugins/discourse-subscriptions/assets/javascripts/discourse/components/payment-plan.gjsindex f632fd2f6d0..051dd0368f2 100644--- a/plugins/discourse-subscriptions/assets/javascripts/discourse/components/payment-plan.gjs+++ b/plugins/discourse-subscriptions/assets/javascripts/discourse/components/payment-plan.gjs@@ -3,8 +3,8 @@ import Component from "@ember/component";import { concat } from "@ember/helper";import { action, computed } from "@ember/object";import { tagName } from "@ember-decorators/component";-import DButton from "discourse/components/d-button";-import concatClass from "discourse/helpers/concat-class";+import DButton from "discourse/ui-kit/d-button";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";import formatCurrency from "../helpers/format-currency";@@ -31,7 +31,7 @@ export default class PaymentPlan extends Component {<template><DButton@action={{this.planClick}}- class={{concatClass+ class={{dConcatClass"btn-discourse-subscriptions-subscribe"this.selectedClass}}diff --git a/plugins/discourse-subscriptions/assets/javascripts/discourse/connectors/user-main-nav/billing.gjs b/plugins/discourse-subscriptions/assets/javascripts/discourse/connectors/user-main-nav/billing.gjsindex 7ff7c18689e..501d6a75186 100644--- a/plugins/discourse-subscriptions/assets/javascripts/discourse/connectors/user-main-nav/billing.gjs+++ b/plugins/discourse-subscriptions/assets/javascripts/discourse/connectors/user-main-nav/billing.gjs@@ -3,8 +3,8 @@ import Component from "@ember/component";import { LinkTo } from "@ember/routing";import { service } from "@ember/service";import { tagName } from "@ember-decorators/component";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";@tagName("")@@ -21,7 +21,7 @@ export default class Billing extends Component {<template><li- class={{concatClass+ class={{dConcatClass"user-main-nav-outlet""billing"(unless this.viewingSelf "hidden")@@ -29,7 +29,7 @@ export default class Billing extends Component {...attributes><LinkTo @route="user.billing">- {{icon "far-credit-card"}}+ {{dIcon "far-credit-card"}}<span>{{i18n "discourse_subscriptions.navigation.billing"}}</span></LinkTo></li>diff --git a/plugins/discourse-subscriptions/assets/javascripts/discourse/templates/admin-plugins/discourse-subscriptions.gjs b/plugins/discourse-subscriptions/assets/javascripts/discourse/templates/admin-plugins/discourse-subscriptions.gjsindex ed870eda991..1a51e85c9fe 100644--- a/plugins/discourse-subscriptions/assets/javascripts/discourse/templates/admin-plugins/discourse-subscriptions.gjs+++ b/plugins/discourse-subscriptions/assets/javascripts/discourse/templates/admin-plugins/discourse-subscriptions.gjs@@ -1,5 +1,5 @@-import DButton from "discourse/components/d-button";-import NavItem from "discourse/components/nav-item";+import DButton from "discourse/ui-kit/d-button";+import DNavItem from "discourse/ui-kit/d-nav-item";import { i18n } from "discourse-i18n";export default <template>@@ -29,15 +29,15 @@ export default <template></div><ul class="nav nav-pills">- <NavItem+ <DNavItem@route="adminPlugins.discourse-subscriptions.products"@label="discourse_subscriptions.admin.products.title"/>- <NavItem+ <DNavItem@route="adminPlugins.discourse-subscriptions.coupons"@label="discourse_subscriptions.admin.coupons.title"/>- <NavItem+ <DNavItem@route="adminPlugins.discourse-subscriptions.subscriptions"@label="discourse_subscriptions.admin.subscriptions.title"/>diff --git a/plugins/discourse-subscriptions/assets/javascripts/discourse/templates/admin-plugins/discourse-subscriptions/coupons.gjs b/plugins/discourse-subscriptions/assets/javascripts/discourse/templates/admin-plugins/discourse-subscriptions/coupons.gjsindex 9ccf8ce8070..500b4f8b161 100644--- a/plugins/discourse-subscriptions/assets/javascripts/discourse/templates/admin-plugins/discourse-subscriptions/coupons.gjs+++ b/plugins/discourse-subscriptions/assets/javascripts/discourse/templates/admin-plugins/discourse-subscriptions/coupons.gjs@@ -1,7 +1,7 @@import { Input } from "@ember/component";import { fn } from "@ember/helper";import { on } from "@ember/modifier";-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";import CreateCouponForm from "../../../components/create-coupon-form";diff --git a/plugins/discourse-subscriptions/assets/javascripts/discourse/templates/admin-plugins/discourse-subscriptions/dashboard.gjs b/plugins/discourse-subscriptions/assets/javascripts/discourse/templates/admin-plugins/discourse-subscriptions/dashboard.gjsindex bbed2fdc395..0c752ed44f6 100644--- a/plugins/discourse-subscriptions/assets/javascripts/discourse/templates/admin-plugins/discourse-subscriptions/dashboard.gjs+++ b/plugins/discourse-subscriptions/assets/javascripts/discourse/templates/admin-plugins/discourse-subscriptions/dashboard.gjs@@ -2,14 +2,14 @@ import { array, fn } from "@ember/helper";import { on } from "@ember/modifier";import { LinkTo } from "@ember/routing";import { trustHTML } from "@ember/template";-import LoadMore from "discourse/components/load-more";-import formatDuration from "discourse/helpers/format-duration";+import DLoadMore from "discourse/ui-kit/d-load-more";+import dFormatDuration from "discourse/ui-kit/helpers/d-format-duration";import { i18n } from "discourse-i18n";export default <template><h3>{{i18n "discourse_subscriptions.admin.dashboard.title"}}</h3>- <LoadMore+ <DLoadMore@selector=".discourse-patrons-table tr"@action={{@controller.loadMore}}>@@ -68,12 +68,12 @@ export default <template></LinkTo></td><td>{{payment.receipt_email}}</td>- <td>{{trustHTML (formatDuration payment.created_at_age)}}</td>+ <td>{{trustHTML (dFormatDuration payment.created_at_age)}}</td><td class="amount">{{payment.amount_currency}}</td></tr>{{/each}}</tbody></table>{{/if}}- </LoadMore>+ </DLoadMore></template>diff --git a/plugins/discourse-subscriptions/assets/javascripts/discourse/templates/admin-plugins/discourse-subscriptions/plans/index.gjs b/plugins/discourse-subscriptions/assets/javascripts/discourse/templates/admin-plugins/discourse-subscriptions/plans/index.gjsindex e4aab393535..d8b9ef400b7 100644--- a/plugins/discourse-subscriptions/assets/javascripts/discourse/templates/admin-plugins/discourse-subscriptions/plans/index.gjs+++ b/plugins/discourse-subscriptions/assets/javascripts/discourse/templates/admin-plugins/discourse-subscriptions/plans/index.gjs@@ -1,6 +1,6 @@import { fn } from "@ember/helper";-import DButton from "discourse/components/d-button";import routeAction from "discourse/helpers/route-action";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";export default <template>diff --git a/plugins/discourse-subscriptions/assets/javascripts/discourse/templates/admin-plugins/discourse-subscriptions/products/index.gjs b/plugins/discourse-subscriptions/assets/javascripts/discourse/templates/admin-plugins/discourse-subscriptions/products/index.gjsindex b8e385fe96b..9385308e4fa 100644--- a/plugins/discourse-subscriptions/assets/javascripts/discourse/templates/admin-plugins/discourse-subscriptions/products/index.gjs+++ b/plugins/discourse-subscriptions/assets/javascripts/discourse/templates/admin-plugins/discourse-subscriptions/products/index.gjs@@ -1,7 +1,7 @@import { LinkTo } from "@ember/routing";-import DButton from "discourse/components/d-button";-import icon from "discourse/helpers/d-icon";import routeAction from "discourse/helpers/route-action";+import DButton from "discourse/ui-kit/d-button";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";import formatUnixDate from "../../../../helpers/format-unix-date";@@ -20,7 +20,7 @@ export default <template>@model="new"class="btn btn-primary">- {{icon "plus"}}+ {{dIcon "plus"}}<span>{{i18n "discourse_subscriptions.admin.products.operations.new"}}</span>@@ -59,7 +59,7 @@ export default <template>@model={{product.id}}class="btn no-text btn-icon">- {{icon "far-pen-to-square"}}+ {{dIcon "far-pen-to-square"}}</LinkTo><DButtondiff --git a/plugins/discourse-subscriptions/assets/javascripts/discourse/templates/admin-plugins/discourse-subscriptions/products/show.gjs b/plugins/discourse-subscriptions/assets/javascripts/discourse/templates/admin-plugins/discourse-subscriptions/products/show.gjsindex cd732bed9f5..bd9e16a472b 100644--- a/plugins/discourse-subscriptions/assets/javascripts/discourse/templates/admin-plugins/discourse-subscriptions/products/show.gjs+++ b/plugins/discourse-subscriptions/assets/javascripts/discourse/templates/admin-plugins/discourse-subscriptions/products/show.gjs@@ -1,8 +1,8 @@import { Input, Textarea } from "@ember/component";import { array } from "@ember/helper";import { LinkTo } from "@ember/routing";-import DButton from "discourse/components/d-button";-import icon from "discourse/helpers/d-icon";+import DButton from "discourse/ui-kit/d-button";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";import formatCurrency from "../../../../helpers/format-currency";import formatUnixDate from "../../../../helpers/format-unix-date";@@ -139,7 +139,7 @@ export default <template>@models={{array @controller.model.product.id plan.id}}class="btn no-text btn-icon">- {{icon "far-pen-to-square"}}+ {{dIcon "far-pen-to-square"}}</LinkTo></td></tr>diff --git a/plugins/discourse-subscriptions/assets/javascripts/discourse/templates/admin-plugins/discourse-subscriptions/products/show/plans/show.gjs b/plugins/discourse-subscriptions/assets/javascripts/discourse/templates/admin-plugins/discourse-subscriptions/products/show/plans/show.gjsindex 5dde76039d5..e269e4c895d 100644--- a/plugins/discourse-subscriptions/assets/javascripts/discourse/templates/admin-plugins/discourse-subscriptions/products/show/plans/show.gjs+++ b/plugins/discourse-subscriptions/assets/javascripts/discourse/templates/admin-plugins/discourse-subscriptions/products/show/plans/show.gjs@@ -1,9 +1,9 @@import { Input } from "@ember/component";import { fn } from "@ember/helper";import { on } from "@ember/modifier";-import DButton from "discourse/components/d-button";import withEventValue from "discourse/helpers/with-event-value";import ComboBox from "discourse/select-kit/components/combo-box";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";export default <template>diff --git a/plugins/discourse-subscriptions/assets/javascripts/discourse/templates/admin-plugins/discourse-subscriptions/subscriptions.gjs b/plugins/discourse-subscriptions/assets/javascripts/discourse/templates/admin-plugins/discourse-subscriptions/subscriptions.gjsindex 50dacb1746d..92ca983f96c 100644--- a/plugins/discourse-subscriptions/assets/javascripts/discourse/templates/admin-plugins/discourse-subscriptions/subscriptions.gjs+++ b/plugins/discourse-subscriptions/assets/javascripts/discourse/templates/admin-plugins/discourse-subscriptions/subscriptions.gjs@@ -1,8 +1,8 @@import { fn } from "@ember/helper";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DButton from "discourse/components/d-button";-import LoadMore from "discourse/components/load-more";-import loadingSpinner from "discourse/helpers/loading-spinner";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DLoadMore from "discourse/ui-kit/d-load-more";+import dLoadingSpinner from "discourse/ui-kit/helpers/d-loading-spinner";import { i18n } from "discourse-i18n";import formatUnixDate from "../../../helpers/format-unix-date";@@ -15,7 +15,7 @@ export default <template></a></p>{{else}}- <LoadMore+ <DLoadMore@selector=".discourse-patrons-table tr"@action={{@controller.loadMore}}>@@ -81,7 +81,7 @@ export default <template></td><td class="td-right">{{#if subscription.loading}}- {{loadingSpinner size="small"}}+ {{dLoadingSpinner size="small"}}{{else}}<DButton@disabled={{subscription.canceled}}@@ -95,8 +95,8 @@ export default <template>{{/each}}</tbody></table>- </LoadMore>+ </DLoadMore>- <ConditionalLoadingSpinner @condition={{@controller.loading}} />+ <DConditionalLoadingSpinner @condition={{@controller.loading}} />{{/if}}</template>diff --git a/plugins/discourse-subscriptions/assets/javascripts/discourse/templates/subscribe/show.gjs b/plugins/discourse-subscriptions/assets/javascripts/discourse/templates/subscribe/show.gjsindex 0b7771f2558..262dce9dd89 100644--- a/plugins/discourse-subscriptions/assets/javascripts/discourse/templates/subscribe/show.gjs+++ b/plugins/discourse-subscriptions/assets/javascripts/discourse/templates/subscribe/show.gjs@@ -1,8 +1,8 @@import { Input } from "@ember/component";import { LinkTo } from "@ember/routing";import { trustHTML } from "@ember/template";-import DButton from "discourse/components/d-button";-import loadingSpinner from "discourse/helpers/loading-spinner";+import DButton from "discourse/ui-kit/d-button";+import dLoadingSpinner from "discourse/ui-kit/helpers/d-loading-spinner";import { i18n } from "discourse-i18n";import LoginRequired from "../../components/login-required";import PaymentOptions from "../../components/payment-options";@@ -43,7 +43,7 @@ export default <template><SubscribeCard @cardElement={{@controller.cardElement}} />{{#if @controller.loading}}- {{loadingSpinner}}+ {{dLoadingSpinner}}{{else if @controller.isAnonymous}}<LoginRequired />{{else}}diff --git a/plugins/discourse-subscriptions/assets/javascripts/discourse/templates/user/billing/subscriptions/card.gjs b/plugins/discourse-subscriptions/assets/javascripts/discourse/templates/user/billing/subscriptions/card.gjsindex 62a724d1051..b523da38e58 100644--- a/plugins/discourse-subscriptions/assets/javascripts/discourse/templates/user/billing/subscriptions/card.gjs+++ b/plugins/discourse-subscriptions/assets/javascripts/discourse/templates/user/billing/subscriptions/card.gjs@@ -1,4 +1,4 @@-import SaveControls from "discourse/components/save-controls";+import DSaveControls from "discourse/ui-kit/d-save-controls";import { i18n } from "discourse-i18n";import SubscribeCard from "../../../../components/subscribe-card";@@ -16,7 +16,7 @@ export default <template>/></div>- <SaveControls+ <DSaveControls@action={{@controller.updatePaymentMethod}}@saved={{@controller.saved}}@saveDisabled={{@controller.loading}}diff --git a/plugins/discourse-subscriptions/assets/javascripts/discourse/templates/user/billing/subscriptions/index.gjs b/plugins/discourse-subscriptions/assets/javascripts/discourse/templates/user/billing/subscriptions/index.gjsindex 9516b7b56c2..c58b513f845 100644--- a/plugins/discourse-subscriptions/assets/javascripts/discourse/templates/user/billing/subscriptions/index.gjs+++ b/plugins/discourse-subscriptions/assets/javascripts/discourse/templates/user/billing/subscriptions/index.gjs@@ -1,6 +1,6 @@-import DButton from "discourse/components/d-button";-import loadingSpinner from "discourse/helpers/loading-spinner";import routeAction from "discourse/helpers/route-action";+import DButton from "discourse/ui-kit/d-button";+import dLoadingSpinner from "discourse/ui-kit/helpers/d-loading-spinner";import { i18n } from "discourse-i18n";import formatUnixDate from "../../../../helpers/format-unix-date";@@ -33,7 +33,7 @@ export default <template><td>{{formatUnixDate subscription.created}}</td><td class="td-right">{{#if subscription.loading}}- {{loadingSpinner size="small"}}+ {{dLoadingSpinner size="small"}}{{else}}{{#if subscription.canceled_at}}<DButtondiff --git a/plugins/discourse-templates/assets/javascripts/discourse/components/d-templates/filterable-list.gjs b/plugins/discourse-templates/assets/javascripts/discourse/components/d-templates/filterable-list.gjsindex ca04b7598ff..e5515fa2612 100644--- a/plugins/discourse-templates/assets/javascripts/discourse/components/d-templates/filterable-list.gjs+++ b/plugins/discourse-templates/assets/javascripts/discourse/components/d-templates/filterable-list.gjs@@ -4,8 +4,6 @@ import { action, computed } from "@ember/object";import didInsert from "@ember/render-modifiers/modifiers/did-insert";import { schedule } from "@ember/runloop";import { service } from "@ember/service";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import TextField from "discourse/components/text-field";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import { bind } from "discourse/lib/decorators";@@ -13,6 +11,8 @@ import {ALL_TAGS_ID,NO_TAG_ID,} from "discourse/select-kit/components/tag-drop";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import DTextField from "discourse/ui-kit/d-text-field";import { i18n } from "discourse-i18n";import Item from "./item";import TagDrop from "./tag-drop";@@ -154,7 +154,7 @@ export default class DTemplatesFilterableList extends Component {<template><div class="templates-filterable-list" {{didInsert this.load}}>- <ConditionalLoadingSpinner @condition={{this.loading}}>+ <DConditionalLoadingSpinner @condition={{this.loading}}><div class="templates-filter-bar">{{#if this.siteSettings.tagging_enabled}}<TagDrop@@ -163,7 +163,7 @@ export default class DTemplatesFilterableList extends Component {@onChangeSelectedTag={{this.changeSelectedTag}}/>{{/if}}- <TextField+ <DTextFieldclass="templates-filter"@value={{this.listFilter}}placeholder={{i18n "templates.filter_hint"}}@@ -178,7 +178,7 @@ export default class DTemplatesFilterableList extends Component {/>{{/each}}</div>- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner></div></template>}diff --git a/plugins/discourse-templates/assets/javascripts/discourse/components/d-templates/item-content.gjs b/plugins/discourse-templates/assets/javascripts/discourse/components/d-templates/item-content.gjsindex f6aef5aa532..4a7ff777cbd 100644--- a/plugins/discourse-templates/assets/javascripts/discourse/components/d-templates/item-content.gjs+++ b/plugins/discourse-templates/assets/javascripts/discourse/components/d-templates/item-content.gjs@@ -1,7 +1,7 @@import { array } from "@ember/helper";import { LinkTo } from "@ember/routing";-import CookText from "discourse/components/cook-text";-import icon from "discourse/helpers/d-icon";+import DCookText from "discourse/ui-kit/d-cook-text";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";const ItemContent = <template>@@ -11,10 +11,10 @@ const ItemContent = <template>@route="topic"@models={{array @template.slug @template.id}}>- {{icon "crosshairs"}}+ {{dIcon "crosshairs"}}{{i18n "templates.source"}}</LinkTo>- <CookText @rawText={{@template.content}} />+ <DCookText @rawText={{@template.content}} /></div></template>;diff --git a/plugins/discourse-templates/assets/javascripts/discourse/components/d-templates/item.gjs b/plugins/discourse-templates/assets/javascripts/discourse/components/d-templates/item.gjsindex ef820d6eb58..378efde4281 100644--- a/plugins/discourse-templates/assets/javascripts/discourse/components/d-templates/item.gjs+++ b/plugins/discourse-templates/assets/javascripts/discourse/components/d-templates/item.gjs@@ -1,8 +1,8 @@import Component from "@glimmer/component";import { action } from "@ember/object";-import DButton from "discourse/components/d-button";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";+import DButton from "discourse/ui-kit/d-button";import ItemContent from "./item-content";export default class DTemplatesItem extends Component {diff --git a/plugins/discourse-templates/assets/javascripts/discourse/components/d-templates/modal/form.gjs b/plugins/discourse-templates/assets/javascripts/discourse/components/d-templates/modal/form.gjsindex df9ee000751..e425a251032 100644--- a/plugins/discourse-templates/assets/javascripts/discourse/components/d-templates/modal/form.gjs+++ b/plugins/discourse-templates/assets/javascripts/discourse/components/d-templates/modal/form.gjs@@ -1,6 +1,6 @@import Component from "@glimmer/component";import { service } from "@ember/service";-import DModal from "discourse/components/d-modal";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";import FilterableList from "../filterable-list";diff --git a/plugins/discourse-templates/assets/javascripts/discourse/connectors/editor-preview/d-templates.gjs b/plugins/discourse-templates/assets/javascripts/discourse/connectors/editor-preview/d-templates.gjsindex 3720db9de12..91d5081bcac 100644--- a/plugins/discourse-templates/assets/javascripts/discourse/connectors/editor-preview/d-templates.gjs+++ b/plugins/discourse-templates/assets/javascripts/discourse/connectors/editor-preview/d-templates.gjs@@ -3,7 +3,7 @@ import Component from "@ember/component";import { action } from "@ember/object";import { service } from "@ember/service";import { tagName } from "@ember-decorators/component";-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";import FilterableList from "../../components/d-templates/filterable-list";const SELECTOR_EDITOR_PREVIEW =diff --git a/plugins/discourse-templates/assets/javascripts/discourse/connectors/topic-above-posts/discourse-templates-button.gjs b/plugins/discourse-templates/assets/javascripts/discourse/connectors/topic-above-posts/discourse-templates-button.gjsindex c1821752e02..133cb1fab37 100644--- a/plugins/discourse-templates/assets/javascripts/discourse/connectors/topic-above-posts/discourse-templates-button.gjs+++ b/plugins/discourse-templates/assets/javascripts/discourse/connectors/topic-above-posts/discourse-templates-button.gjs@@ -2,10 +2,10 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import concatClass from "discourse/helpers/concat-class";import { ajax } from "discourse/lib/ajax";import discourseDebounce from "discourse/lib/debounce";+import DButton from "discourse/ui-kit/d-button";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";export default class DiscourseTemplatesButton extends Component {static shouldRender(outletArgs, helper) {@@ -48,7 +48,7 @@ export default class DiscourseTemplatesButton extends Component {@icon={{if this.copyConfirm "check" "copy"}}@action={{this.copy}}@label="templates.copy"- class={{concatClass+ class={{dConcatClass"btn-default""template-copy"(if this.copyConfirm "ok")diff --git a/plugins/discourse-topic-voting/assets/javascripts/discourse/components/vote-button.gjs b/plugins/discourse-topic-voting/assets/javascripts/discourse/components/vote-button.gjsindex ed127235d05..4ac8287efd7 100644--- a/plugins/discourse-topic-voting/assets/javascripts/discourse/components/vote-button.gjs+++ b/plugins/discourse-topic-voting/assets/javascripts/discourse/components/vote-button.gjs@@ -2,14 +2,14 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import DropdownMenu from "discourse/components/dropdown-menu";import DMenu from "discourse/float-kit/components/d-menu";import DTooltip from "discourse/float-kit/components/d-tooltip";-import icon from "discourse/helpers/d-icon";import { NotificationLevels } from "discourse/lib/notification-levels";import { applyBehaviorTransformer } from "discourse/lib/transformer";import { and, eq, not } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class VoteBox extends Component {@@ -172,7 +172,7 @@ export default class VoteBox extends Component {@placement="right"><:content>- <DropdownMenu as |dropdown|>+ <DDropdownMenu as |dropdown|>{{#if this.showVotedMenu}}<dropdown.item class="topic-voting-menu__votes-left"><DButton@@ -204,7 +204,7 @@ export default class VoteBox extends Component {</dropdown.item>{{else if (eq this.currentUser.vote_limit 0)}}<dropdown.item class="topic-voting-menu__title --locked">- {{icon "lock"}}+ {{dIcon "lock"}}<span>{{i18n "topic_voting.locked_description"}}</span></dropdown.item>{{else if@@ -254,7 +254,7 @@ export default class VoteBox extends Component {</dropdown.item>{{/if}}{{/if}}- </DropdownMenu>+ </DDropdownMenu></:content></DMenu>{{else}}diff --git a/plugins/discourse-topic-voting/assets/javascripts/discourse/components/vote-count.gjs b/plugins/discourse-topic-voting/assets/javascripts/discourse/components/vote-count.gjsindex 4acdc79bcfd..033fe793de8 100644--- a/plugins/discourse-topic-voting/assets/javascripts/discourse/components/vote-count.gjs+++ b/plugins/discourse-topic-voting/assets/javascripts/discourse/components/vote-count.gjs@@ -2,13 +2,13 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { service } from "@ember/service";import DMenu from "discourse/float-kit/components/d-menu";-import avatar from "discourse/helpers/bound-avatar-template";-import concatClass from "discourse/helpers/concat-class";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import { bind } from "discourse/lib/decorators";import getURL from "discourse/lib/get-url";import { eq } from "discourse/truth-helpers";+import dBoundAvatarTemplate from "discourse/ui-kit/helpers/d-bound-avatar-template";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";import VoteCountTrigger from "./vote-count-trigger";@@ -86,7 +86,7 @@ export default class VoteCount extends Component {@onShow={{this.loadVoters}}@modalForMobile={{true}}@placement="right"- class={{concatClass+ class={{dConcatClass"voting-wrapper__count"(if (eq @topic.vote_count 0) "no-votes")}}@@ -111,7 +111,7 @@ export default class VoteCount extends Component {data-user-card={{voter.username}}title={{voter.username}}>- {{avatar voter.template "small"}}+ {{dBoundAvatarTemplate voter.template "small"}}</a>{{/each}}{{#if this.hasOverflowVoters}}@@ -128,7 +128,7 @@ export default class VoteCount extends Component {</DMenu>{{else}}<div- class={{concatClass+ class={{dConcatClass"voting-wrapper__count"(if (eq @topic.vote_count 0) "no-votes")}}diff --git a/plugins/discourse-topic-voting/assets/javascripts/discourse/connectors/user-activity-bottom/user-voted-topics.gjs b/plugins/discourse-topic-voting/assets/javascripts/discourse/connectors/user-activity-bottom/user-voted-topics.gjsindex 4a27da82db7..c1b6a99dc33 100644--- a/plugins/discourse-topic-voting/assets/javascripts/discourse/connectors/user-activity-bottom/user-voted-topics.gjs+++ b/plugins/discourse-topic-voting/assets/javascripts/discourse/connectors/user-activity-bottom/user-voted-topics.gjs@@ -1,7 +1,7 @@import Component from "@glimmer/component";import { LinkTo } from "@ember/routing";import { service } from "@ember/service";-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class UserVotedTopics extends Component {@@ -12,7 +12,7 @@ export default class UserVotedTopics extends Component {<li class="user-nav__activity-votes"><LinkTo @route="userActivity.votes">- {{icon "check-to-slot" aria-hidden="true"}}+ {{dIcon "check-to-slot" aria-hidden="true"}}{{i18n "topic_voting.vote_title_plural"}}</LinkTo></li>diff --git a/plugins/discourse-user-notes/assets/javascripts/discourse/components/modal/user-notes.gjs b/plugins/discourse-user-notes/assets/javascripts/discourse/components/modal/user-notes.gjsindex 49963cf6a1e..d972ad011a1 100644--- a/plugins/discourse-user-notes/assets/javascripts/discourse/components/modal/user-notes.gjs+++ b/plugins/discourse-user-notes/assets/javascripts/discourse/components/modal/user-notes.gjs@@ -1,11 +1,11 @@import Component from "@glimmer/component";import { action } from "@ember/object";import { service } from "@ember/service";-import DModal from "discourse/components/d-modal";import Form from "discourse/components/form";import { popupAjaxError } from "discourse/lib/ajax-error";import { removeValueFromArray } from "discourse/lib/array-tools";import { applyValueTransformer } from "discourse/lib/transformer";+import DModal from "discourse/ui-kit/d-modal";import { i18n } from "discourse-i18n";import UserNote from "../user-note";diff --git a/plugins/discourse-user-notes/assets/javascripts/discourse/components/post-metadata-user-notes.gjs b/plugins/discourse-user-notes/assets/javascripts/discourse/components/post-metadata-user-notes.gjsindex bb3a6a409bd..fd86f5124aa 100644--- a/plugins/discourse-user-notes/assets/javascripts/discourse/components/post-metadata-user-notes.gjs+++ b/plugins/discourse-user-notes/assets/javascripts/discourse/components/post-metadata-user-notes.gjs@@ -2,8 +2,8 @@ import Component from "@glimmer/component";import { on } from "@ember/modifier";import { action } from "@ember/object";import { service } from "@ember/service";-import icon from "discourse/helpers/d-icon";-import emoji from "discourse/helpers/emoji";+import dEmoji from "discourse/ui-kit/helpers/d-emoji";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { showUserNotes, updatePostUserNotesCount } from "../lib/user-notes";export default class PostMetadataUserNotes extends Component {@@ -26,9 +26,9 @@ export default class PostMetadataUserNotes extends Component {{{! template-lint-disable no-invalid-interactive }}<span class="user-notes-icon" {{on "click" this.showNotes}}>{{#if this.siteSettings.enable_emoji}}- {{emoji "memo"}}+ {{dEmoji "memo"}}{{else}}- {{icon "pen-to-square"}}+ {{dIcon "pen-to-square"}}{{/if}}</span></template>diff --git a/plugins/discourse-user-notes/assets/javascripts/discourse/components/show-user-notes.gjs b/plugins/discourse-user-notes/assets/javascripts/discourse/components/show-user-notes.gjsindex 3f9bc98be0b..f5d14ea44a5 100644--- a/plugins/discourse-user-notes/assets/javascripts/discourse/components/show-user-notes.gjs+++ b/plugins/discourse-user-notes/assets/javascripts/discourse/components/show-user-notes.gjs@@ -1,5 +1,5 @@import Component from "@glimmer/component";-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";export default class ShowUserNotes extends Component {diff --git a/plugins/discourse-user-notes/assets/javascripts/discourse/components/user-note.gjs b/plugins/discourse-user-notes/assets/javascripts/discourse/components/user-note.gjsindex a4473fe003b..ed530918a01 100644--- a/plugins/discourse-user-notes/assets/javascripts/discourse/components/user-note.gjs+++ b/plugins/discourse-user-notes/assets/javascripts/discourse/components/user-note.gjs@@ -1,12 +1,12 @@import { fn } from "@ember/helper";import { LinkTo } from "@ember/routing";-import CookText from "discourse/components/cook-text";-import DButton from "discourse/components/d-button";import PluginOutlet from "discourse/components/plugin-outlet";-import UserLink from "discourse/components/user-link";-import ageWithTooltip from "discourse/helpers/age-with-tooltip";-import avatar from "discourse/helpers/avatar";import lazyHash from "discourse/helpers/lazy-hash";+import DButton from "discourse/ui-kit/d-button";+import DCookText from "discourse/ui-kit/d-cook-text";+import DUserLink from "discourse/ui-kit/d-user-link";+import dAgeWithTooltip from "discourse/ui-kit/helpers/d-age-with-tooltip";+import dAvatar from "discourse/ui-kit/helpers/d-avatar";import { i18n } from "discourse-i18n";const UserNote = <template>@@ -16,14 +16,14 @@ const UserNote = <template>><div class="user-note"><div class="posted-by">- <UserLink @user={{@note.created_by}}>- {{avatar @note.created_by imageSize="small"}}- </UserLink>+ <DUserLink @user={{@note.created_by}}>+ {{dAvatar @note.created_by imageSize="small"}}+ </DUserLink></div><div class="note-contents"><div class="note-info"><span class="username">{{@note.created_by.username}}</span>- <span class="post-date">{{ageWithTooltip @note.created_at}}</span>+ <span class="post-date">{{dAgeWithTooltip @note.created_at}}</span>{{#if @note.reviewable_id}}<LinkTo@route="review.show"@@ -44,7 +44,7 @@ const UserNote = <template></div><div class="cooked">- <CookText @rawText={{@note.raw}} />+ <DCookText @rawText={{@note.raw}} /></div>{{#if @note.post_id}}<adiff --git a/plugins/discourse-user-notes/assets/javascripts/discourse/connectors/after-reviewable-post-user/show-user-notes-on-flags.gjs b/plugins/discourse-user-notes/assets/javascripts/discourse/connectors/after-reviewable-post-user/show-user-notes-on-flags.gjsindex d537be2d437..abd9f61e370 100644--- a/plugins/discourse-user-notes/assets/javascripts/discourse/connectors/after-reviewable-post-user/show-user-notes-on-flags.gjs+++ b/plugins/discourse-user-notes/assets/javascripts/discourse/connectors/after-reviewable-post-user/show-user-notes-on-flags.gjs@@ -2,9 +2,9 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import icon from "discourse/helpers/d-icon";import { emojiUrlFor } from "discourse/lib/text";+import DButton from "discourse/ui-kit/d-button";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";import { showUserNotes } from "../../lib/user-notes";@@ -44,7 +44,7 @@ export default class ShowUserNotesOnFlags extends Component {class="emoji"/>{{else}}- {{icon "pen-to-square"}}+ {{dIcon "pen-to-square"}}{{/if}}</DButton>{{/if}}diff --git a/plugins/discourse-user-notes/assets/javascripts/discourse/connectors/user-card-post-names/show-user-notes-on-card.gjs b/plugins/discourse-user-notes/assets/javascripts/discourse/connectors/user-card-post-names/show-user-notes-on-card.gjsindex a7ebffb08f1..7e2d5ca08f1 100644--- a/plugins/discourse-user-notes/assets/javascripts/discourse/connectors/user-card-post-names/show-user-notes-on-card.gjs+++ b/plugins/discourse-user-notes/assets/javascripts/discourse/connectors/user-card-post-names/show-user-notes-on-card.gjs@@ -1,9 +1,9 @@import Component from "@glimmer/component";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import icon from "discourse/helpers/d-icon";-import emoji from "discourse/helpers/emoji";+import DButton from "discourse/ui-kit/d-button";+import dEmoji from "discourse/ui-kit/helpers/d-emoji";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";import { showUserNotes } from "../../lib/user-notes";@@ -38,9 +38,9 @@ export default class extends Component {class="btn-flat">{{#if this.siteSettings.enable_emoji}}- {{emoji "memo"}}+ {{dEmoji "memo"}}{{else}}- {{icon "pen-to-square"}}+ {{dIcon "pen-to-square"}}{{/if}}</DButton>{{/if}}diff --git a/plugins/discourse-zendesk-plugin/assets/javascripts/discourse-zendesk-plugin/connectors/after-topic-footer-buttons/zendesk-topic-actions.gjs b/plugins/discourse-zendesk-plugin/assets/javascripts/discourse-zendesk-plugin/connectors/after-topic-footer-buttons/zendesk-topic-actions.gjsindex a654b8850a2..ffe3122c66d 100644--- a/plugins/discourse-zendesk-plugin/assets/javascripts/discourse-zendesk-plugin/connectors/after-topic-footer-buttons/zendesk-topic-actions.gjs+++ b/plugins/discourse-zendesk-plugin/assets/javascripts/discourse-zendesk-plugin/connectors/after-topic-footer-buttons/zendesk-topic-actions.gjs@@ -2,8 +2,8 @@import Component from "@ember/component";import { action } from "@ember/object";import { tagName } from "@ember-decorators/component";-import DButton from "discourse/components/d-button";import { ajax } from "discourse/lib/ajax";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";@tagName("")diff --git a/plugins/poll/assets/javascripts/discourse/components/modal/poll-breakdown.gjs b/plugins/poll/assets/javascripts/discourse/components/modal/poll-breakdown.gjsindex 6b83009ba54..3f67f18bcee 100644--- a/plugins/poll/assets/javascripts/discourse/components/modal/poll-breakdown.gjs+++ b/plugins/poll/assets/javascripts/discourse/components/modal/poll-breakdown.gjs@@ -7,12 +7,12 @@ import { service } from "@ember/service";import { classify } from "@ember/string";import { trustHTML } from "@ember/template";import { tagName } from "@ember-decorators/component";-import DModal from "discourse/components/d-modal";-import concatClass from "discourse/helpers/concat-class";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import ComboBox from "discourse/select-kit/components/combo-box";import { eq } from "discourse/truth-helpers";+import DModal from "discourse/ui-kit/d-modal";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";import PollBreakdownChart from "discourse/plugins/poll/discourse/components/poll-breakdown-chart";import PollBreakdownOption from "discourse/plugins/poll/discourse/components/poll-breakdown-option";@@ -111,14 +111,14 @@ export default class PollBreakdownModal extends Component {<:headerBelowTitle><ul class="modal-tabs"><li- class={{concatClass+ class={{dConcatClass"modal-tab percentage"(if (eq this.displayMode "percentage") "is-active")}}{{on "click" (fn (mut this.displayMode) "percentage")}}>{{i18n "poll.breakdown.percentage"}}</li><li- class={{concatClass+ class={{dConcatClass"modal-tab count"(if (eq this.displayMode "count") "is-active")}}diff --git a/plugins/poll/assets/javascripts/discourse/components/modal/poll-ui-builder.gjs b/plugins/poll/assets/javascripts/discourse/components/modal/poll-ui-builder.gjsindex 5e23ba4c937..58c09f37ced 100644--- a/plugins/poll/assets/javascripts/discourse/components/modal/poll-ui-builder.gjs+++ b/plugins/poll/assets/javascripts/discourse/components/modal/poll-ui-builder.gjs@@ -6,24 +6,24 @@ import { on } from "@ember/modifier";import { action } from "@ember/object";import { trackedObject } from "@ember/reactive/collections";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import DModal from "discourse/components/d-modal";-import DToggleSwitch from "discourse/components/d-toggle-switch";-import DateTimeInput from "discourse/components/date-time-input";-import InputTip from "discourse/components/input-tip";-import RadioButton from "discourse/components/radio-button";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import withEventValue from "discourse/helpers/with-event-value";import { removeValueFromArray } from "discourse/lib/array-tools";import { AUTO_GROUPS } from "discourse/lib/constants";import { bind } from "discourse/lib/decorators";import { autoTrackedArray } from "discourse/lib/tracked-tools";import { optionalRequire } from "discourse/lib/utilities";-import autoFocus from "discourse/modifiers/auto-focus";import ComboBox from "discourse/select-kit/components/combo-box";import GroupChooser from "discourse/select-kit/components/group-chooser";import { and, not } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DDateTimeInput from "discourse/ui-kit/d-date-time-input";+import DInputTip from "discourse/ui-kit/d-input-tip";+import DModal from "discourse/ui-kit/d-modal";+import DRadioButton from "discourse/ui-kit/d-radio-button";+import DToggleSwitch from "discourse/ui-kit/d-toggle-switch";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";+import dAutoFocus from "discourse/ui-kit/modifiers/d-auto-focus";import { i18n } from "discourse-i18n";export const BAR_CHART_TYPE = "bar";@@ -443,7 +443,7 @@ export default class PollUiBuilderModal extends Component {<li><DButton@action={{fn this.updatePollType "regular"}}- class={{concatClass+ class={{dConcatClass"poll-type-value poll-type-value-regular"(if this.isRegular "active")}}@@ -454,7 +454,7 @@ export default class PollUiBuilderModal extends Component {<li><DButton@action={{fn this.updatePollType "multiple"}}- class={{concatClass+ class={{dConcatClass"poll-type-value poll-type-value-multiple"(if this.isMultiple "active")}}@@ -466,7 +466,7 @@ export default class PollUiBuilderModal extends Component {<li><DButton@action={{fn this.updatePollType "number"}}- class={{concatClass+ class={{dConcatClass"poll-type-value poll-type-value-number"(if this.isNumber "active")}}@@ -479,7 +479,7 @@ export default class PollUiBuilderModal extends Component {<li><DButton@action={{fn this.updatePollType "ranked_choice"}}- class={{concatClass+ class={{dConcatClass"poll-type-value poll-type-value-ranked-choice"(if this.isRankedChoice "active")}}@@ -515,7 +515,7 @@ export default class PollUiBuilderModal extends Component {/>{{#if this.showMinNumOfOptionsValidation}}{{#unless this.minNumOfOptionsValidation.ok}}- <InputTip @validation={{this.minNumOfOptionsValidation}} />+ <DInputTip @validation={{this.minNumOfOptionsValidation}} />{{/unless}}{{/if}}{{else}}@@ -524,7 +524,7 @@ export default class PollUiBuilderModal extends Component {<inputtype="text"value={{option.value}}- {{autoFocus}}+ {{dAutoFocus}}{{on "input" (fn this.updateValue option)}}{{on "keydown" (fn this.onInputKeydown option index)}}/>@@ -550,7 +550,7 @@ export default class PollUiBuilderModal extends Component {(not this.minNumOfOptionsValidation.ok))}}- <InputTip @validation={{this.minNumOfOptionsValidation}} />+ <DInputTip @validation={{this.minNumOfOptionsValidation}} />{{/if}}</div>{{/if}}@@ -602,7 +602,7 @@ export default class PollUiBuilderModal extends Component {</div>{{#unless this.minMaxValueValidation.ok}}- <InputTip @validation={{this.minMaxValueValidation}} />+ <DInputTip @validation={{this.minMaxValueValidation}} />{{/unless}}{{/unless}}@@ -641,7 +641,7 @@ export default class PollUiBuilderModal extends Component {<label class="input-group-label">{{i18n"poll.ui_builder.automatic_close.label"}}</label>- <DateTimeInput+ <DDateTimeInput@date={{this.pollAutoClose}}@onChange={{fn (mut this.pollAutoClose)}}@clearable={{true}}@@ -669,24 +669,24 @@ export default class PollUiBuilderModal extends Component {}}</label><div class="radio-group">- <RadioButton+ <DRadioButton@id="poll-chart-type-bar"@name="poll-chart-type"@value="bar"@selection={{this.chartType}}/>- <label for="poll-chart-type-bar">{{icon "chart-bar"}}+ <label for="poll-chart-type-bar">{{dIcon "chart-bar"}}{{i18n "poll.ui_builder.poll_chart_type.bar"}}</label></div><div class="radio-group">- <RadioButton+ <DRadioButton@id="poll-chart-type-pie"@name="poll-chart-type"@value="pie"@selection={{this.chartType}}/>- <label for="poll-chart-type-pie">{{icon "chart-pie"}}+ <label for="poll-chart-type-pie">{{dIcon "chart-pie"}}{{i18n "poll.ui_builder.poll_chart_type.pie"}}</label></div></div>diff --git a/plugins/poll/assets/javascripts/discourse/components/poll-buttons-dropdown.gjs b/plugins/poll/assets/javascripts/discourse/components/poll-buttons-dropdown.gjsindex a346c251de9..49c4e3fa7ce 100644--- a/plugins/poll/assets/javascripts/discourse/components/poll-buttons-dropdown.gjs+++ b/plugins/poll/assets/javascripts/discourse/components/poll-buttons-dropdown.gjs@@ -2,10 +2,10 @@ import Component from "@glimmer/component";import { fn } from "@ember/helper";import { action, get } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import DropdownMenu from "discourse/components/dropdown-menu";import DMenu from "discourse/float-kit/components/d-menu";-import icon from "discourse/helpers/d-icon";+import DButton from "discourse/ui-kit/d-button";+import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";+import dIcon from "discourse/ui-kit/helpers/d-icon";const buttonOptionsMap = {exportResults: {@@ -133,10 +133,10 @@ export default class PollButtonsDropdownComponent extends Component {{{#if this.showDropdown}}<DMenu class="widget-dropdown-header"><:trigger>- {{icon "gear"}}+ {{dIcon "gear"}}</:trigger><:content>- <DropdownMenu as |dropdown|>+ <DDropdownMenu as |dropdown|>{{#each this.getDropdownContent as |content|}}<dropdown.item><DButton@@ -148,7 +148,7 @@ export default class PollButtonsDropdownComponent extends Component {</dropdown.item><dropdown.divider />{{/each}}- </DropdownMenu>+ </DDropdownMenu></:content></DMenu>{{else if this.showDropdownAsButton}}diff --git a/plugins/poll/assets/javascripts/discourse/components/poll-info.gjs b/plugins/poll/assets/javascripts/discourse/components/poll-info.gjsindex 4b85d28592b..97d48c6d746 100644--- a/plugins/poll/assets/javascripts/discourse/components/poll-info.gjs+++ b/plugins/poll/assets/javascripts/discourse/components/poll-info.gjs@@ -1,8 +1,8 @@import Component from "@glimmer/component";import { service } from "@ember/service";import { trustHTML } from "@ember/template";-import icon from "discourse/helpers/d-icon";import { relativeAge } from "discourse/lib/formatter";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";const ON_VOTE = "on_vote";@@ -175,50 +175,50 @@ export default class PollInfoComponent extends Component {<ul class="poll-info_instructions">{{#if (if @isDynamic true this.poll.dynamic)}}<li class="is-dynamic">- {{icon "shuffle"}}+ {{dIcon "shuffle"}}<span>{{i18n "poll.dynamic.enabled_hint"}}</span></li>{{/if}}{{#if this.showMultipleHelpText}}<li class="multiple-help-text">- {{icon "list-ul"}}+ {{dIcon "list-ul"}}<span>{{this.multipleHelpText}}</span></li>{{/if}}{{#if this.poll.close}}{{#if this.isAutomaticallyClosed}}<li title={{this.title}}>- {{icon "lock"}}+ {{dIcon "lock"}}<span>{{this.automaticCloseAgeLabel}}</span></li>{{else}}<li title={{this.title}}>- {{icon "far-clock"}}+ {{dIcon "far-clock"}}<span>{{this.automaticCloseClosesInLabel}}</span></li>{{/if}}{{/if}}{{#if this.resultsOnVote}}<li class="results-on-vote">- {{icon "check"}}+ {{dIcon "check"}}<span>{{this.resultsOnVoteTitle}}</span></li>{{/if}}{{#if this.resultsOnClose}}<li class="results-on-close">- {{icon "lock"}}+ {{dIcon "lock"}}<span>{{this.resultsOnCloseTitle}}</span></li>{{/if}}{{#if this.resultsStaffOnly}}<li class="results-staff-only">- {{icon "shield-halved"}}+ {{dIcon "shield-halved"}}<span>{{this.resultsStaffOnlyTitle}}</span></li>{{/if}}{{#if this.publicTitle}}<li class="is-public">- {{icon "far-eye"}}+ {{dIcon "far-eye"}}<span>{{this.publicTitleLabel}}</span></li>{{/if}}diff --git a/plugins/poll/assets/javascripts/discourse/components/poll-option-ranked-choice-dropdown.gjs b/plugins/poll/assets/javascripts/discourse/components/poll-option-ranked-choice-dropdown.gjsindex fb8bddc2bb8..a7cfd42bba0 100644--- a/plugins/poll/assets/javascripts/discourse/components/poll-option-ranked-choice-dropdown.gjs+++ b/plugins/poll/assets/javascripts/discourse/components/poll-option-ranked-choice-dropdown.gjs@@ -1,10 +1,10 @@import Component from "@glimmer/component";import { fn } from "@ember/helper";import { action } from "@ember/object";-import DButton from "discourse/components/d-button";-import DropdownMenu from "discourse/components/dropdown-menu";import DMenu from "discourse/float-kit/components/d-menu";-import icon from "discourse/helpers/d-icon";+import DButton from "discourse/ui-kit/d-button";+import DDropdownMenu from "discourse/ui-kit/d-dropdown-menu";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";export default class PollOptionsDropdownComponent extends Component {@@ -31,10 +31,10 @@ export default class PollOptionsDropdownComponent extends Component {<span class="d-button-label">{{this.rankLabel}}</span>- {{icon "angle-down"}}+ {{dIcon "angle-down"}}</:trigger><:content>- <DropdownMenu as |dropdown|>+ <DDropdownMenu as |dropdown|>{{#each @rankedChoiceDropdownContent as |content|}}<dropdown.item><DButton@@ -44,7 +44,7 @@ export default class PollOptionsDropdownComponent extends Component {/></dropdown.item>{{/each}}- </DropdownMenu>+ </DDropdownMenu></:content></DMenu></template>diff --git a/plugins/poll/assets/javascripts/discourse/components/poll-option-ranked-choice.gjs b/plugins/poll/assets/javascripts/discourse/components/poll-option-ranked-choice.gjsindex 93bba492f73..0f3e7ed9098 100644--- a/plugins/poll/assets/javascripts/discourse/components/poll-option-ranked-choice.gjs+++ b/plugins/poll/assets/javascripts/discourse/components/poll-option-ranked-choice.gjs@@ -1,8 +1,8 @@import Component from "@glimmer/component";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import routeAction from "discourse/helpers/route-action";+import DButton from "discourse/ui-kit/d-button";import decoratePollOption from "../modifiers/decorate-poll-option";import PollOptionRankedChoiceDropdown from "./poll-option-ranked-choice-dropdown";diff --git a/plugins/poll/assets/javascripts/discourse/components/poll-options.gjs b/plugins/poll/assets/javascripts/discourse/components/poll-options.gjsindex 483b70f0f05..ab440fa84b5 100644--- a/plugins/poll/assets/javascripts/discourse/components/poll-options.gjs+++ b/plugins/poll/assets/javascripts/discourse/components/poll-options.gjs@@ -3,9 +3,9 @@ import { fn } from "@ember/helper";import { on } from "@ember/modifier";import { action } from "@ember/object";import { service } from "@ember/service";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import routeAction from "discourse/helpers/route-action";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";import decoratePollOption from "../modifiers/decorate-poll-option";import PollOptionRankedChoice from "./poll-option-ranked-choice";@@ -61,7 +61,7 @@ export default class PollOptionsComponent extends Component {<template><ul- class={{concatClass+ class={{dConcatClass(if @isRankedChoice "ranked-choice-poll-options")"options"}}@@ -79,15 +79,15 @@ export default class PollOptionsComponent extends Component {<button {{on "click" (fn this.sendClick option)}}>{{#if (this.isChosen option)}}{{#if @isCheckbox}}- {{icon "far-square-check"}}+ {{dIcon "far-square-check"}}{{else}}- {{icon "circle"}}+ {{dIcon "circle"}}{{/if}}{{else}}{{#if @isCheckbox}}- {{icon "far-square"}}+ {{dIcon "far-square"}}{{else}}- {{icon "far-circle"}}+ {{dIcon "far-circle"}}{{/if}}{{/if}}<span@@ -99,15 +99,15 @@ export default class PollOptionsComponent extends Component {<button {{on "click" (routeAction "showLogin")}}>{{#if (this.isChosen option)}}{{#if @isCheckbox}}- {{icon "far-square-check"}}+ {{dIcon "far-square-check"}}{{else}}- {{icon "circle"}}+ {{dIcon "circle"}}{{/if}}{{else}}{{#if @isCheckbox}}- {{icon "far-square"}}+ {{dIcon "far-square"}}{{else}}- {{icon "far-circle"}}+ {{dIcon "far-circle"}}{{/if}}{{/if}}<spandiff --git a/plugins/poll/assets/javascripts/discourse/components/poll-results-pie.gjs b/plugins/poll/assets/javascripts/discourse/components/poll-results-pie.gjsindex 09f828371a8..183408f3eb2 100644--- a/plugins/poll/assets/javascripts/discourse/components/poll-results-pie.gjs+++ b/plugins/poll/assets/javascripts/discourse/components/poll-results-pie.gjs@@ -3,12 +3,12 @@ import { action } from "@ember/object";import didInsert from "@ember/render-modifiers/modifiers/did-insert";import { trustHTML } from "@ember/template";import { modifier } from "ember-modifier";+import loadChartJS from "discourse/lib/load-chart-js";import {applyHtmlDecorators,NON_STREAM_HTML_DECORATOR,NULL_HELPER,-} from "discourse/components/decorated-html";-import loadChartJS from "discourse/lib/load-chart-js";+} from "discourse/ui-kit/d-decorated-html";import { getColors } from "discourse/plugins/poll/lib/chart-colors";import { PIE_CHART_TYPE } from "../components/modal/poll-ui-builder";diff --git a/plugins/poll/assets/javascripts/discourse/components/poll-results-tabs.gjs b/plugins/poll/assets/javascripts/discourse/components/poll-results-tabs.gjsindex c9315f445e4..0aae4ea2dc8 100644--- a/plugins/poll/assets/javascripts/discourse/components/poll-results-tabs.gjs+++ b/plugins/poll/assets/javascripts/discourse/components/poll-results-tabs.gjs@@ -2,8 +2,8 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { fn } from "@ember/helper";import { action } from "@ember/object";-import DButton from "discourse/components/d-button";import { eq } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";import { i18n } from "discourse-i18n";import PollResultsRankedChoice from "./poll-results-ranked-choice";import PollResultsStandard from "./poll-results-standard";diff --git a/plugins/poll/assets/javascripts/discourse/components/poll-voters-ranked-choice.gjs b/plugins/poll/assets/javascripts/discourse/components/poll-voters-ranked-choice.gjsindex f27ba4940ed..c1069755038 100644--- a/plugins/poll/assets/javascripts/discourse/components/poll-voters-ranked-choice.gjs+++ b/plugins/poll/assets/javascripts/discourse/components/poll-voters-ranked-choice.gjs@@ -1,7 +1,7 @@import Component from "@glimmer/component";-import avatar from "discourse/helpers/bound-avatar-template";-import icon from "discourse/helpers/d-icon";import { eq } from "discourse/truth-helpers";+import dBoundAvatarTemplate from "discourse/ui-kit/helpers/d-bound-avatar-template";+import dIcon from "discourse/ui-kit/helpers/d-icon";export default class PollVotersComponent extends Component {groupVotersByRank = (voters) => {@@ -32,7 +32,7 @@ export default class PollVotersComponent extends Component {{{#each this.rankedChoiceVoters as |rank|}}<ul>{{#if (eq rank.rank "Abstain")}}- <span class="rank">{{icon "ban"}}</span>+ <span class="rank">{{dIcon "ban"}}</span>{{else}}<span class="rank">{{rank.rank}}</span>{{/if}}@@ -42,7 +42,7 @@ export default class PollVotersComponent extends Component {data-user-card={{voter.user.username}}title={{voter.user.username}}>- {{avatar voter.user.avatar_template "tiny"}}+ {{dBoundAvatarTemplate voter.user.avatar_template "tiny"}}</a></li>{{/each}}diff --git a/plugins/poll/assets/javascripts/discourse/components/poll-voters.gjs b/plugins/poll/assets/javascripts/discourse/components/poll-voters.gjsindex 2599b61cc1b..32294b9dca4 100644--- a/plugins/poll/assets/javascripts/discourse/components/poll-voters.gjs+++ b/plugins/poll/assets/javascripts/discourse/components/poll-voters.gjs@@ -1,8 +1,8 @@import Component from "@glimmer/component";import { fn } from "@ember/helper";-import ConditionalLoadingSpinner from "discourse/components/conditional-loading-spinner";-import DButton from "discourse/components/d-button";-import avatar from "discourse/helpers/bound-avatar-template";+import DButton from "discourse/ui-kit/d-button";+import DConditionalLoadingSpinner from "discourse/ui-kit/d-conditional-loading-spinner";+import dBoundAvatarTemplate from "discourse/ui-kit/helpers/d-bound-avatar-template";import PollVotersRankedChoice from "./poll-voters-ranked-choice";export default class PollVotersComponent extends Component {@@ -19,20 +19,20 @@ export default class PollVotersComponent extends Component {{{#each @voters as |user|}}<li><a data-user-card={{user.username}} title={{user.username}}>- {{avatar user.avatar_template "tiny"}}+ {{dBoundAvatarTemplate user.avatar_template "tiny"}}</a></li>{{/each}}{{/if}}</ul>{{#if this.showMore}}- <ConditionalLoadingSpinner @condition={{@loading}}>+ <DConditionalLoadingSpinner @condition={{@loading}}><DButton@action={{fn @fetchVoters @optionId}}@icon="chevron-down"class="poll-voters-toggle-expand"/>- </ConditionalLoadingSpinner>+ </DConditionalLoadingSpinner>{{/if}}</div></template>diff --git a/plugins/poll/assets/javascripts/discourse/components/poll.gjs b/plugins/poll/assets/javascripts/discourse/components/poll.gjsindex 6c160b2432f..2f59661f0ba 100644--- a/plugins/poll/assets/javascripts/discourse/components/poll.gjs+++ b/plugins/poll/assets/javascripts/discourse/components/poll.gjs@@ -6,10 +6,10 @@ import { trackedObject } from "@ember/reactive/collections";import didUpdate from "@ember/render-modifiers/modifiers/did-update";import { service } from "@ember/service";import { trustHTML } from "@ember/template";-import icon from "discourse/helpers/d-icon";import { ajax } from "discourse/lib/ajax";import { popupAjaxError } from "discourse/lib/ajax-error";import round from "discourse/lib/round";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";import PollBreakdownModal from "../components/modal/poll-breakdown";import {@@ -751,7 +751,7 @@ export default class PollComponent extends Component {disabled={{this.castVotesDisabled}}{{on "click" this.castVotes}}>- {{icon this.castVotesButtonIcon}}+ {{dIcon this.castVotesButtonIcon}}<span class="d-button-label">{{i18n "poll.cast-votes.label"}}</span></button>{{/if}}@@ -762,7 +762,7 @@ export default class PollComponent extends Component {title={{i18n "poll.hide-results.title"}}{{on "click" this.toggleResults}}>- {{icon "chevron-left"}}+ {{dIcon "chevron-left"}}<span class="d-button-label">{{i18n"poll.hide-results.label"}}</span>@@ -775,7 +775,7 @@ export default class PollComponent extends Component {title={{i18n "poll.show-results.title"}}{{on "click" this.toggleResults}}>- {{icon "chart-bar"}}+ {{dIcon "chart-bar"}}<span class="d-button-label">{{i18n"poll.show-results.label"}}</span>@@ -788,7 +788,7 @@ export default class PollComponent extends Component {title={{i18n "poll.remove-vote.title"}}{{on "click" this.removeVote}}>- {{icon "arrow-rotate-left"}}+ {{dIcon "arrow-rotate-left"}}<span class="d-button-label">{{i18n"poll.remove-vote.label"}}</span>diff --git a/plugins/poll/assets/javascripts/discourse/modifiers/decorate-cooked-content.js b/plugins/poll/assets/javascripts/discourse/modifiers/decorate-cooked-content.jsindex b882799d304..be44b9b08d3 100644--- a/plugins/poll/assets/javascripts/discourse/modifiers/decorate-cooked-content.js+++ b/plugins/poll/assets/javascripts/discourse/modifiers/decorate-cooked-content.js@@ -3,7 +3,7 @@ import {applyHtmlDecorators,NON_STREAM_HTML_DECORATOR,NULL_HELPER,-} from "discourse/components/decorated-html";+} from "discourse/ui-kit/d-decorated-html";/** Modifier that applies cooked content decorators to an element's existing content. */export default modifier((element) => {diff --git a/plugins/poll/assets/javascripts/discourse/modifiers/decorate-poll-option.js b/plugins/poll/assets/javascripts/discourse/modifiers/decorate-poll-option.jsindex 7b17170b87d..feab8090396 100644--- a/plugins/poll/assets/javascripts/discourse/modifiers/decorate-poll-option.js+++ b/plugins/poll/assets/javascripts/discourse/modifiers/decorate-poll-option.js@@ -3,7 +3,7 @@ import {applyHtmlDecorators,NON_STREAM_HTML_DECORATOR,NULL_HELPER,-} from "discourse/components/decorated-html";+} from "discourse/ui-kit/d-decorated-html";/** Modifier that sets element innerHTML and applies cooked content decorators. */export default modifier((element, [html]) => {diff --git a/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/01-font-scale.gjs b/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/01-font-scale.gjsindex f35858811b5..7086796916a 100644--- a/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/01-font-scale.gjs+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/01-font-scale.gjs@@ -1,4 +1,4 @@-import HighlightedCode from "discourse/components/highlighted-code";+import DHighlightedCode from "discourse/ui-kit/d-highlighted-code";import { i18n } from "discourse-i18n";import StyleguideExample from "discourse/plugins/styleguide/discourse/components/styleguide-example";@@ -20,7 +20,7 @@ const FontScale = <template>also provide different font sizes for the user text size settings definedabove. The example below increases all text size options by 1px.</p>- <HighlightedCode+ <DHighlightedCode@code="html {font-size: 16px; // default font-size@@ -44,7 +44,7 @@ const FontScale = <template>Changing the font-size of a parent element will proportionately scalethe font sizes of all its children.</p>- <HighlightedCode+ <DHighlightedCode@code=".parent {font-size: var(--font-up-3);// Increases the relative font-size of this element and its children by 3 steps in the scalediff --git a/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/02-buttons.gjs b/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/02-buttons.gjsindex 1d0a7097a5f..c5069a99726 100644--- a/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/02-buttons.gjs+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/02-buttons.gjs@@ -1,10 +1,10 @@import Component from "@glimmer/component";import { fn } from "@ember/helper";import { on } from "@ember/modifier";-import DButton from "discourse/components/d-button";-import DToggleSwitch from "discourse/components/d-toggle-switch";-import concatClass from "discourse/helpers/concat-class";import { not } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DToggleSwitch from "discourse/ui-kit/d-toggle-switch";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import StyleguideExample from "discourse/plugins/styleguide/discourse/components/styleguide-example";export default class Buttons extends Component {@@ -289,7 +289,7 @@ import { not } from "discourse/truth-helpers";@icon="xmark"@translatedTitle={{bs.text}}@disabled={{bs.disabled}}- class={{concatClass "btn-default" bs.class}}+ class={{dConcatClass "btn-default" bs.class}}/>{{/each}}</StyleguideExample>@@ -303,7 +303,7 @@ import { not } from "discourse/truth-helpers";@icon="xmark"@translatedTitle={{bs.text}}@disabled={{bs.disabled}}- class={{concatClass "btn-default" bs.class}}+ class={{dConcatClass "btn-default" bs.class}}/>{{/each}}</StyleguideExample>@@ -316,7 +316,7 @@ import { not } from "discourse/truth-helpers";<DButton@translatedLabel={{bs.text}}@disabled={{bs.disabled}}- class={{concatClass "btn-default" bs.class}}+ class={{dConcatClass "btn-default" bs.class}}/>{{/each}}</StyleguideExample>@@ -329,7 +329,7 @@ import { not } from "discourse/truth-helpers";<DButton@translatedLabel={{bs.text}}@disabled={{bs.disabled}}- class={{concatClass "btn-default" bs.class}}+ class={{dConcatClass "btn-default" bs.class}}/>{{/each}}</StyleguideExample>@@ -343,7 +343,7 @@ import { not } from "discourse/truth-helpers";@icon="plus"@translatedLabel={{bs.text}}@disabled={{bs.disabled}}- class={{concatClass "btn-default" bs.class}}+ class={{dConcatClass "btn-default" bs.class}}/>{{/each}}</StyleguideExample>@@ -357,7 +357,7 @@ import { not } from "discourse/truth-helpers";@icon="plus"@translatedLabel={{bs.text}}@disabled={{bs.disabled}}- class={{concatClass "btn-default" bs.class}}+ class={{dConcatClass "btn-default" bs.class}}/>{{/each}}</StyleguideExample>@@ -371,7 +371,7 @@ import { not } from "discourse/truth-helpers";@icon="plus"@translatedLabel={{bs.text}}@disabled={{bs.disabled}}- class={{concatClass "btn-primary" bs.class}}+ class={{dConcatClass "btn-primary" bs.class}}/>{{/each}}</StyleguideExample>@@ -385,7 +385,7 @@ import { not } from "discourse/truth-helpers";@icon="plus"@translatedLabel={{bs.text}}@disabled={{bs.disabled}}- class={{concatClass "btn-primary" bs.class}}+ class={{dConcatClass "btn-primary" bs.class}}/>{{/each}}</StyleguideExample>@@ -399,7 +399,7 @@ import { not } from "discourse/truth-helpers";@icon="trash-can"@translatedLabel={{bs.text}}@disabled={{bs.disabled}}- class={{concatClass "btn-danger" bs.class}}+ class={{dConcatClass "btn-danger" bs.class}}/>{{/each}}</StyleguideExample>@@ -413,7 +413,7 @@ import { not } from "discourse/truth-helpers";@icon="trash-can"@translatedLabel={{bs.text}}@disabled={{bs.disabled}}- class={{concatClass "btn-danger" bs.class}}+ class={{dConcatClass "btn-danger" bs.class}}/>{{/each}}</StyleguideExample>@@ -427,7 +427,7 @@ import { not } from "discourse/truth-helpers";@icon="trash-can"@disabled={{bs.disabled}}@translatedTitle={{bs.title}}- class={{concatClass "btn-flat" bs.class}}+ class={{dConcatClass "btn-flat" bs.class}}/>{{/each}}</StyleguideExample>@@ -441,7 +441,7 @@ import { not } from "discourse/truth-helpers";@icon="trash-can"@disabled={{bs.disabled}}@translatedLabel={{bs.text}}- class={{concatClass "btn-flat" bs.class}}+ class={{dConcatClass "btn-flat" bs.class}}/>{{/each}}</StyleguideExample>@@ -455,7 +455,7 @@ import { not } from "discourse/truth-helpers";@icon="trash-can"@disabled={{bs.disabled}}@translatedLabel={{bs.text}}- class={{concatClass "btn-transparent" bs.class}}+ class={{dConcatClass "btn-transparent" bs.class}}/>{{/each}}</StyleguideExample>diff --git a/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/07-otp.gjs b/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/07-otp.gjsindex 3144b3aefb9..a29b6871895 100644--- a/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/07-otp.gjs+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/07-otp.gjs@@ -1,7 +1,7 @@import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";-import DOTP from "discourse/components/d-otp";+import DOtp from "discourse/ui-kit/d-otp";import StyleguideExample from "discourse/plugins/styleguide/discourse/components/styleguide-example";export default class OTP extends Component {@@ -42,7 +42,7 @@ export default class OTP extends Component {<template><StyleguideExample @title="DOTP" @code={{this.codeSample1}}>- <DOTP @onFill={{this.filled}} @onChange={{this.changed}} />+ <DOtp @onFill={{this.filled}} @onChange={{this.changed}} />{{#if this.changedOutput}}<output>@@ -58,7 +58,7 @@ export default class OTP extends Component {</StyleguideExample><StyleguideExample @title="DOTP @slots={{4}}" @code={{this.codeSample2}}>- <DOTP @slots={{4}} />+ <DOtp @slots={{4}} /></StyleguideExample></template>}diff --git a/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/08-date-time-inputs.gjs b/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/08-date-time-inputs.gjsindex 309475d9b73..f29c6b80fd6 100644--- a/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/08-date-time-inputs.gjs+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/08-date-time-inputs.gjs@@ -1,10 +1,10 @@import Component from "@glimmer/component";-import DateInput from "discourse/components/date-input";-import DatePicker from "discourse/components/date-picker";-import DateTimeInput from "discourse/components/date-time-input";-import DateTimeInputRange from "discourse/components/date-time-input-range";-import FutureDateInput from "discourse/components/future-date-input";-import TimeInput from "discourse/components/time-input";+import DDateInput from "discourse/ui-kit/d-date-input";+import DDatePicker from "discourse/ui-kit/d-date-picker";+import DDateTimeInput from "discourse/ui-kit/d-date-time-input";+import DDateTimeInputRange from "discourse/ui-kit/d-date-time-input-range";+import DFutureDateInput from "discourse/ui-kit/d-future-date-input";+import DTimeInput from "discourse/ui-kit/d-time-input";import CalendarDateTimeInput from "discourse/plugins/styleguide/discourse/components/styleguide/calendar-date-time-input";import StyleguideExample from "discourse/plugins/styleguide/discourse/components/styleguide-example";@@ -81,40 +81,40 @@ import DatePicker from "discourse/components/date-picker";<template><StyleguideExample @title="TimeInput" @code={{this.timeInputCode}}>- <TimeInput />+ <DTimeInput /></StyleguideExample><StyleguideExample @title="DateInput" @code={{this.dateInputCode}}>- <DateInput />+ <DDateInput /></StyleguideExample><StyleguideExample @title="DateTimeInput" @code={{this.dateTimeInputCode}}>- <DateTimeInput @clearable={{true}} />+ <DDateTimeInput @clearable={{true}} /></StyleguideExample><StyleguideExample@title="DateTimeInputRange"@code={{this.dateTimeInputRangeCode}}>- <DateTimeInputRange />+ <DDateTimeInputRange /></StyleguideExample><StyleguideExample@title="DateTimeInputRange without time"@code={{this.dateTimeInputRangeNoTimeCode}}>- <DateTimeInputRange @showFromTime={{false}} @showToTime={{false}} />+ <DDateTimeInputRange @showFromTime={{false}} @showToTime={{false}} /></StyleguideExample><StyleguideExample@title="FutureDateInput"@code={{this.futureDateInputCode}}>- <FutureDateInput @displayLabelIcon="far-clock" @clearable={{true}} />+ <DFutureDateInput @displayLabelIcon="far-clock" @clearable={{true}} /></StyleguideExample><StyleguideExample @title="DatePicker" @code={{this.datePickerCode}}>- <DatePicker @defaultDate="YYYY-MM-DD" />+ <DDatePicker @defaultDate="YYYY-MM-DD" /></StyleguideExample><CalendarDateTimeInput />diff --git a/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/09-dropdowns.gjs b/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/09-dropdowns.gjsindex 96ded0116f2..90ecab4df5d 100644--- a/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/09-dropdowns.gjs+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/09-dropdowns.gjs@@ -1,7 +1,6 @@import Component from "@glimmer/component";import { fn, get, hash } from "@ember/helper";import CategoryNotificationsTracking from "discourse/components/category-notifications-tracking";-import DIconGridPicker from "discourse/components/d-icon-grid-picker";import PinnedButton from "discourse/components/pinned-button";import PinnedOptions from "discourse/components/pinned-options";import TopicNotificationsTracking from "discourse/components/topic-notifications-tracking";@@ -15,6 +14,7 @@ import ListSetting from "discourse/select-kit/components/list-setting";import MiniTagChooser from "discourse/select-kit/components/mini-tag-chooser";import MultiSelect from "discourse/select-kit/components/multi-select";import UserNotificationsDropdown from "discourse/select-kit/components/user-notifications-dropdown";+import DIconGridPicker from "discourse/ui-kit/d-icon-grid-picker";import StyleguideExample from "discourse/plugins/styleguide/discourse/components/styleguide-example";export default class Dropdowns extends Component {diff --git a/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/10-topic-link-status.gjs b/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/10-topic-link-status.gjsindex 5881f4bdce5..8fe7886e127 100644--- a/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/10-topic-link-status.gjs+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/atoms/10-topic-link-status.gjs@@ -1,6 +1,6 @@import Component from "@glimmer/component";import TopicStatus from "discourse/components/topic-status";-import topicLink from "discourse/helpers/topic-link";+import dTopicLink from "discourse/ui-kit/helpers/d-topic-link";import StyleguideExample from "discourse/plugins/styleguide/discourse/components/styleguide-example";export default class TopicStatuses extends Component {@@ -91,7 +91,7 @@ import TopicStatus from "discourse/components/topic-status";@title="topic-link (no status)"@code={{this.noStatusCode}}>- {{topicLink @dummy.topic}}+ {{dTopicLink @dummy.topic}}</StyleguideExample><StyleguideExample@@ -99,7 +99,7 @@ import TopicStatus from "discourse/components/topic-status";@code={{this.invisibleCode}}><TopicStatus @topic={{@dummy.invisibleTopic}} />- {{topicLink @dummy.invisibleTopic}}+ {{dTopicLink @dummy.invisibleTopic}}</StyleguideExample><StyleguideExample@@ -107,7 +107,7 @@ import TopicStatus from "discourse/components/topic-status";@code={{this.closedCode}}><TopicStatus @topic={{@dummy.closedTopic}} />- {{topicLink @dummy.closedTopic}}+ {{dTopicLink @dummy.closedTopic}}</StyleguideExample><StyleguideExample@@ -115,7 +115,7 @@ import TopicStatus from "discourse/components/topic-status";@code={{this.pinnedCode}}><TopicStatus @topic={{@dummy.pinnedTopic}} />- {{topicLink @dummy.pinnedTopic}}+ {{dTopicLink @dummy.pinnedTopic}}</StyleguideExample><StyleguideExample@@ -123,7 +123,7 @@ import TopicStatus from "discourse/components/topic-status";@code={{this.unpinnedCode}}><TopicStatus @topic={{@dummy.unpinnedTopic}} />- {{topicLink @dummy.unpinnedTopic}}+ {{dTopicLink @dummy.unpinnedTopic}}</StyleguideExample><StyleguideExample@@ -131,7 +131,7 @@ import TopicStatus from "discourse/components/topic-status";@code={{this.archivedCode}}><TopicStatus @topic={{@dummy.archivedTopic}} />- {{topicLink @dummy.archivedTopic}}+ {{dTopicLink @dummy.archivedTopic}}</StyleguideExample><StyleguideExample@@ -139,7 +139,7 @@ import TopicStatus from "discourse/components/topic-status";@code={{this.warningCode}}><TopicStatus @topic={{@dummy.warningTopic}} />- {{topicLink @dummy.warningTopic}}+ {{dTopicLink @dummy.warningTopic}}</StyleguideExample></template>}diff --git a/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/categories.gjs b/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/categories.gjsindex 9a95c172f56..e4af863620e 100644--- a/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/categories.gjs+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/categories.gjs@@ -1,5 +1,5 @@import Component from "@glimmer/component";-import categoryBadge from "discourse/helpers/category-badge";+import dCategoryBadge from "discourse/ui-kit/helpers/d-category-badge";import StyleguideExample from "discourse/plugins/styleguide/discourse/components/styleguide-example";export default class Categories extends Component {@@ -10,7 +10,7 @@ export default class Categories extends Component {<template><StyleguideExample @title="categoryBadge" @code={{this.categoryBadgeCode}}>{{#each @dummy.categories as |c|}}- {{categoryBadge c categoryStyle="bullet"}}+ {{dCategoryBadge c categoryStyle="bullet"}}{{/each}}</StyleguideExample></template>diff --git a/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/char-counter.gjs b/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/char-counter.gjsindex d0a8c293d84..b74005dbf85 100644--- a/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/char-counter.gjs+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/char-counter.gjs@@ -1,8 +1,8 @@import Component from "@glimmer/component";import { fn } from "@ember/helper";import { on } from "@ember/modifier";-import CharCounter from "discourse/components/char-counter";import withEventValue from "discourse/helpers/with-event-value";+import DCharCounter from "discourse/ui-kit/d-char-counter";import StyleguideExample from "discourse/plugins/styleguide/discourse/components/styleguide-example";export default class CharCounterMolecule extends Component {@@ -26,12 +26,12 @@ import withEventValue from "discourse/helpers/with-event-value";<template><StyleguideExample @title="<CharCounter>" @code={{this.charCounterCode}}>- <CharCounter @max="50" @value={{@dummy.charCounterContent}}>+ <DCharCounter @max="50" @value={{@dummy.charCounterContent}}><textarea{{on "input" (withEventValue (fn (mut @dummy.charCounterContent)))}}class="styleguide--char-counter"></textarea>- </CharCounter>+ </DCharCounter></StyleguideExample></template>}diff --git a/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/dialog.gjs b/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/dialog.gjsindex 58b6b634b58..120118a092b 100644--- a/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/dialog.gjs+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/dialog.gjs@@ -2,7 +2,7 @@ import Component from "@glimmer/component";import { fn, hash } from "@ember/helper";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";+import DButton from "discourse/ui-kit/d-button";import StyleguideComponent from "discourse/plugins/styleguide/discourse/components/styleguide/component";import StyleguideExample from "discourse/plugins/styleguide/discourse/components/styleguide-example";diff --git a/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/empty-state.gjs b/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/empty-state.gjsindex 3fe99b54360..63631a4b57b 100644--- a/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/empty-state.gjs+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/empty-state.gjs@@ -1,5 +1,5 @@import Component from "@glimmer/component";-import EmptyState from "discourse/components/empty-state";+import DEmptyState from "discourse/ui-kit/d-empty-state";import StyleguideExample from "discourse/plugins/styleguide/discourse/components/styleguide-example";export default class EmptyStateMolecule extends Component {@@ -7,7 +7,7 @@ export default class EmptyStateMolecule extends Component {<template><StyleguideExample @title="<EmptyState>" @code={{this.emptyStateCode}}>- <EmptyState @title={{@dummy.sentence}} @body={{@dummy.short_sentence}} />+ <DEmptyState @title={{@dummy.sentence}} @body={{@dummy.short_sentence}} /></StyleguideExample></template>}diff --git a/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/menus.gjs b/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/menus.gjsindex 6e5d926fd70..b41e28bed93 100644--- a/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/menus.gjs+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/menus.gjs@@ -5,11 +5,11 @@ import { on } from "@ember/modifier";import { action } from "@ember/object";import { service } from "@ember/service";import { trustHTML } from "@ember/template";-import DButton from "discourse/components/d-button";-import DToggleSwitch from "discourse/components/d-toggle-switch";import DMenu from "discourse/float-kit/components/d-menu";import { MENU } from "discourse/float-kit/lib/constants";import withEventValue from "discourse/helpers/with-event-value";+import DButton from "discourse/ui-kit/d-button";+import DToggleSwitch from "discourse/ui-kit/d-toggle-switch";import DummyComponent from "discourse/plugins/styleguide/discourse/components/dummy-component";import StyleguideComponent from "discourse/plugins/styleguide/discourse/components/styleguide/component";import Controls from "discourse/plugins/styleguide/discourse/components/styleguide/controls";diff --git a/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/multi-select.gjs b/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/multi-select.gjsindex 6791c483e33..51af88946c6 100644--- a/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/multi-select.gjs+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/multi-select.gjs@@ -1,7 +1,7 @@import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";-import DMultiSelect from "discourse/components/d-multi-select";+import DMultiSelect from "discourse/ui-kit/d-multi-select";import StyleguideComponent from "../../styleguide/component";import StyleguideExample from "../../styleguide-example";diff --git a/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/toasts.gjs b/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/toasts.gjsindex 6177011e8e9..7d96adc764d 100644--- a/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/toasts.gjs+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/toasts.gjs@@ -4,11 +4,11 @@ import { fn } from "@ember/helper";import { on } from "@ember/modifier";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";-import DIconGridPicker from "discourse/components/d-icon-grid-picker";-import DToggleSwitch from "discourse/components/d-toggle-switch";import { TOAST } from "discourse/float-kit/lib/constants";import withEventValue from "discourse/helpers/with-event-value";+import DButton from "discourse/ui-kit/d-button";+import DIconGridPicker from "discourse/ui-kit/d-icon-grid-picker";+import DToggleSwitch from "discourse/ui-kit/d-toggle-switch";import DummyComponent from "discourse/plugins/styleguide/discourse/components/dummy-component";import StyleguideComponent from "discourse/plugins/styleguide/discourse/components/styleguide/component";import Controls from "discourse/plugins/styleguide/discourse/components/styleguide/controls";diff --git a/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/tooltips.gjs b/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/tooltips.gjsindex 79726e78010..ffacab8f798 100644--- a/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/tooltips.gjs+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/molecules/tooltips.gjs@@ -5,11 +5,11 @@ import { on } from "@ember/modifier";import { action } from "@ember/object";import { service } from "@ember/service";import { trustHTML } from "@ember/template";-import DButton from "discourse/components/d-button";-import DToggleSwitch from "discourse/components/d-toggle-switch";import DTooltip from "discourse/float-kit/components/d-tooltip";import { TOOLTIP } from "discourse/float-kit/lib/constants";import withEventValue from "discourse/helpers/with-event-value";+import DButton from "discourse/ui-kit/d-button";+import DToggleSwitch from "discourse/ui-kit/d-toggle-switch";import DummyComponent from "discourse/plugins/styleguide/discourse/components/dummy-component";import StyleguideComponent from "discourse/plugins/styleguide/discourse/components/styleguide/component";import Controls from "discourse/plugins/styleguide/discourse/components/styleguide/controls";diff --git a/plugins/styleguide/assets/javascripts/discourse/components/sections/organisms/04-topic-footer-buttons.gjs b/plugins/styleguide/assets/javascripts/discourse/components/sections/organisms/04-topic-footer-buttons.gjsindex e84c88e3d86..3409d2db847 100644--- a/plugins/styleguide/assets/javascripts/discourse/components/sections/organisms/04-topic-footer-buttons.gjs+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/organisms/04-topic-footer-buttons.gjs@@ -1,6 +1,6 @@import Component from "@glimmer/component";-import DButton from "discourse/components/d-button";import TopicFooterButtons from "discourse/components/topic-footer-buttons";+import DButton from "discourse/ui-kit/d-button";import StyleguideExample from "discourse/plugins/styleguide/discourse/components/styleguide-example";export default class TopicFooterButtonsOrganism extends Component {diff --git a/plugins/styleguide/assets/javascripts/discourse/components/sections/organisms/docked-composer.gjs b/plugins/styleguide/assets/javascripts/discourse/components/sections/organisms/docked-composer.gjsindex 1b141e1039c..a33eb492a51 100644--- a/plugins/styleguide/assets/javascripts/discourse/components/sections/organisms/docked-composer.gjs+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/organisms/docked-composer.gjs@@ -3,9 +3,9 @@ import { tracked } from "@glimmer/tracking";import { fn } from "@ember/helper";import { on } from "@ember/modifier";import { action } from "@ember/object";-import DToggleSwitch from "discourse/components/d-toggle-switch";import DockedComposer from "discourse/components/docked-composer";import withEventValue from "discourse/helpers/with-event-value";+import DToggleSwitch from "discourse/ui-kit/d-toggle-switch";import { i18n } from "discourse-i18n";import StyleguideComponent from "discourse/plugins/styleguide/discourse/components/styleguide/component";import Controls from "discourse/plugins/styleguide/discourse/components/styleguide/controls";diff --git a/plugins/styleguide/assets/javascripts/discourse/components/sections/organisms/modal.gjs b/plugins/styleguide/assets/javascripts/discourse/components/sections/organisms/modal.gjsindex 95fa9ec9748..5a60abd4f6b 100644--- a/plugins/styleguide/assets/javascripts/discourse/components/sections/organisms/modal.gjs+++ b/plugins/styleguide/assets/javascripts/discourse/components/sections/organisms/modal.gjs@@ -4,11 +4,11 @@ import { Textarea } from "@ember/component";import { fn } from "@ember/helper";import { on } from "@ember/modifier";import { action } from "@ember/object";-import DModal from "discourse/components/d-modal";-import DToggleSwitch from "discourse/components/d-toggle-switch";import withEventValue from "discourse/helpers/with-event-value";import { getLoadedFaker } from "discourse/lib/load-faker";import ComboBox from "discourse/select-kit/components/combo-box";+import DModal from "discourse/ui-kit/d-modal";+import DToggleSwitch from "discourse/ui-kit/d-toggle-switch";import { i18n } from "discourse-i18n";import StyleguideComponent from "discourse/plugins/styleguide/discourse/components/styleguide/component";import Controls from "discourse/plugins/styleguide/discourse/components/styleguide/controls";diff --git a/plugins/styleguide/assets/javascripts/discourse/components/styleguide-example.gjs b/plugins/styleguide/assets/javascripts/discourse/components/styleguide-example.gjsindex 4db72e2725b..40d13f837af 100644--- a/plugins/styleguide/assets/javascripts/discourse/components/styleguide-example.gjs+++ b/plugins/styleguide/assets/javascripts/discourse/components/styleguide-example.gjs@@ -1,9 +1,9 @@import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { fn } from "@ember/helper";-import DButton from "discourse/components/d-button";-import HighlightedCode from "discourse/components/highlighted-code";import { not } from "discourse/truth-helpers";+import DButton from "discourse/ui-kit/d-button";+import DHighlightedCode from "discourse/ui-kit/d-highlighted-code";export default class StyleguideExample extends Component {@tracked value = null;@@ -32,7 +32,7 @@ export default class StyleguideExample extends Component {{{#if this.showCode}}<div class="styleguide-code">- <HighlightedCode @code={{@code}} @lang="javascript" />+ <DHighlightedCode @code={{@code}} @lang="javascript" /></div>{{/if}}diff --git a/plugins/styleguide/assets/javascripts/discourse/components/styleguide-icons.gjs b/plugins/styleguide/assets/javascripts/discourse/components/styleguide-icons.gjsindex aa5f1e59378..2685b38336d 100644--- a/plugins/styleguide/assets/javascripts/discourse/components/styleguide-icons.gjs+++ b/plugins/styleguide/assets/javascripts/discourse/components/styleguide-icons.gjs@@ -1,11 +1,11 @@/* eslint-disable ember/no-classic-components */import Component from "@ember/component";import { tagName } from "@ember-decorators/component";-import icon from "discourse/helpers/d-icon";import { uniqueItemsFromArray } from "discourse/lib/array-tools";import { afterRender } from "discourse/lib/decorators";import { REPLACEMENTS } from "discourse/lib/icon-library";import discourseLater from "discourse/lib/later";+import dIcon from "discourse/ui-kit/helpers/d-icon";@tagName("")export default class StyleguideIcons extends Component {@@ -33,7 +33,7 @@ export default class StyleguideIcons extends Component {<section class="styleguide-icons" ...attributes>{{#each this.iconIds as |id|}}<div class="styleguide-icon">- {{icon id}}+ {{dIcon id}}<span>{{id}}</span></div>{{/each}}diff --git a/plugins/styleguide/assets/javascripts/discourse/components/styleguide-section.gjs b/plugins/styleguide/assets/javascripts/discourse/components/styleguide-section.gjsindex 7f641aab4f4..157b1b4a5b5 100644--- a/plugins/styleguide/assets/javascripts/discourse/components/styleguide-section.gjs+++ b/plugins/styleguide/assets/javascripts/discourse/components/styleguide-section.gjs@@ -2,7 +2,7 @@import Component from "@ember/component";import { computed } from "@ember/object";import { tagName } from "@ember-decorators/component";-import concatClass from "discourse/helpers/concat-class";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";import { i18n } from "discourse-i18n";import sectionTitle from "discourse/plugins/styleguide/discourse/helpers/section-title";@@ -22,7 +22,7 @@ export default class StyleguideSection extends Component {<template><section- class={{concatClass "styleguide-section" this.sectionClass}}+ class={{dConcatClass "styleguide-section" this.sectionClass}}...attributes><h1 class="section-title">diff --git a/plugins/styleguide/assets/javascripts/discourse/components/styleguide/calendar-date-time-input.gjs b/plugins/styleguide/assets/javascripts/discourse/components/styleguide/calendar-date-time-input.gjsindex def9617826b..c5d4ba35581 100644--- a/plugins/styleguide/assets/javascripts/discourse/components/styleguide/calendar-date-time-input.gjs+++ b/plugins/styleguide/assets/javascripts/discourse/components/styleguide/calendar-date-time-input.gjs@@ -2,8 +2,8 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { Input } from "@ember/component";import { action } from "@ember/object";-import CalendarDateTimeInput from "discourse/components/calendar-date-time-input";-import DatePicker from "discourse/components/date-picker";+import DCalendarDateTimeInput from "discourse/ui-kit/d-calendar-date-time-input";+import DDatePicker from "discourse/ui-kit/d-date-picker";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";@@ -47,7 +47,7 @@ import CalendarDateTimeInput from "discourse/components/calendar-date-time-input@code={{this.calendarDateTimeInputCode}}><StyleguideComponent>- <CalendarDateTimeInput+ <DCalendarDateTimeInput@datePickerId="styleguide"@date={{this.date}}@time={{this.time}}@@ -61,11 +61,11 @@ import CalendarDateTimeInput from "discourse/components/calendar-date-time-input<Controls><Row @name="Min date">- <DatePicker @defaultDate="YYYY-MM-DD" @value={{this.minDate}} />+ <DDatePicker @defaultDate="YYYY-MM-DD" @value={{this.minDate}} /></Row><Row @name="Date">- <DatePicker @defaultDate="YYYY-MM-DD" @value={{this.date}} />+ <DDatePicker @defaultDate="YYYY-MM-DD" @value={{this.date}} /></Row><Row @name="Time">diff --git a/plugins/styleguide/assets/javascripts/discourse/components/styleguide/controls/toggle.gjs b/plugins/styleguide/assets/javascripts/discourse/components/styleguide/controls/toggle.gjsindex 232cfb3d80d..1c21aa9f66d 100644--- a/plugins/styleguide/assets/javascripts/discourse/components/styleguide/controls/toggle.gjs+++ b/plugins/styleguide/assets/javascripts/discourse/components/styleguide/controls/toggle.gjs@@ -1,5 +1,5 @@import { on } from "@ember/modifier";-import DToggleSwitch from "discourse/components/d-toggle-switch";+import DToggleSwitch from "discourse/ui-kit/d-toggle-switch";const Toggle = <template><DToggleSwitch @state={{@enabled}} {{on "click" @action}} />diff --git a/plugins/styleguide/assets/javascripts/discourse/components/toggle-color-mode.gjs b/plugins/styleguide/assets/javascripts/discourse/components/toggle-color-mode.gjsindex 1924a7f06fa..17be3b8bf2b 100644--- a/plugins/styleguide/assets/javascripts/discourse/components/toggle-color-mode.gjs+++ b/plugins/styleguide/assets/javascripts/discourse/components/toggle-color-mode.gjs@@ -2,9 +2,9 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import { loadColorSchemeStylesheet } from "discourse/lib/color-scheme-picker";import { currentThemeId } from "discourse/lib/theme-selector";+import DButton from "discourse/ui-kit/d-button";const DARK = "dark";const LIGHT = "light";diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 20a0c27f1b6..9238094e599 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -36,8 +36,8 @@ importers:specifier: ^7.29.0version: 7.29.0(@babel/[email protected])'@discourse/lint-configs':- specifier: ^2.45.0+ specifier: ^2.46.0+ version: 2.46.0([email protected])([email protected]([email protected]))([email protected])([email protected])([email protected]([email protected]))'@discourse/moment-timezone-names-translations':specifier: ^1.0.0version: 1.0.0@@ -1763,6 +1763,14 @@ packages:peerDependencies:prettier: 3.8.1+ '@discourse/[email protected]':+ resolution: {integrity: sha512-vGINuiul23U74ZIS+8ZMd2gR3hX2k485KGPC0ZFYCGsb2u7yyTeZ0VAmY94Wss2DOmyxlFyNBzhD+SdGgt2l1Q==}+ peerDependencies:+ ember-template-lint: 7.9.3+ eslint: 9.39.2+ prettier: 3.8.1+ stylelint: 17.5.0+'@discourse/[email protected]':resolution: {integrity: sha512-4xr1QWQ0nzmFa2ZXQgWZA+dtE/BU2ePA+qkJWPFzNpq4ZnQi8MmMMAS2285t3rc2ySMBQqYaAArmcSUiufUgRA==}@@ -10419,6 +10427,36 @@ snapshots:- postcss- supports-color+ '@discourse/[email protected]([email protected])([email protected]([email protected]))([email protected])([email protected])([email protected]([email protected]))':+ dependencies:+ '@babel/core': 7.29.0([email protected])+ '@babel/plugin-proposal-decorators': 7.29.0(@babel/[email protected])+ '@eslint/js': 9.39.4+ ember-eslint-parser: 0.5.13(@babel/[email protected])([email protected]([email protected]))([email protected])+ ember-template-lint: 7.9.3+ eslint: 9.39.2([email protected])+ eslint-plugin-decorator-position: 6.0.0(@babel/[email protected](@babel/[email protected])([email protected]([email protected])))([email protected]([email protected]))+ eslint-plugin-ember: 12.7.5(@babel/[email protected])([email protected]([email protected]))([email protected])+ eslint-plugin-import: 2.32.0([email protected]([email protected]))+ eslint-plugin-qunit: 8.2.6([email protected]([email protected]))+ eslint-plugin-simple-import-sort: 12.1.1([email protected]([email protected]))+ eslint-plugin-sort-class-members: 1.21.0([email protected]([email protected]))+ globals: 17.4.0+ prettier: 3.8.1+ prettier-plugin-ember-template-tag: 2.1.3([email protected])+ stylelint: 17.4.0([email protected])+ stylelint-config-standard: 40.0.0([email protected]([email protected]))+ stylelint-scss: 7.0.0([email protected]([email protected]))+ typescript: 5.9.3+ transitivePeerDependencies:+ - '@typescript-eslint/parser'+ - eslint-import-resolver-typescript+ - eslint-import-resolver-webpack+ - postcss+ - supports-color+'@discourse/[email protected]': {}'@discourse/[email protected]': {}@@ -18563,6 +18601,15 @@ snapshots:+ dependencies:+ postcss-scss: 4.0.9([email protected])+ stylelint: 17.4.0([email protected])+ stylelint-config-recommended: 18.0.0([email protected]([email protected]))+ stylelint-scss: 7.0.0([email protected]([email protected]))+ optionalDependencies:+ postcss: 8.5.13+dependencies:postcss-scss: 4.0.9([email protected])@@ -18572,10 +18619,22 @@ snapshots:optionalDependencies:postcss: 8.5.13+ dependencies:+ stylelint: 17.4.0([email protected])+dependencies:stylelint: 17.7.0([email protected])+ dependencies:+ stylelint: 17.4.0([email protected])+ stylelint-config-recommended-scss: 17.0.0([email protected])([email protected]([email protected]))+ stylelint-config-standard: 40.0.0([email protected]([email protected]))+ optionalDependencies:+ postcss: 8.5.13+dependencies:stylelint: 17.7.0([email protected])@@ -18584,11 +18643,28 @@ snapshots:optionalDependencies:postcss: 8.5.13+ dependencies:+ stylelint: 17.4.0([email protected])+ stylelint-config-recommended: 18.0.0([email protected]([email protected]))+dependencies:stylelint: 17.7.0([email protected])stylelint-config-recommended: 18.0.0([email protected]([email protected]))+ dependencies:+ css-tree: 3.2.1+ is-plain-object: 5.0.0+ known-css-properties: 0.37.0+ mdn-data: 2.27.1+ postcss-media-query-parser: 0.2.3+ postcss-resolve-nested-selector: 0.1.6+ postcss-selector-parser: 7.1.1+ postcss-value-parser: 4.2.0+ stylelint: 17.4.0([email protected])+dependencies:css-tree: 3.2.1diff --git a/themes/horizon/javascripts/discourse/components/card/high-context-topic-card.gjs b/themes/horizon/javascripts/discourse/components/card/high-context-topic-card.gjsindex f95f357f4ff..bb6bf04d34f 100644--- a/themes/horizon/javascripts/discourse/components/card/high-context-topic-card.gjs+++ b/themes/horizon/javascripts/discourse/components/card/high-context-topic-card.gjs@@ -9,16 +9,16 @@ import TopicLink from "discourse/components/topic-list/topic-link";import UnreadIndicator from "discourse/components/topic-list/unread-indicator";import TopicPostBadges from "discourse/components/topic-post-badges";import TopicStatus from "discourse/components/topic-status";-import avatar from "discourse/helpers/avatar";-import { categoryLinkHTML } from "discourse/helpers/category-link";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";-import discourseTags from "discourse/helpers/discourse-tags";-import formatDate from "discourse/helpers/format-date";-import number from "discourse/helpers/number";import topicFeaturedLink from "discourse/helpers/topic-featured-link";import { shortDateNoYear } from "discourse/lib/formatter";import { or } from "discourse/truth-helpers";+import dAvatar from "discourse/ui-kit/helpers/d-avatar";+import { categoryLinkHTML } from "discourse/ui-kit/helpers/d-category-link";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dDiscourseTags from "discourse/ui-kit/helpers/d-discourse-tags";+import dFormatDate from "discourse/ui-kit/helpers/d-format-date";+import dIcon from "discourse/ui-kit/helpers/d-icon";+import dNumber from "discourse/ui-kit/helpers/d-number";import { i18n } from "discourse-i18n";import { getTopicStatusBadge } from "../../lib/topic-status-badge";@@ -136,7 +136,7 @@ export default class HighContextTopicCard extends Component {<div class="hc-topic-card__header"><div class="hc-topic-card__op"><div class="hc-topic-card__avatar">- {{avatar this.topicCreator imageSize="medium"}}+ {{dAvatar this.topicCreator imageSize="medium"}}</div><div class="hc-topic-card__op-info"><span class="hc-topic-card__op-timestamp">@@ -157,18 +157,18 @@ export default class HighContextTopicCard extends Component {{{#if this.capabilities.viewport.sm}}{{i18n (themePrefix "solved")}}{{/if}}- {{icon "square-check"}}+ {{dIcon "square-check"}}</span>{{/if}}{{#if this.statusBadge}}<span- class={{concatClass+ class={{dConcatClass"hc-topic-card__status"this.statusBadge.className}}>- {{icon this.statusBadge.icon}}+ {{dIcon this.statusBadge.icon}}{{#if this.capabilities.viewport.sm}}<span class="hc-topic-card__status-text">{{i18n@@ -209,20 +209,20 @@ export default class HighContextTopicCard extends Component {<div class="hc-topic-card__context">{{#if this.hasReplies}}<div class="hc-topic-card__last-reply">- {{avatar this.lastPoster.user imageSize="tiny"}}+ {{dAvatar this.lastPoster.user imageSize="tiny"}}<spanclass="hc-topic-card__last-reply-name">{{this.lastPoster.username}}</span><span>{{i18n (themePrefix "replied")}}</span><span class="hc-topic-card__time">- {{formatDate @topic.bumpedAt leaveAgo="true"}}+ {{dFormatDate @topic.bumpedAt leaveAgo="true"}}</span></div>{{/if}}{{#if this.hasAssigned}}{{#if this.assignedUser}}<div class="hc-topic-card__assigned">- {{icon "user-plus"}}+ {{dIcon "user-plus"}}<spanclass="hc-topic-card__assigned-name">{{this.assignedUser.username}}</span>@@ -230,7 +230,7 @@ export default class HighContextTopicCard extends Component {{{/if}}{{#each this.indirectAssignees as |assignment|}}<div class="hc-topic-card__assigned">- {{icon "user-plus"}}+ {{dIcon "user-plus"}}<spanclass="hc-topic-card__assigned-name">{{assignment.user.username}}</span>@@ -252,7 +252,11 @@ export default class HighContextTopicCard extends Component {{{/unless}}{{#if this.hasTags}}- {{discourseTags @topic mode="list" className="hc-topic-card__tags"}}+ {{dDiscourseTags+ @topic+ mode="list"+ className="hc-topic-card__tags"+ }}{{/if}}</div>@@ -263,8 +267,8 @@ export default class HighContextTopicCard extends Component {aria-label={{this.voteCountLabel}}title={{this.voteCountLabel}}>- {{icon "check-to-slot" skipTitle=true}}- <span class="hc-topic-card__votes-count">{{number+ {{dIcon "check-to-slot" skipTitle=true}}+ <span class="hc-topic-card__votes-count">{{dNumber@topic.vote_count}}</span></span>@@ -276,8 +280,8 @@ export default class HighContextTopicCard extends Component {aria-label={{this.replyCountLabel}}title={{this.replyCountLabel}}>- {{icon "reply" skipTitle=true}}- <span class="hc-topic-card__count">{{number+ {{dIcon "reply" skipTitle=true}}+ <span class="hc-topic-card__count">{{dNumber@topic.replyCount}}</span></span>@@ -289,8 +293,8 @@ export default class HighContextTopicCard extends Component {aria-label={{this.likeCountLabel}}title={{this.likeCountLabel}}>- {{icon "heart" skipTitle=true}}- <span class="hc-topic-card__count">{{number+ {{dIcon "heart" skipTitle=true}}+ <span class="hc-topic-card__count">{{dNumber@topic.like_count}}</span></span>diff --git a/themes/horizon/javascripts/discourse/components/card/topic-activity-column.gjs b/themes/horizon/javascripts/discourse/components/card/topic-activity-column.gjsindex 8fbaee8ae93..c52454e9e4d 100644--- a/themes/horizon/javascripts/discourse/components/card/topic-activity-column.gjs+++ b/themes/horizon/javascripts/discourse/components/card/topic-activity-column.gjs@@ -1,6 +1,6 @@import Component from "@glimmer/component";-import concatClass from "discourse/helpers/concat-class";-import formatDate from "discourse/helpers/format-date";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dFormatDate from "discourse/ui-kit/helpers/d-format-date";export default class TopicActivityColumn extends Component {get topicUser() {@@ -47,7 +47,7 @@ export default class TopicActivityColumn extends Component {}<template>- <span class={{concatClass "topic-activity" this.topicUser.class}}>+ <span class={{dConcatClass "topic-activity" this.topicUser.class}}>{{#if this.topicUser.username}}<spanclass="topic-activity__username"@@ -55,7 +55,7 @@ export default class TopicActivityColumn extends Component {<span class="dot-separator"></span>{{/if}}<div class="topic-activity__time">- {{formatDate @topic.bumpedAt leaveAgo="true" format="tiny"}}+ {{dFormatDate @topic.bumpedAt leaveAgo="true" format="tiny"}}</div></span></template>diff --git a/themes/horizon/javascripts/discourse/components/card/topic-category-column.gjs b/themes/horizon/javascripts/discourse/components/card/topic-category-column.gjsindex ca8ae87483b..4c08f0e1174 100644--- a/themes/horizon/javascripts/discourse/components/card/topic-category-column.gjs+++ b/themes/horizon/javascripts/discourse/components/card/topic-category-column.gjs@@ -1,4 +1,4 @@-import { categoryLinkHTML } from "discourse/helpers/category-link";+import { categoryLinkHTML } from "discourse/ui-kit/helpers/d-category-link";const TopicCategoryColumn = <template>{{categoryLinkHTML @topic.category}}diff --git a/themes/horizon/javascripts/discourse/components/card/topic-creator-column.gjs b/themes/horizon/javascripts/discourse/components/card/topic-creator-column.gjsindex bcaad298d38..50b684bbf98 100644--- a/themes/horizon/javascripts/discourse/components/card/topic-creator-column.gjs+++ b/themes/horizon/javascripts/discourse/components/card/topic-creator-column.gjs@@ -1,5 +1,5 @@import Component from "@glimmer/component";-import avatar from "discourse/helpers/avatar";+import dAvatar from "discourse/ui-kit/helpers/d-avatar";export default class TopicCreatorColumn extends Component {get topicCreator() {@@ -11,7 +11,7 @@ export default class TopicCreatorColumn extends Component {<template><div class={{this.topicCreator.class}}>- {{avatar this.topicCreator.user}}+ {{dAvatar this.topicCreator.user}}</div></template>}diff --git a/themes/horizon/javascripts/discourse/components/card/topic-likes-column.gjs b/themes/horizon/javascripts/discourse/components/card/topic-likes-column.gjsindex f1d6affc5ff..e4f03f24adc 100644--- a/themes/horizon/javascripts/discourse/components/card/topic-likes-column.gjs+++ b/themes/horizon/javascripts/discourse/components/card/topic-likes-column.gjs@@ -1,8 +1,8 @@-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";const TopicLikesColumn = <template>{{#if @topic.like_count}}- <span class="topic-likes">{{icon "heart"}}{{@topic.like_count}}</span>+ <span class="topic-likes">{{dIcon "heart"}}{{@topic.like_count}}</span>{{/if}}</template>;diff --git a/themes/horizon/javascripts/discourse/components/card/topic-replies-column.gjs b/themes/horizon/javascripts/discourse/components/card/topic-replies-column.gjsindex 3f5d75bee20..4cda9377b7c 100644--- a/themes/horizon/javascripts/discourse/components/card/topic-replies-column.gjs+++ b/themes/horizon/javascripts/discourse/components/card/topic-replies-column.gjs@@ -1,9 +1,9 @@-import icon from "discourse/helpers/d-icon";-import number from "discourse/helpers/number";+import dIcon from "discourse/ui-kit/helpers/d-icon";+import dNumber from "discourse/ui-kit/helpers/d-number";const TopicRepliesColumn = <template>{{#if @topic.replyCount}}- <span class="topic-replies">{{icon "reply"}}{{number+ <span class="topic-replies">{{dIcon "reply"}}{{dNumber@topic.replyCount}}</span>{{/if}}diff --git a/themes/horizon/javascripts/discourse/components/card/topic-status-column.gjs b/themes/horizon/javascripts/discourse/components/card/topic-status-column.gjsindex b229413bd81..3f9459ced7f 100644--- a/themes/horizon/javascripts/discourse/components/card/topic-status-column.gjs+++ b/themes/horizon/javascripts/discourse/components/card/topic-status-column.gjs@@ -1,5 +1,5 @@import Component from "@glimmer/component";-import icon from "discourse/helpers/d-icon";+import dIcon from "discourse/ui-kit/helpers/d-icon";import { i18n } from "discourse-i18n";import { getTopicStatusBadge } from "../../lib/topic-status-badge";@@ -10,7 +10,7 @@ export default class TopicStatusColumn extends Component {<template>{{#if this.badge}}- <span class="topic-status-card {{this.badge.className}}">{{icon+ <span class="topic-status-card {{this.badge.className}}">{{dIconthis.badge.icon}}<p class="topic-status-card__name">{{i18n this.badge.text}}</p></span>{{/if}}diff --git a/themes/horizon/javascripts/discourse/components/composer-peek-mode-toggle.gjs b/themes/horizon/javascripts/discourse/components/composer-peek-mode-toggle.gjsindex a3748256443..8e561adaf04 100644--- a/themes/horizon/javascripts/discourse/components/composer-peek-mode-toggle.gjs+++ b/themes/horizon/javascripts/discourse/components/composer-peek-mode-toggle.gjs@@ -2,8 +2,8 @@ import Component from "@glimmer/component";import { tracked } from "@glimmer/tracking";import { action } from "@ember/object";import { service } from "@ember/service";-import DButton from "discourse/components/d-button";import bodyClass from "discourse/helpers/body-class";+import DButton from "discourse/ui-kit/d-button";export default class ComposerPeekModeToggle extends Component {@service composer;diff --git a/themes/horizon/javascripts/discourse/components/user-color-palette-menu-item.gjs b/themes/horizon/javascripts/discourse/components/user-color-palette-menu-item.gjsindex 63e3112f2cd..333cdd6a9a2 100644--- a/themes/horizon/javascripts/discourse/components/user-color-palette-menu-item.gjs+++ b/themes/horizon/javascripts/discourse/components/user-color-palette-menu-item.gjs@@ -1,8 +1,8 @@import Component from "@glimmer/component";import { action } from "@ember/object";import { trustHTML } from "@ember/template";-import DButton from "discourse/components/d-button";-import concatClass from "discourse/helpers/concat-class";+import DButton from "discourse/ui-kit/d-button";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";export default class UserColorPaletteMenuItem extends Component {get siteStyle() {@@ -26,7 +26,7 @@ export default class UserColorPaletteMenuItem extends Component {data-color-palette={{@colorPalette.name}}><DButton- class={{concatClass+ class={{dConcatClass"btn-flat user-color-palette-menu__item-choice"this.activeClass}}diff --git a/themes/horizon/javascripts/discourse/components/user-color-palette-selector.gjs b/themes/horizon/javascripts/discourse/components/user-color-palette-selector.gjsindex 12281bec49d..f0eafbbcaae 100644--- a/themes/horizon/javascripts/discourse/components/user-color-palette-selector.gjs+++ b/themes/horizon/javascripts/discourse/components/user-color-palette-selector.gjs@@ -5,8 +5,6 @@ import { service } from "@ember/service";import { isEmpty } from "@ember/utils";import { Promise } from "rsvp";import DMenu from "discourse/float-kit/components/d-menu";-import concatClass from "discourse/helpers/concat-class";-import icon from "discourse/helpers/d-icon";import { reload } from "discourse/helpers/page-reloader";import { ajax } from "discourse/lib/ajax";import {@@ -14,6 +12,8 @@ import {updateColorSchemeCookie,} from "discourse/lib/color-scheme-picker";import cookie from "discourse/lib/cookie";+import dConcatClass from "discourse/ui-kit/helpers/d-concat-class";+import dIcon from "discourse/ui-kit/helpers/d-icon";import UserColorPaletteMenuItem from "./user-color-palette-menu-item";const HORIZON_PALETTES = [@@ -183,7 +183,7 @@ export default class UserColorPaletteSelector extends Component {@identifier="user-color-palette-selector"@placementStrategy="fixed"@onRegisterApi={{this.onRegisterMenu}}- class={{concatClass+ class={{dConcatClass"btn-flat user-color-palette-selector sidebar-footer-actions-button"(if this.cssLoaded "user-color-palette-css-loaded")}}@@ -191,7 +191,7 @@ export default class UserColorPaletteSelector extends Component {@inline={{true}}><:trigger>- {{icon "paintbrush"}}+ {{dIcon "paintbrush"}}</:trigger><:content><div class="user-color-palette-menu">