IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

DEV: enforces ember-template-lint: no-partial (#9173)

Browse Source 
selected-posts parial is kept and calling the new component to prevent errors with users who would have rewritten topic.hbs

dashboard-problems and version-checks seem less risky and have only been converted to components
This commit is contained in:
Joffrey JAFFEUX
2020-03-11 15:30:14 +01:00
committed by GitHub
parent 4e0b2ae294
commit 61a2c3650d
8 changed files with 249 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/admin/templates/dashboard-problems.hbs → app/assets/javascripts/admin/templates/components/dashboard-problems.hbs
View File

@@ -18,7 +18,7 @@
</div>
<p class="actions">
{{d-button action=(action "refreshProblems") class="btn-default" icon="sync" label="admin.dashboard.refresh_problems"}}
{{d-button action=refreshProblems class="btn-default" icon="sync" label="admin.dashboard.refresh_problems"}}
{{i18n 'admin.dashboard.last_checked'}}: {{problemsTimestamp}}
</p>
{{/conditional-loading-section}}

135
app/assets/javascripts/admin/templates/components/version-checks.hbs Normal file
View File

@@ -0,0 +1,135 @@
<div class="section-title">
<h2>
{{i18n "admin.dashboard.version"}}
</h2>
</div>
<div
class="dashboard-stats version-check
{{if versionCheck.critical_updates "critical" "normal"}}"
>
<div class="version-number">
<h4>
{{i18n "admin.dashboard.installed_version"}}
</h4>
<h3>
{{dash-if-empty versionCheck.installed_version}}
</h3>
{{#if versionCheck.gitLink}}
<div class="sha-link">
(
<a href={{versionCheck.gitLink}} rel="noopener" target="_blank">
{{versionCheck.shortSha}}
</a>
)
</div>
{{/if}}
</div>
{{#if versionCheck.noCheckPerformed}}
<div class="version-number">
<h4>
{{i18n "admin.dashboard.latest_version"}}
</h4>
<h3>
—
</h3>
</div>
<div class="version-status">
<div class="face">
<span class="icon critical-updates-available">
{{d-icon "far-frown"}}
</span>
</div>
<div class="version-notes">
<span class="normal-note">
{{i18n "admin.dashboard.no_check_performed"}}
</span>
</div>
</div>
{{else if versionCheck.stale_data}}
<div class="version-number">
<h4>
{{i18n "admin.dashboard.latest_version"}}
</h4>
<h3>
{{#if versionCheck.version_check_pending}}
{{dash-if-empty versionCheck.installed_version}}
{{/if}}
</h3>
</div>
<div class="version-status">
<div class="face">
{{#if versionCheck.version_check_pending}}
<span class="icon up-to-date">
{{d-icon "far-smile"}}
</span>
{{else}}
<span class="icon critical-updates-available">
{{d-icon "far-frown"}}
</span>
{{/if}}
</div>
<div class="version-notes">
<span class="normal-note">
{{#if versionCheck.version_check_pending}}
{{i18n "admin.dashboard.version_check_pending"}}
{{else}}
{{i18n "admin.dashboard.stale_data"}}
{{/if}}
</span>
</div>
</div>
{{else}}
<div class="version-number">
<h4>
{{i18n "admin.dashboard.latest_version"}}
</h4>
<h3>
{{dash-if-empty versionCheck.latest_version}}
</h3>
</div>
<div class="version-status">
<div class="face">
{{#if versionCheck.upToDate}}
<span class="icon up-to-date">
{{d-icon "far-smile"}}
</span>
{{else}}
<span
class="icon
{{if
versionCheck.critical_updates
"critical-updates-available"
"updates-available"
}}"
>
{{#if versionCheck.behindByOneVersion}}
{{d-icon "meh-o"}}
{{else}}
{{d-icon "far-frown"}}
{{/if}}
</span>
{{/if}}
</div>
<div class="version-notes">
{{#if versionCheck.upToDate}}
{{i18n "admin.dashboard.up_to_date"}}
{{else}}
<span class="critical-note">
{{i18n "admin.dashboard.critical_available"}}
</span>
<span class="normal-note">
{{i18n "admin.dashboard.updates_available"}}
</span>
{{i18n "admin.dashboard.please_upgrade"}}
{{/if}}
</div>
</div>
{{/if}}
{{custom-html
name="upgrade-header"
versionCheck=versionCheck
tagName="div"
classNames="upgrade-header"
}}
</div>

10
app/assets/javascripts/admin/templates/dashboard.hbs
View File

@@ -3,12 +3,18 @@
{{#if showVersionChecks}}
<div class="section-top">
<div class="version-checks">
{{partial "admin/templates/version-checks"}}
{{version-checks versionCheck=versionCheck}}
</div>
</div>
{{/if}}
{{partial "admin/templates/dashboard-problems"}}
{{dashboard-problems
loadingProblems=loadingProblems
foundProblems=foundProblems
problems=problems
problemsTimestamp=problemsTimestamp
refreshProblems=(action "refreshProblems")
}}
<ul class="navigation">
<li class="navigation-item general">

88
app/assets/javascripts/admin/templates/version-checks.hbs
View File

@@ -1,88 +0,0 @@
<div class="section-title">
<h2>{{i18n 'admin.dashboard.version'}}</h2>
</div>
<div class="dashboard-stats version-check {{if versionCheck.critical_updates 'critical' 'normal'}}">
<div class="version-number">
<h4>{{i18n 'admin.dashboard.installed_version'}}</h4>
<h3>{{dash-if-empty versionCheck.installed_version}}</h3>
{{#if versionCheck.gitLink}}
<div class="sha-link">
(<a href={{versionCheck.gitLink}} rel="noopener" target="_blank">{{versionCheck.shortSha}}</a>)
</div>
{{/if}}
</div>
{{#if versionCheck.noCheckPerformed}}
<div class="version-number">
<h4>{{i18n 'admin.dashboard.latest_version'}}</h4>
<h3>&mdash;</h3>
</div>
<div class="version-status">
<div class="face">
<span class="icon critical-updates-available">{{d-icon "far-frown"}}</span>
</div>
<div class="version-notes">
<span class="normal-note">{{i18n 'admin.dashboard.no_check_performed'}}</span>
</div>
</div>
{{else}}
{{#if versionCheck.stale_data}}
<div class="version-number">
<h4>{{i18n 'admin.dashboard.latest_version'}}</h4>
<h3>{{#if versionCheck.version_check_pending}}{{dash-if-empty versionCheck.installed_version}}{{/if}}</h3>
</div>
<div class="version-status">
<div class="face">
{{#if versionCheck.version_check_pending}}
<span class='icon up-to-date'>{{d-icon "far-smile"}}</span>
{{else}}
<span class="icon critical-updates-available">{{d-icon "far-frown"}}</span>
{{/if}}
</div>
<div class="version-notes">
<span class="normal-note">
{{#if versionCheck.version_check_pending}}
{{i18n 'admin.dashboard.version_check_pending'}}
{{else}}
{{i18n 'admin.dashboard.stale_data'}}
{{/if}}
</span>
</div>
</div>
{{else}}
<div class="version-number">
<h4>{{i18n 'admin.dashboard.latest_version'}}</h4>
<h3>{{dash-if-empty versionCheck.latest_version}}</h3>
</div>
<div class="version-status">
<div class="face">
{{#if versionCheck.upToDate }}
<span class='icon up-to-date'>{{d-icon "far-smile"}}</span>
{{else}}
<span class="icon {{if versionCheck.critical_updates 'critical-updates-available' 'updates-available'}}">
{{#if versionCheck.behindByOneVersion}}
{{d-icon "meh-o"}}
{{else}}
{{d-icon "far-frown"}}
{{/if}}
</span>
{{/if}}
</div>
<div class="version-notes">
{{#if versionCheck.upToDate }}
{{i18n 'admin.dashboard.up_to_date'}}
{{else}}
<span class="critical-note">{{i18n 'admin.dashboard.critical_available'}}</span>
<span class="normal-note">{{i18n 'admin.dashboard.updates_available'}}</span>
{{i18n 'admin.dashboard.please_upgrade'}}
{{/if}}
</div>
</div>
{{/if}}
{{/if}}
{{custom-html name="upgrade-header" versionCheck=versionCheck tagName="div" classNames="upgrade-header"}}
</div>