From 48193767bf753bedf9483b4a0c3b2f9760745df3 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Tue, 10 Oct 2023 19:38:59 +0100 Subject: [PATCH] DEV: Sort imports Automatically generated by `eslint --fix` to satisfy the updated configuration --- .../admin/addon/components/ace-editor.js | 6 +- .../addon/components/admin-backups-logs.js | 6 +- .../addon/components/admin-editable-field.js | 2 +- .../admin/addon/components/admin-form-row.js | 2 +- .../admin/addon/components/admin-graph.js | 2 +- .../admin/addon/components/admin-nav.gjs | 2 +- .../addon/components/admin-penalty-history.js | 2 +- .../components/admin-penalty-post-action.js | 2 +- .../addon/components/admin-penalty-reason.js | 4 +- .../components/admin-penalty-similar-users.js | 2 +- .../addon/components/admin-report-chart.js | 12 +- .../addon/components/admin-report-counters.js | 2 +- .../addon/components/admin-report-counts.js | 4 +- .../components/admin-report-inline-table.js | 2 +- .../components/admin-report-per-day-counts.js | 2 +- .../components/admin-report-stacked-chart.js | 12 +- .../components/admin-report-storage-stats.js | 8 +- .../components/admin-report-table-cell.js | 4 +- .../components/admin-report-table-header.js | 2 +- .../components/admin-report-table-row.js | 2 +- .../addon/components/admin-report-table.js | 8 +- .../admin-report-trust-level-counts.js | 2 +- .../admin/addon/components/admin-report.js | 20 +- .../addon/components/admin-theme-editor.js | 8 +- .../addon/components/admin-user-field-item.js | 14 +- .../addon/components/admin-watched-word.js | 8 +- .../admin/addon/components/cancel-link.js | 2 +- .../admin/addon/components/color-input.js | 4 +- .../components/dashboard-new-features.js | 2 +- .../addon/components/email-styles-editor.js | 8 +- .../admin/addon/components/embeddable-host.js | 16 +- .../addon/components/embedding-setting.js | 6 +- .../addon/components/emoji-value-list.js | 8 +- .../admin/addon/components/flag-user-lists.js | 2 +- .../addon/components/form-template/form.js | 6 +- .../addon/components/highlighted-code.js | 2 +- .../addon/components/inline-edit-checkbox.js | 2 +- .../addon/components/install-theme-item.js | 2 +- .../admin/addon/components/ip-lookup.js | 14 +- .../addon/components/modal/badge-preview.js | 2 +- .../modal/color-scheme-select-base.js | 2 +- .../components/modal/custom-date-range.js | 2 +- .../modal/delete-user-posts-progress.js | 4 +- .../components/modal/edit-badge-groupings.js | 8 +- .../addon/components/modal/install-theme.js | 8 +- .../components/modal/merge-users-progress.js | 2 +- .../addon/components/modal/penalize-user.js | 2 +- .../admin/addon/components/modal/reseed.js | 4 +- .../addon/components/modal/start-backup.js | 2 +- .../components/modal/uploaded-image-list.js | 2 +- .../components/moderation-history-item.js | 2 +- .../admin/addon/components/permalink-form.js | 14 +- .../addon/components/report-filters/bool.js | 2 +- .../components/report-filters/category.js | 2 +- .../addon/components/report-filters/group.js | 2 +- .../components/screened-ip-address-form.js | 12 +- .../addon/components/secret-value-list.js | 8 +- .../admin/addon/components/silence-details.js | 2 +- .../admin/addon/components/simple-list.js | 6 +- .../admin/addon/components/site-setting.js | 2 +- .../addon/components/site-settings/bool.js | 2 +- .../components/site-settings/category-list.js | 2 +- .../addon/components/site-settings/color.js | 2 +- .../components/site-settings/compact-list.js | 2 +- .../components/site-settings/group-list.js | 2 +- .../addon/components/site-text-summary.js | 4 +- .../admin/addon/components/staff-actions.js | 4 +- .../admin/addon/components/tags-uploader.js | 6 +- .../addon/components/theme-setting-editor.js | 2 +- .../addon/components/theme-settings-editor.js | 4 +- .../addon/components/theme-translation.js | 4 +- .../addon/components/theme-upload-add.js | 6 +- .../addon/components/themes-list-item.js | 8 +- .../admin/addon/components/themes-list.js | 10 +- .../admin/addon/components/value-list.js | 10 +- .../addon/components/watched-word-form.js | 18 +- .../addon/components/watched-word-uploader.js | 8 +- .../admin/addon/components/webhook-event.js | 10 +- .../admin/addon/components/webhook-events.js | 6 +- .../addon/controllers/admin-api-keys-new.js | 12 +- .../addon/controllers/admin-api-keys-show.js | 6 +- .../addon/controllers/admin-backups-index.js | 11 +- .../addon/controllers/admin-backups-logs.js | 2 +- .../admin/addon/controllers/admin-backups.js | 2 +- .../admin/addon/controllers/admin-badges.js | 2 +- .../addon/controllers/admin-badges/award.js | 8 +- .../addon/controllers/admin-badges/index.js | 2 +- .../addon/controllers/admin-badges/show.js | 18 +- .../admin-customize-colors-show.js | 6 +- .../controllers/admin-customize-colors.js | 4 +- .../admin-customize-email-style-edit.js | 4 +- .../admin-customize-email-templates-edit.js | 6 +- .../admin-customize-email-templates.js | 2 +- .../controllers/admin-customize-robots-txt.js | 4 +- .../admin-customize-themes-edit.js | 8 +- .../admin-customize-themes-show.js | 16 +- .../controllers/admin-customize-themes.js | 2 +- .../controllers/admin-dashboard-general.js | 16 +- .../controllers/admin-dashboard-moderation.js | 8 +- .../controllers/admin-dashboard-reports.js | 6 +- .../addon/controllers/admin-dashboard.js | 8 +- .../controllers/admin-email-advanced-test.js | 2 +- .../addon/controllers/admin-email-bounced.js | 6 +- .../addon/controllers/admin-email-index.js | 12 +- .../addon/controllers/admin-email-logs.js | 2 +- .../controllers/admin-email-preview-digest.js | 6 +- .../addon/controllers/admin-email-received.js | 8 +- .../addon/controllers/admin-email-rejected.js | 10 +- .../addon/controllers/admin-email-sent.js | 4 +- .../addon/controllers/admin-email-skipped.js | 4 +- .../addon/controllers/admin-embedding.js | 4 +- .../admin/addon/controllers/admin-emojis.js | 8 +- .../controllers/admin-logs-screened-emails.js | 4 +- .../admin-logs-screened-ip-addresses.js | 16 +- .../controllers/admin-logs-screened-urls.js | 4 +- .../admin-logs-staff-action-logs.js | 10 +- .../addon/controllers/admin-permalinks.js | 14 +- .../addon/controllers/admin-plugins-index.js | 2 +- .../admin/addon/controllers/admin-plugins.js | 2 +- .../addon/controllers/admin-site-settings.js | 12 +- .../addon/controllers/admin-site-text-edit.js | 8 +- .../controllers/admin-site-text-index.js | 8 +- .../addon/controllers/admin-user-badges.js | 14 +- .../addon/controllers/admin-user-fields.js | 8 +- .../addon/controllers/admin-user-index.js | 26 +-- .../controllers/admin-users-list-show.js | 14 +- .../controllers/admin-watched-words-action.js | 16 +- .../addon/controllers/admin-watched-words.js | 4 +- .../addon/controllers/admin-web-hooks-edit.js | 8 +- .../controllers/admin-web-hooks-index.js | 8 +- .../addon/controllers/admin-web-hooks-show.js | 4 +- .../admin/addon/controllers/admin.js | 2 +- .../admin/addon/helpers/disposition-icon.js | 2 +- .../admin/addon/helpers/human-size.js | 2 +- .../admin/addon/mixins/period-computation.js | 2 +- .../admin/addon/mixins/setting-component.js | 20 +- .../admin/addon/mixins/setting-object.js | 6 +- .../admin/addon/models/admin-user.js | 10 +- .../javascripts/admin/addon/models/api-key.js | 6 +- .../admin/addon/models/backup-status.js | 2 +- .../admin/addon/models/color-scheme-color.js | 6 +- .../admin/addon/models/color-scheme.js | 6 +- .../admin/addon/models/email-log.js | 2 +- .../admin/addon/models/email-template.js | 4 +- .../admin/addon/models/flag-type.js | 2 +- .../admin/addon/models/form-template.js | 2 +- .../admin/addon/models/incoming-email.js | 2 +- .../admin/addon/models/permalink.js | 4 +- .../javascripts/admin/addon/models/report.js | 14 +- .../admin/addon/models/screened-email.js | 2 +- .../admin/addon/models/screened-ip-address.js | 4 +- .../admin/addon/models/screened-url.js | 2 +- .../admin/addon/models/site-setting.js | 4 +- .../admin/addon/models/site-text.js | 4 +- .../admin/addon/models/staff-action-log.js | 8 +- .../javascripts/admin/addon/models/theme.js | 6 +- .../admin/addon/models/user-field.js | 2 +- .../admin/addon/models/watched-word.js | 2 +- .../admin/addon/models/web-hook.js | 4 +- .../admin/addon/routes/admin-backups-index.js | 2 +- .../admin/addon/routes/admin-backups-logs.js | 2 +- .../admin/addon/routes/admin-backups.js | 14 +- .../admin/addon/routes/admin-badges.js | 2 +- .../admin/addon/routes/admin-badges/show.js | 10 +- .../addon/routes/admin-customize-colors.js | 2 +- .../admin-customize-email-style-edit.js | 2 +- .../routes/admin-customize-email-templates.js | 2 +- .../admin-customize-form-templates-index.js | 2 +- .../routes/admin-customize-themes-edit.js | 2 +- .../routes/admin-customize-themes-show.js | 4 +- .../addon/routes/admin-customize-themes.js | 4 +- .../addon/routes/admin-dashboard-reports.js | 2 +- .../admin/addon/routes/admin-dashboard.js | 2 +- .../admin/addon/routes/admin-email-bounced.js | 8 +- .../routes/admin-email-preview-digest.js | 2 +- .../addon/routes/admin-email-rejected.js | 4 +- .../admin/addon/routes/admin-emojis.js | 2 +- .../admin/addon/routes/admin-logs-index.js | 2 +- .../routes/admin-logs-staff-action-logs.js | 2 +- .../admin/addon/routes/admin-plugins.js | 2 +- .../admin/addon/routes/admin-reports-index.js | 2 +- .../admin/addon/routes/admin-reports-show.js | 2 +- .../addon/routes/admin-search-logs-index.js | 2 +- .../addon/routes/admin-search-logs-term.js | 4 +- .../routes/admin-site-settings-category.js | 2 +- .../addon/routes/admin-site-settings-index.js | 2 +- .../addon/routes/admin-site-text-index.js | 2 +- .../admin/addon/routes/admin-user-badges.js | 2 +- .../admin/addon/routes/admin-user-index.js | 2 +- .../admin/addon/routes/admin-user.js | 4 +- .../admin/addon/routes/admin-users-index.js | 2 +- .../addon/routes/admin-users-list-index.js | 2 +- .../admin/addon/routes/admin-users-list.js | 6 +- .../routes/admin-watched-words-action.js | 2 +- .../addon/routes/admin-watched-words-index.js | 2 +- .../admin/addon/services/admin-tools.js | 14 +- .../addon/components/dialog-holder.js | 2 +- .../dialog-holder/addon/services/dialog.js | 2 +- .../addon/helpers/bound-i18n.js | 2 +- .../discourse-common/addon/helpers/fa-icon.js | 2 +- .../discourse-common/addon/helpers/i18n.js | 2 +- .../addon/lib/avatar-utils.js | 2 +- .../discourse-common/addon/lib/helpers.js | 4 +- .../addon/lib/icon-library.js | 6 +- .../addon/lib/raw-templates.js | 2 +- .../discourse-common/addon/resolver.js | 4 +- .../addon/utils/category-macro.js | 2 +- .../addon/utils/decorators.js | 17 +- .../addon/utils/handle-descriptor.js | 2 +- .../addon/utils/macro-alias.js | 2 +- .../discourse-widget-hbs/addon/helpers.js | 4 +- .../discourse/app/adapters/post.js | 2 +- .../discourse/app/adapters/rest.js | 2 +- .../discourse/app/adapters/topic-list.js | 2 +- app/assets/javascripts/discourse/app/app.js | 9 +- .../app/components/about-page-users.js | 2 +- .../components/add-category-tag-classes.gjs | 2 +- .../app/components/admin-post-menu.gjs | 10 +- .../app/components/ai-summary-skeleton.js | 4 +- .../app/components/auth-token-dropdown.js | 4 +- .../app/components/avatar-uploader.js | 2 +- .../discourse/app/components/backup-codes.js | 2 +- .../discourse/app/components/badge-card.js | 4 +- .../app/components/badge-selector.js | 6 +- .../discourse/app/components/badge-title.js | 4 +- .../app/components/basic-topic-list.js | 2 +- .../components/bookmark-actions-dropdown.js | 2 +- .../discourse/app/components/bookmark-icon.js | 8 +- .../discourse/app/components/bookmark-list.js | 8 +- .../app/components/bootstrap-mode-notice.js | 8 +- .../discourse/app/components/bread-crumbs.js | 2 +- .../bulk-actions/notification-level.js | 4 +- .../components/bulk-group-member-dropdown.js | 4 +- .../app/components/bulk-select-toggle.js | 2 +- .../components/calendar-date-time-input.js | 8 +- .../app/components/card-container.js | 2 +- .../categories-boxes-with-topics.js | 2 +- .../app/components/categories-boxes.js | 2 +- .../app/components/categories-only.js | 2 +- .../app/components/category-permission-row.js | 6 +- .../discourse/app/components/cdn-img.js | 4 +- .../app/components/choose-message.js | 4 +- .../discourse/app/components/choose-topic.js | 4 +- .../app/components/color-picker-choice.js | 4 +- .../app/components/composer-action-title.js | 12 +- .../discourse/app/components/composer-body.js | 12 +- .../app/components/composer-editor.js | 52 ++--- .../app/components/composer-message.js | 2 +- .../app/components/composer-messages.js | 16 +- .../app/components/composer-save-button.js | 2 +- .../app/components/composer-title.js | 14 +- .../discourse/app/components/cook-text.gjs | 10 +- .../discourse/app/components/count-i18n.js | 2 +- .../discourse/app/components/custom-html.js | 4 +- .../discourse/app/components/d-button.gjs | 10 +- .../discourse/app/components/d-document.js | 6 +- .../discourse/app/components/d-editor.js | 54 ++--- .../discourse/app/components/d-lightbox.js | 11 +- .../discourse/app/components/d-modal-body.js | 8 +- .../app/components/d-modal-legacy.js | 12 +- .../discourse/app/components/d-modal.js | 2 +- .../discourse/app/components/d-navigation.js | 12 +- .../discourse/app/components/d-section.gjs | 4 +- .../app/components/d-toggle-switch.gjs | 2 +- .../discourse/app/components/date-input.js | 8 +- .../discourse/app/components/date-picker.js | 6 +- .../app/components/date-time-input.js | 2 +- .../components/desktop-notification-config.js | 8 +- .../second-factor-confirm-phrase.js | 4 +- .../app/components/discourse-banner.js | 2 +- .../app/components/discourse-linked-text.js | 2 +- .../app/components/discourse-tag-bound.js | 2 +- .../app/components/discourse-topic.js | 14 +- .../app/components/discovery-topics-list.js | 4 +- .../app/components/edit-category-general.js | 10 +- .../app/components/edit-category-security.js | 6 +- .../app/components/edit-category-settings.js | 14 +- .../app/components/edit-category-tab.js | 10 +- .../app/components/edit-category-tags.js | 2 +- .../edit-category-topic-template.js | 4 +- .../app/components/edit-topic-timer-form.js | 16 +- .../app/components/email-dropdown.js | 4 +- .../discourse/app/components/emoji-picker.js | 20 +- .../app/components/emoji-uploader.js | 6 +- .../app/components/expanding-text-area.js | 4 +- .../discourse/app/components/fast-edit.gjs | 8 +- .../app/components/flag-action-type.js | 4 +- .../discourse/app/components/flat-button.js | 2 +- .../discourse/app/components/footer-nav.js | 4 +- .../components/form-template-field/upload.js | 6 +- .../form-template-field/wrapper.gjs | 6 +- .../app/components/future-date-input.js | 8 +- ...r-component-with-deprecated-parent-view.js | 2 +- .../discourse/app/components/global-notice.js | 10 +- .../discourse/app/components/google-search.js | 2 +- .../app/components/group-card-contents.js | 12 +- .../app/components/group-flair-inputs.js | 12 +- .../components/group-imap-email-settings.js | 8 +- .../components/group-manage-email-settings.js | 4 +- .../components/group-manage-logs-filter.js | 2 +- .../components/group-manage-save-button.js | 10 +- .../app/components/group-member-dropdown.js | 4 +- .../app/components/group-membership-button.js | 6 +- .../discourse/app/components/group-post.js | 6 +- .../app/components/group-selector.js | 6 +- .../components/group-smtp-email-settings.js | 8 +- .../groups-form-interaction-fields.js | 4 +- .../groups-form-membership-fields.js | 4 +- .../components/groups-form-profile-fields.js | 10 +- .../app/components/highlight-search.js | 2 +- .../app/components/horizontal-overflow-nav.js | 6 +- .../app/components/html-with-links.js | 2 +- .../app/components/ignored-user-list.js | 2 +- .../app/components/images-uploader.js | 2 +- .../discourse/app/components/input-tip.js | 4 +- .../discourse/app/components/invite-panel.js | 14 +- .../app/components/latest-topic-list-item.js | 2 +- .../app/components/links-redirect.js | 2 +- .../discourse/app/components/login-buttons.js | 2 +- .../discourse/app/components/mobile-nav.js | 2 +- .../app/components/modal-container.js | 2 +- .../discourse/app/components/modal-tab.js | 4 +- .../app/components/modal/activation-edit.js | 4 +- .../app/components/modal/auth-token.js | 4 +- .../app/components/modal/bookmark.js | 28 +-- .../app/components/modal/change-owner.js | 8 +- .../components/modal/change-post-notice.js | 2 +- .../app/components/modal/change-timestamp.js | 4 +- .../app/components/modal/create-invite.js | 6 +- .../modal/customize-form-template-view.js | 6 +- .../app/components/modal/discard-draft.js | 2 +- .../app/components/modal/dismiss-new.gjs | 4 +- .../app/components/modal/do-not-disturb.js | 2 +- .../app/components/modal/download-calendar.js | 4 +- .../app/components/modal/edit-slow-mode.js | 6 +- .../app/components/modal/edit-topic-timer.js | 10 +- .../modal/edit-user-directory-columns.js | 4 +- .../app/components/modal/feature-topic.js | 10 +- .../discourse/app/components/modal/flag.js | 6 +- .../app/components/modal/forgot-password.js | 10 +- .../app/components/modal/fullscreen-code.js | 2 +- .../app/components/modal/grant-badge.js | 12 +- .../app/components/modal/group-add-members.js | 8 +- .../discourse/app/components/modal/history.js | 16 +- .../modal/ignore-duration-with-username.js | 4 +- .../app/components/modal/insert-hyperlink.js | 4 +- .../components/modal/json-schema-editor.js | 10 +- .../modal/keyboard-shortcuts-help.js | 6 +- .../discourse/app/components/modal/login.js | 12 +- .../modal/login/local-login-form.js | 12 +- .../app/components/modal/move-to-topic.js | 10 +- .../app/components/modal/not-activated.js | 2 +- .../app/components/modal/publish-page.js | 4 +- .../modal/request-group-membership-form.js | 4 +- .../modal/second-factor-add-security-key.js | 10 +- .../modal/second-factor-add-totp.js | 4 +- .../modal/second-factor-backup-edit.js | 6 +- .../modal/second-factor-edit-security-key.js | 2 +- .../components/modal/second-factor-edit.js | 2 +- .../app/components/modal/share-topic.js | 12 +- .../components/modal/sidebar-section-form.js | 18 +- .../components/modal/topic-bulk-actions.js | 12 +- .../app/components/modal/user-status.js | 6 +- .../discourse/app/components/more-topics.js | 4 +- .../discourse/app/components/mount-widget.js | 10 +- .../discourse/app/components/nav-item.js | 6 +- .../app/components/navigation-bar.js | 8 +- .../app/components/navigation-item.js | 8 +- .../components/notification-consent-banner.js | 2 +- .../discourse/app/components/number-field.js | 2 +- .../app/components/page-loading-slider.js | 6 +- .../discourse/app/components/pending-post.js | 6 +- .../app/components/pick-files-button.js | 4 +- .../app/components/plugin-connector.js | 4 +- .../discourse/app/components/plugin-outlet.js | 11 +- .../app/components/popup-input-tip.js | 6 +- .../post-text-selection-toolbar.gjs | 26 +-- .../app/components/post-text-selection.gjs | 22 +- .../app/components/preference-checkbox.js | 2 +- .../app/components/pwa-install-banner.js | 2 +- .../app/components/related-messages.js | 2 +- .../app/components/relative-time-picker.js | 6 +- .../app/components/responsive-table.js | 2 +- .../components/reviewable-bundled-action.gjs | 10 +- .../components/reviewable-claimed-topic.js | 2 +- .../components/reviewable-field-category.js | 2 +- .../app/components/reviewable-flagged-post.js | 2 +- .../app/components/reviewable-item.js | 22 +- .../app/components/reviewable-post-edits.js | 6 +- .../app/components/reviewable-score.js | 2 +- .../discourse/app/components/save-controls.js | 2 +- .../app/components/scroll-tracker.js | 2 +- .../app/components/scrolling-post-stream.js | 12 +- .../app/components/search-advanced-options.js | 4 +- .../discourse/app/components/search-menu.js | 18 +- .../search-menu/browser-search-tip.js | 2 +- .../search-menu/highlighted-search.js | 2 +- .../app/components/search-menu/results.js | 12 +- .../search-menu/results/assistant-item.js | 6 +- .../search-menu/results/initial-options.js | 4 +- .../search-menu/results/more-link.js | 2 +- .../search-menu/results/random-quick-tip.js | 4 +- .../search-menu/results/recent-searches.js | 2 +- .../components/search-menu/results/types.js | 6 +- .../app/components/search-menu/search-term.js | 4 +- .../app/components/search-text-field.js | 4 +- .../app/components/second-factor-form.js | 2 +- .../app/components/second-factor-input.js | 2 +- .../app/components/security-key-dropdown.js | 4 +- .../discourse/app/components/share-panel.js | 8 +- .../app/components/shared-draft-controls.js | 4 +- .../discourse/app/components/sidebar.js | 2 +- .../sidebar/anonymous/tags-section.js | 1 - .../sidebar/common/categories-section.js | 5 +- .../sidebar/common/custom-section.js | 5 +- .../edit-navigation-menu/categories-modal.js | 9 +- .../sidebar/edit-navigation-menu/modal.js | 2 +- .../edit-navigation-menu/tags-modal.js | 3 +- .../app/components/sidebar/footer.js | 2 +- .../components/sidebar/more-section-links.js | 3 +- .../components/sidebar/section-form-link.js | 2 +- .../app/components/sidebar/section.js | 5 +- .../sidebar/switch-panel-buttons.js | 4 +- .../sidebar/user/categories-section.js | 9 +- .../sidebar/user/custom-sections.js | 2 +- .../sidebar/user/messages-section.js | 9 +- .../components/sidebar/user/tags-section.js | 9 +- .../discourse/app/components/signup-cta.js | 2 +- .../discourse/app/components/site-header.js | 18 +- .../app/components/slow-mode-info.js | 4 +- .../app/components/software-update-prompt.js | 8 +- .../discourse/app/components/summary-box.js | 6 +- .../app/components/table-header-toggle.js | 4 +- .../discourse/app/components/tag-drop-link.js | 2 +- .../app/components/tag-groups-form.js | 10 +- .../discourse/app/components/tag-info.js | 14 +- .../discourse/app/components/tag-list.js | 6 +- .../app/components/tags-admin-dropdown.js | 4 +- .../discourse/app/components/tap-tile.js | 2 +- .../discourse/app/components/text-field.js | 6 +- .../discourse/app/components/time-input.js | 4 +- .../app/components/time-shortcut-picker.js | 11 +- .../components/token-based-auth-dropdown.js | 4 +- .../app/components/top-period-buttons.js | 2 +- .../app/components/topic-dismiss-buttons.js | 6 +- .../app/components/topic-entrance.js | 8 +- .../app/components/topic-footer-buttons.js | 6 +- .../app/components/topic-list-item.js | 24 +-- .../discourse/app/components/topic-list.js | 6 +- .../app/components/topic-navigation.js | 6 +- .../app/components/topic-post-badges.js | 2 +- .../app/components/topic-progress.js | 6 +- .../discourse/app/components/topic-status.js | 6 +- .../app/components/topic-timeline.js | 6 +- .../components/topic-timeline/container.js | 10 +- .../app/components/topic-timeline/scroller.js | 2 +- .../app/components/topic-timer-info.js | 16 +- .../discourse/app/components/topic-title.js | 2 +- .../components/two-factor-backup-dropdown.js | 4 +- .../app/components/uppy-backup-uploader.js | 2 +- .../app/components/uppy-image-uploader.js | 10 +- .../app/components/user-card-contents.js | 18 +- .../app/components/user-flag-percentage.js | 2 +- .../discourse/app/components/user-info.js | 4 +- .../components/user-menu/bookmarks-list.js | 6 +- .../app/components/user-menu/menu-item.js | 4 +- .../app/components/user-menu/menu.js | 20 +- .../app/components/user-menu/messages-list.js | 10 +- .../user-menu/notifications-list.js | 12 +- .../user-menu/profile-tab-content.js | 4 +- .../components/user-menu/reviewables-list.js | 8 +- .../components/user-notification-schedule.js | 4 +- .../app/components/user-status-message.js | 2 +- .../app/components/user-stream-item.js | 2 +- .../discourse/app/components/user-stream.js | 16 +- .../app/components/user-tip-container.gjs | 4 +- .../discourse/app/components/user-tip.gjs | 10 +- .../app/components/username-preference.js | 12 +- .../discourse/app/components/watch-read.js | 4 +- .../discourse/app/controllers/about.js | 4 +- .../controllers/account-created-edit-email.js | 4 +- .../app/controllers/account-created-index.js | 8 +- .../discourse/app/controllers/application.js | 6 +- .../controllers/associate-account-confirm.js | 4 +- .../app/controllers/avatar-selector.js | 10 +- .../discourse/app/controllers/badges/show.js | 6 +- .../discourse/app/controllers/composer.js | 10 +- .../app/controllers/create-account.js | 40 ++-- .../app/controllers/discovery-filter.js | 2 +- .../discourse/app/controllers/discovery.js | 6 +- .../app/controllers/discovery/categories.js | 4 +- .../app/controllers/discovery/topics.js | 18 +- .../app/controllers/edit-category-tabs.js | 18 +- .../discourse/app/controllers/email-login.js | 14 +- .../discourse/app/controllers/exception.js | 14 +- .../app/controllers/full-page-search.js | 32 +-- .../discourse/app/controllers/group-index.js | 8 +- .../app/controllers/group-requests.js | 4 +- .../discourse/app/controllers/group.js | 6 +- .../discourse/app/controllers/groups-index.js | 8 +- .../discourse/app/controllers/groups-new.js | 4 +- .../discourse/app/controllers/invites-show.js | 18 +- .../app/controllers/navigation/categories.js | 2 +- .../app/controllers/navigation/category.js | 6 +- .../app/controllers/navigation/default.js | 10 +- .../app/controllers/navigation/filter.js | 4 +- .../app/controllers/password-reset.js | 14 +- .../app/controllers/preferences/account.js | 22 +- .../app/controllers/preferences/categories.js | 2 +- .../app/controllers/preferences/email.js | 8 +- .../app/controllers/preferences/emails.js | 4 +- .../app/controllers/preferences/interface.js | 18 +- .../preferences/navigation-menu.js | 5 +- .../controllers/preferences/notifications.js | 2 +- .../app/controllers/preferences/profile.js | 12 +- .../controllers/preferences/second-factor.js | 18 +- .../app/controllers/preferences/security.js | 6 +- .../app/controllers/preferences/tags.js | 2 +- .../app/controllers/preferences/tracking.js | 8 +- .../app/controllers/preferences/users.js | 6 +- .../controllers/reject-reason-reviewable.js | 2 +- .../app/controllers/reorder-categories.js | 8 +- .../discourse/app/controllers/review-index.js | 6 +- .../app/controllers/review-settings.js | 4 +- .../app/controllers/second-factor-auth.js | 12 +- .../discourse/app/controllers/tag-show.js | 16 +- .../discourse/app/controllers/tags-index.js | 10 +- .../discourse/app/controllers/topic.js | 58 +++--- .../controllers/user-activity-bookmarks.js | 10 +- .../app/controllers/user-activity.js | 4 +- .../app/controllers/user-invited-show.js | 10 +- .../app/controllers/user-notifications.js | 8 +- .../user-private-messages-group.js | 2 +- .../user-private-messages-tags-index.js | 2 +- .../controllers/user-private-messages-tags.js | 2 +- .../controllers/user-private-messages-user.js | 2 +- .../app/controllers/user-private-messages.js | 6 +- .../discourse/app/controllers/user-summary.js | 2 +- .../app/controllers/user-topics-list.js | 5 +- .../discourse/app/controllers/user.js | 14 +- .../discourse/app/controllers/users.js | 6 +- .../discourse/app/global-compat.js | 2 +- .../discourse/app/helpers/application.js | 4 +- .../app/helpers/bound-avatar-template.js | 2 +- .../discourse/app/helpers/bound-avatar.js | 2 +- .../discourse/app/helpers/category-badge.js | 2 +- .../discourse/app/helpers/category-link.js | 12 +- .../discourse/app/helpers/custom-html.js | 2 +- .../discourse/app/helpers/dir-span.js | 2 +- .../helpers/directory-table-header-title.js | 6 +- .../discourse/app/helpers/discourse-tag.js | 2 +- .../discourse/app/helpers/discourse-tags.js | 2 +- .../discourse/app/helpers/emoji.js | 2 +- .../discourse/app/helpers/format-age.js | 2 +- .../discourse/app/helpers/format-date.js | 2 +- .../discourse/app/helpers/icon-or-image.js | 4 +- .../discourse/app/helpers/inline-date.js | 2 +- .../javascripts/discourse/app/helpers/node.js | 2 +- .../discourse/app/helpers/period-title.js | 2 +- .../app/helpers/raw-plugin-outlet.js | 2 +- .../javascripts/discourse/app/helpers/raw.js | 10 +- .../discourse/app/helpers/replace-emoji.js | 2 +- .../helpers/reviewable-history-description.js | 8 +- .../app/helpers/reviewable-status.js | 4 +- .../discourse/app/helpers/route-action.js | 6 +- .../discourse/app/helpers/theme-helpers.js | 2 +- .../app/helpers/topic-featured-link.js | 2 +- .../discourse/app/helpers/user-avatar.js | 6 +- .../discourse/app/helpers/user-status.js | 4 +- .../app/initializers/discourse-bootstrap.js | 16 +- .../initializers/dynamic-route-builders.js | 4 +- .../initializers/inject-discourse-objects.js | 6 +- .../animated-images-pause-on-click.js | 4 +- .../instance-initializers/auth-complete.js | 10 +- .../auto-load-modules.js | 4 +- .../app/instance-initializers/banner.js | 2 +- .../click-interceptor.js | 2 +- .../codeblock-buttons.js | 2 +- .../component-templates.js | 2 +- .../app/instance-initializers/enable-emoji.js | 2 +- .../instance-initializers/handle-cookies.js | 6 +- .../hashtag-post-decorations.js | 2 +- .../instance-initializers/inject-objects.js | 4 +- .../instance-initializers/jquery-plugins.js | 4 +- .../keyboard-shortcuts.js | 2 +- .../app/instance-initializers/localization.js | 2 +- .../app/instance-initializers/logout.js | 2 +- .../app/instance-initializers/logs-notice.js | 2 +- .../app/instance-initializers/message-bus.js | 4 +- .../instance-initializers/page-tracking.js | 2 +- .../instance-initializers/post-decorations.js | 18 +- .../register-hashtag-types.js | 2 +- ...ter-media-optimization-upload-processor.js | 2 +- .../instance-initializers/sharing-sources.js | 2 +- .../subscribe-user-notifications.js | 2 +- .../topic-footer-buttons.js | 6 +- .../discourse/app/lib/ajax-error.js | 4 +- .../javascripts/discourse/app/lib/ajax.js | 6 +- .../discourse/app/lib/autocomplete.js | 10 +- .../javascripts/discourse/app/lib/bookmark.js | 6 +- .../discourse/app/lib/bulk-select-helper.js | 8 +- .../discourse/app/lib/category-tag-search.js | 10 +- .../discourse/app/lib/click-track.js | 12 +- .../discourse/app/lib/codeblock-buttons.js | 12 +- .../discourse/app/lib/color-scheme-picker.js | 6 +- .../javascripts/discourse/app/lib/computed.js | 4 +- .../app/lib/desktop-notifications.js | 8 +- .../discourse/app/lib/discourse-location.js | 2 +- .../discourse/app/lib/download-calendar.js | 6 +- .../discourse/app/lib/ember-events.js | 2 +- .../discourse/app/lib/export-csv.js | 2 +- .../discourse/app/lib/export-result.js | 2 +- .../app/lib/flag-targets/topic-flag.js | 2 +- .../discourse/app/lib/formatter.js | 6 +- .../discourse/app/lib/hashtag-autocomplete.js | 16 +- .../app/lib/hashtag-types/category.js | 2 +- .../discourse/app/lib/hashtag-types/tag.js | 2 +- .../discourse/app/lib/highlight-search.js | 2 +- .../discourse/app/lib/highlight-syntax.js | 2 +- .../discourse/app/lib/implicit-injections.js | 9 +- .../discourse/app/lib/keyboard-shortcuts.js | 16 +- .../javascripts/discourse/app/lib/lightbox.js | 11 +- .../app/lib/lightbox/process-html.js | 2 +- .../discourse/app/lib/link-hashtags.js | 6 +- .../discourse/app/lib/link-mentions.js | 2 +- .../discourse/app/lib/load-oneboxes.js | 2 +- .../discourse/app/lib/load-script.js | 8 +- .../javascripts/discourse/app/lib/lock-on.js | 2 +- .../javascripts/discourse/app/lib/logout.js | 4 +- .../app/lib/notification-types-manager.js | 9 +- .../app/lib/notification-types/base.js | 6 +- .../notification-types/bookmark-reminder.js | 2 +- .../discourse/app/lib/optional-service.js | 2 +- .../discourse/app/lib/page-tracker.js | 2 +- .../discourse/app/lib/plugin-api.js | 190 +++++++++--------- .../discourse/app/lib/plugin-connectors.js | 4 +- .../discourse/app/lib/push-notifications.js | 2 +- .../discourse/app/lib/put-cursor-at-end.js | 2 +- .../discourse/app/lib/raw-render-glimmer.js | 2 +- .../app/lib/register-topic-footer-button.js | 2 +- .../discourse/app/lib/render-tag.js | 4 +- .../discourse/app/lib/render-tags.js | 2 +- .../app/lib/render-topic-featured-link.js | 2 +- .../app/lib/reviewable-types-manager.js | 1 - .../app/lib/reviewable-types/flagged-post.js | 4 +- .../app/lib/reviewable-types/queued-post.js | 4 +- .../javascripts/discourse/app/lib/search.js | 22 +- .../community-section/about-section-link.js | 3 +- .../community-section/badges-section-link.js | 3 +- .../everything-section-link.js | 3 +- .../community-section/faq-section-link.js | 3 +- .../community-section/groups-section-link.js | 3 +- .../common/community-section/section.js | 19 +- .../community-section/users-section-link.js | 3 +- .../app/lib/sidebar/custom-sections.js | 2 +- .../discourse/app/lib/sidebar/section-link.js | 4 +- .../discourse/app/lib/sidebar/section.js | 8 +- .../category-section-link.js | 6 +- .../community-section/admin-section-link.js | 3 +- .../user/community-section/admin-section.js | 5 +- .../my-posts-section-link.js | 3 +- .../community-section/review-section-link.js | 2 +- .../group-message-section-link.js | 3 +- .../messages-section/message-section-link.js | 1 - .../personal-message-section-link.js | 3 +- .../user/tags-section/tag-section-link.js | 6 +- .../discourse/app/lib/source-identifier.js | 2 +- .../javascripts/discourse/app/lib/text.js | 16 +- .../discourse/app/lib/theme-selector.js | 2 +- .../discourse/app/lib/time-shortcut.js | 6 +- .../discourse/app/lib/topic-fancy-title.js | 2 +- .../discourse/app/lib/transform-post.js | 2 +- .../app/lib/update-user-status-on-mention.js | 2 +- .../javascripts/discourse/app/lib/uploads.js | 4 +- .../discourse/app/lib/uppy-checksum-plugin.js | 2 +- .../discourse/app/lib/uppy-chunked-upload.js | 4 +- .../app/lib/uppy-chunked-uploader-plugin.js | 6 +- .../app/lib/uppy-media-optimization-plugin.js | 2 +- .../discourse/app/lib/uppy-plugin-base.js | 2 +- .../javascripts/discourse/app/lib/url.js | 14 +- .../discourse/app/lib/user-menu/base-item.js | 2 +- .../app/lib/user-menu/message-item.js | 4 +- .../app/lib/user-menu/notification-item.js | 6 +- .../app/lib/user-menu/reviewable-item.js | 2 +- .../discourse/app/lib/user-search.js | 10 +- .../discourse/app/lib/user-status-message.js | 8 +- .../discourse/app/lib/utilities.js | 8 +- .../discourse/app/lib/waving-hand-url.js | 2 +- .../discourse/app/mapping-router.js | 8 +- .../discourse/app/mixins/buffered-content.js | 4 +- .../discourse/app/mixins/can-check-emails.js | 2 +- .../app/mixins/card-contents-base.js | 10 +- .../discourse/app/mixins/cleans-up.js | 2 +- .../app/mixins/composer-upload-uppy.js | 30 +-- .../mixins/composer-video-thumbnail-uppy.js | 12 +- .../discourse/app/mixins/dismiss-topics.js | 2 +- .../discourse/app/mixins/docking.js | 2 +- .../discourse/app/mixins/load-more.js | 2 +- .../discourse/app/mixins/name-validation.js | 4 +- .../app/mixins/password-validation.js | 4 +- .../rerender-on-do-not-disturb-change.js | 4 +- .../discourse/app/mixins/scroll-top.js | 2 +- .../app/mixins/textarea-text-manipulation.js | 12 +- .../discourse/app/mixins/upload-debugging.js | 2 +- .../discourse/app/mixins/uppy-s3-multipart.js | 6 +- .../discourse/app/mixins/uppy-upload.js | 26 +-- .../app/mixins/user-fields-validation.js | 4 +- .../app/mixins/username-validation.js | 6 +- .../discourse/app/models/action-summary.js | 4 +- .../discourse/app/models/archetype.js | 2 +- .../discourse/app/models/badge-grouping.js | 2 +- .../javascripts/discourse/app/models/badge.js | 12 +- .../discourse/app/models/bookmark.js | 22 +- .../discourse/app/models/category-list.js | 10 +- .../discourse/app/models/category.js | 6 +- .../discourse/app/models/composer.js | 26 +-- .../discourse/app/models/group-history.js | 2 +- .../javascripts/discourse/app/models/group.js | 12 +- .../discourse/app/models/invite.js | 10 +- .../discourse/app/models/login-method.js | 6 +- .../discourse/app/models/nav-item.js | 18 +- .../discourse/app/models/notification.js | 2 +- .../discourse/app/models/pending-post.js | 8 +- .../discourse/app/models/permission-type.js | 2 +- .../discourse/app/models/post-action-type.js | 2 +- .../discourse/app/models/post-stream.js | 28 +-- .../javascripts/discourse/app/models/post.js | 22 +- .../discourse/app/models/published-page.js | 2 +- .../javascripts/discourse/app/models/rest.js | 8 +- .../app/models/reviewable-history.js | 2 +- .../discourse/app/models/reviewable.js | 6 +- .../discourse/app/models/session.js | 2 +- .../javascripts/discourse/app/models/site.js | 10 +- .../javascripts/discourse/app/models/tag.js | 2 +- .../discourse/app/models/topic-details.js | 4 +- .../discourse/app/models/topic-list.js | 10 +- .../discourse/app/models/topic-timer.js | 2 +- .../app/models/topic-tracking-state.js | 12 +- .../javascripts/discourse/app/models/topic.js | 36 ++-- .../discourse/app/models/user-action-stat.js | 2 +- .../discourse/app/models/user-action.js | 8 +- .../discourse/app/models/user-badge.js | 6 +- .../discourse/app/models/user-draft.js | 6 +- .../app/models/user-drafts-stream.js | 4 +- .../app/models/user-menu-reviewable.js | 2 +- .../discourse/app/models/user-posts-stream.js | 4 +- .../discourse/app/models/user-stream.js | 8 +- .../javascripts/discourse/app/models/user.js | 52 ++--- .../discourse/app/modifiers/draggable.js | 2 +- .../discourse/app/modifiers/sticky-avatars.js | 8 +- .../discourse/app/modifiers/trap-tab.js | 2 +- .../raw-views/list/post-count-or-badges.js | 4 +- .../app/raw-views/list/posts-count-column.js | 2 +- .../app/raw-views/topic-list-header-column.js | 4 +- .../discourse/app/raw-views/topic-status.js | 2 +- .../javascripts/discourse/app/routes/about.js | 2 +- .../discourse/app/routes/app-route-map.js | 2 +- .../discourse/app/routes/application.js | 26 +-- .../discourse/app/routes/associate-account.js | 10 +- .../discourse/app/routes/badges-index.js | 2 +- .../discourse/app/routes/badges-show.js | 8 +- .../app/routes/build-category-route.js | 12 +- .../app/routes/build-group-messages-route.js | 2 +- .../build-private-messages-group-route.js | 4 +- .../routes/build-private-messages-route.js | 10 +- .../discourse/app/routes/build-topic-route.js | 14 +- .../discourse/app/routes/discourse.js | 6 +- .../app/routes/discovery-categories.js | 18 +- .../discourse/app/routes/discovery-filter.js | 5 +- .../discourse/app/routes/discovery.js | 8 +- .../app/routes/edit-category-index.js | 2 +- .../discourse/app/routes/edit-category.js | 2 +- .../discourse/app/routes/email-login.js | 2 +- .../javascripts/discourse/app/routes/faq.js | 2 +- .../discourse/app/routes/forgot-password.js | 6 +- .../discourse/app/routes/full-page-search.js | 10 +- .../app/routes/group-activity-posts.js | 2 +- .../discourse/app/routes/group-index.js | 6 +- .../app/routes/group-manage-email.js | 2 +- .../app/routes/group-manage-index.js | 2 +- .../discourse/app/routes/group-manage-logs.js | 2 +- .../app/routes/group-manage-membership.js | 2 +- .../discourse/app/routes/group-manage.js | 2 +- .../discourse/app/routes/group-members.js | 2 +- .../discourse/app/routes/group-messages.js | 4 +- .../discourse/app/routes/group-permissions.js | 6 +- .../discourse/app/routes/groups-new.js | 6 +- .../discourse/app/routes/invites-show.js | 6 +- .../javascripts/discourse/app/routes/login.js | 4 +- .../discourse/app/routes/new-category.js | 6 +- .../discourse/app/routes/new-message.js | 8 +- .../discourse/app/routes/new-topic.js | 6 +- .../discourse/app/routes/password-reset.js | 8 +- .../javascripts/discourse/app/routes/post.js | 2 +- .../app/routes/preferences-account.js | 6 +- .../discourse/app/routes/preferences-index.js | 2 +- .../app/routes/preferences-interface.js | 2 +- .../app/routes/preferences-navigation-menu.js | 2 +- .../app/routes/preferences-second-factor.js | 2 +- .../discourse/app/routes/preferences.js | 2 +- .../discourse/app/routes/privacy.js | 2 +- .../discourse/app/routes/restricted-user.js | 2 +- .../discourse/app/routes/review-index.js | 4 +- .../app/routes/second-factor-auth.js | 4 +- .../discourse/app/routes/signup.js | 4 +- .../discourse/app/routes/tag-groups-new.js | 2 +- .../discourse/app/routes/tag-show.js | 22 +- .../discourse/app/routes/tags-index.js | 6 +- .../app/routes/topic-by-slug-or-id.js | 2 +- .../discourse/app/routes/topic-from-params.js | 10 +- .../javascripts/discourse/app/routes/topic.js | 26 +-- .../javascripts/discourse/app/routes/tos.js | 2 +- .../discourse/app/routes/unknown.js | 4 +- .../user-activity-bookmarks-with-reminders.js | 2 +- .../app/routes/user-activity-bookmarks.js | 2 +- .../app/routes/user-activity-index.js | 8 +- .../app/routes/user-activity-likes-given.js | 2 +- .../app/routes/user-activity-pending.js | 4 +- .../app/routes/user-activity-read.js | 6 +- .../app/routes/user-activity-replies.js | 4 +- .../app/routes/user-activity-stream.js | 2 +- .../app/routes/user-activity-topics.js | 4 +- .../discourse/app/routes/user-activity.js | 2 +- .../discourse/app/routes/user-badges.js | 4 +- .../app/routes/user-deleted-posts.js | 2 +- .../discourse/app/routes/user-index.js | 2 +- .../app/routes/user-invited-index.js | 2 +- .../discourse/app/routes/user-invited-show.js | 6 +- .../app/routes/user-notifications-index.js | 2 +- .../app/routes/user-notifications.js | 2 +- .../app/routes/user-private-messages-group.js | 2 +- .../user-private-messages-tags-index.js | 4 +- .../app/routes/user-private-messages.js | 6 +- .../discourse/app/routes/user-summary.js | 2 +- .../discourse/app/routes/user-topic-list.js | 4 +- .../javascripts/discourse/app/routes/user.js | 6 +- .../javascripts/discourse/app/routes/users.js | 8 +- .../app/services/admin-post-menu-buttons.js | 2 +- .../discourse/app/services/body-classes.js | 2 +- .../app/services/client-error-handler.js | 16 +- .../discourse/app/services/composer.js | 68 +++---- .../discourse/app/services/document-title.js | 4 +- .../discourse/app/services/emoji-store.js | 2 +- .../discourse/app/services/footer.js | 4 +- .../discourse/app/services/key-value-store.js | 2 +- .../discourse/app/services/lightbox.js | 8 +- .../discourse/app/services/loading-slider.js | 6 +- .../discourse/app/services/logs-notice.js | 12 +- .../app/services/media-optimization-worker.js | 2 +- .../discourse/app/services/modal.js | 8 +- .../more-topics-preference-tracking.js | 2 +- .../app/services/network-connectivity.js | 10 +- .../app/services/pm-topic-tracking-state.js | 8 +- .../discourse/app/services/presence.js | 14 +- .../app/services/route-scroll-manager.js | 6 +- .../discourse/app/services/screen-track.js | 8 +- .../discourse/app/services/search.js | 4 +- .../discourse/app/services/sidebar-state.js | 4 +- .../discourse/app/services/site-settings.js | 2 +- .../discourse/app/services/store.js | 8 +- .../discourse/app/services/user-tips.js | 10 +- .../discourse/app/widgets/actions-summary.js | 8 +- .../admin-problems-notification-item.js | 2 +- .../discourse/app/widgets/avatar-flair.js | 4 +- .../bookmark-reminder-notification-item.js | 6 +- .../discourse/app/widgets/button.js | 6 +- .../discourse/app/widgets/category-link.js | 2 +- .../app/widgets/custom-notification-item.js | 6 +- .../discourse/app/widgets/decorator-helper.js | 2 +- .../app/widgets/default-notification-item.js | 14 +- .../discourse/app/widgets/discourse-tags.js | 2 +- .../discourse/app/widgets/do-not-disturb.js | 10 +- .../discourse/app/widgets/embedded-post.js | 4 +- .../discourse/app/widgets/emoji.js | 2 +- .../javascripts/discourse/app/widgets/glue.js | 2 +- ...group-message-summary-notification-item.js | 2 +- .../app/widgets/hamburger-categories.js | 8 +- .../discourse/app/widgets/hamburger-menu.js | 10 +- .../discourse/app/widgets/header-contents.js | 2 +- .../app/widgets/header-topic-info.js | 14 +- .../discourse/app/widgets/header.js | 20 +- .../discourse/app/widgets/home-logo.js | 4 +- .../invitee-accepted-notification-item.js | 2 +- .../liked-consolidated-notification-item.js | 8 +- .../app/widgets/liked-notification-item.js | 6 +- .../javascripts/discourse/app/widgets/link.js | 6 +- ...ship-request-accepted-notification-item.js | 6 +- ...-request-consolidated-notification-item.js | 6 +- .../discourse/app/widgets/menu-panel.js | 2 +- .../widgets/new-features-notification-item.js | 2 +- .../discourse/app/widgets/post-cooked.js | 16 +- .../app/widgets/post-edits-indicator.js | 4 +- .../discourse/app/widgets/post-gap.js | 2 +- .../discourse/app/widgets/post-links.js | 4 +- .../discourse/app/widgets/post-menu.js | 16 +- .../discourse/app/widgets/post-placeholder.js | 2 +- .../app/widgets/post-small-action.js | 16 +- .../discourse/app/widgets/post-stream.js | 10 +- .../discourse/app/widgets/post-user-status.js | 4 +- .../javascripts/discourse/app/widgets/post.js | 36 ++-- .../discourse/app/widgets/poster-name.js | 10 +- .../app/widgets/private-message-map.js | 8 +- .../discourse/app/widgets/render-glimmer.js | 4 +- .../app/widgets/search-menu-controls.js | 2 +- .../app/widgets/search-menu-results.js | 30 +-- .../discourse/app/widgets/search-menu.js | 16 +- .../discourse/app/widgets/time-gap.js | 4 +- .../discourse/app/widgets/topic-admin-menu.js | 2 +- .../discourse/app/widgets/topic-map.js | 12 +- .../app/widgets/topic-post-visited-line.js | 4 +- .../discourse/app/widgets/topic-status.js | 8 +- .../app/widgets/user-notifications-large.js | 6 +- .../discourse/app/widgets/widget-dropdown.js | 8 +- .../discourse/app/widgets/widget.js | 18 +- .../discourse/tests/acceptance/about-test.js | 4 +- .../tests/acceptance/account-created-test.js | 6 +- .../acceptance/admin-badges-award-test.js | 4 +- .../acceptance/admin-badges-show-test.js | 4 +- .../tests/acceptance/admin-emails-test.js | 2 +- .../admin-install-theme-modal-test.js | 2 +- .../acceptance/admin-penalize-user-test.js | 2 +- .../tests/acceptance/admin-permalink-test.js | 2 +- .../tests/acceptance/admin-plugins-test.js | 2 +- .../acceptance/admin-search-log-term-test.js | 4 +- .../acceptance/admin-search-logs-test.js | 2 +- .../acceptance/admin-site-settings-test.js | 16 +- .../tests/acceptance/admin-site-text-test.js | 4 +- .../acceptance/admin-user-badges-test.js | 4 +- .../acceptance/admin-user-emails-test.js | 4 +- .../tests/acceptance/admin-user-index-test.js | 6 +- .../tests/acceptance/admin-users-list-test.js | 4 +- .../acceptance/admin-watched-words-test.js | 4 +- .../tests/acceptance/admin-webhooks-test.js | 2 +- .../tests/acceptance/assets-version-test.js | 8 +- .../tests/acceptance/auth-complete-test.js | 2 +- .../discourse/tests/acceptance/badges-test.js | 4 +- .../discourse/tests/acceptance/banner-test.js | 4 +- .../acceptance/bootstrap-mode-notice-test.js | 4 +- .../tests/acceptance/categories-test.js | 9 +- .../tests/acceptance/category-banner-test.js | 6 +- .../tests/acceptance/category-chooser-test.js | 2 +- .../acceptance/category-edit-security-test.js | 6 +- .../tests/acceptance/category-edit-test.js | 12 +- .../tests/acceptance/category-new-test.js | 10 +- .../tests/acceptance/click-track-test.js | 4 +- .../tests/acceptance/composer-actions-test.js | 14 +- .../acceptance/composer-draft-saving-test.js | 4 +- .../acceptance/composer-edit-conflict-test.js | 2 +- .../composer-editor-mentions-test.js | 4 +- .../acceptance/composer-form-template-test.js | 4 +- .../acceptance/composer-hyperlink-test.js | 2 +- .../acceptance/composer-image-grid-test.js | 2 +- .../acceptance/composer-image-preview-test.js | 2 +- .../acceptance/composer-messages-test.js | 10 +- .../tests/acceptance/composer-onebox-test.js | 4 +- .../tests/acceptance/composer-tags-test.js | 8 +- .../tests/acceptance/composer-test.js | 12 +- .../acceptance/composer-topic-links-test.js | 4 +- .../acceptance/composer-uncategorized-test.js | 4 +- .../acceptance/composer-uploads-uppy-test.js | 12 +- .../create-account-external-test.js | 4 +- .../create-account-from-login-test.js | 2 +- .../create-account-user-fields-test.js | 4 +- .../acceptance/create-invite-modal-test.js | 2 +- .../tests/acceptance/css-generator-test.js | 2 +- .../tests/acceptance/custom-html-set-test.js | 8 +- .../acceptance/custom-html-template-test.js | 4 +- .../tests/acceptance/d-lightbox-test.js | 27 ++- .../tests/acceptance/dashboard-test.js | 4 +- .../tests/acceptance/do-not-disturb-test.js | 6 +- .../edit-notification-click-test.js | 2 +- .../tests/acceptance/email-notice-test.js | 4 +- .../tests/acceptance/emoji-picker-test.js | 4 +- .../discourse/tests/acceptance/emoji-test.js | 6 +- .../tests/acceptance/encoded-category-test.js | 6 +- .../acceptance/enforce-second-factor-test.js | 4 +- .../tests/acceptance/fast-edit-test.js | 6 +- .../tests/acceptance/flag-post-test.js | 6 +- .../tests/acceptance/forgot-password-test.js | 4 +- .../acceptance/glimmer-search-mobile-test.js | 4 +- .../tests/acceptance/glimmer-search-test.js | 10 +- .../tests/acceptance/globals-test.js | 8 +- .../tests/acceptance/group-index-test.js | 6 +- .../group-manage-categories-test.js | 4 +- .../group-manage-email-settings-test.js | 4 +- .../group-manage-interaction-test.js | 4 +- .../acceptance/group-manage-logs-test.js | 4 +- .../group-manage-membership-test.js | 6 +- .../acceptance/group-manage-profile-test.js | 4 +- .../group-manage-save-button-test.js | 4 +- .../acceptance/group-manage-tags-test.js | 4 +- .../tests/acceptance/group-requests-test.js | 4 +- .../discourse/tests/acceptance/group-test.js | 6 +- .../tests/acceptance/groups-index-test.js | 4 +- .../tests/acceptance/groups-new-test.js | 4 +- .../acceptance/hashtag-autocomplete-test.js | 4 +- .../tests/acceptance/history-test.js | 4 +- .../acceptance/image-aspect-ratio-test.js | 2 +- .../acceptance/implicit-injections-test.js | 6 +- .../tests/acceptance/invite-accept-test.js | 6 +- .../invite-show-user-fields-test.js | 4 +- .../tests/acceptance/jump-to-test.js | 2 +- .../acceptance/keyboard-shortcuts-test.js | 8 +- .../tests/acceptance/lightbox-test.js | 4 +- .../acceptance/loading-indicator-test.js | 4 +- .../tests/acceptance/login-redirect-test.js | 2 +- .../tests/acceptance/login-required-test.js | 4 +- .../tests/acceptance/meta-tag-updater-test.js | 2 +- .../tests/acceptance/mobile-discovery-test.js | 4 +- .../tests/acceptance/mobile-pan-test.js | 2 +- .../tests/acceptance/mobile-sign-in-test.js | 2 +- .../mobile-topic-bulk-actions-test.js | 4 +- .../tests/acceptance/mobile-users-test.js | 4 +- .../tests/acceptance/modal-service-test.gjs | 12 +- .../tests/acceptance/modal/login-test.js | 4 +- .../acceptance/modal/login/login-test.js | 4 +- ...email-and-hide-email-address-taken-test.js | 4 +- ...in-with-email-and-no-social-logins-test.js | 4 +- .../login/login-with-email-disabled-test.js | 2 +- .../modal/login/login-with-email-test.js | 8 +- .../tests/acceptance/new-message-test.js | 6 +- .../tests/acceptance/new-topic-test.js | 4 +- .../tests/acceptance/new-topics-test.js | 6 +- .../acceptance/notifications-filter-test.js | 4 +- .../tests/acceptance/notifications-test.js | 4 +- .../tests/acceptance/page-publishing-test.js | 2 +- .../tests/acceptance/page-tracking-test.js | 6 +- .../tests/acceptance/password-reset-test.js | 12 +- .../tests/acceptance/pending-posts-test.js | 4 +- .../tests/acceptance/personal-message-test.js | 14 +- .../plugin-keyboard-shortcut-test.js | 6 +- .../plugin-outlet-decorator-test.js | 8 +- .../plugin-outlet-multi-template-test.js | 6 +- .../plugin-outlet-parent-view-test.js | 10 +- .../plugin-outlet-single-template-test.js | 6 +- .../tests/acceptance/post-admin-menu-test.js | 2 +- .../tests/acceptance/post-controls-test.js | 4 +- .../tests/acceptance/post-history-test.js | 2 +- .../acceptance/post-inline-mentions-test.js | 6 +- .../acceptance/post-table-wrapper-test.js | 2 +- .../tests/acceptance/preferences-test.js | 14 +- .../acceptance/raw-plugin-outlet-test.js | 6 +- .../tests/acceptance/redirect-to-top-test.js | 6 +- .../tests/acceptance/reports-test.js | 4 +- .../discourse/tests/acceptance/review-test.js | 6 +- .../tests/acceptance/search-full-test.js | 14 +- .../tests/acceptance/search-mobile-test.js | 4 +- .../discourse/tests/acceptance/search-test.js | 20 +- .../acceptance/second-factor-auth-test.js | 6 +- .../select-kit-accessibility-test.js | 4 +- .../tests/acceptance/share-topic-test.js | 6 +- .../tests/acceptance/shared-drafts-test.js | 4 +- ...debar-anonymous-categories-section-test.js | 4 +- ...idebar-anonymous-community-section-test.js | 6 +- .../acceptance/sidebar-anonymous-user-test.js | 4 +- .../acceptance/sidebar-narrow-desktop-test.js | 2 +- .../acceptance/sidebar-plugin-api-test.js | 20 +- .../sidebar-user-categories-section-test.js | 15 +- .../sidebar-user-community-section-test.js | 10 +- .../sidebar-user-messages-section-test.js | 6 +- .../sidebar-user-tags-section-test.js | 8 +- .../tests/acceptance/sidebar-user-test.js | 6 +- .../tests/acceptance/sign-in-test.js | 4 +- .../discourse/tests/acceptance/static-test.js | 2 +- .../tests/acceptance/tag-groups-test.js | 4 +- .../acceptance/tags-intersection-test.js | 4 +- .../discourse/tests/acceptance/tags-test.js | 6 +- .../discourse/tests/acceptance/themes-test.js | 2 +- .../tests/acceptance/topic-admin-menu-test.js | 4 +- .../tests/acceptance/topic-anonymous-test.js | 4 +- .../acceptance/topic-bulk-actions-test.js | 4 +- .../tests/acceptance/topic-discovery-test.js | 14 +- .../topic-discovery-tracked-test.js | 8 +- .../tests/acceptance/topic-edit-timer-test.js | 8 +- .../tests/acceptance/topic-entrance-test.js | 2 +- .../topic-footer-button-api-mobile-test.js | 6 +- .../topic-footer-button-api-test.js | 2 +- .../topic-footer-dropdown-api-test.js | 2 +- .../acceptance/topic-list-plugin-api-test.js | 6 +- .../acceptance/topic-list-tracker-test.js | 10 +- .../tests/acceptance/topic-move-posts-test.js | 4 +- .../topic-notifications-button-test.js | 4 +- .../topic-post-decorate-cooked-test.js | 6 +- .../acceptance/topic-quote-button-test.js | 8 +- .../acceptance/topic-set-slow-mode-test.js | 4 +- .../tests/acceptance/topic-slow-mode-test.js | 10 +- .../tests/acceptance/topic-summary-test.js | 6 +- .../discourse/tests/acceptance/topic-test.js | 24 +-- .../tests/acceptance/topic-timeline-test.js | 2 +- .../acceptance/topic-user-status-test.js | 6 +- .../tests/acceptance/unknown-test.js | 2 +- .../acceptance/user-activity-all-test.js | 4 +- .../acceptance/user-activity-drafts-test.js | 4 +- .../acceptance/user-activity-likes-test.js | 4 +- .../acceptance/user-activity-read-test.js | 4 +- .../acceptance/user-activity-replies-test.js | 4 +- .../acceptance/user-activity-topic-test.js | 6 +- .../tests/acceptance/user-anonymous-test.js | 2 +- .../tests/acceptance/user-bookmarks-test.js | 8 +- .../tests/acceptance/user-card-test.js | 10 +- .../acceptance/user-deleted-posts-test.js | 4 +- .../acceptance/user-drafts-stream-test.js | 6 +- .../tests/acceptance/user-menu-test.js | 16 +- .../user-preferences-account-test.js | 16 +- ...er-preferences-account-user-status-test.js | 4 +- .../acceptance/user-preferences-admin-test.js | 4 +- .../user-preferences-categories-test.js | 2 +- .../acceptance/user-preferences-email-test.js | 4 +- .../user-preferences-interface-test.js | 14 +- .../user-preferences-navigation-menu-test.js | 6 +- .../user-preferences-notifications-test.js | 4 +- .../user-preferences-profile-test.js | 4 +- ...r-preferences-second-factor-backup-test.js | 2 +- .../user-preferences-second-factor-test.js | 2 +- .../user-preferences-security-test.js | 4 +- .../user-preferences-tracking-test.js | 2 +- .../acceptance/user-private-messages-test.js | 20 +- .../acceptance/user-profile-summary-test.js | 8 +- .../tests/acceptance/user-status-test.js | 4 +- .../discourse/tests/acceptance/user-test.js | 8 +- .../tests/acceptance/user-tips-test.js | 2 +- .../discourse/tests/acceptance/users-test.js | 8 +- .../discourse/tests/acceptance/wizard-test.js | 2 +- .../integration/helpers/includes-test.js | 4 +- .../discourse/tests/helpers/component-test.js | 6 +- .../discourse/tests/helpers/create-store.js | 12 +- .../tests/helpers/deprecation-counter.js | 2 +- .../helpers/notification-types-helper.js | 4 +- .../tests/helpers/presence-pretender.js | 2 +- .../discourse/tests/helpers/qunit-helpers.js | 142 ++++++------- .../tests/helpers/raise-on-deprecation.js | 2 +- .../tests/helpers/reviewable-types-helper.js | 4 +- .../tests/helpers/select-kit-helper.js | 2 +- .../tests/helpers/temporary-module-helper.js | 2 +- .../integration/component-templates-test.gjs | 12 +- .../integration/components/ace-editor-test.js | 4 +- .../components/activation-controls-test.js | 4 +- .../components/admin-report-test.js | 6 +- .../admin-theme-settings-editor-test.js | 4 +- .../components/admin-user-field-item-test.js | 4 +- .../components/avatar-uploader-test.js | 6 +- .../components/badge-button-test.js | 4 +- .../components/badge-title-test.js | 6 +- .../components/bookmark-icon-test.js | 10 +- .../components/char-counter-test.js | 4 +- .../components/composer-editor-test.gjs | 6 +- .../integration/components/cook-text-test.js | 8 +- .../integration/components/d-button-test.js | 8 +- .../integration/components/d-document-test.js | 4 +- .../integration/components/d-editor-test.js | 12 +- .../integration/components/d-lightbox-test.js | 11 +- .../integration/components/d-modal-test.gjs | 10 +- .../components/d-navigation-test.js | 4 +- .../integration/components/d-section-test.gjs | 4 +- .../components/d-toggle-switch-test.js | 4 +- .../integration/components/date-input-test.js | 4 +- .../components/date-time-input-range-test.js | 4 +- .../components/date-time-input-test.js | 4 +- .../components/dialog-holder-test.js | 8 +- .../components/dismiss-new-test.js | 4 +- .../components/emoji-picker-test.js | 4 +- .../components/emoji-uploader-test.js | 6 +- .../components/empty-state-test.js | 4 +- .../components/flat-button-test.js | 4 +- .../float-kit/d-button-tooltip-test.js | 4 +- .../float-kit/d-default-toast-test.js | 4 +- .../components/float-kit/d-menu-test.js | 4 +- .../components/float-kit/d-tooltip-test.js | 4 +- .../form-template-field/checkbox-test.js | 4 +- .../form-template-field/dropdown-test.js | 6 +- .../form-template-field/input-test.js | 4 +- .../form-template-field/multi-select-test.js | 6 +- .../form-template-field/textarea-test.js | 4 +- .../form-template-field/wrapper-test.js | 6 +- .../components/group-list-setting-test.js | 6 +- .../group-membership-button-test.js | 4 +- .../components/hidden-details-test.js | 4 +- .../components/highlighted-code-test.js | 4 +- .../components/iframed-html-test.js | 4 +- .../integration/components/input-size-test.js | 4 +- .../components/invite-panel-test.js | 8 +- .../integration/components/load-more-test.js | 6 +- .../components/pending-post-test.js | 6 +- .../components/plugin-outlet-test.gjs | 18 +- .../components/relative-time-picker-test.js | 4 +- .../request-group-membership-form-test.gjs | 4 +- .../components/search-menu-test.gjs | 8 +- .../components/secret-value-list-test.js | 4 +- .../components/select-kit/api-test.js | 8 +- .../select-kit/category-chooser-test.js | 8 +- .../select-kit/category-drop-test.js | 18 +- .../components/select-kit/combo-box-test.js | 4 +- .../select-kit/dropdown-select-box-test.js | 4 +- .../email-group-user-chooser-test.js | 6 +- .../select-kit/form-template-chooser-test.js | 4 +- .../select-kit/future-date-input-test.js | 4 +- .../select-kit/list-setting-test.js | 4 +- .../select-kit/mini-tag-chooser-test.js | 6 +- .../select-kit/multi-select-test.js | 6 +- .../select-kit/notifications-button-test.js | 4 +- .../select-kit/pinned-options-test.js | 6 +- .../select-kit/single-select-test.js | 8 +- .../components/select-kit/tag-drop-test.js | 6 +- .../topic-notifications-button-test.js | 8 +- .../topic-notifications-options-test.js | 8 +- .../select-kit/user-chooser-test.js | 4 +- .../components/sidebar/section-link-test.js | 6 +- .../components/sidebar/section-test.js | 4 +- .../components/simple-list-test.js | 6 +- .../components/site-header-test.js | 6 +- .../components/site-setting-test.js | 6 +- .../components/slow-mode-info-test.js | 4 +- .../components/software-update-prompt-test.js | 4 +- .../integration/components/text-field-test.js | 6 +- .../components/themes-list-item-test.js | 6 +- .../components/themes-list-test.js | 4 +- .../integration/components/time-input-test.js | 4 +- .../components/time-shortcut-picker-test.js | 4 +- .../components/topic-list-item-test.js | 6 +- .../integration/components/topic-list-test.js | 6 +- .../components/uppy-image-uploader-test.js | 4 +- .../components/user-avatar-flair-test.js | 6 +- .../integration/components/user-info-test.js | 4 +- .../components/user-invited-show-test.js | 2 +- .../user-menu/bookmarks-list-test.js | 8 +- .../components/user-menu/likes-list-test.js | 6 +- .../components/user-menu/menu-item-test.js | 22 +- .../components/user-menu/menu-test.js | 8 +- .../user-menu/messages-list-test.js | 12 +- .../user-menu/notifications-list-test.js | 10 +- .../other-notifications-list-test.js | 6 +- .../replies-notifications-list-test.js | 6 +- .../user-menu/reviewables-list-test.js | 4 +- .../components/user-status-message-test.js | 4 +- .../components/user-status-picker-test.js | 4 +- .../integration/components/value-list-test.js | 4 +- .../components/watched-word-uploader-test.js | 10 +- .../widgets/actions-summary-test.js | 4 +- .../components/widgets/avatar-flair-test.js | 4 +- .../components/widgets/button-test.js | 4 +- .../widgets/default-notification-item-test.js | 8 +- .../components/widgets/hamburger-menu-test.js | 6 +- .../components/widgets/header-test.js | 4 +- .../components/widgets/home-logo-test.gjs | 10 +- .../components/widgets/post-cooked-test.js | 4 +- .../components/widgets/post-links-test.js | 4 +- .../components/widgets/post-menu-test.js | 12 +- .../widgets/post-small-action-test.js | 6 +- .../components/widgets/post-stream-test.js | 6 +- .../components/widgets/post-test.js | 8 +- .../components/widgets/poster-name-test.js | 4 +- .../components/widgets/render-glimmer-test.js | 10 +- .../widgets/small-user-list-test.js | 4 +- .../widgets/topic-admin-menu-test.js | 12 +- .../widgets/topic-participant-test.js | 4 +- .../components/widgets/topic-status-test.js | 12 +- .../widgets/widget-dropdown-test.js | 4 +- .../components/widgets/widget-test.js | 20 +- .../integration/helpers/body-class-test.js | 4 +- .../helpers/category-badge-test.js | 6 +- .../integration/helpers/concat-class-test.js | 4 +- .../tests/integration/helpers/d-icon-test.js | 4 +- .../tests/integration/helpers/emoji-test.js | 4 +- .../integration/helpers/html-safe-test.js | 4 +- .../tests/integration/helpers/raw-test.gjs | 16 +- .../integration/helpers/replace-emoji-test.js | 4 +- .../discourse/tests/setup-tests.js | 68 +++---- .../discourse/tests/test-boot-ember-cli.js | 8 +- .../admin-customize-themes-show-test.js | 2 +- .../admin-customize-themes-test.js | 2 +- .../controllers/admin-site-settings-test.js | 2 +- .../controllers/admin-user-badges-test.js | 6 +- .../unit/controllers/avatar-selector-test.js | 4 +- .../unit/controllers/create-account-test.js | 4 +- .../controllers/preferences-account-test.js | 2 +- .../controllers/preferences-profile-test.js | 2 +- .../preferences-second-factor-test.js | 2 +- .../controllers/reorder-categories-test.js | 4 +- .../tests/unit/controllers/topic-test.js | 14 +- .../controllers/user-notifications-test.js | 4 +- .../tests/unit/ember/resolver-test.js | 4 +- .../tests/unit/lib/allow-lister-test.js | 2 +- .../tests/unit/lib/autocomplete-test.js | 4 +- .../tests/unit/lib/avatar-utils-test.js | 4 +- .../discourse/tests/unit/lib/bookmark-test.js | 4 +- .../tests/unit/lib/build-quote-test.js | 6 +- .../tests/unit/lib/category-badge-test.js | 4 +- .../tests/unit/lib/click-track-test.js | 4 +- .../discourse/tests/unit/lib/columns-test.js | 2 +- .../discourse/tests/unit/lib/computed-test.js | 12 +- .../tests/unit/lib/deprecated-test.js | 14 +- .../tests/unit/lib/dom-from-string-test.js | 2 +- .../tests/unit/lib/download-calendar-test.js | 4 +- .../unit/lib/ember-action-modifer-test.js | 6 +- .../tests/unit/lib/ember-events-test.js | 10 +- .../discourse/tests/unit/lib/emoji-test.js | 10 +- .../tests/unit/lib/formatter-test.js | 6 +- .../discourse/tests/unit/lib/get-url-test.js | 2 +- .../tests/unit/lib/grant-badge-utils-test.js | 2 +- .../tests/unit/lib/highlight-search-test.js | 2 +- .../tests/unit/lib/highlight-syntax-test.js | 2 +- .../discourse/tests/unit/lib/i18n-test.js | 4 +- .../tests/unit/lib/icon-library-test.js | 2 +- .../tests/unit/lib/key-value-store-test.js | 2 +- .../tests/unit/lib/keyboard-shortcuts-test.js | 6 +- .../helpers/create-download-link-test.js | 3 +- .../find-nearest-shared-parent-test.js | 1 - .../helpers/get-swipe-direction-test.js | 1 - .../helpers/open-image-in-new-tab-test.js | 3 +- .../helpers/preload-item-images-test.js | 11 +- ...scroll-parent-to-element-to-center-test.js | 1 - .../set-carousel-scroll-position-test.js | 1 - .../lightbox/helpers/site-theme-color-test.js | 5 +- .../unit/lib/lightbox/process-html-test.js | 8 +- .../tests/unit/lib/link-lookup-test.js | 6 +- .../tests/unit/lib/link-mentions-test.js | 2 +- .../tests/unit/lib/load-script-test.js | 2 +- .../bookmark-reminder-test.js | 12 +- .../notification-types/granted-badge-test.js | 12 +- .../group-mentioned-test.js | 10 +- .../group-message-summary-test.js | 12 +- .../liked-consolidated-test.js | 12 +- .../unit/lib/notification-types/liked-test.js | 12 +- .../discourse/tests/unit/lib/oneboxer-test.js | 6 +- .../tests/unit/lib/parse-bbcode-tag-test.js | 2 +- .../tests/unit/lib/plugin-api-test.js | 10 +- .../tests/unit/lib/preload-store-test.js | 4 +- .../tests/unit/lib/pretty-text-test.js | 10 +- .../tests/unit/lib/render-tag-test.js | 4 +- .../lib/reviewable-types/flagged-post-test.js | 6 +- .../lib/reviewable-types/queued-post-test.js | 6 +- .../tests/unit/lib/sanitizer-test.js | 4 +- .../discourse/tests/unit/lib/search-test.js | 2 +- .../discourse/tests/unit/lib/sharing-test.js | 2 +- .../tests/unit/lib/suffix-trie-test.js | 2 +- .../tests/unit/lib/text-direction-test.js | 2 +- .../discourse/tests/unit/lib/text-test.js | 2 +- .../tests/unit/lib/time-shortcut-test.js | 2 +- .../tests/unit/lib/time-utils-test.js | 6 +- .../tests/unit/lib/to-markdown-test.js | 2 +- .../tests/unit/lib/upload-short-url-test.js | 6 +- .../discourse/tests/unit/lib/uploads-test.js | 8 +- .../unit/lib/uppy-checksum-plugin-test.js | 4 +- .../uppy-media-optimization-plugin-test.js | 2 +- .../discourse/tests/unit/lib/url-test.js | 4 +- .../tests/unit/lib/user-search-test.js | 4 +- .../tests/unit/lib/utilities-test.js | 16 +- .../discourse/tests/unit/localization-test.js | 6 +- .../tests/unit/mixins/setting-object-test.js | 4 +- .../tests/unit/mixins/singleton-test.js | 4 +- .../discourse/tests/unit/models/badge-test.js | 6 +- .../tests/unit/models/bookmark-test.js | 4 +- .../tests/unit/models/category-test.js | 6 +- .../tests/unit/models/composer-test.js | 8 +- .../tests/unit/models/email-log-test.js | 4 +- .../discourse/tests/unit/models/group-test.js | 4 +- .../tests/unit/models/invite-test.js | 4 +- .../tests/unit/models/nav-item-test.js | 4 +- .../tests/unit/models/pending-post-test.js | 4 +- .../tests/unit/models/post-stream-test.js | 8 +- .../discourse/tests/unit/models/post-test.js | 2 +- ...ivate-message-topic-tracking-state-test.js | 8 +- .../tests/unit/models/report-test.js | 4 +- .../tests/unit/models/rest-model-test.js | 8 +- .../tests/unit/models/result-set-test.js | 2 +- .../tests/unit/models/session-test.js | 2 +- .../discourse/tests/unit/models/site-test.js | 4 +- .../unit/models/staff-action-log-test.js | 4 +- .../discourse/tests/unit/models/tag-test.js | 2 +- .../discourse/tests/unit/models/theme-test.js | 4 +- .../tests/unit/models/topic-details-test.js | 4 +- .../discourse/tests/unit/models/topic-test.js | 6 +- .../unit/models/topic-tracking-state-test.js | 18 +- .../tests/unit/models/user-action-test.js | 4 +- .../tests/unit/models/user-badge-test.js | 4 +- .../tests/unit/models/user-drafts-test.js | 8 +- .../tests/unit/models/user-stream-test.js | 4 +- .../discourse/tests/unit/models/user-test.js | 12 +- .../tests/unit/services/current-user-test.js | 2 +- .../unit/services/document-title-test.js | 4 +- .../tests/unit/services/emoji-store-test.js | 4 +- .../tests/unit/services/lightbox-test.js | 12 +- .../tests/unit/services/presence-test.js | 14 +- .../tests/unit/services/screen-track-test.js | 2 +- .../tests/unit/services/site-settings-test.js | 6 +- .../tests/unit/services/store-test.js | 4 +- .../tests/unit/services/user-tips-test.js | 4 +- .../tests/unit/utils/decorators-test.js | 14 +- .../tests/unit/utils/dom-utils-test.js | 8 +- .../addon/components/d-default-toast.gjs | 4 +- .../addon/components/d-float-body.gjs | 14 +- .../addon/components/d-inline-menu.gjs | 2 +- .../addon/components/d-inline-tooltip.gjs | 2 +- .../float-kit/addon/components/d-menu.gjs | 10 +- .../float-kit/addon/components/d-popover.gjs | 1 - .../float-kit/addon/components/d-toasts.gjs | 2 +- .../float-kit/addon/components/d-tooltip.gjs | 12 +- .../float-kit/addon/lib/d-menu-instance.js | 6 +- .../float-kit/addon/lib/d-toast-instance.js | 6 +- .../float-kit/addon/lib/d-tooltip-instance.js | 6 +- .../float-kit/addon/lib/float-kit-instance.js | 4 +- .../float-kit/addon/lib/update-position.js | 6 +- .../addon/modifiers/apply-floating-ui.js | 4 +- .../addon/modifiers/close-on-click-outside.js | 2 +- .../addon/modifiers/close-on-escape.js | 4 +- .../float-kit/addon/services/menu.js | 6 +- .../float-kit/addon/services/toasts.js | 6 +- .../float-kit/addon/services/tooltip.js | 6 +- .../addon/engines/discourse-markdown-it.js | 4 +- .../javascripts/pretty-text/addon/oneboxer.js | 2 +- .../pretty-text/addon/pretty-text.js | 2 +- .../pretty-text/addon/upload-short-url.js | 2 +- .../components/categories-admin-dropdown.js | 4 +- .../addon/components/category-chooser.js | 14 +- .../addon/components/category-drop.js | 12 +- .../category-drop/category-drop-header.js | 4 +- .../category-notifications-button.js | 2 +- .../addon/components/category-row.js | 8 +- .../addon/components/category-selector.js | 10 +- .../addon/components/color-palettes.js | 2 +- .../color-palettes/color-palettes-row.js | 2 +- .../select-kit/addon/components/combo-box.js | 2 +- .../components/combo-box/combo-box-header.js | 2 +- .../addon/components/composer-actions.js | 14 +- .../addon/components/create-color-row.js | 4 +- .../dropdown-select-box-header.js | 2 +- .../dropdown-select-box-row.js | 2 +- .../email-group-user-chooser-filter.js | 2 +- .../addon/components/form-template-chooser.js | 4 +- .../components/future-date-input-selector.js | 2 +- .../addon/components/group-dropdown.js | 6 +- .../addon/components/icon-picker.js | 8 +- .../addon/components/list-setting.js | 6 +- .../addon/components/mini-tag-chooser.js | 10 +- .../mini-tag-chooser/selected-collection.js | 2 +- .../addon/components/multi-select.js | 4 +- .../multi-select/multi-select-filter.js | 4 +- .../multi-select/multi-select-header.js | 2 +- .../multi-select/selected-category.js | 4 +- .../components/multi-select/selected-color.js | 4 +- .../addon/components/none-category-row.js | 4 +- .../addon/components/notifications-button.js | 4 +- .../notifications-button-row.js | 6 +- .../addon/components/notifications-filter.js | 4 +- .../notifications-filter-header.js | 4 +- .../addon/components/period-chooser.js | 2 +- .../period-chooser/period-chooser-header.js | 2 +- .../period-chooser/period-chooser-row.js | 4 +- .../addon/components/pinned-button.js | 2 +- .../addon/components/pinned-options.js | 4 +- .../select-kit/addon/components/select-kit.js | 24 +-- .../components/select-kit/select-kit-body.js | 4 +- .../select-kit/select-kit-filter.js | 8 +- .../select-kit/select-kit-header.js | 2 +- .../components/select-kit/select-kit-row.js | 10 +- .../select-kit/single-select-header.js | 2 +- .../components/selected-choice-category.js | 4 +- .../addon/components/selected-choice-color.js | 4 +- .../addon/components/selected-choice.js | 2 +- .../addon/components/selected-color.js | 4 +- .../addon/components/selected-name.js | 8 +- .../addon/components/single-select.js | 2 +- .../addon/components/tag-chooser.js | 4 +- .../select-kit/addon/components/tag-drop.js | 6 +- .../addon/components/tag-group-chooser.js | 4 +- .../components/tags-intersection-chooser.js | 6 +- .../components/toolbar-popup-menu-options.js | 2 +- .../components/topic-notifications-button.js | 6 +- .../components/topic-notifications-options.js | 2 +- .../addon/components/user-chooser.js | 6 +- .../components/user-notifications-dropdown.js | 8 +- .../select-kit/addon/mixins/tags.js | 14 +- .../select-kit/addon/mixins/utils.js | 2 +- .../theme-transpiler/transpiler.js | 11 +- .../addon/components/homepage-preview.js | 2 +- .../components/image-preview-logo-small.js | 2 +- .../addon/components/image-preview-logo.js | 2 +- .../addon/components/styling-preview.js | 4 +- .../wizard/addon/components/wizard-canvas.js | 2 +- .../addon/components/wizard-field-dropdown.js | 2 +- .../addon/components/wizard-field-image.js | 10 +- .../addon/components/wizard-preview-base.js | 6 +- .../wizard/addon/components/wizard-step.js | 6 +- .../wizard/addon/controllers/wizard-step.js | 2 +- .../javascripts/wizard/addon/models/step.js | 2 +- .../javascripts/wizard/addon/models/wizard.js | 4 +- .../wizard/addon/routes/wizard-index.js | 2 +- .../javascripts/wizard/addon/routes/wizard.js | 2 +- package.json | 4 +- .../discourse/components/channels-list.js | 4 +- .../discourse/components/chat-browse-view.js | 4 +- .../components/chat-channel-archive-status.js | 8 +- .../components/chat-channel-info.gjs | 6 +- .../components/chat-channel-members.gjs | 18 +- .../chat-channel-message-emoji-picker.gjs | 4 +- .../components/chat-channel-preview-card.js | 2 +- .../discourse/components/chat-channel-row.gjs | 32 +-- .../components/chat-channel-settings.gjs | 30 +-- .../components/chat-channel-status.js | 2 +- .../discourse/components/chat-channel.js | 38 ++-- .../components/chat-composer-uploads.js | 4 +- .../discourse/components/chat-composer.js | 32 +-- .../discourse/components/chat-drawer.js | 4 +- .../components/chat-drawer/channel.js | 2 +- .../components/chat-drawer/thread.js | 2 +- .../components/chat-drawer/threads.js | 2 +- .../discourse/components/chat-emoji-picker.js | 14 +- .../components/chat-full-page-header.js | 2 +- .../components/chat-mention-warnings.js | 4 +- .../chat-message-actions-desktop.gjs | 22 +- .../chat-message-actions-mobile.gjs | 26 +-- .../components/chat-message-collapser.js | 2 +- .../components/chat-message-reaction.gjs | 12 +- .../chat-message-thread-indicator.js | 6 +- .../discourse/components/chat-message.gjs | 56 +++--- .../discourse/components/chat-notice.js | 2 +- .../components/chat-replying-indicator.js | 8 +- .../chat-retention-reminder-text.gjs | 2 +- .../components/chat-retention-reminder.js | 2 +- .../discourse/components/chat-side-panel.js | 6 +- .../components/chat-thread-participants.gjs | 2 +- .../discourse/components/chat-thread.js | 22 +- .../components/chat-to-topic-selector.js | 2 +- .../components/chat-upload-drop-zone.js | 2 +- .../discourse/components/chat-upload.js | 7 +- .../discourse/components/chat-user-avatar.gjs | 2 +- .../components/chat-user-display-name.js | 2 +- .../discourse/components/chat-vh.js | 2 +- .../components/chat/composer/channel.js | 8 +- .../components/chat/composer/thread.js | 4 +- .../discourse/components/chat/form/row.gjs | 2 +- .../discourse/components/chat/header/icon.gjs | 10 +- .../chat/header/icon/unread-indicator.gjs | 2 +- .../components/chat/message-creator.js | 14 +- .../discourse/components/chat/message/info.js | 2 +- .../components/chat/modal/archive-channel.js | 8 +- .../components/chat/modal/channel-summary.js | 4 +- .../components/chat/modal/create-channel.js | 18 +- .../components/chat/modal/delete-channel.js | 8 +- .../chat/modal/edit-channel-description.js | 2 +- .../chat/modal/edit-channel-name.js | 10 +- .../chat/modal/move-message-to-channel.js | 6 +- .../components/chat/modal/new-message.js | 1 - .../components/chat/modal/thread-settings.js | 4 +- .../chat/modal/toggle-channel-status.js | 6 +- .../notices/mention_without_membership.js | 6 +- .../components/chat/selection-manager.gjs | 14 +- .../discourse/components/chat/thread-list.js | 2 +- .../components/chat/thread-list/item.js | 2 +- .../components/chat/thread/header.js | 10 +- .../discourse/components/dc-filter-input.gjs | 8 +- .../components/reviewable-chat-message.js | 2 +- .../chat-composer-message-details.js | 4 +- .../components/styleguide/chat-composer.js | 2 +- .../components/styleguide/chat-header-icon.js | 2 +- .../components/styleguide/chat-message.js | 6 +- .../styleguide/chat-modal-archive-channel.js | 8 +- .../styleguide/chat-modal-channel-summary.js | 6 +- .../styleguide/chat-modal-create-channel.js | 4 +- .../styleguide/chat-modal-delete-channel.js | 8 +- .../chat-modal-edit-channel-description.js | 8 +- .../chat-modal-edit-channel-name.js | 8 +- .../chat-modal-move-message-to-channel.js | 4 +- .../styleguide/chat-modal-new-message.js | 4 +- .../styleguide/chat-modal-thread-settings.js | 6 +- .../chat-modal-toggle-channel-status.js | 6 +- .../styleguide/chat-thread-list-item.js | 2 +- .../toggle-channel-membership-button.js | 6 +- .../controllers/admin-plugins-chat.js | 4 +- .../controllers/chat-channel-thread.js | 2 +- .../discourse/controllers/chat-channel.js | 2 +- .../discourse/controllers/preferences-chat.js | 6 +- .../discourse/helpers/format-chat-date.js | 6 +- .../discourse/initializers/chat-decorators.js | 8 +- .../initializers/chat-keyboard-shortcuts.js | 2 +- .../initializers/chat-plugin-decorators.js | 2 +- .../discourse/initializers/chat-setup.js | 6 +- .../discourse/initializers/chat-sidebar.js | 18 +- .../discourse/initializers/chat-user-menu.js | 3 +- .../discourse/lib/chat-ios-hacks.js | 4 +- .../discourse/lib/chat-message-flag.js | 2 +- .../discourse/lib/chat-message-interactor.js | 26 +-- .../discourse/lib/chat-messages-loader.js | 6 +- .../discourse/lib/chat-notification-levels.js | 2 +- .../discourse/lib/chat-threads-manager.js | 6 +- .../javascripts/discourse/lib/collection.js | 4 +- .../javascripts/discourse/lib/fabricators.js | 12 +- .../discourse/lib/hashtag-types/channel.js | 2 +- .../discourse/lib/textarea-interactor.js | 8 +- .../discourse/lib/transform-auto-links.js | 2 +- .../discourse/models/chat-channel.js | 18 +- .../discourse/models/chat-chatable.js | 4 +- .../discourse/models/chat-direct-message.js | 2 +- .../discourse/models/chat-message-reaction.js | 2 +- .../discourse/models/chat-message.js | 10 +- .../discourse/models/chat-thread.js | 8 +- .../discourse/models/chat-tracking-state.js | 2 +- .../chat/emoji-picker-scroll-listener.js | 4 +- .../discourse/modifiers/chat/later-fn.js | 2 +- .../modifiers/chat/on-animation-end.js | 2 +- .../discourse/modifiers/chat/on-long-press.js | 6 +- .../discourse/modifiers/chat/on-resize.js | 2 +- .../discourse/modifiers/chat/on-scroll.js | 2 +- .../modifiers/chat/resizable-node.js | 2 +- .../modifiers/chat/scrollable-list.js | 4 +- .../chat/track-message-separator-date.js | 2 +- .../discourse/modifiers/chat/track-message.js | 2 +- .../pre-initializers/chat-plugin-api.js | 2 +- .../discourse/routes/admin-plugins-chat.js | 4 +- .../discourse/routes/chat-browse-archived.js | 2 +- .../discourse/routes/chat-browse-index.js | 2 +- .../routes/chat-channel-info-index.js | 2 +- .../routes/chat-channel-info-members.js | 2 +- .../discourse/routes/chat-channel-info.js | 2 +- .../discourse/routes/chat-channel-legacy.js | 2 +- .../routes/chat-channel-near-message.js | 2 +- .../chat-channel-thread-near-message.js | 2 +- .../discourse/routes/chat-channel-thread.js | 4 +- .../discourse/routes/chat-channel-threads.js | 4 +- .../discourse/routes/chat-draft-channel.js | 2 +- .../discourse/routes/chat-index.js | 2 +- .../discourse/routes/chat-message.js | 4 +- .../javascripts/discourse/routes/chat.js | 12 +- .../discourse/routes/preferences-chat.js | 4 +- .../discourse/services/chat-audio-manager.js | 2 +- .../services/chat-channel-composer.js | 6 +- .../chat-channel-info-route-origin-manager.js | 2 +- ...chat-channel-pane-subscriptions-manager.js | 6 +- .../services/chat-channels-manager.js | 8 +- .../chat-composer-presence-manager.js | 2 +- .../chat-composer-warnings-tracker.js | 4 +- .../discourse/services/chat-drawer-router.js | 4 +- .../services/chat-emoji-picker-manager.js | 12 +- .../services/chat-emoji-reaction-store.js | 2 +- .../discourse/services/chat-history.js | 2 +- .../services/chat-notification-manager.js | 4 +- .../chat-pane-base-subscriptions-manager.js | 2 +- .../discourse/services/chat-state-manager.js | 6 +- .../services/chat-subscriptions-manager.js | 2 +- .../services/chat-thread-composer.js | 4 +- .../discourse/services/chat-thread-pane.js | 2 +- .../services/chat-tracking-state-manager.js | 4 +- .../javascripts/discourse/services/chat.js | 14 +- .../services/emoji-picker-scroll-observer.js | 2 +- .../discourse/widgets/chat-header-icon.js | 4 +- .../chat-invitation-notification-item.js | 8 +- .../widgets/chat-mention-notification-item.js | 8 +- .../lib/discourse-markdown/chat-transcript.js | 2 +- .../acceptance/chat-composer-test.js | 4 +- .../chat-live-pane-collapse-test.js | 2 +- .../acceptance/chat-live-pane-test.js | 2 +- .../acceptance/hashtag-css-generator-test.js | 2 +- .../javascripts/acceptance/mentions-test.js | 4 +- .../user-status-on-mentions-test.js | 6 +- .../components/chat-channel-card-test.js | 8 +- .../components/chat-channel-leave-btn-test.js | 8 +- .../components/chat-channel-metadata-test.js | 6 +- .../chat-channel-preview-card-test.js | 6 +- .../components/chat-channel-row-test.js | 4 +- .../components/chat-channel-status-test.js | 8 +- .../components/chat-channel-test.js | 6 +- .../components/chat-channel-title-test.js | 6 +- .../components/chat-composer-dropdown-test.js | 6 +- .../chat-composer-message-details-test.js | 8 +- .../chat-composer-placeholder-test.js | 10 +- .../components/chat-composer-upload-test.js | 6 +- .../components/chat-composer-uploads-test.js | 6 +- .../components/chat-emoji-avatar-test.js | 6 +- .../components/chat-emoji-picker-test.js | 6 +- .../components/chat-header-icon-test.js | 4 +- .../components/chat-message-avatar-test.js | 10 +- .../components/chat-message-collapser-test.js | 4 +- .../components/chat-message-info-test.js | 8 +- .../chat-message-left-gutter-test.js | 4 +- .../components/chat-message-reaction-test.js | 4 +- .../chat-message-separator-date-test.js | 6 +- .../chat-message-separator-new-test.js | 6 +- .../components/chat-message-test.js | 4 +- .../components/chat-message-text-test.js | 8 +- .../chat-modal-archive-channel-test.js | 8 +- .../chat-modal-delete-channel-test.js | 8 +- ...chat-modal-move-message-to-channel-test.js | 8 +- .../components/chat-notices-test.js | 14 +- .../chat-replying-indicator-test.js | 10 +- .../chat-retention-reminder-test.js | 10 +- .../chat-retention-reminder-text-test.js | 8 +- .../chat-thread-participants-test.js | 6 +- .../components/chat-upload-test.js | 6 +- .../components/chat-user-avatar-test.js | 4 +- .../components/chat-user-card-button-test.js | 4 +- .../components/chat-user-display-name-test.js | 6 +- .../components/chat-user-info-test.js | 4 +- .../javascripts/components/collapser-test.js | 6 +- .../components/dc-filter-input-test.js | 6 +- .../javascripts/helpers/chat-pretenders.js | 5 +- .../user-menu/chat-notifications-list-test.js | 6 +- .../unit/helpers/format-chat-date-test.js | 4 +- .../unit/helpers/tonable-emoji-title-test.js | 4 +- .../lib/chat-emoji-reaction-store-test.js | 2 +- .../unit/lib/get-reaction-text-test.js | 8 +- ...-channel-info-route-origin-manager-test.js | 4 +- .../unit/services/chat-drafts-manager-test.js | 4 +- .../unit/services/chat-drawer-size-test.js | 2 +- .../chat-emoji-picker-manager-test.js | 4 +- .../unit/services/chat-guardian-test.js | 4 +- .../unit/services/chat-state-manager-test.js | 8 +- .../unit/utility/plugin-api-test.js | 6 +- .../chat-invitation-notification-item-test.js | 8 +- .../chat-mention-notification-item-test.js | 10 +- .../discourse/initializers/checklist.js | 2 +- .../test/javascripts/lib/checklist-test.js | 4 +- .../javascripts/initializers/apply-details.js | 2 +- .../acceptance/details-button-test.js | 8 +- .../discourse/components/lazy-video.js | 2 +- .../javascripts/initializers/lazy-videos.js | 2 +- .../javascripts/components/lazy-video-test.js | 4 +- .../components/modal/local-dates-create.js | 16 +- .../initializers/discourse-local-dates.js | 16 +- .../javascripts/lib/local-date-builder.js | 4 +- .../acceptance/download-calendar-test.js | 6 +- .../acceptance/local-dates-composer-test.js | 4 +- .../acceptance/local-dates-quoting-test.js | 6 +- .../lib/date-with-zone-helper-test.js | 2 +- .../unit/discourse-local-dates-test.js | 2 +- .../unit/local-date-builder-test.js | 4 +- .../components/composer-presence-display.js | 6 +- .../components/topic-presence-display.js | 2 +- .../services/composer-presence-manager.js | 2 +- .../acceptance/discourse-presence-test.js | 16 +- .../components/modal/poll-breakdown.js | 10 +- .../components/modal/poll-ui-builder.js | 4 +- .../components/poll-breakdown-chart.js | 14 +- .../components/poll-breakdown-option.js | 10 +- .../discourse/initializers/extend-for-poll.js | 2 +- .../discourse/widgets/discourse-poll.js | 24 +-- .../acceptance/poll-breakdown-test.js | 4 +- .../acceptance/poll-builder-disabled-test.js | 2 +- .../acceptance/poll-builder-enabled-test.js | 6 +- .../acceptance/poll-in-reply-history-test.js | 4 +- .../acceptance/poll-pie-chart-test.js | 4 +- .../javascripts/acceptance/poll-quote-test.js | 4 +- .../acceptance/poll-results-test.js | 4 +- .../polls-bar-chart-test-desktop.js | 4 +- .../acceptance/polls-bar-chart-test-mobile.js | 4 +- .../component/poll-ui-builder-test.js | 4 +- .../helpers/display-poll-builder-button.js | 2 +- .../widgets/discourse-poll-option-test.js | 4 +- .../discourse-poll-standard-results-test.js | 6 +- .../widgets/discourse-poll-test.js | 8 +- .../sections/atoms/00-typography.gjs | 2 +- .../components/sections/molecules/menus.js | 4 +- .../components/sections/molecules/toasts.js | 2 +- .../components/sections/molecules/tooltips.js | 6 +- .../components/sections/organisms/modal.js | 2 +- .../discourse/components/styleguide-icons.js | 2 +- .../discourse/components/toggle-color-mode.js | 2 +- .../javascripts/discourse/lib/styleguide.js | 6 +- .../discourse/routes/styleguide-show.js | 2 +- 1758 files changed, 5434 insertions(+), 5502 deletions(-) diff --git a/app/assets/javascripts/admin/addon/components/ace-editor.js b/app/assets/javascripts/admin/addon/components/ace-editor.js index 84aa4351e15..7f36fd7e3c9 100644 --- a/app/assets/javascripts/admin/addon/components/ace-editor.js +++ b/app/assets/javascripts/admin/addon/components/ace-editor.js @@ -1,11 +1,11 @@ +import Component from "@ember/component"; import { action } from "@ember/object"; import { classNames } from "@ember-decorators/component"; import { observes, on } from "@ember-decorators/object"; -import Component from "@ember/component"; -import getURL from "discourse-common/lib/get-url"; import loadScript from "discourse/lib/load-script"; -import I18n from "I18n"; +import getURL from "discourse-common/lib/get-url"; import { bind } from "discourse-common/utils/decorators"; +import I18n from "I18n"; const COLOR_VARS_REGEX = /\$(primary|secondary|tertiary|quaternary|header_background|header_primary|highlight|danger|success|love)(\s|;|-(low|medium|high))/g; diff --git a/app/assets/javascripts/admin/addon/components/admin-backups-logs.js b/app/assets/javascripts/admin/addon/components/admin-backups-logs.js index e1c12d04a32..ef6771a2751 100644 --- a/app/assets/javascripts/admin/addon/components/admin-backups-logs.js +++ b/app/assets/javascripts/admin/addon/components/admin-backups-logs.js @@ -1,9 +1,9 @@ +import Component from "@ember/component"; +import { scheduleOnce } from "@ember/runloop"; import { classNames } from "@ember-decorators/component"; import { observes, on } from "@ember-decorators/object"; -import Component from "@ember/component"; -import I18n from "I18n"; import discourseDebounce from "discourse-common/lib/debounce"; -import { scheduleOnce } from "@ember/runloop"; +import I18n from "I18n"; @classNames("admin-backups-logs") export default class AdminBackupsLogs extends Component { diff --git a/app/assets/javascripts/admin/addon/components/admin-editable-field.js b/app/assets/javascripts/admin/addon/components/admin-editable-field.js index a99265b20cb..bc848ddc50d 100644 --- a/app/assets/javascripts/admin/addon/components/admin-editable-field.js +++ b/app/assets/javascripts/admin/addon/components/admin-editable-field.js @@ -1,6 +1,6 @@ -import { tagName } from "@ember-decorators/component"; import Component from "@ember/component"; import { action } from "@ember/object"; +import { tagName } from "@ember-decorators/component"; @tagName("") export default class AdminEditableField extends Component { diff --git a/app/assets/javascripts/admin/addon/components/admin-form-row.js b/app/assets/javascripts/admin/addon/components/admin-form-row.js index 266301263d4..dcebfe7f9f9 100644 --- a/app/assets/javascripts/admin/addon/components/admin-form-row.js +++ b/app/assets/javascripts/admin/addon/components/admin-form-row.js @@ -1,5 +1,5 @@ -import { classNames } from "@ember-decorators/component"; import Component from "@ember/component"; +import { classNames } from "@ember-decorators/component"; @classNames("row") export default class AdminFormRow extends Component {} diff --git a/app/assets/javascripts/admin/addon/components/admin-graph.js b/app/assets/javascripts/admin/addon/components/admin-graph.js index 4ef05fca32e..29852f1c09c 100644 --- a/app/assets/javascripts/admin/addon/components/admin-graph.js +++ b/app/assets/javascripts/admin/addon/components/admin-graph.js @@ -1,5 +1,5 @@ -import { tagName } from "@ember-decorators/component"; import Component from "@ember/component"; +import { tagName } from "@ember-decorators/component"; import loadScript from "discourse/lib/load-script"; @tagName("canvas") diff --git a/app/assets/javascripts/admin/addon/components/admin-nav.gjs b/app/assets/javascripts/admin/addon/components/admin-nav.gjs index be3aa02cb4a..fd08dd5ad5c 100644 --- a/app/assets/javascripts/admin/addon/components/admin-nav.gjs +++ b/app/assets/javascripts/admin/addon/components/admin-nav.gjs @@ -1,5 +1,5 @@ -import { tagName } from "@ember-decorators/component"; import Component from "@ember/component"; +import { tagName } from "@ember-decorators/component"; @tagName("") export default class AdminNav extends Component { diff --git a/app/assets/javascripts/admin/addon/components/admin-penalty-history.js b/app/assets/javascripts/admin/addon/components/admin-penalty-history.js index 0931ac8e4a4..35206b8cc69 100644 --- a/app/assets/javascripts/admin/addon/components/admin-penalty-history.js +++ b/app/assets/javascripts/admin/addon/components/admin-penalty-history.js @@ -1,5 +1,5 @@ -import { classNames } from "@ember-decorators/component"; import Component from "@ember/component"; +import { classNames } from "@ember-decorators/component"; import discourseComputed from "discourse-common/utils/decorators"; @classNames("penalty-history") diff --git a/app/assets/javascripts/admin/addon/components/admin-penalty-post-action.js b/app/assets/javascripts/admin/addon/components/admin-penalty-post-action.js index 08314925460..f27d1d55614 100644 --- a/app/assets/javascripts/admin/addon/components/admin-penalty-post-action.js +++ b/app/assets/javascripts/admin/addon/components/admin-penalty-post-action.js @@ -1,6 +1,6 @@ +import Component from "@ember/component"; import { action } from "@ember/object"; import { equal } from "@ember/object/computed"; -import Component from "@ember/component"; import discourseComputed, { afterRender, } from "discourse-common/utils/decorators"; diff --git a/app/assets/javascripts/admin/addon/components/admin-penalty-reason.js b/app/assets/javascripts/admin/addon/components/admin-penalty-reason.js index e8d037d249b..726dcbec8db 100644 --- a/app/assets/javascripts/admin/addon/components/admin-penalty-reason.js +++ b/app/assets/javascripts/admin/addon/components/admin-penalty-reason.js @@ -1,7 +1,7 @@ -import { tagName } from "@ember-decorators/component"; -import { equal } from "@ember/object/computed"; import Component from "@ember/component"; import { action } from "@ember/object"; +import { equal } from "@ember/object/computed"; +import { tagName } from "@ember-decorators/component"; import discourseComputed from "discourse-common/utils/decorators"; import I18n from "I18n"; diff --git a/app/assets/javascripts/admin/addon/components/admin-penalty-similar-users.js b/app/assets/javascripts/admin/addon/components/admin-penalty-similar-users.js index 52996d458f3..4531b83d9d8 100644 --- a/app/assets/javascripts/admin/addon/components/admin-penalty-similar-users.js +++ b/app/assets/javascripts/admin/addon/components/admin-penalty-similar-users.js @@ -1,6 +1,6 @@ -import { tagName } from "@ember-decorators/component"; import Component from "@ember/component"; import { action } from "@ember/object"; +import { tagName } from "@ember-decorators/component"; import discourseComputed from "discourse-common/utils/decorators"; @tagName("") diff --git a/app/assets/javascripts/admin/addon/components/admin-report-chart.js b/app/assets/javascripts/admin/addon/components/admin-report-chart.js index 64f09aa0d7d..4f3184cbeb2 100644 --- a/app/assets/javascripts/admin/addon/components/admin-report-chart.js +++ b/app/assets/javascripts/admin/addon/components/admin-report-chart.js @@ -1,12 +1,12 @@ -import { classNames } from "@ember-decorators/component"; -import Report from "admin/models/report"; import Component from "@ember/component"; -import discourseDebounce from "discourse-common/lib/debounce"; -import loadScript from "discourse/lib/load-script"; -import { makeArray } from "discourse-common/lib/helpers"; -import { number } from "discourse/lib/formatter"; import { schedule } from "@ember/runloop"; +import { classNames } from "@ember-decorators/component"; +import { number } from "discourse/lib/formatter"; +import loadScript from "discourse/lib/load-script"; +import discourseDebounce from "discourse-common/lib/debounce"; +import { makeArray } from "discourse-common/lib/helpers"; import { bind } from "discourse-common/utils/decorators"; +import Report from "admin/models/report"; @classNames("admin-report-chart") export default class AdminReportChart extends Component { diff --git a/app/assets/javascripts/admin/addon/components/admin-report-counters.js b/app/assets/javascripts/admin/addon/components/admin-report-counters.js index 6e3dab52366..29d42a40204 100644 --- a/app/assets/javascripts/admin/addon/components/admin-report-counters.js +++ b/app/assets/javascripts/admin/addon/components/admin-report-counters.js @@ -1,5 +1,5 @@ -import { attributeBindings, classNames } from "@ember-decorators/component"; import Component from "@ember/component"; +import { attributeBindings, classNames } from "@ember-decorators/component"; @classNames("admin-report-counters") @attributeBindings("model.description:title") diff --git a/app/assets/javascripts/admin/addon/components/admin-report-counts.js b/app/assets/javascripts/admin/addon/components/admin-report-counts.js index fd1b6cc68d6..e6ef645aa0e 100644 --- a/app/assets/javascripts/admin/addon/components/admin-report-counts.js +++ b/app/assets/javascripts/admin/addon/components/admin-report-counts.js @@ -1,6 +1,6 @@ -import { classNameBindings, tagName } from "@ember-decorators/component"; -import { match } from "@ember/object/computed"; import Component from "@ember/component"; +import { match } from "@ember/object/computed"; +import { classNameBindings, tagName } from "@ember-decorators/component"; @tagName("tr") @classNameBindings("reverseColors") diff --git a/app/assets/javascripts/admin/addon/components/admin-report-inline-table.js b/app/assets/javascripts/admin/addon/components/admin-report-inline-table.js index 3e770da6467..c1919679b97 100644 --- a/app/assets/javascripts/admin/addon/components/admin-report-inline-table.js +++ b/app/assets/javascripts/admin/addon/components/admin-report-inline-table.js @@ -1,5 +1,5 @@ -import { classNames } from "@ember-decorators/component"; import Component from "@ember/component"; +import { classNames } from "@ember-decorators/component"; @classNames("admin-report-inline-table") export default class AdminReportInlineTable extends Component {} diff --git a/app/assets/javascripts/admin/addon/components/admin-report-per-day-counts.js b/app/assets/javascripts/admin/addon/components/admin-report-per-day-counts.js index ee48a5138f2..b5d5984f988 100644 --- a/app/assets/javascripts/admin/addon/components/admin-report-per-day-counts.js +++ b/app/assets/javascripts/admin/addon/components/admin-report-per-day-counts.js @@ -1,5 +1,5 @@ -import { tagName } from "@ember-decorators/component"; import Component from "@ember/component"; +import { tagName } from "@ember-decorators/component"; @tagName("tr") export default class AdminReportPerDayCounts extends Component {} diff --git a/app/assets/javascripts/admin/addon/components/admin-report-stacked-chart.js b/app/assets/javascripts/admin/addon/components/admin-report-stacked-chart.js index b69e75141e8..e34901eefc9 100644 --- a/app/assets/javascripts/admin/addon/components/admin-report-stacked-chart.js +++ b/app/assets/javascripts/admin/addon/components/admin-report-stacked-chart.js @@ -1,12 +1,12 @@ -import { classNames } from "@ember-decorators/component"; -import Report from "admin/models/report"; import Component from "@ember/component"; -import discourseDebounce from "discourse-common/lib/debounce"; -import loadScript from "discourse/lib/load-script"; -import { makeArray } from "discourse-common/lib/helpers"; -import { number } from "discourse/lib/formatter"; import { schedule } from "@ember/runloop"; +import { classNames } from "@ember-decorators/component"; +import { number } from "discourse/lib/formatter"; +import loadScript from "discourse/lib/load-script"; +import discourseDebounce from "discourse-common/lib/debounce"; +import { makeArray } from "discourse-common/lib/helpers"; import { bind } from "discourse-common/utils/decorators"; +import Report from "admin/models/report"; @classNames("admin-report-chart", "admin-report-stacked-chart") export default class AdminReportStackedChart extends Component { diff --git a/app/assets/javascripts/admin/addon/components/admin-report-storage-stats.js b/app/assets/javascripts/admin/addon/components/admin-report-storage-stats.js index ee0d7d24764..56a726cb7e6 100644 --- a/app/assets/javascripts/admin/addon/components/admin-report-storage-stats.js +++ b/app/assets/javascripts/admin/addon/components/admin-report-storage-stats.js @@ -1,9 +1,9 @@ -import { classNames } from "@ember-decorators/component"; -import { alias } from "@ember/object/computed"; import Component from "@ember/component"; -import I18n from "I18n"; -import discourseComputed from "discourse-common/utils/decorators"; +import { alias } from "@ember/object/computed"; +import { classNames } from "@ember-decorators/component"; import { setting } from "discourse/lib/computed"; +import discourseComputed from "discourse-common/utils/decorators"; +import I18n from "I18n"; @classNames("admin-report-storage-stats") export default class AdminReportStorageStats extends Component { diff --git a/app/assets/javascripts/admin/addon/components/admin-report-table-cell.js b/app/assets/javascripts/admin/addon/components/admin-report-table-cell.js index 89997c9afab..9bd4750376b 100644 --- a/app/assets/javascripts/admin/addon/components/admin-report-table-cell.js +++ b/app/assets/javascripts/admin/addon/components/admin-report-table-cell.js @@ -1,11 +1,11 @@ +import Component from "@ember/component"; +import { alias } from "@ember/object/computed"; import { attributeBindings, classNameBindings, classNames, tagName, } from "@ember-decorators/component"; -import { alias } from "@ember/object/computed"; -import Component from "@ember/component"; import discourseComputed from "discourse-common/utils/decorators"; @tagName("td") diff --git a/app/assets/javascripts/admin/addon/components/admin-report-table-header.js b/app/assets/javascripts/admin/addon/components/admin-report-table-header.js index 7de3ac97088..e27ad5a1f03 100644 --- a/app/assets/javascripts/admin/addon/components/admin-report-table-header.js +++ b/app/assets/javascripts/admin/addon/components/admin-report-table-header.js @@ -1,10 +1,10 @@ +import Component from "@ember/component"; import { attributeBindings, classNameBindings, classNames, tagName, } from "@ember-decorators/component"; -import Component from "@ember/component"; import discourseComputed from "discourse-common/utils/decorators"; @tagName("th") diff --git a/app/assets/javascripts/admin/addon/components/admin-report-table-row.js b/app/assets/javascripts/admin/addon/components/admin-report-table-row.js index e5e275aa7ad..53b56a1b1c6 100644 --- a/app/assets/javascripts/admin/addon/components/admin-report-table-row.js +++ b/app/assets/javascripts/admin/addon/components/admin-report-table-row.js @@ -1,5 +1,5 @@ -import { classNames, tagName } from "@ember-decorators/component"; import Component from "@ember/component"; +import { classNames, tagName } from "@ember-decorators/component"; @tagName("tr") @classNames("admin-report-table-row") diff --git a/app/assets/javascripts/admin/addon/components/admin-report-table.js b/app/assets/javascripts/admin/addon/components/admin-report-table.js index 3638625f872..494636a335e 100644 --- a/app/assets/javascripts/admin/addon/components/admin-report-table.js +++ b/app/assets/javascripts/admin/addon/components/admin-report-table.js @@ -1,9 +1,9 @@ -import { action } from "@ember/object"; -import { classNameBindings, classNames } from "@ember-decorators/component"; -import { alias } from "@ember/object/computed"; import Component from "@ember/component"; -import discourseComputed from "discourse-common/utils/decorators"; +import { action } from "@ember/object"; +import { alias } from "@ember/object/computed"; +import { classNameBindings, classNames } from "@ember-decorators/component"; import { makeArray } from "discourse-common/lib/helpers"; +import discourseComputed from "discourse-common/utils/decorators"; const PAGES_LIMIT = 8; diff --git a/app/assets/javascripts/admin/addon/components/admin-report-trust-level-counts.js b/app/assets/javascripts/admin/addon/components/admin-report-trust-level-counts.js index 6da6a748934..0c41a0f6167 100644 --- a/app/assets/javascripts/admin/addon/components/admin-report-trust-level-counts.js +++ b/app/assets/javascripts/admin/addon/components/admin-report-trust-level-counts.js @@ -1,5 +1,5 @@ -import { tagName } from "@ember-decorators/component"; import Component from "@ember/component"; +import { tagName } from "@ember-decorators/component"; @tagName("tr") export default class AdminReportTrustLevelCounts extends Component {} diff --git a/app/assets/javascripts/admin/addon/components/admin-report.js b/app/assets/javascripts/admin/addon/components/admin-report.js index fede9cc2d60..74fff51553e 100644 --- a/app/assets/javascripts/admin/addon/components/admin-report.js +++ b/app/assets/javascripts/admin/addon/components/admin-report.js @@ -1,17 +1,17 @@ -import { classNameBindings, classNames } from "@ember-decorators/component"; -import { alias, and, equal, notEmpty, or } from "@ember/object/computed"; -import EmberObject, { action, computed } from "@ember/object"; -import Report, { DAILY_LIMIT_DAYS, SCHEMA_VERSION } from "admin/models/report"; import Component from "@ember/component"; -import I18n from "I18n"; -import ReportLoader from "discourse/lib/reports-loader"; -import discourseComputed from "discourse-common/utils/decorators"; -import { exportEntity } from "discourse/lib/export-csv"; +import EmberObject, { action, computed } from "@ember/object"; +import { alias, and, equal, notEmpty, or } from "@ember/object/computed"; +import { next } from "@ember/runloop"; import { isPresent } from "@ember/utils"; +import { classNameBindings, classNames } from "@ember-decorators/component"; +import { exportEntity } from "discourse/lib/export-csv"; +import { outputExportResult } from "discourse/lib/export-result"; +import ReportLoader from "discourse/lib/reports-loader"; import { isTesting } from "discourse-common/config/environment"; import { makeArray } from "discourse-common/lib/helpers"; -import { next } from "@ember/runloop"; -import { outputExportResult } from "discourse/lib/export-result"; +import discourseComputed from "discourse-common/utils/decorators"; +import Report, { DAILY_LIMIT_DAYS, SCHEMA_VERSION } from "admin/models/report"; +import I18n from "I18n"; const TABLE_OPTIONS = { perPage: 8, diff --git a/app/assets/javascripts/admin/addon/components/admin-theme-editor.js b/app/assets/javascripts/admin/addon/components/admin-theme-editor.js index 31a0d02ec91..7489a0dbf1a 100644 --- a/app/assets/javascripts/admin/addon/components/admin-theme-editor.js +++ b/app/assets/javascripts/admin/addon/components/admin-theme-editor.js @@ -1,10 +1,10 @@ import Component from "@ember/component"; -import I18n from "I18n"; -import discourseComputed from "discourse-common/utils/decorators"; -import { fmt } from "discourse/lib/computed"; -import { isDocumentRTL } from "discourse/lib/text-direction"; import { action, computed } from "@ember/object"; import { next } from "@ember/runloop"; +import { fmt } from "discourse/lib/computed"; +import { isDocumentRTL } from "discourse/lib/text-direction"; +import discourseComputed from "discourse-common/utils/decorators"; +import I18n from "I18n"; export default class AdminThemeEditor extends Component { warning = null; diff --git a/app/assets/javascripts/admin/addon/components/admin-user-field-item.js b/app/assets/javascripts/admin/addon/components/admin-user-field-item.js index faf374788c5..08b0b869a82 100644 --- a/app/assets/javascripts/admin/addon/components/admin-user-field-item.js +++ b/app/assets/javascripts/admin/addon/components/admin-user-field-item.js @@ -1,13 +1,13 @@ -import discourseComputed from "discourse-common/utils/decorators"; -import { i18n, propertyEqual } from "discourse/lib/computed"; import Component from "@ember/component"; -import I18n from "I18n"; -import UserField from "admin/models/user-field"; -import { bufferedProperty } from "discourse/mixins/buffered-content"; +import { action } from "@ember/object"; +import { schedule } from "@ember/runloop"; import { isEmpty } from "@ember/utils"; import { popupAjaxError } from "discourse/lib/ajax-error"; -import { schedule } from "@ember/runloop"; -import { action } from "@ember/object"; +import { i18n, propertyEqual } from "discourse/lib/computed"; +import { bufferedProperty } from "discourse/mixins/buffered-content"; +import discourseComputed from "discourse-common/utils/decorators"; +import UserField from "admin/models/user-field"; +import I18n from "I18n"; export default Component.extend(bufferedProperty("userField"), { tagName: "", diff --git a/app/assets/javascripts/admin/addon/components/admin-watched-word.js b/app/assets/javascripts/admin/addon/components/admin-watched-word.js index d6bde8016d2..25775acac01 100644 --- a/app/assets/javascripts/admin/addon/components/admin-watched-word.js +++ b/app/assets/javascripts/admin/addon/components/admin-watched-word.js @@ -1,9 +1,9 @@ -import { classNames } from "@ember-decorators/component"; -import { inject as service } from "@ember/service"; -import { alias, equal } from "@ember/object/computed"; import Component from "@ember/component"; -import discourseComputed from "discourse-common/utils/decorators"; import { action } from "@ember/object"; +import { alias, equal } from "@ember/object/computed"; +import { inject as service } from "@ember/service"; +import { classNames } from "@ember-decorators/component"; +import discourseComputed from "discourse-common/utils/decorators"; import I18n from "I18n"; @classNames("watched-word") diff --git a/app/assets/javascripts/admin/addon/components/cancel-link.js b/app/assets/javascripts/admin/addon/components/cancel-link.js index aa5d4dda65c..c023fb8cf97 100644 --- a/app/assets/javascripts/admin/addon/components/cancel-link.js +++ b/app/assets/javascripts/admin/addon/components/cancel-link.js @@ -1,5 +1,5 @@ -import { tagName } from "@ember-decorators/component"; import Component from "@ember/component"; +import { tagName } from "@ember-decorators/component"; @tagName("") export default class CancelLink extends Component {} diff --git a/app/assets/javascripts/admin/addon/components/color-input.js b/app/assets/javascripts/admin/addon/components/color-input.js index 9c1c67f0442..bb225341380 100644 --- a/app/assets/javascripts/admin/addon/components/color-input.js +++ b/app/assets/javascripts/admin/addon/components/color-input.js @@ -1,6 +1,6 @@ -import { classNames } from "@ember-decorators/component"; -import { action, computed } from "@ember/object"; import Component from "@ember/component"; +import { action, computed } from "@ember/object"; +import { classNames } from "@ember-decorators/component"; import { observes } from "@ember-decorators/object"; /** diff --git a/app/assets/javascripts/admin/addon/components/dashboard-new-features.js b/app/assets/javascripts/admin/addon/components/dashboard-new-features.js index 46b7559585b..141833627fb 100644 --- a/app/assets/javascripts/admin/addon/components/dashboard-new-features.js +++ b/app/assets/javascripts/admin/addon/components/dashboard-new-features.js @@ -1,6 +1,6 @@ -import { classNameBindings, classNames } from "@ember-decorators/component"; import Component from "@ember/component"; import { action, computed } from "@ember/object"; +import { classNameBindings, classNames } from "@ember-decorators/component"; import { ajax } from "discourse/lib/ajax"; @classNames("section", "dashboard-new-features") diff --git a/app/assets/javascripts/admin/addon/components/email-styles-editor.js b/app/assets/javascripts/admin/addon/components/email-styles-editor.js index 2e1fc059be1..b6d2347c562 100644 --- a/app/assets/javascripts/admin/addon/components/email-styles-editor.js +++ b/app/assets/javascripts/admin/addon/components/email-styles-editor.js @@ -1,9 +1,9 @@ -import { action, computed } from "@ember/object"; -import { inject as service } from "@ember/service"; -import { reads } from "@ember/object/computed"; import Component from "@ember/component"; -import I18n from "I18n"; +import { action, computed } from "@ember/object"; +import { reads } from "@ember/object/computed"; +import { inject as service } from "@ember/service"; import discourseComputed from "discourse-common/utils/decorators"; +import I18n from "I18n"; export default class EmailStylesEditor extends Component { @service dialog; diff --git a/app/assets/javascripts/admin/addon/components/embeddable-host.js b/app/assets/javascripts/admin/addon/components/embeddable-host.js index 2375aa81412..759009c69ac 100644 --- a/app/assets/javascripts/admin/addon/components/embeddable-host.js +++ b/app/assets/javascripts/admin/addon/components/embeddable-host.js @@ -1,14 +1,14 @@ -import { action } from "@ember/object"; -import { tagName } from "@ember-decorators/component"; -import { inject as service } from "@ember/service"; -import { or } from "@ember/object/computed"; -import Category from "discourse/models/category"; import Component from "@ember/component"; -import I18n from "I18n"; -import { bufferedProperty } from "discourse/mixins/buffered-content"; -import discourseComputed from "discourse-common/utils/decorators"; +import { action } from "@ember/object"; +import { or } from "@ember/object/computed"; +import { inject as service } from "@ember/service"; import { isEmpty } from "@ember/utils"; +import { tagName } from "@ember-decorators/component"; import { popupAjaxError } from "discourse/lib/ajax-error"; +import { bufferedProperty } from "discourse/mixins/buffered-content"; +import Category from "discourse/models/category"; +import discourseComputed from "discourse-common/utils/decorators"; +import I18n from "I18n"; @tagName("tr") export default class EmbeddableHost extends Component.extend( diff --git a/app/assets/javascripts/admin/addon/components/embedding-setting.js b/app/assets/javascripts/admin/addon/components/embedding-setting.js index 85c26e7ea6d..e99b85a0336 100644 --- a/app/assets/javascripts/admin/addon/components/embedding-setting.js +++ b/app/assets/javascripts/admin/addon/components/embedding-setting.js @@ -1,8 +1,8 @@ -import { classNames } from "@ember-decorators/component"; -import { computed } from "@ember/object"; import Component from "@ember/component"; -import discourseComputed from "discourse-common/utils/decorators"; +import { computed } from "@ember/object"; import { dasherize } from "@ember/string"; +import { classNames } from "@ember-decorators/component"; +import discourseComputed from "discourse-common/utils/decorators"; @classNames("embed-setting") export default class EmbeddingSetting extends Component { diff --git a/app/assets/javascripts/admin/addon/components/emoji-value-list.js b/app/assets/javascripts/admin/addon/components/emoji-value-list.js index 40363b874d8..fc6e78d9039 100644 --- a/app/assets/javascripts/admin/addon/components/emoji-value-list.js +++ b/app/assets/javascripts/admin/addon/components/emoji-value-list.js @@ -1,11 +1,11 @@ -import { classNameBindings } from "@ember-decorators/component"; import Component from "@ember/component"; -import I18n from "I18n"; -import discourseComputed from "discourse-common/utils/decorators"; -import { emojiUrlFor } from "discourse/lib/text"; import { action, set, setProperties } from "@ember/object"; import { schedule } from "@ember/runloop"; +import { classNameBindings } from "@ember-decorators/component"; +import { emojiUrlFor } from "discourse/lib/text"; import discourseLater from "discourse-common/lib/later"; +import discourseComputed from "discourse-common/utils/decorators"; +import I18n from "I18n"; @classNameBindings(":value-list", ":emoji-list") export default class EmojiValueList extends Component { diff --git a/app/assets/javascripts/admin/addon/components/flag-user-lists.js b/app/assets/javascripts/admin/addon/components/flag-user-lists.js index 0096ce0a575..e44dc9831a0 100644 --- a/app/assets/javascripts/admin/addon/components/flag-user-lists.js +++ b/app/assets/javascripts/admin/addon/components/flag-user-lists.js @@ -1,5 +1,5 @@ -import { classNames } from "@ember-decorators/component"; import Component from "@ember/component"; +import { classNames } from "@ember-decorators/component"; @classNames("flag-user-lists") export default class FlagUserLists extends Component {} diff --git a/app/assets/javascripts/admin/addon/components/form-template/form.js b/app/assets/javascripts/admin/addon/components/form-template/form.js index 242568826d0..ddfd5d27b42 100644 --- a/app/assets/javascripts/admin/addon/components/form-template/form.js +++ b/app/assets/javascripts/admin/addon/components/form-template/form.js @@ -1,12 +1,12 @@ import Component from "@glimmer/component"; +import { tracked } from "@glimmer/tracking"; import { action } from "@ember/object"; import { inject as service } from "@ember/service"; -import { tracked } from "@glimmer/tracking"; -import I18n from "I18n"; import { popupAjaxError } from "discourse/lib/ajax-error"; +import FormTemplateValidationOptionsModal from "admin/components/modal/form-template-validation-options"; import { templateFormFields } from "admin/lib/template-form-fields"; import FormTemplate from "admin/models/form-template"; -import FormTemplateValidationOptionsModal from "admin/components/modal/form-template-validation-options"; +import I18n from "I18n"; export default class FormTemplateForm extends Component { @service router; diff --git a/app/assets/javascripts/admin/addon/components/highlighted-code.js b/app/assets/javascripts/admin/addon/components/highlighted-code.js index 782754682f3..65208dc6eff 100644 --- a/app/assets/javascripts/admin/addon/components/highlighted-code.js +++ b/app/assets/javascripts/admin/addon/components/highlighted-code.js @@ -1,5 +1,5 @@ -import { observes, on } from "@ember-decorators/object"; import Component from "@ember/component"; +import { observes, on } from "@ember-decorators/object"; import highlightSyntax from "discourse/lib/highlight-syntax"; export default class HighlightedCode extends Component { diff --git a/app/assets/javascripts/admin/addon/components/inline-edit-checkbox.js b/app/assets/javascripts/admin/addon/components/inline-edit-checkbox.js index 8618e4044b4..d7ba4bc40c0 100644 --- a/app/assets/javascripts/admin/addon/components/inline-edit-checkbox.js +++ b/app/assets/javascripts/admin/addon/components/inline-edit-checkbox.js @@ -1,6 +1,6 @@ -import { classNames } from "@ember-decorators/component"; import Component from "@ember/component"; import { action } from "@ember/object"; +import { classNames } from "@ember-decorators/component"; import discourseComputed from "discourse-common/utils/decorators"; @classNames("inline-edit") diff --git a/app/assets/javascripts/admin/addon/components/install-theme-item.js b/app/assets/javascripts/admin/addon/components/install-theme-item.js index 459dc5dc673..d755c575060 100644 --- a/app/assets/javascripts/admin/addon/components/install-theme-item.js +++ b/app/assets/javascripts/admin/addon/components/install-theme-item.js @@ -1,5 +1,5 @@ -import { classNames } from "@ember-decorators/component"; import Component from "@ember/component"; +import { classNames } from "@ember-decorators/component"; @classNames("install-theme-item") export default class InstallThemeItem extends Component {} diff --git a/app/assets/javascripts/admin/addon/components/ip-lookup.js b/app/assets/javascripts/admin/addon/components/ip-lookup.js index 42c5f128116..a95d6efeb60 100644 --- a/app/assets/javascripts/admin/addon/components/ip-lookup.js +++ b/app/assets/javascripts/admin/addon/components/ip-lookup.js @@ -1,14 +1,14 @@ -import { classNames } from "@ember-decorators/component"; -import { inject as service } from "@ember/service"; -import AdminUser from "admin/models/admin-user"; import Component from "@ember/component"; import EmberObject, { action } from "@ember/object"; -import I18n from "I18n"; +import { inject as service } from "@ember/service"; +import { classNames } from "@ember-decorators/component"; import { ajax } from "discourse/lib/ajax"; -import copyText from "discourse/lib/copy-text"; -import discourseComputed from "discourse-common/utils/decorators"; -import discourseLater from "discourse-common/lib/later"; import { popupAjaxError } from "discourse/lib/ajax-error"; +import copyText from "discourse/lib/copy-text"; +import discourseLater from "discourse-common/lib/later"; +import discourseComputed from "discourse-common/utils/decorators"; +import AdminUser from "admin/models/admin-user"; +import I18n from "I18n"; @classNames("ip-lookup") export default class IpLookup extends Component { diff --git a/app/assets/javascripts/admin/addon/components/modal/badge-preview.js b/app/assets/javascripts/admin/addon/components/modal/badge-preview.js index 399eee7d97e..136f85b0248 100644 --- a/app/assets/javascripts/admin/addon/components/modal/badge-preview.js +++ b/app/assets/javascripts/admin/addon/components/modal/badge-preview.js @@ -1,6 +1,6 @@ import Component from "@glimmer/component"; -import I18n from "I18n"; import { escapeExpression } from "discourse/lib/utilities"; +import I18n from "I18n"; export default class BadgePreview extends Component { get processedSample() { diff --git a/app/assets/javascripts/admin/addon/components/modal/color-scheme-select-base.js b/app/assets/javascripts/admin/addon/components/modal/color-scheme-select-base.js index 491ee03dd7d..310bbb3a637 100644 --- a/app/assets/javascripts/admin/addon/components/modal/color-scheme-select-base.js +++ b/app/assets/javascripts/admin/addon/components/modal/color-scheme-select-base.js @@ -1,6 +1,6 @@ import Component from "@glimmer/component"; -import { action } from "@ember/object"; import { tracked } from "@glimmer/tracking"; +import { action } from "@ember/object"; export default class ColorSchemeSelectBase extends Component { @tracked diff --git a/app/assets/javascripts/admin/addon/components/modal/custom-date-range.js b/app/assets/javascripts/admin/addon/components/modal/custom-date-range.js index 42692d197f3..ba182675902 100644 --- a/app/assets/javascripts/admin/addon/components/modal/custom-date-range.js +++ b/app/assets/javascripts/admin/addon/components/modal/custom-date-range.js @@ -1,6 +1,6 @@ import Component from "@glimmer/component"; -import { action } from "@ember/object"; import { tracked } from "@glimmer/tracking"; +import { action } from "@ember/object"; export default class CustomDateRange extends Component { @tracked startDate = this.args.model.startDate; diff --git a/app/assets/javascripts/admin/addon/components/modal/delete-user-posts-progress.js b/app/assets/javascripts/admin/addon/components/modal/delete-user-posts-progress.js index f4b9448b40d..6738dc68450 100644 --- a/app/assets/javascripts/admin/addon/components/modal/delete-user-posts-progress.js +++ b/app/assets/javascripts/admin/addon/components/modal/delete-user-posts-progress.js @@ -1,8 +1,8 @@ import Component from "@glimmer/component"; -import { action } from "@ember/object"; import { tracked } from "@glimmer/tracking"; -import AdminUser from "admin/models/admin-user"; +import { action } from "@ember/object"; import { extractError } from "discourse/lib/ajax-error"; +import AdminUser from "admin/models/admin-user"; import I18n from "I18n"; export default class DeleteUserPostsProgress extends Component { diff --git a/app/assets/javascripts/admin/addon/components/modal/edit-badge-groupings.js b/app/assets/javascripts/admin/addon/components/modal/edit-badge-groupings.js index de40d2b6cec..0201af67cad 100644 --- a/app/assets/javascripts/admin/addon/components/modal/edit-badge-groupings.js +++ b/app/assets/javascripts/admin/addon/components/modal/edit-badge-groupings.js @@ -1,11 +1,11 @@ import Component from "@glimmer/component"; import { tracked } from "@glimmer/tracking"; -import { inject as service } from "@ember/service"; -import { action } from "@ember/object"; -import I18n from "I18n"; import { A } from "@ember/array"; -import { ajax } from "discourse/lib/ajax"; +import { action } from "@ember/object"; +import { inject as service } from "@ember/service"; import { TrackedArray } from "@ember-compat/tracked-built-ins"; +import { ajax } from "discourse/lib/ajax"; +import I18n from "I18n"; export default class EditBadgeGroupings extends Component { @service dialog; diff --git a/app/assets/javascripts/admin/addon/components/modal/install-theme.js b/app/assets/javascripts/admin/addon/components/modal/install-theme.js index 14cfb4c9d7b..9b67bc0954a 100644 --- a/app/assets/javascripts/admin/addon/components/modal/install-theme.js +++ b/app/assets/javascripts/admin/addon/components/modal/install-theme.js @@ -1,12 +1,12 @@ import Component from "@glimmer/component"; import { tracked } from "@glimmer/tracking"; import { action } from "@ember/object"; -import { COMPONENTS, THEMES } from "admin/models/theme"; -import { POPULAR_THEMES } from "discourse-common/lib/popular-themes"; -import { ajax } from "discourse/lib/ajax"; -import I18n from "I18n"; import { inject as service } from "@ember/service"; +import { ajax } from "discourse/lib/ajax"; import { popupAjaxError } from "discourse/lib/ajax-error"; +import { POPULAR_THEMES } from "discourse-common/lib/popular-themes"; +import { COMPONENTS, THEMES } from "admin/models/theme"; +import I18n from "I18n"; const MIN_NAME_LENGTH = 4; diff --git a/app/assets/javascripts/admin/addon/components/modal/merge-users-progress.js b/app/assets/javascripts/admin/addon/components/modal/merge-users-progress.js index ea174d115e2..4bda6e935ec 100644 --- a/app/assets/javascripts/admin/addon/components/modal/merge-users-progress.js +++ b/app/assets/javascripts/admin/addon/components/modal/merge-users-progress.js @@ -1,8 +1,8 @@ import Component from "@glimmer/component"; import { tracked } from "@glimmer/tracking"; import { inject as service } from "@ember/service"; -import { bind } from "discourse-common/utils/decorators"; import DiscourseURL from "discourse/lib/url"; +import { bind } from "discourse-common/utils/decorators"; import I18n from "I18n"; export default class MergeUsersProgress extends Component { diff --git a/app/assets/javascripts/admin/addon/components/modal/penalize-user.js b/app/assets/javascripts/admin/addon/components/modal/penalize-user.js index 8e8d1dfd1a4..6c7b6acd397 100644 --- a/app/assets/javascripts/admin/addon/components/modal/penalize-user.js +++ b/app/assets/javascripts/admin/addon/components/modal/penalize-user.js @@ -1,8 +1,8 @@ import Component from "@glimmer/component"; import { tracked } from "@glimmer/tracking"; import { action } from "@ember/object"; -import { isEmpty } from "@ember/utils"; import { inject as service } from "@ember/service"; +import { isEmpty } from "@ember/utils"; import { extractError } from "discourse/lib/ajax-error"; import I18n from "I18n"; diff --git a/app/assets/javascripts/admin/addon/components/modal/reseed.js b/app/assets/javascripts/admin/addon/components/modal/reseed.js index e2581ba20ca..193987a2362 100644 --- a/app/assets/javascripts/admin/addon/components/modal/reseed.js +++ b/app/assets/javascripts/admin/addon/components/modal/reseed.js @@ -1,9 +1,9 @@ import Component from "@glimmer/component"; +import { tracked } from "@glimmer/tracking"; import { action } from "@ember/object"; import { inject as service } from "@ember/service"; -import I18n from "I18n"; import { ajax } from "discourse/lib/ajax"; -import { tracked } from "@glimmer/tracking"; +import I18n from "I18n"; export default class Reseed extends Component { @service dialog; diff --git a/app/assets/javascripts/admin/addon/components/modal/start-backup.js b/app/assets/javascripts/admin/addon/components/modal/start-backup.js index 8dd1bf27a0e..5b1f4ae1c98 100644 --- a/app/assets/javascripts/admin/addon/components/modal/start-backup.js +++ b/app/assets/javascripts/admin/addon/components/modal/start-backup.js @@ -1,6 +1,6 @@ import Component from "@glimmer/component"; -import { action } from "@ember/object"; import { tracked } from "@glimmer/tracking"; +import { action } from "@ember/object"; import { inject as service } from "@ember/service"; import I18n from "I18n"; diff --git a/app/assets/javascripts/admin/addon/components/modal/uploaded-image-list.js b/app/assets/javascripts/admin/addon/components/modal/uploaded-image-list.js index fadd2905b34..9bdaf064077 100644 --- a/app/assets/javascripts/admin/addon/components/modal/uploaded-image-list.js +++ b/app/assets/javascripts/admin/addon/components/modal/uploaded-image-list.js @@ -1,6 +1,6 @@ import Component from "@glimmer/component"; -import { action } from "@ember/object"; import { tracked } from "@glimmer/tracking"; +import { action } from "@ember/object"; export default class UploadedImageList extends Component { @tracked diff --git a/app/assets/javascripts/admin/addon/components/moderation-history-item.js b/app/assets/javascripts/admin/addon/components/moderation-history-item.js index a94d4e65532..e7aa1d46422 100644 --- a/app/assets/javascripts/admin/addon/components/moderation-history-item.js +++ b/app/assets/javascripts/admin/addon/components/moderation-history-item.js @@ -1,5 +1,5 @@ -import { tagName } from "@ember-decorators/component"; import Component from "@ember/component"; +import { tagName } from "@ember-decorators/component"; @tagName("tr") export default class ModerationHistoryItem extends Component {} diff --git a/app/assets/javascripts/admin/addon/components/permalink-form.js b/app/assets/javascripts/admin/addon/components/permalink-form.js index 129ab0d58e4..2c0f5cbd102 100644 --- a/app/assets/javascripts/admin/addon/components/permalink-form.js +++ b/app/assets/javascripts/admin/addon/components/permalink-form.js @@ -1,12 +1,12 @@ -import { tagName } from "@ember-decorators/component"; -import { inject as service } from "@ember/service"; import Component from "@ember/component"; -import I18n from "I18n"; -import Permalink from "admin/models/permalink"; -import discourseComputed, { bind } from "discourse-common/utils/decorators"; -import { fmt } from "discourse/lib/computed"; -import { schedule } from "@ember/runloop"; import { action } from "@ember/object"; +import { schedule } from "@ember/runloop"; +import { inject as service } from "@ember/service"; +import { tagName } from "@ember-decorators/component"; +import { fmt } from "discourse/lib/computed"; +import discourseComputed, { bind } from "discourse-common/utils/decorators"; +import Permalink from "admin/models/permalink"; +import I18n from "I18n"; @tagName("") export default class PermalinkForm extends Component { diff --git a/app/assets/javascripts/admin/addon/components/report-filters/bool.js b/app/assets/javascripts/admin/addon/components/report-filters/bool.js index d406b1e87e5..602ed3c0766 100644 --- a/app/assets/javascripts/admin/addon/components/report-filters/bool.js +++ b/app/assets/javascripts/admin/addon/components/report-filters/bool.js @@ -1,5 +1,5 @@ -import FilterComponent from "admin/components/report-filters/filter"; import { action } from "@ember/object"; +import FilterComponent from "admin/components/report-filters/filter"; export default class Bool extends FilterComponent { checked = false; diff --git a/app/assets/javascripts/admin/addon/components/report-filters/category.js b/app/assets/javascripts/admin/addon/components/report-filters/category.js index c32e99c50f7..cf381edbb9b 100644 --- a/app/assets/javascripts/admin/addon/components/report-filters/category.js +++ b/app/assets/javascripts/admin/addon/components/report-filters/category.js @@ -1,6 +1,6 @@ +import { action } from "@ember/object"; import { readOnly } from "@ember/object/computed"; import FilterComponent from "admin/components/report-filters/filter"; -import { action } from "@ember/object"; export default class Category extends FilterComponent { @readOnly("filter.default") category; diff --git a/app/assets/javascripts/admin/addon/components/report-filters/group.js b/app/assets/javascripts/admin/addon/components/report-filters/group.js index 8ac7eb3b9a2..720840e3386 100644 --- a/app/assets/javascripts/admin/addon/components/report-filters/group.js +++ b/app/assets/javascripts/admin/addon/components/report-filters/group.js @@ -1,5 +1,5 @@ -import { classNames } from "@ember-decorators/component"; import { computed } from "@ember/object"; +import { classNames } from "@ember-decorators/component"; import FilterComponent from "admin/components/report-filters/filter"; @classNames("group-filter") diff --git a/app/assets/javascripts/admin/addon/components/screened-ip-address-form.js b/app/assets/javascripts/admin/addon/components/screened-ip-address-form.js index fe7945dee79..ef6c077d2a5 100644 --- a/app/assets/javascripts/admin/addon/components/screened-ip-address-form.js +++ b/app/assets/javascripts/admin/addon/components/screened-ip-address-form.js @@ -1,11 +1,11 @@ -import { action } from "@ember/object"; -import { classNames, tagName } from "@ember-decorators/component"; -import { inject as service } from "@ember/service"; -import discourseComputed from "discourse-common/utils/decorators"; import Component from "@ember/component"; -import I18n from "I18n"; -import ScreenedIpAddress from "admin/models/screened-ip-address"; +import { action } from "@ember/object"; import { schedule } from "@ember/runloop"; +import { inject as service } from "@ember/service"; +import { classNames, tagName } from "@ember-decorators/component"; +import discourseComputed from "discourse-common/utils/decorators"; +import ScreenedIpAddress from "admin/models/screened-ip-address"; +import I18n from "I18n"; /** A form to create an IP address that will be blocked or allowed. diff --git a/app/assets/javascripts/admin/addon/components/secret-value-list.js b/app/assets/javascripts/admin/addon/components/secret-value-list.js index eae2a34d6dc..de1b5bdb080 100644 --- a/app/assets/javascripts/admin/addon/components/secret-value-list.js +++ b/app/assets/javascripts/admin/addon/components/secret-value-list.js @@ -1,9 +1,9 @@ -import { classNameBindings } from "@ember-decorators/component"; import Component from "@ember/component"; -import I18n from "I18n"; -import { isEmpty } from "@ember/utils"; -import { on } from "@ember-decorators/object"; import { action, set } from "@ember/object"; +import { isEmpty } from "@ember/utils"; +import { classNameBindings } from "@ember-decorators/component"; +import { on } from "@ember-decorators/object"; +import I18n from "I18n"; @classNameBindings(":value-list", ":secret-value-list") export default class SecretValueList extends Component { diff --git a/app/assets/javascripts/admin/addon/components/silence-details.js b/app/assets/javascripts/admin/addon/components/silence-details.js index b50edba07ee..c51e6079181 100644 --- a/app/assets/javascripts/admin/addon/components/silence-details.js +++ b/app/assets/javascripts/admin/addon/components/silence-details.js @@ -1,5 +1,5 @@ -import { tagName } from "@ember-decorators/component"; import Component from "@ember/component"; +import { tagName } from "@ember-decorators/component"; @tagName("") export default class SilenceDetails extends Component {} diff --git a/app/assets/javascripts/admin/addon/components/simple-list.js b/app/assets/javascripts/admin/addon/components/simple-list.js index e30d06c0725..0d096cac94a 100644 --- a/app/assets/javascripts/admin/addon/components/simple-list.js +++ b/app/assets/javascripts/admin/addon/components/simple-list.js @@ -1,9 +1,9 @@ -import { classNameBindings } from "@ember-decorators/component"; -import { empty } from "@ember/object/computed"; import Component from "@ember/component"; import { action } from "@ember/object"; -import discourseComputed from "discourse-common/utils/decorators"; +import { empty } from "@ember/object/computed"; +import { classNameBindings } from "@ember-decorators/component"; import { on } from "@ember-decorators/object"; +import discourseComputed from "discourse-common/utils/decorators"; @classNameBindings(":simple-list", ":value-list") export default class SimpleList extends Component { diff --git a/app/assets/javascripts/admin/addon/components/site-setting.js b/app/assets/javascripts/admin/addon/components/site-setting.js index f405a425285..33331677de5 100644 --- a/app/assets/javascripts/admin/addon/components/site-setting.js +++ b/app/assets/javascripts/admin/addon/components/site-setting.js @@ -1,6 +1,6 @@ +import Component from "@ember/component"; import { readOnly } from "@ember/object/computed"; import BufferedContent from "discourse/mixins/buffered-content"; -import Component from "@ember/component"; import SettingComponent from "admin/mixins/setting-component"; import SiteSetting from "admin/models/site-setting"; diff --git a/app/assets/javascripts/admin/addon/components/site-settings/bool.js b/app/assets/javascripts/admin/addon/components/site-settings/bool.js index 8837213db27..dc6001d31fb 100644 --- a/app/assets/javascripts/admin/addon/components/site-settings/bool.js +++ b/app/assets/javascripts/admin/addon/components/site-settings/bool.js @@ -1,5 +1,5 @@ -import { computed } from "@ember/object"; import Component from "@ember/component"; +import { computed } from "@ember/object"; import { isEmpty } from "@ember/utils"; export default class Bool extends Component { diff --git a/app/assets/javascripts/admin/addon/components/site-settings/category-list.js b/app/assets/javascripts/admin/addon/components/site-settings/category-list.js index 44fdee3a715..65966787210 100644 --- a/app/assets/javascripts/admin/addon/components/site-settings/category-list.js +++ b/app/assets/javascripts/admin/addon/components/site-settings/category-list.js @@ -1,6 +1,6 @@ +import Component from "@ember/component"; import { action, computed } from "@ember/object"; import Category from "discourse/models/category"; -import Component from "@ember/component"; export default class CategoryList extends Component { @computed("value") diff --git a/app/assets/javascripts/admin/addon/components/site-settings/color.js b/app/assets/javascripts/admin/addon/components/site-settings/color.js index a044348c0b2..e9d9fb7cfed 100644 --- a/app/assets/javascripts/admin/addon/components/site-settings/color.js +++ b/app/assets/javascripts/admin/addon/components/site-settings/color.js @@ -1,5 +1,5 @@ -import { action, computed } from "@ember/object"; import Component from "@ember/component"; +import { action, computed } from "@ember/object"; function RGBToHex(rgb) { // Choose correct separator diff --git a/app/assets/javascripts/admin/addon/components/site-settings/compact-list.js b/app/assets/javascripts/admin/addon/components/site-settings/compact-list.js index 35d86e32dce..c1823ecd327 100644 --- a/app/assets/javascripts/admin/addon/components/site-settings/compact-list.js +++ b/app/assets/javascripts/admin/addon/components/site-settings/compact-list.js @@ -1,5 +1,5 @@ -import { action, computed } from "@ember/object"; import Component from "@ember/component"; +import { action, computed } from "@ember/object"; import { makeArray } from "discourse-common/lib/helpers"; export default class CompactList extends Component { diff --git a/app/assets/javascripts/admin/addon/components/site-settings/group-list.js b/app/assets/javascripts/admin/addon/components/site-settings/group-list.js index e483afc3951..dafef1f6c66 100644 --- a/app/assets/javascripts/admin/addon/components/site-settings/group-list.js +++ b/app/assets/javascripts/admin/addon/components/site-settings/group-list.js @@ -1,5 +1,5 @@ -import { action, computed } from "@ember/object"; import Component from "@ember/component"; +import { action, computed } from "@ember/object"; export default class GroupList extends Component { tokenSeparator = "|"; diff --git a/app/assets/javascripts/admin/addon/components/site-text-summary.js b/app/assets/javascripts/admin/addon/components/site-text-summary.js index a8706d5ba55..3509a29bfde 100644 --- a/app/assets/javascripts/admin/addon/components/site-text-summary.js +++ b/app/assets/javascripts/admin/addon/components/site-text-summary.js @@ -1,7 +1,7 @@ -import { classNameBindings, classNames } from "@ember-decorators/component"; import Component from "@ember/component"; -import highlightHTML from "discourse/lib/highlight-html"; +import { classNameBindings, classNames } from "@ember-decorators/component"; import { on } from "@ember-decorators/object"; +import highlightHTML from "discourse/lib/highlight-html"; @classNames("site-text") @classNameBindings("siteText.overridden") diff --git a/app/assets/javascripts/admin/addon/components/staff-actions.js b/app/assets/javascripts/admin/addon/components/staff-actions.js index 4e4fe55c508..feb9db749ec 100644 --- a/app/assets/javascripts/admin/addon/components/staff-actions.js +++ b/app/assets/javascripts/admin/addon/components/staff-actions.js @@ -1,6 +1,6 @@ -import { tagName } from "@ember-decorators/component"; -import { action } from "@ember/object"; import Component from "@ember/component"; +import { action } from "@ember/object"; +import { tagName } from "@ember-decorators/component"; import DiscourseURL from "discourse/lib/url"; @tagName("") diff --git a/app/assets/javascripts/admin/addon/components/tags-uploader.js b/app/assets/javascripts/admin/addon/components/tags-uploader.js index acc31e3506e..3ffabd91f49 100644 --- a/app/assets/javascripts/admin/addon/components/tags-uploader.js +++ b/app/assets/javascripts/admin/addon/components/tags-uploader.js @@ -1,8 +1,8 @@ -import { inject as service } from "@ember/service"; -import { alias } from "@ember/object/computed"; import Component from "@ember/component"; -import I18n from "I18n"; +import { alias } from "@ember/object/computed"; +import { inject as service } from "@ember/service"; import UppyUploadMixin from "discourse/mixins/uppy-upload"; +import I18n from "I18n"; export default class TagsUploader extends Component.extend(UppyUploadMixin) { @service dialog; diff --git a/app/assets/javascripts/admin/addon/components/theme-setting-editor.js b/app/assets/javascripts/admin/addon/components/theme-setting-editor.js index 1982145c03c..e28bbc95fbd 100644 --- a/app/assets/javascripts/admin/addon/components/theme-setting-editor.js +++ b/app/assets/javascripts/admin/addon/components/theme-setting-editor.js @@ -1,6 +1,6 @@ -import SiteSettingComponent from "./site-setting"; import { ajax } from "discourse/lib/ajax"; import { url } from "discourse/lib/computed"; +import SiteSettingComponent from "./site-setting"; export default class extends SiteSettingComponent { @url("model.id", "/admin/themes/%@/setting") updateUrl; diff --git a/app/assets/javascripts/admin/addon/components/theme-settings-editor.js b/app/assets/javascripts/admin/addon/components/theme-settings-editor.js index 17993846ace..d1d20d89659 100644 --- a/app/assets/javascripts/admin/addon/components/theme-settings-editor.js +++ b/app/assets/javascripts/admin/addon/components/theme-settings-editor.js @@ -1,8 +1,8 @@ import Component from "@glimmer/component"; -import { action } from "@ember/object"; import { tracked } from "@glimmer/tracking"; -import { ajax } from "discourse/lib/ajax"; +import { action } from "@ember/object"; import { inject as service } from "@ember/service"; +import { ajax } from "discourse/lib/ajax"; import I18n from "I18n"; export default class ThemeSettingsEditor extends Component { diff --git a/app/assets/javascripts/admin/addon/components/theme-translation.js b/app/assets/javascripts/admin/addon/components/theme-translation.js index c111b350515..6c3834f80e1 100644 --- a/app/assets/javascripts/admin/addon/components/theme-translation.js +++ b/app/assets/javascripts/admin/addon/components/theme-translation.js @@ -1,7 +1,7 @@ -import SiteSettingComponent from "./site-setting"; +import { alias } from "@ember/object/computed"; import { ajax } from "discourse/lib/ajax"; import { url } from "discourse/lib/computed"; -import { alias } from "@ember/object/computed"; +import SiteSettingComponent from "./site-setting"; export default class ThemeTranslation extends SiteSettingComponent { @alias("translation") setting; diff --git a/app/assets/javascripts/admin/addon/components/theme-upload-add.js b/app/assets/javascripts/admin/addon/components/theme-upload-add.js index 5ef4604b161..dcb35fb2d1c 100644 --- a/app/assets/javascripts/admin/addon/components/theme-upload-add.js +++ b/app/assets/javascripts/admin/addon/components/theme-upload-add.js @@ -1,10 +1,10 @@ import Component from "@glimmer/component"; -import { action } from "@ember/object"; import { tracked } from "@glimmer/tracking"; -import I18n from "I18n"; -import { ajax } from "discourse/lib/ajax"; +import { action } from "@ember/object"; import { isEmpty } from "@ember/utils"; +import { ajax } from "discourse/lib/ajax"; import { extractError } from "discourse/lib/ajax-error"; +import I18n from "I18n"; const THEME_FIELD_VARIABLE_TYPE_IDS = [2, 3, 4]; const SCSS_VARIABLE_NAMES = [ diff --git a/app/assets/javascripts/admin/addon/components/themes-list-item.js b/app/assets/javascripts/admin/addon/components/themes-list-item.js index b059b96ea47..d395776fe77 100644 --- a/app/assets/javascripts/admin/addon/components/themes-list-item.js +++ b/app/assets/javascripts/admin/addon/components/themes-list-item.js @@ -1,10 +1,10 @@ -import { classNameBindings, classNames } from "@ember-decorators/component"; -import { and, gt } from "@ember/object/computed"; -import discourseComputed from "discourse-common/utils/decorators"; import Component from "@ember/component"; +import { action } from "@ember/object"; +import { and, gt } from "@ember/object/computed"; +import { classNameBindings, classNames } from "@ember-decorators/component"; import { escape } from "pretty-text/sanitizer"; import { iconHTML } from "discourse-common/lib/icon-library"; -import { action } from "@ember/object"; +import discourseComputed from "discourse-common/utils/decorators"; const MAX_COMPONENTS = 4; diff --git a/app/assets/javascripts/admin/addon/components/themes-list.js b/app/assets/javascripts/admin/addon/components/themes-list.js index 63d2d8b6b40..32296a7c0ea 100644 --- a/app/assets/javascripts/admin/addon/components/themes-list.js +++ b/app/assets/javascripts/admin/addon/components/themes-list.js @@ -1,11 +1,11 @@ -import { classNames } from "@ember-decorators/component"; -import { inject as service } from "@ember/service"; -import { equal, gt, gte } from "@ember/object/computed"; -import { COMPONENTS, THEMES } from "admin/models/theme"; import Component from "@ember/component"; -import discourseComputed, { bind } from "discourse-common/utils/decorators"; import { action } from "@ember/object"; +import { equal, gt, gte } from "@ember/object/computed"; +import { inject as service } from "@ember/service"; +import { classNames } from "@ember-decorators/component"; import DeleteThemesConfirm from "discourse/components/modal/delete-themes-confirm"; +import discourseComputed, { bind } from "discourse-common/utils/decorators"; +import { COMPONENTS, THEMES } from "admin/models/theme"; @classNames("themes-list") export default class ThemesList extends Component { diff --git a/app/assets/javascripts/admin/addon/components/value-list.js b/app/assets/javascripts/admin/addon/components/value-list.js index 078fbab2133..68386eda1e1 100644 --- a/app/assets/javascripts/admin/addon/components/value-list.js +++ b/app/assets/javascripts/admin/addon/components/value-list.js @@ -1,10 +1,10 @@ -import { action } from "@ember/object"; -import { classNames } from "@ember-decorators/component"; -import discourseComputed from "discourse-common/utils/decorators"; -import { on } from "@ember-decorators/object"; -import { empty, reads } from "@ember/object/computed"; import Component from "@ember/component"; +import { action } from "@ember/object"; +import { empty, reads } from "@ember/object/computed"; +import { classNames } from "@ember-decorators/component"; +import { on } from "@ember-decorators/object"; import { makeArray } from "discourse-common/lib/helpers"; +import discourseComputed from "discourse-common/utils/decorators"; @classNames("value-list") export default class ValueList extends Component { diff --git a/app/assets/javascripts/admin/addon/components/watched-word-form.js b/app/assets/javascripts/admin/addon/components/watched-word-form.js index e3ab1c7b212..1dd28884351 100644 --- a/app/assets/javascripts/admin/addon/components/watched-word-form.js +++ b/app/assets/javascripts/admin/addon/components/watched-word-form.js @@ -1,14 +1,14 @@ -import { action } from "@ember/object"; -import { classNames, tagName } from "@ember-decorators/component"; -import { inject as service } from "@ember/service"; -import { equal, not } from "@ember/object/computed"; -import discourseComputed from "discourse-common/utils/decorators"; -import { observes } from "@ember-decorators/object"; import Component from "@ember/component"; -import I18n from "I18n"; -import WatchedWord from "admin/models/watched-word"; -import { isEmpty } from "@ember/utils"; +import { action } from "@ember/object"; +import { equal, not } from "@ember/object/computed"; import { schedule } from "@ember/runloop"; +import { inject as service } from "@ember/service"; +import { isEmpty } from "@ember/utils"; +import { classNames, tagName } from "@ember-decorators/component"; +import { observes } from "@ember-decorators/object"; +import discourseComputed from "discourse-common/utils/decorators"; +import WatchedWord from "admin/models/watched-word"; +import I18n from "I18n"; @tagName("form") @classNames("watched-word-form") diff --git a/app/assets/javascripts/admin/addon/components/watched-word-uploader.js b/app/assets/javascripts/admin/addon/components/watched-word-uploader.js index 3c29a88cf7c..f76e3eeb429 100644 --- a/app/assets/javascripts/admin/addon/components/watched-word-uploader.js +++ b/app/assets/javascripts/admin/addon/components/watched-word-uploader.js @@ -1,9 +1,9 @@ -import { classNames } from "@ember-decorators/component"; -import { alias } from "@ember/object/computed"; import Component from "@ember/component"; -import I18n from "I18n"; -import UppyUploadMixin from "discourse/mixins/uppy-upload"; +import { alias } from "@ember/object/computed"; +import { classNames } from "@ember-decorators/component"; import { dialog } from "discourse/lib/uploads"; +import UppyUploadMixin from "discourse/mixins/uppy-upload"; +import I18n from "I18n"; @classNames("watched-words-uploader") export default class WatchedWordUploader extends Component.extend( diff --git a/app/assets/javascripts/admin/addon/components/webhook-event.js b/app/assets/javascripts/admin/addon/components/webhook-event.js index bb6b81bb378..d2658e9171d 100644 --- a/app/assets/javascripts/admin/addon/components/webhook-event.js +++ b/app/assets/javascripts/admin/addon/components/webhook-event.js @@ -1,11 +1,11 @@ import Component from "@glimmer/component"; -import { ensureJSON, plainJSON, prettyJSON } from "discourse/lib/formatter"; -import I18n from "I18n"; +import { tracked } from "@glimmer/tracking"; +import { action } from "@ember/object"; +import { inject as service } from "@ember/service"; import { ajax } from "discourse/lib/ajax"; import { popupAjaxError } from "discourse/lib/ajax-error"; -import { inject as service } from "@ember/service"; -import { action } from "@ember/object"; -import { tracked } from "@glimmer/tracking"; +import { ensureJSON, plainJSON, prettyJSON } from "discourse/lib/formatter"; +import I18n from "I18n"; export default class WebhookEvent extends Component { @service dialog; diff --git a/app/assets/javascripts/admin/addon/components/webhook-events.js b/app/assets/javascripts/admin/addon/components/webhook-events.js index 5f887202e4d..a0447a0c6fc 100644 --- a/app/assets/javascripts/admin/addon/components/webhook-events.js +++ b/app/assets/javascripts/admin/addon/components/webhook-events.js @@ -1,11 +1,11 @@ import Component from "@glimmer/component"; -import { inject as service } from "@ember/service"; import { tracked } from "@glimmer/tracking"; import { action } from "@ember/object"; -import { ajax } from "discourse/lib/ajax"; import { gt, readOnly } from "@ember/object/computed"; -import { bind } from "discourse-common/utils/decorators"; +import { inject as service } from "@ember/service"; +import { ajax } from "discourse/lib/ajax"; import { popupAjaxError } from "discourse/lib/ajax-error"; +import { bind } from "discourse-common/utils/decorators"; export default class WebhookEvents extends Component { @service messageBus; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-api-keys-new.js b/app/assets/javascripts/admin/addon/controllers/admin-api-keys-new.js index bac3168656a..5b7114a7da5 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-api-keys-new.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-api-keys-new.js @@ -1,12 +1,12 @@ -import { equal } from "@ember/object/computed"; import Controller from "@ember/controller"; -import I18n from "I18n"; -import discourseComputed from "discourse-common/utils/decorators"; -import { isBlank } from "@ember/utils"; -import { popupAjaxError } from "discourse/lib/ajax-error"; import { action, get } from "@ember/object"; -import { ajax } from "discourse/lib/ajax"; +import { equal } from "@ember/object/computed"; import { inject as service } from "@ember/service"; +import { isBlank } from "@ember/utils"; +import { ajax } from "discourse/lib/ajax"; +import { popupAjaxError } from "discourse/lib/ajax-error"; +import discourseComputed from "discourse-common/utils/decorators"; +import I18n from "I18n"; import ApiKeyUrlsModal from "../components/modal/api-key-urls"; export default class AdminApiKeysNewController extends Controller { diff --git a/app/assets/javascripts/admin/addon/controllers/admin-api-keys-show.js b/app/assets/javascripts/admin/addon/controllers/admin-api-keys-show.js index 499bd0c75d8..29e8e7f275b 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-api-keys-show.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-api-keys-show.js @@ -1,10 +1,10 @@ +import Controller from "@ember/controller"; import { action } from "@ember/object"; import { empty } from "@ember/object/computed"; -import Controller from "@ember/controller"; -import { bufferedProperty } from "discourse/mixins/buffered-content"; +import { inject as service } from "@ember/service"; import { isEmpty } from "@ember/utils"; import { popupAjaxError } from "discourse/lib/ajax-error"; -import { inject as service } from "@ember/service"; +import { bufferedProperty } from "discourse/mixins/buffered-content"; import ApiKeyUrlsModal from "../components/modal/api-key-urls"; export default class AdminApiKeysShowController extends Controller.extend( diff --git a/app/assets/javascripts/admin/addon/controllers/admin-backups-index.js b/app/assets/javascripts/admin/addon/controllers/admin-backups-index.js index 09b7a3f9734..d2aafd751c0 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-backups-index.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-backups-index.js @@ -1,12 +1,11 @@ -import { action } from "@ember/object"; -import { inject as service } from "@ember/service"; -import { alias, equal } from "@ember/object/computed"; import Controller, { inject as controller } from "@ember/controller"; -import { i18n, setting } from "discourse/lib/computed"; -import I18n from "I18n"; +import { action } from "@ember/object"; +import { alias, equal } from "@ember/object/computed"; +import { inject as service } from "@ember/service"; import { ajax } from "discourse/lib/ajax"; - +import { i18n, setting } from "discourse/lib/computed"; import discourseComputed from "discourse-common/utils/decorators"; +import I18n from "I18n"; export default class AdminBackupsIndexController extends Controller { @service dialog; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-backups-logs.js b/app/assets/javascripts/admin/addon/controllers/admin-backups-logs.js index 3eae5564d17..ab60b3bb1a0 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-backups-logs.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-backups-logs.js @@ -1,5 +1,5 @@ -import { alias } from "@ember/object/computed"; import Controller, { inject as controller } from "@ember/controller"; +import { alias } from "@ember/object/computed"; export default class AdminBackupsLogsController extends Controller { @controller adminBackups; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-backups.js b/app/assets/javascripts/admin/addon/controllers/admin-backups.js index bb5c7251b16..402d0a7b155 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-backups.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-backups.js @@ -1,5 +1,5 @@ -import { and, not } from "@ember/object/computed"; import Controller from "@ember/controller"; +import { and, not } from "@ember/object/computed"; export default class AdminBackupsController extends Controller { @not("model.isOperationRunning") noOperationIsRunning; @not("rollbackEnabled") rollbackDisabled; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-badges.js b/app/assets/javascripts/admin/addon/controllers/admin-badges.js index 50af52d17f8..52cd67455d7 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-badges.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-badges.js @@ -1,6 +1,6 @@ +import { tracked } from "@glimmer/tracking"; import Controller from "@ember/controller"; import { inject as service } from "@ember/service"; -import { tracked } from "@glimmer/tracking"; export default class AdminBadgesController extends Controller { @service router; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-badges/award.js b/app/assets/javascripts/admin/addon/controllers/admin-badges/award.js index 93745bd79ed..68b64e1c3d3 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-badges/award.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-badges/award.js @@ -1,10 +1,10 @@ +import { tracked } from "@glimmer/tracking"; import Controller from "@ember/controller"; -import I18n from "I18n"; +import { action } from "@ember/object"; +import { inject as service } from "@ember/service"; import { ajax } from "discourse/lib/ajax"; import { extractError } from "discourse/lib/ajax-error"; -import { action } from "@ember/object"; -import { tracked } from "@glimmer/tracking"; -import { inject as service } from "@ember/service"; +import I18n from "I18n"; export default class AdminBadgesAwardController extends Controller { @service dialog; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-badges/index.js b/app/assets/javascripts/admin/addon/controllers/admin-badges/index.js index a2981cc4a0a..47dcfefae3d 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-badges/index.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-badges/index.js @@ -1,5 +1,5 @@ -import Controller from "@ember/controller"; import { tracked } from "@glimmer/tracking"; +import Controller from "@ember/controller"; export default class AdminBadgesIndexController extends Controller { // Set by the route diff --git a/app/assets/javascripts/admin/addon/controllers/admin-badges/show.js b/app/assets/javascripts/admin/addon/controllers/admin-badges/show.js index 9f49f32f744..1d80b3b1a39 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-badges/show.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-badges/show.js @@ -1,13 +1,13 @@ -import Controller, { inject as controller } from "@ember/controller"; -import { observes } from "@ember-decorators/object"; -import I18n from "I18n"; -import { bufferedProperty } from "discourse/mixins/buffered-content"; -import { popupAjaxError } from "discourse/lib/ajax-error"; -import { next } from "@ember/runloop"; -import { action } from "@ember/object"; -import { inject as service } from "@ember/service"; -import getURL from "discourse-common/lib/get-url"; import { tracked } from "@glimmer/tracking"; +import Controller, { inject as controller } from "@ember/controller"; +import { action } from "@ember/object"; +import { next } from "@ember/runloop"; +import { inject as service } from "@ember/service"; +import { observes } from "@ember-decorators/object"; +import { popupAjaxError } from "discourse/lib/ajax-error"; +import { bufferedProperty } from "discourse/mixins/buffered-content"; +import getURL from "discourse-common/lib/get-url"; +import I18n from "I18n"; const IMAGE = "image"; const ICON = "icon"; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-customize-colors-show.js b/app/assets/javascripts/admin/addon/controllers/admin-customize-colors-show.js index e92f513e208..b29fd43becc 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-customize-colors-show.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-customize-colors-show.js @@ -1,9 +1,9 @@ import Controller from "@ember/controller"; -import I18n from "I18n"; -import discourseLater from "discourse-common/lib/later"; import { action, computed } from "@ember/object"; -import { clipboardCopy } from "discourse/lib/utilities"; import { inject as service } from "@ember/service"; +import { clipboardCopy } from "discourse/lib/utilities"; +import discourseLater from "discourse-common/lib/later"; +import I18n from "I18n"; export default class AdminCustomizeColorsShowController extends Controller { @service dialog; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-customize-colors.js b/app/assets/javascripts/admin/addon/controllers/admin-customize-colors.js index 5cf067b5ddf..32bcb54eacf 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-customize-colors.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-customize-colors.js @@ -1,9 +1,9 @@ import Controller from "@ember/controller"; import EmberObject, { action } from "@ember/object"; -import I18n from "I18n"; -import discourseComputed from "discourse-common/utils/decorators"; import { inject as service } from "@ember/service"; +import discourseComputed from "discourse-common/utils/decorators"; import ColorSchemeSelectBaseModal from "admin/components/modal/color-scheme-select-base"; +import I18n from "I18n"; export default class AdminCustomizeColorsController extends Controller { @service router; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-customize-email-style-edit.js b/app/assets/javascripts/admin/addon/controllers/admin-customize-email-style-edit.js index 02b553c4312..0665bfd19a0 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-customize-email-style-edit.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-customize-email-style-edit.js @@ -1,8 +1,8 @@ +import Controller from "@ember/controller"; import { action } from "@ember/object"; import { inject as service } from "@ember/service"; -import Controller from "@ember/controller"; -import I18n from "I18n"; import discourseComputed from "discourse-common/utils/decorators"; +import I18n from "I18n"; export default class AdminCustomizeEmailStyleEditController extends Controller { @service dialog; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-customize-email-templates-edit.js b/app/assets/javascripts/admin/addon/controllers/admin-customize-email-templates-edit.js index b517fc3feda..65b016b04ed 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-customize-email-templates-edit.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-customize-email-templates-edit.js @@ -1,10 +1,10 @@ -import { inject as service } from "@ember/service"; import Controller, { inject as controller } from "@ember/controller"; -import I18n from "I18n"; import { action } from "@ember/object"; +import { inject as service } from "@ember/service"; +import { popupAjaxError } from "discourse/lib/ajax-error"; import { bufferedProperty } from "discourse/mixins/buffered-content"; import discourseComputed from "discourse-common/utils/decorators"; -import { popupAjaxError } from "discourse/lib/ajax-error"; +import I18n from "I18n"; export default class AdminCustomizeEmailTemplatesEditController extends Controller.extend( bufferedProperty("emailTemplate") diff --git a/app/assets/javascripts/admin/addon/controllers/admin-customize-email-templates.js b/app/assets/javascripts/admin/addon/controllers/admin-customize-email-templates.js index a5781f50d56..25578bb2958 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-customize-email-templates.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-customize-email-templates.js @@ -1,6 +1,6 @@ -import { sort } from "@ember/object/computed"; import Controller from "@ember/controller"; import { action } from "@ember/object"; +import { sort } from "@ember/object/computed"; import { inject as service } from "@ember/service"; export default class AdminCustomizeEmailTemplatesController extends Controller { diff --git a/app/assets/javascripts/admin/addon/controllers/admin-customize-robots-txt.js b/app/assets/javascripts/admin/addon/controllers/admin-customize-robots-txt.js index de93b226c3b..a51f9fb45e9 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-customize-robots-txt.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-customize-robots-txt.js @@ -1,9 +1,9 @@ +import Controller from "@ember/controller"; import { action } from "@ember/object"; import { not } from "@ember/object/computed"; -import Controller from "@ember/controller"; import { ajax } from "discourse/lib/ajax"; -import { bufferedProperty } from "discourse/mixins/buffered-content"; import { propertyEqual } from "discourse/lib/computed"; +import { bufferedProperty } from "discourse/mixins/buffered-content"; export default class AdminCustomizeRobotsTxtController extends Controller.extend( bufferedProperty("model") diff --git a/app/assets/javascripts/admin/addon/controllers/admin-customize-themes-edit.js b/app/assets/javascripts/admin/addon/controllers/admin-customize-themes-edit.js index 82079543641..37ee5b04d2a 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-customize-themes-edit.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-customize-themes-edit.js @@ -1,9 +1,9 @@ -import { action } from "@ember/object"; import Controller from "@ember/controller"; -import I18n from "I18n"; -import discourseComputed from "discourse-common/utils/decorators"; -import { url } from "discourse/lib/computed"; +import { action } from "@ember/object"; import { inject as service } from "@ember/service"; +import { url } from "discourse/lib/computed"; +import discourseComputed from "discourse-common/utils/decorators"; +import I18n from "I18n"; export default class AdminCustomizeThemesEditController extends Controller { @service router; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-customize-themes-show.js b/app/assets/javascripts/admin/addon/controllers/admin-customize-themes-show.js index b37756645c4..54a91fed0d1 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-customize-themes-show.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-customize-themes-show.js @@ -1,4 +1,5 @@ -import { inject as service } from "@ember/service"; +import Controller from "@ember/controller"; +import EmberObject, { action } from "@ember/object"; import { empty, filterBy, @@ -6,16 +7,15 @@ import { match, notEmpty, } from "@ember/object/computed"; -import { COMPONENTS, THEMES } from "admin/models/theme"; -import Controller from "@ember/controller"; -import EmberObject, { action } from "@ember/object"; -import I18n from "I18n"; -import ThemeSettings from "admin/models/theme-settings"; -import discourseComputed from "discourse-common/utils/decorators"; -import { makeArray } from "discourse-common/lib/helpers"; +import { inject as service } from "@ember/service"; import { popupAjaxError } from "discourse/lib/ajax-error"; import { url } from "discourse/lib/computed"; +import { makeArray } from "discourse-common/lib/helpers"; +import discourseComputed from "discourse-common/utils/decorators"; import ThemeSettingsEditor from "admin/components/theme-settings-editor"; +import { COMPONENTS, THEMES } from "admin/models/theme"; +import ThemeSettings from "admin/models/theme-settings"; +import I18n from "I18n"; import ThemeUploadAddModal from "../components/theme-upload-add"; const THEME_UPLOAD_VAR = 2; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-customize-themes.js b/app/assets/javascripts/admin/addon/controllers/admin-customize-themes.js index 341114f89fb..57049eaee5c 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-customize-themes.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-customize-themes.js @@ -1,6 +1,6 @@ import Controller from "@ember/controller"; -import { THEMES } from "admin/models/theme"; import discourseComputed from "discourse-common/utils/decorators"; +import { THEMES } from "admin/models/theme"; export default class AdminCustomizeThemesController extends Controller { currentTab = THEMES; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-dashboard-general.js b/app/assets/javascripts/admin/addon/controllers/admin-dashboard-general.js index da1181db066..c8cc2e855f8 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-dashboard-general.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-dashboard-general.js @@ -1,14 +1,14 @@ -import { action, computed } from "@ember/object"; import Controller, { inject as controller } from "@ember/controller"; -import AdminDashboard from "admin/models/admin-dashboard"; -import I18n from "I18n"; -import PeriodComputationMixin from "admin/mixins/period-computation"; -import Report from "admin/models/report"; -import discourseComputed from "discourse-common/utils/decorators"; +import { action, computed } from "@ember/object"; +import { inject as service } from "@ember/service"; +import { setting } from "discourse/lib/computed"; import getURL from "discourse-common/lib/get-url"; import { makeArray } from "discourse-common/lib/helpers"; -import { setting } from "discourse/lib/computed"; -import { inject as service } from "@ember/service"; +import discourseComputed from "discourse-common/utils/decorators"; +import PeriodComputationMixin from "admin/mixins/period-computation"; +import AdminDashboard from "admin/models/admin-dashboard"; +import Report from "admin/models/report"; +import I18n from "I18n"; import CustomDateRangeModal from "../components/modal/custom-date-range"; function staticReport(reportType) { diff --git a/app/assets/javascripts/admin/addon/controllers/admin-dashboard-moderation.js b/app/assets/javascripts/admin/addon/controllers/admin-dashboard-moderation.js index 636695b851d..b4e79e41b07 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-dashboard-moderation.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-dashboard-moderation.js @@ -1,9 +1,9 @@ -import { action, computed } from "@ember/object"; import Controller from "@ember/controller"; -import PeriodComputationMixin from "admin/mixins/period-computation"; -import discourseComputed from "discourse-common/utils/decorators"; -import getURL from "discourse-common/lib/get-url"; +import { action, computed } from "@ember/object"; import { inject as service } from "@ember/service"; +import getURL from "discourse-common/lib/get-url"; +import discourseComputed from "discourse-common/utils/decorators"; +import PeriodComputationMixin from "admin/mixins/period-computation"; import CustomDateRangeModal from "../components/modal/custom-date-range"; export default class AdminDashboardModerationController extends Controller.extend( diff --git a/app/assets/javascripts/admin/addon/controllers/admin-dashboard-reports.js b/app/assets/javascripts/admin/addon/controllers/admin-dashboard-reports.js index 920f9459eca..a7f615f68f0 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-dashboard-reports.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-dashboard-reports.js @@ -1,8 +1,8 @@ import Controller from "@ember/controller"; -import { INPUT_DELAY } from "discourse-common/config/environment"; -import discourseComputed from "discourse-common/utils/decorators"; -import discourseDebounce from "discourse-common/lib/debounce"; import { action, get } from "@ember/object"; +import { INPUT_DELAY } from "discourse-common/config/environment"; +import discourseDebounce from "discourse-common/lib/debounce"; +import discourseComputed from "discourse-common/utils/decorators"; export default class AdminDashboardReportsController extends Controller { filter = null; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-dashboard.js b/app/assets/javascripts/admin/addon/controllers/admin-dashboard.js index abe340f2eea..cf95ce7fe3b 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-dashboard.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-dashboard.js @@ -1,10 +1,10 @@ -import { action, computed } from "@ember/object"; import Controller, { inject as controller } from "@ember/controller"; +import { action, computed } from "@ember/object"; +import { inject as service } from "@ember/service"; +import { setting } from "discourse/lib/computed"; +import discourseComputed from "discourse-common/utils/decorators"; import AdminDashboard from "admin/models/admin-dashboard"; import VersionCheck from "admin/models/version-check"; -import discourseComputed from "discourse-common/utils/decorators"; -import { setting } from "discourse/lib/computed"; -import { inject as service } from "@ember/service"; const PROBLEMS_CHECK_MINUTES = 1; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-email-advanced-test.js b/app/assets/javascripts/admin/addon/controllers/admin-email-advanced-test.js index 1b27a572b6f..2ae222da0c7 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-email-advanced-test.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-email-advanced-test.js @@ -1,5 +1,5 @@ -import { action } from "@ember/object"; import Controller from "@ember/controller"; +import { action } from "@ember/object"; import { ajax } from "discourse/lib/ajax"; import { popupAjaxError } from "discourse/lib/ajax-error"; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-email-bounced.js b/app/assets/javascripts/admin/addon/controllers/admin-email-bounced.js index 79384e70f18..834d6fa9aa8 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-email-bounced.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-email-bounced.js @@ -1,8 +1,8 @@ -import AdminEmailLogsController from "admin/controllers/admin-email-logs"; +import { action } from "@ember/object"; +import { observes } from "@ember-decorators/object"; import { INPUT_DELAY } from "discourse-common/config/environment"; import discourseDebounce from "discourse-common/lib/debounce"; -import { observes } from "@ember-decorators/object"; -import { action } from "@ember/object"; +import AdminEmailLogsController from "admin/controllers/admin-email-logs"; export default class AdminEmailBouncedController extends AdminEmailLogsController { @action diff --git a/app/assets/javascripts/admin/addon/controllers/admin-email-index.js b/app/assets/javascripts/admin/addon/controllers/admin-email-index.js index 81bda7c5b16..c09562b7bb8 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-email-index.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-email-index.js @@ -1,12 +1,12 @@ -import { action } from "@ember/object"; -import { inject as service } from "@ember/service"; -import { empty } from "@ember/object/computed"; import Controller from "@ember/controller"; -import I18n from "I18n"; -import { ajax } from "discourse/lib/ajax"; -import { observes } from "@ember-decorators/object"; +import { action } from "@ember/object"; +import { empty } from "@ember/object/computed"; +import { inject as service } from "@ember/service"; import { htmlSafe } from "@ember/template"; +import { observes } from "@ember-decorators/object"; +import { ajax } from "discourse/lib/ajax"; import { escapeExpression } from "discourse/lib/utilities"; +import I18n from "I18n"; export default class AdminEmailIndexController extends Controller { @service dialog; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-email-logs.js b/app/assets/javascripts/admin/addon/controllers/admin-email-logs.js index cb8e04736a7..08349d37326 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-email-logs.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-email-logs.js @@ -1,6 +1,6 @@ import Controller from "@ember/controller"; -import EmailLog from "admin/models/email-log"; import EmberObject, { action } from "@ember/object"; +import EmailLog from "admin/models/email-log"; export default class AdminEmailLogsController extends Controller { loading = false; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-email-preview-digest.js b/app/assets/javascripts/admin/addon/controllers/admin-email-preview-digest.js index 4120390eedb..2a1e55bb37d 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-email-preview-digest.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-email-preview-digest.js @@ -1,9 +1,9 @@ -import { inject as service } from "@ember/service"; -import { empty, notEmpty, or } from "@ember/object/computed"; import Controller from "@ember/controller"; -import EmailPreview from "admin/models/email-preview"; import { action, get } from "@ember/object"; +import { empty, notEmpty, or } from "@ember/object/computed"; +import { inject as service } from "@ember/service"; import { popupAjaxError } from "discourse/lib/ajax-error"; +import EmailPreview from "admin/models/email-preview"; export default class AdminEmailPreviewDigestController extends Controller { @service dialog; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-email-received.js b/app/assets/javascripts/admin/addon/controllers/admin-email-received.js index 65434538eff..1f55fec6eb3 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-email-received.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-email-received.js @@ -1,9 +1,9 @@ import { action } from "@ember/object"; -import AdminEmailLogsController from "admin/controllers/admin-email-logs"; -import { INPUT_DELAY } from "discourse-common/config/environment"; -import IncomingEmail from "admin/models/incoming-email"; -import discourseDebounce from "discourse-common/lib/debounce"; import { observes } from "@ember-decorators/object"; +import { INPUT_DELAY } from "discourse-common/config/environment"; +import discourseDebounce from "discourse-common/lib/debounce"; +import AdminEmailLogsController from "admin/controllers/admin-email-logs"; +import IncomingEmail from "admin/models/incoming-email"; export default class AdminEmailReceivedController extends AdminEmailLogsController { @observes("filter.{status,from,to,subject}") diff --git a/app/assets/javascripts/admin/addon/controllers/admin-email-rejected.js b/app/assets/javascripts/admin/addon/controllers/admin-email-rejected.js index 184d632db66..60bfd89dd74 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-email-rejected.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-email-rejected.js @@ -1,9 +1,9 @@ -import AdminEmailLogsController from "admin/controllers/admin-email-logs"; -import { INPUT_DELAY } from "discourse-common/config/environment"; -import IncomingEmail from "admin/models/incoming-email"; -import discourseDebounce from "discourse-common/lib/debounce"; -import { observes } from "@ember-decorators/object"; import { action } from "@ember/object"; +import { observes } from "@ember-decorators/object"; +import { INPUT_DELAY } from "discourse-common/config/environment"; +import discourseDebounce from "discourse-common/lib/debounce"; +import AdminEmailLogsController from "admin/controllers/admin-email-logs"; +import IncomingEmail from "admin/models/incoming-email"; export default class AdminEmailRejectedController extends AdminEmailLogsController { @observes("filter.{status,from,to,subject,error}") diff --git a/app/assets/javascripts/admin/addon/controllers/admin-email-sent.js b/app/assets/javascripts/admin/addon/controllers/admin-email-sent.js index 6d28b33d798..f1c9aa3b46f 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-email-sent.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-email-sent.js @@ -1,7 +1,7 @@ -import AdminEmailLogsController from "admin/controllers/admin-email-logs"; +import { observes } from "@ember-decorators/object"; import { INPUT_DELAY } from "discourse-common/config/environment"; import discourseDebounce from "discourse-common/lib/debounce"; -import { observes } from "@ember-decorators/object"; +import AdminEmailLogsController from "admin/controllers/admin-email-logs"; export default class AdminEmailSentController extends AdminEmailLogsController { @observes("filter.{status,user,address,type,reply_key}") diff --git a/app/assets/javascripts/admin/addon/controllers/admin-email-skipped.js b/app/assets/javascripts/admin/addon/controllers/admin-email-skipped.js index 366f27b8d2e..d7082aecd33 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-email-skipped.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-email-skipped.js @@ -1,7 +1,7 @@ -import AdminEmailLogsController from "admin/controllers/admin-email-logs"; +import { observes } from "@ember-decorators/object"; import { INPUT_DELAY } from "discourse-common/config/environment"; import discourseDebounce from "discourse-common/lib/debounce"; -import { observes } from "@ember-decorators/object"; +import AdminEmailLogsController from "admin/controllers/admin-email-logs"; export default class AdminEmailSkippedController extends AdminEmailLogsController { @observes("filter.{status,user,address,type}") diff --git a/app/assets/javascripts/admin/addon/controllers/admin-embedding.js b/app/assets/javascripts/admin/addon/controllers/admin-embedding.js index 9fcccf318fc..2fecb6717a0 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-embedding.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-embedding.js @@ -1,7 +1,7 @@ -import { action } from "@ember/object"; import Controller from "@ember/controller"; -import discourseComputed from "discourse-common/utils/decorators"; +import { action } from "@ember/object"; import { popupAjaxError } from "discourse/lib/ajax-error"; +import discourseComputed from "discourse-common/utils/decorators"; export default class AdminEmbeddingController extends Controller { saved = false; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-emojis.js b/app/assets/javascripts/admin/addon/controllers/admin-emojis.js index 6e7f86d88aa..723369579e4 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-emojis.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-emojis.js @@ -1,9 +1,9 @@ -import { inject as service } from "@ember/service"; -import { sort } from "@ember/object/computed"; -import EmberObject, { action, computed } from "@ember/object"; import Controller from "@ember/controller"; -import I18n from "I18n"; +import EmberObject, { action, computed } from "@ember/object"; +import { sort } from "@ember/object/computed"; +import { inject as service } from "@ember/service"; import { ajax } from "discourse/lib/ajax"; +import I18n from "I18n"; const ALL_FILTER = "all"; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-emails.js b/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-emails.js index 4ce490eff02..1869a63fdd9 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-emails.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-emails.js @@ -1,8 +1,8 @@ -import { action } from "@ember/object"; import Controller from "@ember/controller"; -import ScreenedEmail from "admin/models/screened-email"; +import { action } from "@ember/object"; import { exportEntity } from "discourse/lib/export-csv"; import { outputExportResult } from "discourse/lib/export-result"; +import ScreenedEmail from "admin/models/screened-email"; export default class AdminLogsScreenedEmailsController extends Controller { loading = false; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-ip-addresses.js b/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-ip-addresses.js index 99e0bcfc2bd..5259954d9eb 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-ip-addresses.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-ip-addresses.js @@ -1,13 +1,13 @@ -import { inject as service } from "@ember/service"; import Controller from "@ember/controller"; -import I18n from "I18n"; -import { INPUT_DELAY } from "discourse-common/config/environment"; -import ScreenedIpAddress from "admin/models/screened-ip-address"; -import discourseDebounce from "discourse-common/lib/debounce"; -import { exportEntity } from "discourse/lib/export-csv"; -import { observes } from "@ember-decorators/object"; -import { outputExportResult } from "discourse/lib/export-result"; import { action } from "@ember/object"; +import { inject as service } from "@ember/service"; +import { observes } from "@ember-decorators/object"; +import { exportEntity } from "discourse/lib/export-csv"; +import { outputExportResult } from "discourse/lib/export-result"; +import { INPUT_DELAY } from "discourse-common/config/environment"; +import discourseDebounce from "discourse-common/lib/debounce"; +import ScreenedIpAddress from "admin/models/screened-ip-address"; +import I18n from "I18n"; export default class AdminLogsScreenedIpAddressesController extends Controller { @service dialog; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-urls.js b/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-urls.js index dc1e174d6a5..83b227c7956 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-urls.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-logs-screened-urls.js @@ -1,8 +1,8 @@ -import { action } from "@ember/object"; import Controller from "@ember/controller"; -import ScreenedUrl from "admin/models/screened-url"; +import { action } from "@ember/object"; import { exportEntity } from "discourse/lib/export-csv"; import { outputExportResult } from "discourse/lib/export-result"; +import ScreenedUrl from "admin/models/screened-url"; export default class AdminLogsScreenedUrlsController extends Controller { loading = false; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-logs-staff-action-logs.js b/app/assets/javascripts/admin/addon/controllers/admin-logs-staff-action-logs.js index 73c61699696..3726563ef83 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-logs-staff-action-logs.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-logs-staff-action-logs.js @@ -1,13 +1,13 @@ import Controller from "@ember/controller"; import EmberObject, { action } from "@ember/object"; -import I18n from "I18n"; -import discourseComputed from "discourse-common/utils/decorators"; -import { exportEntity } from "discourse/lib/export-csv"; -import { outputExportResult } from "discourse/lib/export-result"; import { scheduleOnce } from "@ember/runloop"; import { inject as service } from "@ember/service"; -import ThemeChangeModal from "../components/modal/theme-change"; +import { exportEntity } from "discourse/lib/export-csv"; +import { outputExportResult } from "discourse/lib/export-result"; +import discourseComputed from "discourse-common/utils/decorators"; +import I18n from "I18n"; import StaffActionLogDetailsModal from "../components/modal/staff-action-log-details"; +import ThemeChangeModal from "../components/modal/theme-change"; export default class AdminLogsStaffActionLogsController extends Controller { @service modal; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-permalinks.js b/app/assets/javascripts/admin/addon/controllers/admin-permalinks.js index dcd31f10207..b13fde101f3 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-permalinks.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-permalinks.js @@ -1,13 +1,13 @@ -import { action } from "@ember/object"; -import { inject as service } from "@ember/service"; -import { or } from "@ember/object/computed"; import Controller from "@ember/controller"; -import I18n from "I18n"; -import { INPUT_DELAY } from "discourse-common/config/environment"; -import Permalink from "admin/models/permalink"; -import discourseDebounce from "discourse-common/lib/debounce"; +import { action } from "@ember/object"; +import { or } from "@ember/object/computed"; +import { inject as service } from "@ember/service"; import { observes } from "@ember-decorators/object"; import { clipboardCopy } from "discourse/lib/utilities"; +import { INPUT_DELAY } from "discourse-common/config/environment"; +import discourseDebounce from "discourse-common/lib/debounce"; +import Permalink from "admin/models/permalink"; +import I18n from "I18n"; export default class AdminPermalinksController extends Controller { @service dialog; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-plugins-index.js b/app/assets/javascripts/admin/addon/controllers/admin-plugins-index.js index af26474bcb7..75a20376b8a 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-plugins-index.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-plugins-index.js @@ -1,8 +1,8 @@ import Controller from "@ember/controller"; import { action } from "@ember/object"; import { inject as service } from "@ember/service"; -import SiteSetting from "admin/models/site-setting"; import { popupAjaxError } from "discourse/lib/ajax-error"; +import SiteSetting from "admin/models/site-setting"; export default class AdminPluginsIndexController extends Controller { @service session; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-plugins.js b/app/assets/javascripts/admin/addon/controllers/admin-plugins.js index 1f7f10282ab..14a19551112 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-plugins.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-plugins.js @@ -1,5 +1,5 @@ -import { inject as service } from "@ember/service"; import Controller from "@ember/controller"; +import { inject as service } from "@ember/service"; export default class AdminPluginsController extends Controller { @service router; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-site-settings.js b/app/assets/javascripts/admin/addon/controllers/admin-site-settings.js index a72bab8faa6..a0a23f11b66 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-site-settings.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-site-settings.js @@ -1,12 +1,12 @@ -import { alias } from "@ember/object/computed"; import Controller from "@ember/controller"; -import I18n from "I18n"; -import { INPUT_DELAY } from "discourse-common/config/environment"; -import { isEmpty } from "@ember/utils"; -import { debounce } from "discourse-common/utils/decorators"; -import { observes } from "@ember-decorators/object"; import { action } from "@ember/object"; +import { alias } from "@ember/object/computed"; import { inject as service } from "@ember/service"; +import { isEmpty } from "@ember/utils"; +import { observes } from "@ember-decorators/object"; +import { INPUT_DELAY } from "discourse-common/config/environment"; +import { debounce } from "discourse-common/utils/decorators"; +import I18n from "I18n"; export default class AdminSiteSettingsController extends Controller { @service router; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-site-text-edit.js b/app/assets/javascripts/admin/addon/controllers/admin-site-text-edit.js index 45b0e797cba..059a7c2619f 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-site-text-edit.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-site-text-edit.js @@ -1,10 +1,10 @@ import Controller from "@ember/controller"; -import I18n from "I18n"; -import { bufferedProperty } from "discourse/mixins/buffered-content"; -import discourseComputed from "discourse-common/utils/decorators"; -import { popupAjaxError } from "discourse/lib/ajax-error"; import { action } from "@ember/object"; import { inject as service } from "@ember/service"; +import { popupAjaxError } from "discourse/lib/ajax-error"; +import { bufferedProperty } from "discourse/mixins/buffered-content"; +import discourseComputed from "discourse-common/utils/decorators"; +import I18n from "I18n"; export default Controller.extend(bufferedProperty("siteText"), { dialog: service(), diff --git a/app/assets/javascripts/admin/addon/controllers/admin-site-text-index.js b/app/assets/javascripts/admin/addon/controllers/admin-site-text-index.js index bf35700c0ac..a5bec89e901 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-site-text-index.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-site-text-index.js @@ -1,9 +1,9 @@ -import { action } from "@ember/object"; -import Controller from "@ember/controller"; -import discourseDebounce from "discourse-common/lib/debounce"; -import { inject as service } from "@ember/service"; import { tracked } from "@glimmer/tracking"; +import Controller from "@ember/controller"; +import { action } from "@ember/object"; +import { inject as service } from "@ember/service"; import { disableImplicitInjections } from "discourse/lib/implicit-injections"; +import discourseDebounce from "discourse-common/lib/debounce"; import ReseedModal from "admin/components/modal/reseed"; let lastSearch; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-user-badges.js b/app/assets/javascripts/admin/addon/controllers/admin-user-badges.js index 8b7e4eef166..4e59bf625af 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-user-badges.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-user-badges.js @@ -1,13 +1,13 @@ -import { action } from "@ember/object"; -import { inject as service } from "@ember/service"; -import { alias, empty, sort } from "@ember/object/computed"; import Controller, { inject as controller } from "@ember/controller"; -import UserBadge from "discourse/models/user-badge"; -import { grantableBadges } from "discourse/lib/grant-badge-utils"; -import I18n from "I18n"; -import discourseComputed from "discourse-common/utils/decorators"; +import { action } from "@ember/object"; +import { alias, empty, sort } from "@ember/object/computed"; import { next } from "@ember/runloop"; +import { inject as service } from "@ember/service"; import { popupAjaxError } from "discourse/lib/ajax-error"; +import { grantableBadges } from "discourse/lib/grant-badge-utils"; +import UserBadge from "discourse/models/user-badge"; +import discourseComputed from "discourse-common/utils/decorators"; +import I18n from "I18n"; export default class AdminUserBadgesController extends Controller { @service dialog; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-user-fields.js b/app/assets/javascripts/admin/addon/controllers/admin-user-fields.js index 3670bd51b5a..a37f210f08b 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-user-fields.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-user-fields.js @@ -1,9 +1,9 @@ -import { action } from "@ember/object"; -import { inject as service } from "@ember/service"; -import { gte, sort } from "@ember/object/computed"; import Controller from "@ember/controller"; -import I18n from "I18n"; +import { action } from "@ember/object"; +import { gte, sort } from "@ember/object/computed"; +import { inject as service } from "@ember/service"; import { popupAjaxError } from "discourse/lib/ajax-error"; +import I18n from "I18n"; const MAX_FIELDS = 30; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-user-index.js b/app/assets/javascripts/admin/addon/controllers/admin-user-index.js index d041d8ca2de..391dd59bf59 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-user-index.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-user-index.js @@ -1,22 +1,22 @@ -import { action } from "@ember/object"; -import { inject as service } from "@ember/service"; -import { and, notEmpty } from "@ember/object/computed"; -import DiscourseURL, { userPath } from "discourse/lib/url"; -import { fmt, propertyNotEqual, setting } from "discourse/lib/computed"; -import CanCheckEmails from "discourse/mixins/can-check-emails"; import Controller from "@ember/controller"; -import I18n from "I18n"; -import { ajax } from "discourse/lib/ajax"; -import discourseComputed from "discourse-common/utils/decorators"; -import getURL from "discourse-common/lib/get-url"; +import { action } from "@ember/object"; +import { and, notEmpty } from "@ember/object/computed"; +import { inject as service } from "@ember/service"; import { htmlSafe } from "@ember/template"; +import { ajax } from "discourse/lib/ajax"; import { popupAjaxError } from "discourse/lib/ajax-error"; +import { fmt, propertyNotEqual, setting } from "discourse/lib/computed"; +import DiscourseURL, { userPath } from "discourse/lib/url"; +import CanCheckEmails from "discourse/mixins/can-check-emails"; +import getURL from "discourse-common/lib/get-url"; +import discourseComputed from "discourse-common/utils/decorators"; import AdminUser from "admin/models/admin-user"; -import MergeUsersConfirmationModal from "../components/modal/merge-users-confirmation"; -import MergeUsersPromptModal from "../components/modal/merge-users-prompt"; -import MergeUsersProgressModal from "../components/modal/merge-users-progress"; +import I18n from "I18n"; import DeletePostsConfirmationModal from "../components/modal/delete-posts-confirmation"; import DeleteUserPostsProgressModal from "../components/modal/delete-user-posts-progress"; +import MergeUsersConfirmationModal from "../components/modal/merge-users-confirmation"; +import MergeUsersProgressModal from "../components/modal/merge-users-progress"; +import MergeUsersPromptModal from "../components/modal/merge-users-prompt"; export default class AdminUserIndexController extends Controller.extend( CanCheckEmails diff --git a/app/assets/javascripts/admin/addon/controllers/admin-users-list-show.js b/app/assets/javascripts/admin/addon/controllers/admin-users-list-show.js index 7865e57c5d6..af41a29024e 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-users-list-show.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-users-list-show.js @@ -1,13 +1,13 @@ -import { action } from "@ember/object"; -import discourseComputed from "discourse-common/utils/decorators"; -import { observes } from "@ember-decorators/object"; -import AdminUser from "admin/models/admin-user"; -import CanCheckEmails from "discourse/mixins/can-check-emails"; import Controller from "@ember/controller"; -import I18n from "I18n"; +import { action } from "@ember/object"; +import { observes } from "@ember-decorators/object"; +import { i18n } from "discourse/lib/computed"; +import CanCheckEmails from "discourse/mixins/can-check-emails"; import { INPUT_DELAY } from "discourse-common/config/environment"; import discourseDebounce from "discourse-common/lib/debounce"; -import { i18n } from "discourse/lib/computed"; +import discourseComputed from "discourse-common/utils/decorators"; +import AdminUser from "admin/models/admin-user"; +import I18n from "I18n"; export default class AdminUsersListShowController extends Controller.extend( CanCheckEmails diff --git a/app/assets/javascripts/admin/addon/controllers/admin-watched-words-action.js b/app/assets/javascripts/admin/addon/controllers/admin-watched-words-action.js index ca097c2ac6c..a126943233f 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-watched-words-action.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-watched-words-action.js @@ -1,14 +1,14 @@ -import { action } from "@ember/object"; -import { inject as service } from "@ember/service"; -import { or } from "@ember/object/computed"; import Controller, { inject as controller } from "@ember/controller"; -import I18n from "I18n"; -import WatchedWord from "admin/models/watched-word"; -import { ajax } from "discourse/lib/ajax"; -import discourseComputed from "discourse-common/utils/decorators"; -import { fmt } from "discourse/lib/computed"; +import { action } from "@ember/object"; +import { or } from "@ember/object/computed"; import { schedule } from "@ember/runloop"; +import { inject as service } from "@ember/service"; +import { ajax } from "discourse/lib/ajax"; +import { fmt } from "discourse/lib/computed"; +import discourseComputed from "discourse-common/utils/decorators"; import WatchedWordTestModal from "admin/components/modal/watched-word-test"; +import WatchedWord from "admin/models/watched-word"; +import I18n from "I18n"; export default class AdminWatchedWordsActionController extends Controller { @service dialog; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-watched-words.js b/app/assets/javascripts/admin/addon/controllers/admin-watched-words.js index 72a2dedd430..06f582b62f8 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-watched-words.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-watched-words.js @@ -1,9 +1,9 @@ import Controller from "@ember/controller"; import EmberObject, { action } from "@ember/object"; -import { INPUT_DELAY } from "discourse-common/config/environment"; -import discourseDebounce from "discourse-common/lib/debounce"; import { isEmpty } from "@ember/utils"; import { observes } from "@ember-decorators/object"; +import { INPUT_DELAY } from "discourse-common/config/environment"; +import discourseDebounce from "discourse-common/lib/debounce"; export default class AdminWatchedWordsController extends Controller { filter = null; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-edit.js b/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-edit.js index c0db1eb3eb8..97a5ff00b78 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-edit.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-edit.js @@ -1,11 +1,11 @@ -import { inject as service } from "@ember/service"; -import { alias } from "@ember/object/computed"; import Controller, { inject as controller } from "@ember/controller"; import EmberObject, { action } from "@ember/object"; -import I18n from "I18n"; -import discourseComputed from "discourse-common/utils/decorators"; +import { alias } from "@ember/object/computed"; +import { inject as service } from "@ember/service"; import { isEmpty } from "@ember/utils"; import { popupAjaxError } from "discourse/lib/ajax-error"; +import discourseComputed from "discourse-common/utils/decorators"; +import I18n from "I18n"; export default class AdminWebHooksEditController extends Controller { @service dialog; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-index.js b/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-index.js index 865fbad990c..caa1fc5ff54 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-index.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-index.js @@ -1,9 +1,9 @@ -import { inject as service } from "@ember/service"; -import { alias } from "@ember/object/computed"; import Controller, { inject as controller } from "@ember/controller"; -import I18n from "I18n"; -import { popupAjaxError } from "discourse/lib/ajax-error"; import { action } from "@ember/object"; +import { alias } from "@ember/object/computed"; +import { inject as service } from "@ember/service"; +import { popupAjaxError } from "discourse/lib/ajax-error"; +import I18n from "I18n"; export default class AdminWebHooksIndexController extends Controller { @service dialog; diff --git a/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-show.js b/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-show.js index 0cb4ef04996..41b8852c9de 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-show.js +++ b/app/assets/javascripts/admin/addon/controllers/admin-web-hooks-show.js @@ -1,8 +1,8 @@ -import { inject as service } from "@ember/service"; import Controller, { inject as controller } from "@ember/controller"; import { action } from "@ember/object"; -import I18n from "I18n"; +import { inject as service } from "@ember/service"; import { popupAjaxError } from "discourse/lib/ajax-error"; +import I18n from "I18n"; export default class AdminWebHooksShowController extends Controller { @service dialog; diff --git a/app/assets/javascripts/admin/addon/controllers/admin.js b/app/assets/javascripts/admin/addon/controllers/admin.js index 9b802fe89e9..a636b077208 100644 --- a/app/assets/javascripts/admin/addon/controllers/admin.js +++ b/app/assets/javascripts/admin/addon/controllers/admin.js @@ -1,5 +1,5 @@ -import { inject as service } from "@ember/service"; import Controller from "@ember/controller"; +import { inject as service } from "@ember/service"; import { dasherize } from "@ember/string"; import discourseComputed from "discourse-common/utils/decorators"; diff --git a/app/assets/javascripts/admin/addon/helpers/disposition-icon.js b/app/assets/javascripts/admin/addon/helpers/disposition-icon.js index 80820b0bc63..7fc641b851e 100644 --- a/app/assets/javascripts/admin/addon/helpers/disposition-icon.js +++ b/app/assets/javascripts/admin/addon/helpers/disposition-icon.js @@ -1,6 +1,6 @@ import Helper from "@ember/component/helper"; -import { iconHTML } from "discourse-common/lib/icon-library"; import { htmlSafe } from "@ember/template"; +import { iconHTML } from "discourse-common/lib/icon-library"; export default class DispositionIcon extends Helper { compute([disposition]) { diff --git a/app/assets/javascripts/admin/addon/helpers/human-size.js b/app/assets/javascripts/admin/addon/helpers/human-size.js index 06094bed343..5d97883aaad 100644 --- a/app/assets/javascripts/admin/addon/helpers/human-size.js +++ b/app/assets/javascripts/admin/addon/helpers/human-size.js @@ -1,4 +1,4 @@ -import I18n from "I18n"; import { htmlHelper } from "discourse-common/lib/helpers"; +import I18n from "I18n"; export default htmlHelper((size) => I18n.toHumanSize(size)); diff --git a/app/assets/javascripts/admin/addon/mixins/period-computation.js b/app/assets/javascripts/admin/addon/mixins/period-computation.js index b46503e73c0..76ea98e06cb 100644 --- a/app/assets/javascripts/admin/addon/mixins/period-computation.js +++ b/app/assets/javascripts/admin/addon/mixins/period-computation.js @@ -1,5 +1,5 @@ -import DiscourseURL from "discourse/lib/url"; import Mixin from "@ember/object/mixin"; +import DiscourseURL from "discourse/lib/url"; import discourseComputed from "discourse-common/utils/decorators"; export default Mixin.create({ diff --git a/app/assets/javascripts/admin/addon/mixins/setting-component.js b/app/assets/javascripts/admin/addon/mixins/setting-component.js index 6ea8aeb9679..f60fef0654c 100644 --- a/app/assets/javascripts/admin/addon/mixins/setting-component.js +++ b/app/assets/javascripts/admin/addon/mixins/setting-component.js @@ -1,16 +1,16 @@ -import { isNone } from "@ember/utils"; -import { fmt, propertyNotEqual } from "discourse/lib/computed"; -import { alias, oneWay } from "@ember/object/computed"; -import I18n from "I18n"; -import Mixin from "@ember/object/mixin"; -import { ajax } from "discourse/lib/ajax"; -import { categoryLinkHTML } from "discourse/helpers/category-link"; -import discourseComputed, { bind } from "discourse-common/utils/decorators"; -import { htmlSafe } from "@ember/template"; import { warn } from "@ember/debug"; import { action } from "@ember/object"; -import { splitString } from "discourse/lib/utilities"; +import { alias, oneWay } from "@ember/object/computed"; +import Mixin from "@ember/object/mixin"; import { inject as service } from "@ember/service"; +import { htmlSafe } from "@ember/template"; +import { isNone } from "@ember/utils"; +import { categoryLinkHTML } from "discourse/helpers/category-link"; +import { ajax } from "discourse/lib/ajax"; +import { fmt, propertyNotEqual } from "discourse/lib/computed"; +import { splitString } from "discourse/lib/utilities"; +import discourseComputed, { bind } from "discourse-common/utils/decorators"; +import I18n from "I18n"; import SiteSettingDefaultCategoriesModal from "../components/modal/site-setting-default-categories"; const CUSTOM_TYPES = [ diff --git a/app/assets/javascripts/admin/addon/mixins/setting-object.js b/app/assets/javascripts/admin/addon/mixins/setting-object.js index 1830cc89847..05ce6daee46 100644 --- a/app/assets/javascripts/admin/addon/mixins/setting-object.js +++ b/app/assets/javascripts/admin/addon/mixins/setting-object.js @@ -1,9 +1,9 @@ -import I18n from "I18n"; -import Mixin from "@ember/object/mixin"; import { computed } from "@ember/object"; import { readOnly } from "@ember/object/computed"; -import discourseComputed from "discourse-common/utils/decorators"; +import Mixin from "@ember/object/mixin"; import { isPresent } from "@ember/utils"; +import discourseComputed from "discourse-common/utils/decorators"; +import I18n from "I18n"; export default Mixin.create({ @discourseComputed("value", "default") diff --git a/app/assets/javascripts/admin/addon/models/admin-user.js b/app/assets/javascripts/admin/addon/models/admin-user.js index 4b9c94d7954..f95dff4374d 100644 --- a/app/assets/javascripts/admin/addon/models/admin-user.js +++ b/app/assets/javascripts/admin/addon/models/admin-user.js @@ -1,14 +1,14 @@ import { filter, gt, lt, not, or } from "@ember/object/computed"; -import Group from "discourse/models/group"; -import I18n from "I18n"; import { Promise } from "rsvp"; -import User from "discourse/models/user"; import { ajax } from "discourse/lib/ajax"; -import discourseComputed from "discourse-common/utils/decorators"; -import getURL from "discourse-common/lib/get-url"; import { popupAjaxError } from "discourse/lib/ajax-error"; import { propertyNotEqual } from "discourse/lib/computed"; import { userPath } from "discourse/lib/url"; +import Group from "discourse/models/group"; +import User from "discourse/models/user"; +import getURL from "discourse-common/lib/get-url"; +import discourseComputed from "discourse-common/utils/decorators"; +import I18n from "I18n"; export default class AdminUser extends User { static find(user_id) { diff --git a/app/assets/javascripts/admin/addon/models/api-key.js b/app/assets/javascripts/admin/addon/models/api-key.js index f40d643270b..89bd6793803 100644 --- a/app/assets/javascripts/admin/addon/models/api-key.js +++ b/app/assets/javascripts/admin/addon/models/api-key.js @@ -1,9 +1,9 @@ import { computed } from "@ember/object"; -import AdminUser from "admin/models/admin-user"; -import RestModel from "discourse/models/rest"; import { ajax } from "discourse/lib/ajax"; -import discourseComputed from "discourse-common/utils/decorators"; import { fmt } from "discourse/lib/computed"; +import RestModel from "discourse/models/rest"; +import discourseComputed from "discourse-common/utils/decorators"; +import AdminUser from "admin/models/admin-user"; export default class ApiKey extends RestModel { @fmt("truncated_key", "%@...") truncatedKey; diff --git a/app/assets/javascripts/admin/addon/models/backup-status.js b/app/assets/javascripts/admin/addon/models/backup-status.js index e9ee065f3e2..095239d9c7f 100644 --- a/app/assets/javascripts/admin/addon/models/backup-status.js +++ b/app/assets/javascripts/admin/addon/models/backup-status.js @@ -1,5 +1,5 @@ -import { not } from "@ember/object/computed"; import EmberObject from "@ember/object"; +import { not } from "@ember/object/computed"; import discourseComputed from "discourse-common/utils/decorators"; export default class BackupStatus extends EmberObject { diff --git a/app/assets/javascripts/admin/addon/models/color-scheme-color.js b/app/assets/javascripts/admin/addon/models/color-scheme-color.js index 72efcb32c13..92a5ae185dc 100644 --- a/app/assets/javascripts/admin/addon/models/color-scheme-color.js +++ b/app/assets/javascripts/admin/addon/models/color-scheme-color.js @@ -1,8 +1,8 @@ -import discourseComputed from "discourse-common/utils/decorators"; -import { observes, on } from "@ember-decorators/object"; import EmberObject from "@ember/object"; -import I18n from "I18n"; +import { observes, on } from "@ember-decorators/object"; import { propertyNotEqual } from "discourse/lib/computed"; +import discourseComputed from "discourse-common/utils/decorators"; +import I18n from "I18n"; export default class ColorSchemeColor extends EmberObject { // Whether the current value is different than Discourse's default color scheme. diff --git a/app/assets/javascripts/admin/addon/models/color-scheme.js b/app/assets/javascripts/admin/addon/models/color-scheme.js index 53f8ea7eeda..faf52813a67 100644 --- a/app/assets/javascripts/admin/addon/models/color-scheme.js +++ b/app/assets/javascripts/admin/addon/models/color-scheme.js @@ -1,11 +1,11 @@ -import { not } from "@ember/object/computed"; import { A } from "@ember/array"; import ArrayProxy from "@ember/array/proxy"; -import ColorSchemeColor from "admin/models/color-scheme-color"; import EmberObject from "@ember/object"; -import I18n from "I18n"; +import { not } from "@ember/object/computed"; import { ajax } from "discourse/lib/ajax"; import discourseComputed from "discourse-common/utils/decorators"; +import ColorSchemeColor from "admin/models/color-scheme-color"; +import I18n from "I18n"; class ColorSchemes extends ArrayProxy {} diff --git a/app/assets/javascripts/admin/addon/models/email-log.js b/app/assets/javascripts/admin/addon/models/email-log.js index 18034d9f949..921c416e393 100644 --- a/app/assets/javascripts/admin/addon/models/email-log.js +++ b/app/assets/javascripts/admin/addon/models/email-log.js @@ -1,7 +1,7 @@ -import AdminUser from "admin/models/admin-user"; import EmberObject from "@ember/object"; import { ajax } from "discourse/lib/ajax"; import getURL from "discourse-common/lib/get-url"; +import AdminUser from "admin/models/admin-user"; export default class EmailLog extends EmberObject { static create(attrs) { diff --git a/app/assets/javascripts/admin/addon/models/email-template.js b/app/assets/javascripts/admin/addon/models/email-template.js index f3d8c514cbd..360935f30e8 100644 --- a/app/assets/javascripts/admin/addon/models/email-template.js +++ b/app/assets/javascripts/admin/addon/models/email-template.js @@ -1,6 +1,6 @@ -import RestModel from "discourse/models/rest"; -import { ajax } from "discourse/lib/ajax"; import { getProperties } from "@ember/object"; +import { ajax } from "discourse/lib/ajax"; +import RestModel from "discourse/models/rest"; export default class EmailTemplate extends RestModel { revert() { diff --git a/app/assets/javascripts/admin/addon/models/flag-type.js b/app/assets/javascripts/admin/addon/models/flag-type.js index 3bb399fc2e5..ea0cf9890e8 100644 --- a/app/assets/javascripts/admin/addon/models/flag-type.js +++ b/app/assets/javascripts/admin/addon/models/flag-type.js @@ -1,6 +1,6 @@ -import I18n from "I18n"; import RestModel from "discourse/models/rest"; import discourseComputed from "discourse-common/utils/decorators"; +import I18n from "I18n"; export default class FlagType extends RestModel { @discourseComputed("id") diff --git a/app/assets/javascripts/admin/addon/models/form-template.js b/app/assets/javascripts/admin/addon/models/form-template.js index 9981d9ebbb5..6eb18a98f12 100644 --- a/app/assets/javascripts/admin/addon/models/form-template.js +++ b/app/assets/javascripts/admin/addon/models/form-template.js @@ -1,5 +1,5 @@ -import RestModel from "discourse/models/rest"; import { ajax } from "discourse/lib/ajax"; +import RestModel from "discourse/models/rest"; export default class FormTemplate extends RestModel { static createTemplate(data) { diff --git a/app/assets/javascripts/admin/addon/models/incoming-email.js b/app/assets/javascripts/admin/addon/models/incoming-email.js index 90c244f28af..5bc316d09d8 100644 --- a/app/assets/javascripts/admin/addon/models/incoming-email.js +++ b/app/assets/javascripts/admin/addon/models/incoming-email.js @@ -1,6 +1,6 @@ -import AdminUser from "admin/models/admin-user"; import EmberObject from "@ember/object"; import { ajax } from "discourse/lib/ajax"; +import AdminUser from "admin/models/admin-user"; export default class IncomingEmail extends EmberObject { static create(attrs) { diff --git a/app/assets/javascripts/admin/addon/models/permalink.js b/app/assets/javascripts/admin/addon/models/permalink.js index 580b111f0ae..21bafb83de9 100644 --- a/app/assets/javascripts/admin/addon/models/permalink.js +++ b/app/assets/javascripts/admin/addon/models/permalink.js @@ -1,7 +1,7 @@ -import Category from "discourse/models/category"; -import DiscourseURL from "discourse/lib/url"; import EmberObject from "@ember/object"; import { ajax } from "discourse/lib/ajax"; +import DiscourseURL from "discourse/lib/url"; +import Category from "discourse/models/category"; import discourseComputed from "discourse-common/utils/decorators"; export default class Permalink extends EmberObject { diff --git a/app/assets/javascripts/admin/addon/models/report.js b/app/assets/javascripts/admin/addon/models/report.js index dd868a00e02..c0a87fb3109 100644 --- a/app/assets/javascripts/admin/addon/models/report.js +++ b/app/assets/javascripts/admin/addon/models/report.js @@ -1,19 +1,19 @@ +import EmberObject from "@ember/object"; +import { isEmpty } from "@ember/utils"; +import { renderAvatar } from "discourse/helpers/user-avatar"; +import { ajax } from "discourse/lib/ajax"; import { durationTiny, number } from "discourse/lib/formatter"; +import round from "discourse/lib/round"; import { escapeExpression, fillMissingDates, formatUsername, toNumber, } from "discourse/lib/utilities"; -import EmberObject from "@ember/object"; -import I18n from "I18n"; -import { ajax } from "discourse/lib/ajax"; -import discourseComputed from "discourse-common/utils/decorators"; import getURL from "discourse-common/lib/get-url"; -import { isEmpty } from "@ember/utils"; import { makeArray } from "discourse-common/lib/helpers"; -import { renderAvatar } from "discourse/helpers/user-avatar"; -import round from "discourse/lib/round"; +import discourseComputed from "discourse-common/utils/decorators"; +import I18n from "I18n"; // Change this line each time report format change // and you want to ensure cache is reset diff --git a/app/assets/javascripts/admin/addon/models/screened-email.js b/app/assets/javascripts/admin/addon/models/screened-email.js index 8d7a3161ad8..5d7f2ead3fb 100644 --- a/app/assets/javascripts/admin/addon/models/screened-email.js +++ b/app/assets/javascripts/admin/addon/models/screened-email.js @@ -1,7 +1,7 @@ import EmberObject from "@ember/object"; -import I18n from "I18n"; import { ajax } from "discourse/lib/ajax"; import discourseComputed from "discourse-common/utils/decorators"; +import I18n from "I18n"; export default class ScreenedEmail extends EmberObject { static findAll() { diff --git a/app/assets/javascripts/admin/addon/models/screened-ip-address.js b/app/assets/javascripts/admin/addon/models/screened-ip-address.js index 87979087aaa..606d37941bc 100644 --- a/app/assets/javascripts/admin/addon/models/screened-ip-address.js +++ b/app/assets/javascripts/admin/addon/models/screened-ip-address.js @@ -1,8 +1,8 @@ -import { equal } from "@ember/object/computed"; import EmberObject from "@ember/object"; -import I18n from "I18n"; +import { equal } from "@ember/object/computed"; import { ajax } from "discourse/lib/ajax"; import discourseComputed from "discourse-common/utils/decorators"; +import I18n from "I18n"; export default class ScreenedIpAddress extends EmberObject { static findAll(filter) { diff --git a/app/assets/javascripts/admin/addon/models/screened-url.js b/app/assets/javascripts/admin/addon/models/screened-url.js index 3d2c5f97941..a0e022b44cb 100644 --- a/app/assets/javascripts/admin/addon/models/screened-url.js +++ b/app/assets/javascripts/admin/addon/models/screened-url.js @@ -1,7 +1,7 @@ import EmberObject from "@ember/object"; -import I18n from "I18n"; import { ajax } from "discourse/lib/ajax"; import discourseComputed from "discourse-common/utils/decorators"; +import I18n from "I18n"; export default class ScreenedUrl extends EmberObject { static findAll() { diff --git a/app/assets/javascripts/admin/addon/models/site-setting.js b/app/assets/javascripts/admin/addon/models/site-setting.js index 6cd7852834e..a625cb5979b 100644 --- a/app/assets/javascripts/admin/addon/models/site-setting.js +++ b/app/assets/javascripts/admin/addon/models/site-setting.js @@ -1,8 +1,8 @@ import EmberObject from "@ember/object"; -import I18n from "I18n"; -import Setting from "admin/mixins/setting-object"; import { ajax } from "discourse/lib/ajax"; import discourseComputed from "discourse-common/utils/decorators"; +import Setting from "admin/mixins/setting-object"; +import I18n from "I18n"; export default class SiteSetting extends EmberObject.extend(Setting) { static findAll() { diff --git a/app/assets/javascripts/admin/addon/models/site-text.js b/app/assets/javascripts/admin/addon/models/site-text.js index 0460ab3d9dc..d35352c3cc1 100644 --- a/app/assets/javascripts/admin/addon/models/site-text.js +++ b/app/assets/javascripts/admin/addon/models/site-text.js @@ -1,6 +1,6 @@ -import RestModel from "discourse/models/rest"; -import { ajax } from "discourse/lib/ajax"; import { getProperties } from "@ember/object"; +import { ajax } from "discourse/lib/ajax"; +import RestModel from "discourse/models/rest"; export default class SiteText extends RestModel { revert(locale) { diff --git a/app/assets/javascripts/admin/addon/models/staff-action-log.js b/app/assets/javascripts/admin/addon/models/staff-action-log.js index 4eb7864dd44..bead05a14f3 100644 --- a/app/assets/javascripts/admin/addon/models/staff-action-log.js +++ b/app/assets/javascripts/admin/addon/models/staff-action-log.js @@ -1,9 +1,9 @@ +import { ajax } from "discourse/lib/ajax"; +import { escapeExpression } from "discourse/lib/utilities"; +import RestModel from "discourse/models/rest"; +import discourseComputed from "discourse-common/utils/decorators"; import AdminUser from "admin/models/admin-user"; import I18n from "I18n"; -import RestModel from "discourse/models/rest"; -import { ajax } from "discourse/lib/ajax"; -import discourseComputed from "discourse-common/utils/decorators"; -import { escapeExpression } from "discourse/lib/utilities"; function format(label, value, escape = true) { return value diff --git a/app/assets/javascripts/admin/addon/models/theme.js b/app/assets/javascripts/admin/addon/models/theme.js index 83d96dddffc..f1257f20252 100644 --- a/app/assets/javascripts/admin/addon/models/theme.js +++ b/app/assets/javascripts/admin/addon/models/theme.js @@ -1,10 +1,10 @@ +import { get } from "@ember/object"; import { gt, or } from "@ember/object/computed"; import { isBlank, isEmpty } from "@ember/utils"; -import I18n from "I18n"; +import { popupAjaxError } from "discourse/lib/ajax-error"; import RestModel from "discourse/models/rest"; import discourseComputed from "discourse-common/utils/decorators"; -import { get } from "@ember/object"; -import { popupAjaxError } from "discourse/lib/ajax-error"; +import I18n from "I18n"; const THEME_UPLOAD_VAR = 2; const FIELDS_IDS = [0, 1, 5]; diff --git a/app/assets/javascripts/admin/addon/models/user-field.js b/app/assets/javascripts/admin/addon/models/user-field.js index 5a8bdea1832..b27f8b5aff1 100644 --- a/app/assets/javascripts/admin/addon/models/user-field.js +++ b/app/assets/javascripts/admin/addon/models/user-field.js @@ -1,6 +1,6 @@ import EmberObject from "@ember/object"; -import RestModel from "discourse/models/rest"; import { i18n } from "discourse/lib/computed"; +import RestModel from "discourse/models/rest"; export default class UserField extends RestModel { static fieldTypes() { diff --git a/app/assets/javascripts/admin/addon/models/watched-word.js b/app/assets/javascripts/admin/addon/models/watched-word.js index a6de62cc9db..78ce16bb9f9 100644 --- a/app/assets/javascripts/admin/addon/models/watched-word.js +++ b/app/assets/javascripts/admin/addon/models/watched-word.js @@ -1,6 +1,6 @@ import EmberObject from "@ember/object"; -import I18n from "I18n"; import { ajax } from "discourse/lib/ajax"; +import I18n from "I18n"; export default class WatchedWord extends EmberObject { static findAll() { diff --git a/app/assets/javascripts/admin/addon/models/web-hook.js b/app/assets/javascripts/admin/addon/models/web-hook.js index c955d67ae98..cf37020d547 100644 --- a/app/assets/javascripts/admin/addon/models/web-hook.js +++ b/app/assets/javascripts/admin/addon/models/web-hook.js @@ -1,11 +1,11 @@ import { computed } from "@ember/object"; -import discourseComputed from "discourse-common/utils/decorators"; +import { isEmpty } from "@ember/utils"; import { observes } from "@ember-decorators/object"; import Category from "discourse/models/category"; import Group from "discourse/models/group"; import RestModel from "discourse/models/rest"; import Site from "discourse/models/site"; -import { isEmpty } from "@ember/utils"; +import discourseComputed from "discourse-common/utils/decorators"; export default class WebHook extends RestModel { content_type = 1; // json diff --git a/app/assets/javascripts/admin/addon/routes/admin-backups-index.js b/app/assets/javascripts/admin/addon/routes/admin-backups-index.js index 60187bf3722..545a2ba592e 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-backups-index.js +++ b/app/assets/javascripts/admin/addon/routes/admin-backups-index.js @@ -1,6 +1,6 @@ -import Backup from "admin/models/backup"; import Route from "@ember/routing/route"; import { bind } from "discourse-common/utils/decorators"; +import Backup from "admin/models/backup"; export default class AdminBackupsIndexRoute extends Route { activate() { diff --git a/app/assets/javascripts/admin/addon/routes/admin-backups-logs.js b/app/assets/javascripts/admin/addon/routes/admin-backups-logs.js index 62fe429b057..e61d868d585 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-backups-logs.js +++ b/app/assets/javascripts/admin/addon/routes/admin-backups-logs.js @@ -1,6 +1,6 @@ import EmberObject from "@ember/object"; -import PreloadStore from "discourse/lib/preload-store"; import Route from "@ember/routing/route"; +import PreloadStore from "discourse/lib/preload-store"; export default class AdminBackupsLogsRoute extends Route { // since the logs are pushed via the message bus diff --git a/app/assets/javascripts/admin/addon/routes/admin-backups.js b/app/assets/javascripts/admin/addon/routes/admin-backups.js index ed3a2c56475..63a047fb61a 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-backups.js +++ b/app/assets/javascripts/admin/addon/routes/admin-backups.js @@ -1,16 +1,16 @@ -import { inject as service } from "@ember/service"; -import Backup from "admin/models/backup"; -import BackupStatus from "admin/models/backup-status"; -import DiscourseRoute from "discourse/routes/discourse"; import EmberObject, { action } from "@ember/object"; -import I18n from "I18n"; -import PreloadStore from "discourse/lib/preload-store"; -import User from "discourse/models/user"; +import { inject as service } from "@ember/service"; import { ajax } from "discourse/lib/ajax"; import { extractError } from "discourse/lib/ajax-error"; +import PreloadStore from "discourse/lib/preload-store"; +import User from "discourse/models/user"; +import DiscourseRoute from "discourse/routes/discourse"; import getURL from "discourse-common/lib/get-url"; import { bind } from "discourse-common/utils/decorators"; import StartBackupModal from "admin/components/modal/start-backup"; +import Backup from "admin/models/backup"; +import BackupStatus from "admin/models/backup-status"; +import I18n from "I18n"; const LOG_CHANNEL = "/admin/backups/logs"; diff --git a/app/assets/javascripts/admin/addon/routes/admin-badges.js b/app/assets/javascripts/admin/addon/routes/admin-badges.js index b3169966357..b61a933eaf8 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-badges.js +++ b/app/assets/javascripts/admin/addon/routes/admin-badges.js @@ -1,8 +1,8 @@ +import { ajax } from "discourse/lib/ajax"; import Badge from "discourse/models/badge"; import BadgeGrouping from "discourse/models/badge-grouping"; import DiscourseRoute from "discourse/routes/discourse"; import I18n from "I18n"; -import { ajax } from "discourse/lib/ajax"; export default class AdminBadgesRoute extends DiscourseRoute { _json = null; diff --git a/app/assets/javascripts/admin/addon/routes/admin-badges/show.js b/app/assets/javascripts/admin/addon/routes/admin-badges/show.js index b19daf69faa..b35669a663d 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-badges/show.js +++ b/app/assets/javascripts/admin/addon/routes/admin-badges/show.js @@ -1,11 +1,11 @@ +import { action, get } from "@ember/object"; +import Route from "@ember/routing/route"; +import { inject as service } from "@ember/service"; +import { ajax } from "discourse/lib/ajax"; import Badge from "discourse/models/badge"; import I18n from "I18n"; -import Route from "@ember/routing/route"; -import { ajax } from "discourse/lib/ajax"; -import { action, get } from "@ember/object"; -import { inject as service } from "@ember/service"; -import EditBadgeGroupingsModal from "../../components/modal/edit-badge-groupings"; import BadgePreviewModal from "../../components/modal/badge-preview"; +import EditBadgeGroupingsModal from "../../components/modal/edit-badge-groupings"; export default class AdminBadgesShowRoute extends Route { @service dialog; diff --git a/app/assets/javascripts/admin/addon/routes/admin-customize-colors.js b/app/assets/javascripts/admin/addon/routes/admin-customize-colors.js index 5d6dbf9c833..d9e3c4631c5 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-customize-colors.js +++ b/app/assets/javascripts/admin/addon/routes/admin-customize-colors.js @@ -1,5 +1,5 @@ -import ColorScheme from "admin/models/color-scheme"; import Route from "@ember/routing/route"; +import ColorScheme from "admin/models/color-scheme"; export default class AdminCustomizeColorsRoute extends Route { model() { diff --git a/app/assets/javascripts/admin/addon/routes/admin-customize-email-style-edit.js b/app/assets/javascripts/admin/addon/routes/admin-customize-email-style-edit.js index 7ca5c589bb8..8d7c82775fa 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-customize-email-style-edit.js +++ b/app/assets/javascripts/admin/addon/routes/admin-customize-email-style-edit.js @@ -1,7 +1,7 @@ import { action } from "@ember/object"; +import Route from "@ember/routing/route"; import { inject as service } from "@ember/service"; import I18n from "I18n"; -import Route from "@ember/routing/route"; export default class AdminCustomizeEmailStyleEditRoute extends Route { @service dialog; diff --git a/app/assets/javascripts/admin/addon/routes/admin-customize-email-templates.js b/app/assets/javascripts/admin/addon/routes/admin-customize-email-templates.js index 2808b693e1e..91ce35668a8 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-customize-email-templates.js +++ b/app/assets/javascripts/admin/addon/routes/admin-customize-email-templates.js @@ -1,5 +1,5 @@ -import Route from "@ember/routing/route"; import { action } from "@ember/object"; +import Route from "@ember/routing/route"; import { inject as service } from "@ember/service"; export default class AdminCustomizeEmailTemplatesRoute extends Route { diff --git a/app/assets/javascripts/admin/addon/routes/admin-customize-form-templates-index.js b/app/assets/javascripts/admin/addon/routes/admin-customize-form-templates-index.js index 364388c29da..e449e04b307 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-customize-form-templates-index.js +++ b/app/assets/javascripts/admin/addon/routes/admin-customize-form-templates-index.js @@ -1,5 +1,5 @@ -import DiscourseRoute from "discourse/routes/discourse"; import { action } from "@ember/object"; +import DiscourseRoute from "discourse/routes/discourse"; import FormTemplate from "admin/models/form-template"; export default class AdminCustomizeFormTemplatesIndex extends DiscourseRoute { diff --git a/app/assets/javascripts/admin/addon/routes/admin-customize-themes-edit.js b/app/assets/javascripts/admin/addon/routes/admin-customize-themes-edit.js index d1170bfb8ad..f1dedf2d146 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-customize-themes-edit.js +++ b/app/assets/javascripts/admin/addon/routes/admin-customize-themes-edit.js @@ -1,7 +1,7 @@ import { action } from "@ember/object"; +import Route from "@ember/routing/route"; import { inject as service } from "@ember/service"; import I18n from "I18n"; -import Route from "@ember/routing/route"; export default class AdminCustomizeThemesEditRoute extends Route { @service dialog; diff --git a/app/assets/javascripts/admin/addon/routes/admin-customize-themes-show.js b/app/assets/javascripts/admin/addon/routes/admin-customize-themes-show.js index 9479dc4dc76..4033d81aa27 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-customize-themes-show.js +++ b/app/assets/javascripts/admin/addon/routes/admin-customize-themes-show.js @@ -1,9 +1,9 @@ import { action } from "@ember/object"; +import Route from "@ember/routing/route"; import { inject as service } from "@ember/service"; +import { scrollTop } from "discourse/mixins/scroll-top"; import { COMPONENTS, THEMES } from "admin/models/theme"; import I18n from "I18n"; -import Route from "@ember/routing/route"; -import { scrollTop } from "discourse/mixins/scroll-top"; export default class AdminCustomizeThemesShowRoute extends Route { @service dialog; diff --git a/app/assets/javascripts/admin/addon/routes/admin-customize-themes.js b/app/assets/javascripts/admin/addon/routes/admin-customize-themes.js index c17412b588a..ec86d4215b3 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-customize-themes.js +++ b/app/assets/javascripts/admin/addon/routes/admin-customize-themes.js @@ -1,9 +1,9 @@ import { action } from "@ember/object"; -import { inject as service } from "@ember/service"; import Route from "@ember/routing/route"; +import { next } from "@ember/runloop"; +import { inject as service } from "@ember/service"; import I18n from "I18n"; import InstallThemeModal from "../components/modal/install-theme"; -import { next } from "@ember/runloop"; export default class AdminCustomizeThemesRoute extends Route { @service dialog; diff --git a/app/assets/javascripts/admin/addon/routes/admin-dashboard-reports.js b/app/assets/javascripts/admin/addon/routes/admin-dashboard-reports.js index dd0ba24a349..cdcf818b23f 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-dashboard-reports.js +++ b/app/assets/javascripts/admin/addon/routes/admin-dashboard-reports.js @@ -1,5 +1,5 @@ -import DiscourseRoute from "discourse/routes/discourse"; import { ajax } from "discourse/lib/ajax"; +import DiscourseRoute from "discourse/routes/discourse"; export default class AdminDashboardReportsRoute extends DiscourseRoute { model() { diff --git a/app/assets/javascripts/admin/addon/routes/admin-dashboard.js b/app/assets/javascripts/admin/addon/routes/admin-dashboard.js index ca539ff87ad..fdff87f669f 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-dashboard.js +++ b/app/assets/javascripts/admin/addon/routes/admin-dashboard.js @@ -1,5 +1,5 @@ -import DiscourseRoute from "discourse/routes/discourse"; import { scrollTop } from "discourse/mixins/scroll-top"; +import DiscourseRoute from "discourse/routes/discourse"; export default class AdminDashboardRoute extends DiscourseRoute { activate() { diff --git a/app/assets/javascripts/admin/addon/routes/admin-email-bounced.js b/app/assets/javascripts/admin/addon/routes/admin-email-bounced.js index 5a5d410c176..71458ff84eb 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-email-bounced.js +++ b/app/assets/javascripts/admin/addon/routes/admin-email-bounced.js @@ -1,9 +1,9 @@ import { action } from "@ember/object"; -import AdminEmailLogs from "admin/routes/admin-email-logs"; -import IncomingEmail from "admin/models/incoming-email"; -import IncomingEmailModal from "../components/modal/incoming-email"; -import { popupAjaxError } from "discourse/lib/ajax-error"; import { inject as service } from "@ember/service"; +import { popupAjaxError } from "discourse/lib/ajax-error"; +import IncomingEmail from "admin/models/incoming-email"; +import AdminEmailLogs from "admin/routes/admin-email-logs"; +import IncomingEmailModal from "../components/modal/incoming-email"; export default class AdminEmailBouncedRoute extends AdminEmailLogs { @service modal; diff --git a/app/assets/javascripts/admin/addon/routes/admin-email-preview-digest.js b/app/assets/javascripts/admin/addon/routes/admin-email-preview-digest.js index 104a0663945..e0ef990e50d 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-email-preview-digest.js +++ b/app/assets/javascripts/admin/addon/routes/admin-email-preview-digest.js @@ -1,5 +1,5 @@ -import EmailPreview, { oneWeekAgo } from "admin/models/email-preview"; import DiscourseRoute from "discourse/routes/discourse"; +import EmailPreview, { oneWeekAgo } from "admin/models/email-preview"; export default class AdminEmailPreviewDigestRoute extends DiscourseRoute { model() { diff --git a/app/assets/javascripts/admin/addon/routes/admin-email-rejected.js b/app/assets/javascripts/admin/addon/routes/admin-email-rejected.js index bb8b73f77a5..0e2cc5d24af 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-email-rejected.js +++ b/app/assets/javascripts/admin/addon/routes/admin-email-rejected.js @@ -1,8 +1,8 @@ import { action } from "@ember/object"; +import { inject as service } from "@ember/service"; +import IncomingEmail from "admin/models/incoming-email"; import AdminEmailIncomings from "admin/routes/admin-email-incomings"; import IncomingEmailModal from "../components/modal/incoming-email"; -import IncomingEmail from "admin/models/incoming-email"; -import { inject as service } from "@ember/service"; export default class AdminEmailRejectedRoute extends AdminEmailIncomings { @service modal; diff --git a/app/assets/javascripts/admin/addon/routes/admin-emojis.js b/app/assets/javascripts/admin/addon/routes/admin-emojis.js index 793a2ef31c8..f1f6432e716 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-emojis.js +++ b/app/assets/javascripts/admin/addon/routes/admin-emojis.js @@ -1,6 +1,6 @@ -import DiscourseRoute from "discourse/routes/discourse"; import EmberObject from "@ember/object"; import { ajax } from "discourse/lib/ajax"; +import DiscourseRoute from "discourse/routes/discourse"; export default class AdminEmojisRoute extends DiscourseRoute { model() { diff --git a/app/assets/javascripts/admin/addon/routes/admin-logs-index.js b/app/assets/javascripts/admin/addon/routes/admin-logs-index.js index 213e80258fb..e04b2f6b4a8 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-logs-index.js +++ b/app/assets/javascripts/admin/addon/routes/admin-logs-index.js @@ -1,5 +1,5 @@ -import DiscourseRoute from "discourse/routes/discourse"; import { inject as service } from "@ember/service"; +import DiscourseRoute from "discourse/routes/discourse"; export default class AdminLogsIndexRoute extends DiscourseRoute { @service router; diff --git a/app/assets/javascripts/admin/addon/routes/admin-logs-staff-action-logs.js b/app/assets/javascripts/admin/addon/routes/admin-logs-staff-action-logs.js index d027c870f0a..0ee9132372c 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-logs-staff-action-logs.js +++ b/app/assets/javascripts/admin/addon/routes/admin-logs-staff-action-logs.js @@ -1,6 +1,6 @@ -import DiscourseRoute from "discourse/routes/discourse"; import EmberObject, { action } from "@ember/object"; import { inject as service } from "@ember/service"; +import DiscourseRoute from "discourse/routes/discourse"; export default class AdminLogsStaffActionLogsRoute extends DiscourseRoute { @service router; diff --git a/app/assets/javascripts/admin/addon/routes/admin-plugins.js b/app/assets/javascripts/admin/addon/routes/admin-plugins.js index ba021be4b93..ed4b6c1a5df 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-plugins.js +++ b/app/assets/javascripts/admin/addon/routes/admin-plugins.js @@ -1,6 +1,6 @@ import Route from "@ember/routing/route"; -import AdminPlugin from "admin/models/admin-plugin"; import { inject as service } from "@ember/service"; +import AdminPlugin from "admin/models/admin-plugin"; export default class AdminPluginsRoute extends Route { @service router; diff --git a/app/assets/javascripts/admin/addon/routes/admin-reports-index.js b/app/assets/javascripts/admin/addon/routes/admin-reports-index.js index e7196d83de5..59c31497e5a 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-reports-index.js +++ b/app/assets/javascripts/admin/addon/routes/admin-reports-index.js @@ -1,5 +1,5 @@ -import DiscourseRoute from "discourse/routes/discourse"; import { inject as service } from "@ember/service"; +import DiscourseRoute from "discourse/routes/discourse"; export default class AdminReportsIndexRoute extends DiscourseRoute { @service router; diff --git a/app/assets/javascripts/admin/addon/routes/admin-reports-show.js b/app/assets/javascripts/admin/addon/routes/admin-reports-show.js index 3f50d031af7..b06a093438f 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-reports-show.js +++ b/app/assets/javascripts/admin/addon/routes/admin-reports-show.js @@ -1,6 +1,6 @@ import { action } from "@ember/object"; -import DiscourseRoute from "discourse/routes/discourse"; import { inject as service } from "@ember/service"; +import DiscourseRoute from "discourse/routes/discourse"; export default class AdminReportsShowRoute extends DiscourseRoute { @service router; diff --git a/app/assets/javascripts/admin/addon/routes/admin-search-logs-index.js b/app/assets/javascripts/admin/addon/routes/admin-search-logs-index.js index 8c93fdc30dd..03de7453f4a 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-search-logs-index.js +++ b/app/assets/javascripts/admin/addon/routes/admin-search-logs-index.js @@ -1,6 +1,6 @@ -import DiscourseRoute from "discourse/routes/discourse"; import EmberObject from "@ember/object"; import { ajax } from "discourse/lib/ajax"; +import DiscourseRoute from "discourse/routes/discourse"; export default class AdminSearchLogsIndexRoute extends DiscourseRoute { queryParams = { diff --git a/app/assets/javascripts/admin/addon/routes/admin-search-logs-term.js b/app/assets/javascripts/admin/addon/routes/admin-search-logs-term.js index c0c658e6b5f..25bf963898c 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-search-logs-term.js +++ b/app/assets/javascripts/admin/addon/routes/admin-search-logs-term.js @@ -1,8 +1,8 @@ -import DiscourseRoute from "discourse/routes/discourse"; import EmberObject from "@ember/object"; import { ajax } from "discourse/lib/ajax"; -import { fillMissingDates } from "discourse/lib/utilities"; import { translateResults } from "discourse/lib/search"; +import { fillMissingDates } from "discourse/lib/utilities"; +import DiscourseRoute from "discourse/routes/discourse"; export default class AdminSearchLogsTermRoute extends DiscourseRoute { queryParams = { diff --git a/app/assets/javascripts/admin/addon/routes/admin-site-settings-category.js b/app/assets/javascripts/admin/addon/routes/admin-site-settings-category.js index 0d4f770db80..bb90f8e34f2 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-site-settings-category.js +++ b/app/assets/javascripts/admin/addon/routes/admin-site-settings-category.js @@ -1,5 +1,5 @@ -import DiscourseRoute from "discourse/routes/discourse"; import EmberObject from "@ember/object"; +import DiscourseRoute from "discourse/routes/discourse"; import I18n from "I18n"; export default class AdminSiteSettingsCategoryRoute extends DiscourseRoute { diff --git a/app/assets/javascripts/admin/addon/routes/admin-site-settings-index.js b/app/assets/javascripts/admin/addon/routes/admin-site-settings-index.js index ebd4c28513d..7b2939490b0 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-site-settings-index.js +++ b/app/assets/javascripts/admin/addon/routes/admin-site-settings-index.js @@ -2,8 +2,8 @@ Handles when you click the Site Settings tab in admin, but haven't chosen a category. It will redirect to the first category. **/ -import DiscourseRoute from "discourse/routes/discourse"; import { inject as service } from "@ember/service"; +import DiscourseRoute from "discourse/routes/discourse"; export default class AdminSiteSettingsIndexRoute extends DiscourseRoute { @service router; diff --git a/app/assets/javascripts/admin/addon/routes/admin-site-text-index.js b/app/assets/javascripts/admin/addon/routes/admin-site-text-index.js index a424d954be7..a4b20779515 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-site-text-index.js +++ b/app/assets/javascripts/admin/addon/routes/admin-site-text-index.js @@ -1,6 +1,6 @@ import Route from "@ember/routing/route"; -import { disableImplicitInjections } from "discourse/lib/implicit-injections"; import { inject as service } from "@ember/service"; +import { disableImplicitInjections } from "discourse/lib/implicit-injections"; @disableImplicitInjections export default class AdminSiteTextIndexRoute extends Route { diff --git a/app/assets/javascripts/admin/addon/routes/admin-user-badges.js b/app/assets/javascripts/admin/addon/routes/admin-user-badges.js index fcde5d4d749..ae29c2e38d2 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-user-badges.js +++ b/app/assets/javascripts/admin/addon/routes/admin-user-badges.js @@ -1,6 +1,6 @@ import Badge from "discourse/models/badge"; -import DiscourseRoute from "discourse/routes/discourse"; import UserBadge from "discourse/models/user-badge"; +import DiscourseRoute from "discourse/routes/discourse"; export default class AdminUserBadgesRoute extends DiscourseRoute { model() { diff --git a/app/assets/javascripts/admin/addon/routes/admin-user-index.js b/app/assets/javascripts/admin/addon/routes/admin-user-index.js index 7244eb35323..14a4b67ad93 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-user-index.js +++ b/app/assets/javascripts/admin/addon/routes/admin-user-index.js @@ -1,5 +1,5 @@ -import DiscourseRoute from "discourse/routes/discourse"; import Group from "discourse/models/group"; +import DiscourseRoute from "discourse/routes/discourse"; export default class AdminUserIndexRoute extends DiscourseRoute { model() { diff --git a/app/assets/javascripts/admin/addon/routes/admin-user.js b/app/assets/javascripts/admin/addon/routes/admin-user.js index 2fad4956a84..10e866e6280 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-user.js +++ b/app/assets/javascripts/admin/addon/routes/admin-user.js @@ -1,6 +1,6 @@ -import AdminUser from "admin/models/admin-user"; -import DiscourseRoute from "discourse/routes/discourse"; import { get } from "@ember/object"; +import DiscourseRoute from "discourse/routes/discourse"; +import AdminUser from "admin/models/admin-user"; export default class AdminUserRoute extends DiscourseRoute { serialize(model) { diff --git a/app/assets/javascripts/admin/addon/routes/admin-users-index.js b/app/assets/javascripts/admin/addon/routes/admin-users-index.js index 0dd8fcce4fd..6ba35bccb37 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-users-index.js +++ b/app/assets/javascripts/admin/addon/routes/admin-users-index.js @@ -1,5 +1,5 @@ -import DiscourseRoute from "discourse/routes/discourse"; import { inject as service } from "@ember/service"; +import DiscourseRoute from "discourse/routes/discourse"; export default class AdminUsersIndexRoute extends DiscourseRoute { @service router; diff --git a/app/assets/javascripts/admin/addon/routes/admin-users-list-index.js b/app/assets/javascripts/admin/addon/routes/admin-users-list-index.js index 7ccd3d62596..d62e0eea806 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-users-list-index.js +++ b/app/assets/javascripts/admin/addon/routes/admin-users-list-index.js @@ -1,5 +1,5 @@ -import DiscourseRoute from "discourse/routes/discourse"; import { inject as service } from "@ember/service"; +import DiscourseRoute from "discourse/routes/discourse"; export default class AdminUsersListIndexRoute extends DiscourseRoute { @service router; diff --git a/app/assets/javascripts/admin/addon/routes/admin-users-list.js b/app/assets/javascripts/admin/addon/routes/admin-users-list.js index b9c246cb98c..56a25a571b2 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-users-list.js +++ b/app/assets/javascripts/admin/addon/routes/admin-users-list.js @@ -1,9 +1,9 @@ import { action } from "@ember/object"; -import AdminUser from "admin/models/admin-user"; -import DiscourseRoute from "discourse/routes/discourse"; +import { inject as service } from "@ember/service"; import { exportEntity } from "discourse/lib/export-csv"; import { outputExportResult } from "discourse/lib/export-result"; -import { inject as service } from "@ember/service"; +import DiscourseRoute from "discourse/routes/discourse"; +import AdminUser from "admin/models/admin-user"; export default class AdminUsersListRoute extends DiscourseRoute { @service router; diff --git a/app/assets/javascripts/admin/addon/routes/admin-watched-words-action.js b/app/assets/javascripts/admin/addon/routes/admin-watched-words-action.js index 721e193b117..f37e2ce6f59 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-watched-words-action.js +++ b/app/assets/javascripts/admin/addon/routes/admin-watched-words-action.js @@ -1,5 +1,5 @@ -import DiscourseRoute from "discourse/routes/discourse"; import EmberObject from "@ember/object"; +import DiscourseRoute from "discourse/routes/discourse"; import I18n from "I18n"; export default class AdminWatchedWordsActionRoute extends DiscourseRoute { diff --git a/app/assets/javascripts/admin/addon/routes/admin-watched-words-index.js b/app/assets/javascripts/admin/addon/routes/admin-watched-words-index.js index 7eedaef9326..64dca12e68b 100644 --- a/app/assets/javascripts/admin/addon/routes/admin-watched-words-index.js +++ b/app/assets/javascripts/admin/addon/routes/admin-watched-words-index.js @@ -1,5 +1,5 @@ -import DiscourseRoute from "discourse/routes/discourse"; import { inject as service } from "@ember/service"; +import DiscourseRoute from "discourse/routes/discourse"; export default class AdminWatchedWordsIndexRoute extends DiscourseRoute { @service router; diff --git a/app/assets/javascripts/admin/addon/services/admin-tools.js b/app/assets/javascripts/admin/addon/services/admin-tools.js index f7f821ddfd0..0dc7fbd6966 100644 --- a/app/assets/javascripts/admin/addon/services/admin-tools.js +++ b/app/assets/javascripts/admin/addon/services/admin-tools.js @@ -1,12 +1,12 @@ +import { getOwner } from "@ember/application"; +import { action } from "@ember/object"; +import Service, { inject as service } from "@ember/service"; +import { htmlSafe } from "@ember/template"; +import { Promise } from "rsvp"; +import { ajax } from "discourse/lib/ajax"; +import PenalizeUserModal from "admin/components/modal/penalize-user"; import AdminUser from "admin/models/admin-user"; import I18n from "I18n"; -import { Promise } from "rsvp"; -import Service, { inject as service } from "@ember/service"; -import { ajax } from "discourse/lib/ajax"; -import { getOwner } from "@ember/application"; -import { htmlSafe } from "@ember/template"; -import { action } from "@ember/object"; -import PenalizeUserModal from "admin/components/modal/penalize-user"; // A service that can act as a bridge between the front end Discourse application // and the admin application. Use this if you need front end code to access admin diff --git a/app/assets/javascripts/dialog-holder/addon/components/dialog-holder.js b/app/assets/javascripts/dialog-holder/addon/components/dialog-holder.js index 4a2bde4f3d2..ae9371b1c2c 100644 --- a/app/assets/javascripts/dialog-holder/addon/components/dialog-holder.js +++ b/app/assets/javascripts/dialog-holder/addon/components/dialog-holder.js @@ -1,6 +1,6 @@ import Component from "@glimmer/component"; -import { inject as service } from "@ember/service"; import { action } from "@ember/object"; +import { inject as service } from "@ember/service"; export default class DialogHolder extends Component { @service dialog; diff --git a/app/assets/javascripts/dialog-holder/addon/services/dialog.js b/app/assets/javascripts/dialog-holder/addon/services/dialog.js index 3ccaaf2df1a..6040c4027c6 100644 --- a/app/assets/javascripts/dialog-holder/addon/services/dialog.js +++ b/app/assets/javascripts/dialog-holder/addon/services/dialog.js @@ -1,7 +1,7 @@ +import { next } from "@ember/runloop"; import Service from "@ember/service"; import A11yDialog from "a11y-dialog"; import { bind } from "discourse-common/utils/decorators"; -import { next } from "@ember/runloop"; export default Service.extend({ dialogInstance: null, diff --git a/app/assets/javascripts/discourse-common/addon/helpers/bound-i18n.js b/app/assets/javascripts/discourse-common/addon/helpers/bound-i18n.js index c109a7b1d33..681e24ddd2c 100644 --- a/app/assets/javascripts/discourse-common/addon/helpers/bound-i18n.js +++ b/app/assets/javascripts/discourse-common/addon/helpers/bound-i18n.js @@ -1,5 +1,5 @@ -import I18n from "I18n"; import { htmlSafe } from "@ember/template"; +import I18n from "I18n"; export default function boundI18n(key, options) { return htmlSafe(I18n.t(key, options)); diff --git a/app/assets/javascripts/discourse-common/addon/helpers/fa-icon.js b/app/assets/javascripts/discourse-common/addon/helpers/fa-icon.js index 7df981e96f4..ed26d7a09b3 100644 --- a/app/assets/javascripts/discourse-common/addon/helpers/fa-icon.js +++ b/app/assets/javascripts/discourse-common/addon/helpers/fa-icon.js @@ -1,5 +1,5 @@ -import deprecated from "discourse-common/lib/deprecated"; import { htmlSafe } from "@ember/template"; +import deprecated from "discourse-common/lib/deprecated"; import { registerUnbound } from "discourse-common/lib/helpers"; import { renderIcon } from "discourse-common/lib/icon-library"; diff --git a/app/assets/javascripts/discourse-common/addon/helpers/i18n.js b/app/assets/javascripts/discourse-common/addon/helpers/i18n.js index 995df7dfd2e..04a8ffddba0 100644 --- a/app/assets/javascripts/discourse-common/addon/helpers/i18n.js +++ b/app/assets/javascripts/discourse-common/addon/helpers/i18n.js @@ -1,5 +1,5 @@ -import I18n from "I18n"; import { registerUnbound } from "discourse-common/lib/helpers"; +import I18n from "I18n"; export default function i18n(key, params) { return I18n.t(key, params); diff --git a/app/assets/javascripts/discourse-common/addon/lib/avatar-utils.js b/app/assets/javascripts/discourse-common/addon/lib/avatar-utils.js index 41a7d7a2eb4..214ef05e934 100644 --- a/app/assets/javascripts/discourse-common/addon/lib/avatar-utils.js +++ b/app/assets/javascripts/discourse-common/addon/lib/avatar-utils.js @@ -1,6 +1,6 @@ +import { escape } from "pretty-text/sanitizer"; import { getURLWithCDN } from "discourse-common/lib/get-url"; import { helperContext } from "discourse-common/lib/helpers"; -import { escape } from "pretty-text/sanitizer"; import { deepMerge } from "discourse-common/lib/object"; let allowedSizes = null; diff --git a/app/assets/javascripts/discourse-common/addon/lib/helpers.js b/app/assets/javascripts/discourse-common/addon/lib/helpers.js index a0d08262d32..f91bdf57cdb 100644 --- a/app/assets/javascripts/discourse-common/addon/lib/helpers.js +++ b/app/assets/javascripts/discourse-common/addon/lib/helpers.js @@ -1,8 +1,8 @@ import Helper from "@ember/component/helper"; -import RawHandlebars from "discourse-common/lib/raw-handlebars"; import { get } from "@ember/object"; -import { htmlSafe } from "@ember/template"; import { dasherize } from "@ember/string"; +import { htmlSafe } from "@ember/template"; +import RawHandlebars from "discourse-common/lib/raw-handlebars"; export function makeArray(obj) { if (obj === null || obj === undefined) { diff --git a/app/assets/javascripts/discourse-common/addon/lib/icon-library.js b/app/assets/javascripts/discourse-common/addon/lib/icon-library.js index b59c8dbc28b..f165968c8e6 100644 --- a/app/assets/javascripts/discourse-common/addon/lib/icon-library.js +++ b/app/assets/javascripts/discourse-common/addon/lib/icon-library.js @@ -1,9 +1,9 @@ -import I18n from "I18n"; -import attributeHook from "discourse-common/lib/attribute-hook"; import { h } from "virtual-dom"; import { isDevelopment } from "discourse-common/config/environment"; -import escape from "discourse-common/lib/escape"; +import attributeHook from "discourse-common/lib/attribute-hook"; import deprecated from "discourse-common/lib/deprecated"; +import escape from "discourse-common/lib/escape"; +import I18n from "I18n"; const SVG_NAMESPACE = "http://www.w3.org/2000/svg"; let _renderers = []; diff --git a/app/assets/javascripts/discourse-common/addon/lib/raw-templates.js b/app/assets/javascripts/discourse-common/addon/lib/raw-templates.js index 2a7c2a3a747..52c6b3d4960 100644 --- a/app/assets/javascripts/discourse-common/addon/lib/raw-templates.js +++ b/app/assets/javascripts/discourse-common/addon/lib/raw-templates.js @@ -1,5 +1,5 @@ -import { getResolverOption } from "discourse-common/resolver"; import require from "require"; +import { getResolverOption } from "discourse-common/resolver"; export const __DISCOURSE_RAW_TEMPLATES = {}; diff --git a/app/assets/javascripts/discourse-common/addon/resolver.js b/app/assets/javascripts/discourse-common/addon/resolver.js index f4f146506bc..651e48be51f 100644 --- a/app/assets/javascripts/discourse-common/addon/resolver.js +++ b/app/assets/javascripts/discourse-common/addon/resolver.js @@ -1,9 +1,9 @@ import { dasherize, decamelize } from "@ember/string"; +import Resolver from "ember-resolver"; import deprecated from "discourse-common/lib/deprecated"; +import DiscourseTemplateMap from "discourse-common/lib/discourse-template-map"; import { findHelper } from "discourse-common/lib/helpers"; import SuffixTrie from "discourse-common/lib/suffix-trie"; -import Resolver from "ember-resolver"; -import DiscourseTemplateMap from "discourse-common/lib/discourse-template-map"; let _options = {}; let moduleSuffixTrie = null; diff --git a/app/assets/javascripts/discourse-common/addon/utils/category-macro.js b/app/assets/javascripts/discourse-common/addon/utils/category-macro.js index 625cbde74dc..6afd08a56c2 100644 --- a/app/assets/javascripts/discourse-common/addon/utils/category-macro.js +++ b/app/assets/javascripts/discourse-common/addon/utils/category-macro.js @@ -1,5 +1,5 @@ -import Category from "discourse/models/category"; import { computed, get } from "@ember/object"; +import Category from "discourse/models/category"; export default function categoryFromId(property) { return computed(property, function () { diff --git a/app/assets/javascripts/discourse-common/addon/utils/decorators.js b/app/assets/javascripts/discourse-common/addon/utils/decorators.js index 56bab146578..1bc54021b1f 100644 --- a/app/assets/javascripts/discourse-common/addon/utils/decorators.js +++ b/app/assets/javascripts/discourse-common/addon/utils/decorators.js @@ -1,9 +1,3 @@ -import { on as emberOn } from "@ember/object/evented"; -import { - observes as emberObservesDecorator, - on as emberOnDecorator, -} from "@ember-decorators/object"; - import { observer } from "@ember/object"; import { alias as EmberAlias, @@ -35,15 +29,20 @@ import { union as EmberUnion, uniq as EmberUniq, } from "@ember/object/computed"; +import CoreObject from "@ember/object/core"; +import { on as emberOn } from "@ember/object/evented"; import { bind as emberBind, schedule } from "@ember/runloop"; +import { + observes as emberObservesDecorator, + on as emberOnDecorator, +} from "@ember-decorators/object"; +import discourseDebounce from "discourse-common/lib/debounce"; +import deprecated from "discourse-common/lib/deprecated"; import decoratorAlias from "discourse-common/utils/decorator-alias"; import extractValue from "discourse-common/utils/extract-value"; import handleDescriptor from "discourse-common/utils/handle-descriptor"; import isDescriptor from "discourse-common/utils/is-descriptor"; import macroAlias from "discourse-common/utils/macro-alias"; -import discourseDebounce from "discourse-common/lib/debounce"; -import CoreObject from "@ember/object/core"; -import deprecated from "discourse-common/lib/deprecated"; export default function discourseComputedDecorator(...params) { // determine if user called as @discourseComputed('blah', 'blah') or @discourseComputed diff --git a/app/assets/javascripts/discourse-common/addon/utils/handle-descriptor.js b/app/assets/javascripts/discourse-common/addon/utils/handle-descriptor.js index d37e19111f8..20a7d4b7430 100644 --- a/app/assets/javascripts/discourse-common/addon/utils/handle-descriptor.js +++ b/app/assets/javascripts/discourse-common/addon/utils/handle-descriptor.js @@ -1,5 +1,5 @@ -import CoreObject from "@ember/object/core"; import { computed, get } from "@ember/object"; +import CoreObject from "@ember/object/core"; import extractValue from "./extract-value"; export default function handleDescriptor(target, key, desc, params = []) { diff --git a/app/assets/javascripts/discourse-common/addon/utils/macro-alias.js b/app/assets/javascripts/discourse-common/addon/utils/macro-alias.js index 7a2f4f87204..1004c13002f 100644 --- a/app/assets/javascripts/discourse-common/addon/utils/macro-alias.js +++ b/app/assets/javascripts/discourse-common/addon/utils/macro-alias.js @@ -1,5 +1,5 @@ -import isDescriptor from "discourse-common/utils/is-descriptor"; import deprecated from "discourse-common/lib/deprecated"; +import isDescriptor from "discourse-common/utils/is-descriptor"; function handleDescriptor(target, property, desc, fn, params = []) { return { diff --git a/app/assets/javascripts/discourse-widget-hbs/addon/helpers.js b/app/assets/javascripts/discourse-widget-hbs/addon/helpers.js index 3d4f077eb45..e9c35a1fc60 100644 --- a/app/assets/javascripts/discourse-widget-hbs/addon/helpers.js +++ b/app/assets/javascripts/discourse-widget-hbs/addon/helpers.js @@ -1,7 +1,7 @@ -import { avatarFor as avatar } from "discourse/widgets/post"; import { dateNode } from "discourse/helpers/node"; -import { iconNode } from "discourse-common/lib/icon-library"; +import { avatarFor as avatar } from "discourse/widgets/post"; import rawHtml from "discourse/widgets/raw-html"; +import { iconNode } from "discourse-common/lib/icon-library"; export default { avatar, diff --git a/app/assets/javascripts/discourse/app/adapters/post.js b/app/assets/javascripts/discourse/app/adapters/post.js index 3a203510f4f..58a7ce4094e 100644 --- a/app/assets/javascripts/discourse/app/adapters/post.js +++ b/app/assets/javascripts/discourse/app/adapters/post.js @@ -1,6 +1,6 @@ +import { underscore } from "@ember/string"; import RestAdapter, { Result } from "discourse/adapters/rest"; import { ajax } from "discourse/lib/ajax"; -import { underscore } from "@ember/string"; export default RestAdapter.extend({ find(store, type, findArgs) { diff --git a/app/assets/javascripts/discourse/app/adapters/rest.js b/app/assets/javascripts/discourse/app/adapters/rest.js index 6209ea9cca8..102c4afa32e 100644 --- a/app/assets/javascripts/discourse/app/adapters/rest.js +++ b/app/assets/javascripts/discourse/app/adapters/rest.js @@ -1,7 +1,7 @@ import EmberObject from "@ember/object"; +import { underscore } from "@ember/string"; import { ajax } from "discourse/lib/ajax"; import { hashString } from "discourse/lib/hash"; -import { underscore } from "@ember/string"; const ADMIN_MODELS = [ "plugin", diff --git a/app/assets/javascripts/discourse/app/adapters/topic-list.js b/app/assets/javascripts/discourse/app/adapters/topic-list.js index e5bdd606dbb..5975ece8a44 100644 --- a/app/assets/javascripts/discourse/app/adapters/topic-list.js +++ b/app/assets/javascripts/discourse/app/adapters/topic-list.js @@ -1,6 +1,6 @@ -import PreloadStore from "discourse/lib/preload-store"; import RestAdapter from "discourse/adapters/rest"; import { ajax } from "discourse/lib/ajax"; +import PreloadStore from "discourse/lib/preload-store"; export default RestAdapter.extend({ find(store, type, { filter, params }) { diff --git a/app/assets/javascripts/discourse/app/app.js b/app/assets/javascripts/discourse/app/app.js index 1593ebe5057..8c0174c0c86 100644 --- a/app/assets/javascripts/discourse/app/app.js +++ b/app/assets/javascripts/discourse/app/app.js @@ -1,12 +1,11 @@ +import Application from "@ember/application"; import "./global-compat"; import "./loader-shims"; - import require from "require"; -import Application from "@ember/application"; -import { buildResolver } from "discourse-common/resolver"; -import { isTesting } from "discourse-common/config/environment"; -import { normalizeEmberEventHandling } from "./lib/ember-events"; import { registerDiscourseImplicitInjections } from "discourse/lib/implicit-injections"; +import { isTesting } from "discourse-common/config/environment"; +import { buildResolver } from "discourse-common/resolver"; +import { normalizeEmberEventHandling } from "./lib/ember-events"; const _pluginCallbacks = []; let _unhandledThemeErrors = []; diff --git a/app/assets/javascripts/discourse/app/components/about-page-users.js b/app/assets/javascripts/discourse/app/components/about-page-users.js index 3ef57cf10a2..cd3c32e4bc5 100644 --- a/app/assets/javascripts/discourse/app/components/about-page-users.js +++ b/app/assets/javascripts/discourse/app/components/about-page-users.js @@ -1,7 +1,7 @@ import Component from "@ember/component"; import { computed } from "@ember/object"; -import { prioritizeNameInUx } from "discourse/lib/settings"; import { renderAvatar } from "discourse/helpers/user-avatar"; +import { prioritizeNameInUx } from "discourse/lib/settings"; import { userPath } from "discourse/lib/url"; export default Component.extend({ diff --git a/app/assets/javascripts/discourse/app/components/add-category-tag-classes.gjs b/app/assets/javascripts/discourse/app/components/add-category-tag-classes.gjs index 86a5e087ceb..77527a6f8b9 100644 --- a/app/assets/javascripts/discourse/app/components/add-category-tag-classes.gjs +++ b/app/assets/javascripts/discourse/app/components/add-category-tag-classes.gjs @@ -1,5 +1,5 @@ -import bodyClass from "discourse/helpers/body-class"; import { concat } from "@ember/helper"; +import bodyClass from "discourse/helpers/body-class"; const AddCategoryTagClasses =