discourse
/
docker_manager
mirror of https://github.com/discourse/docker_manager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Dynamically fetch logo url (#137) 

Core's recent sprockets update caused the digest of the image file to change. We shouldn't have hardcoded the digest in the JS code. Instead, this commit adds the url to the `preloaded-data` meta tag, so it will always be correct.
This commit is contained in:
David Taylor 2022-04-14 14:01:19 +01:00 committed by GitHub
parent afc7d94b09
commit e46136c597
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/docker_manager/admin/index.html.erb
View File

@ -7,7 +7,7 @@
<meta name="description" content="">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="manager-client/config/environment" content="%7B%22modulePrefix%22%3A%22manager-client%22%2C%22environment%22%3A%22development%22%2C%22rootURL%22%3A%22/%22%2C%22locationType%22%3A%22hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%7D%7D%2C%22APP%22%3A%7B%22name%22%3A%22manager-client%22%2C%22version%22%3A%220.0.0+cfc32897%22%7D%2C%22exportApplicationGlobal%22%3Atrue%7D" />
<meta id="preloaded-data" data-preload="<%= { rootUrl: discourse_root_url, longPollingBaseUrl: long_polling_base_url }.to_json %>">
<meta id="preloaded-data" data-preload="<%= { rootUrl: discourse_root_url, longPollingBaseUrl: long_polling_base_url, logoUrl: image_path('images/docker-manager.png') }.to_json %>">
<script src="<%= script_asset_path('docker-manager-vendor') %>"></script>
<script src="<%= script_asset_path('docker-manager-app') %>"></script>

4
assets/docker-manager-app.js
View File

@ -26,7 +26,7 @@ var t=Ember.Component.extend({classNameBindings:[":logs"],_outputChanged:Ember.o
e.default=t})),define("manager-client/controllers/application",["exports","manager-client/discourse"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
var n=Ember.Controller.extend({showBanner:Ember.computed("banner","bannerDismissed","banner.[]",(function(){if(this.get("bannerDismissed"))return!1
var e=this.get("banner")
return e&&e.length>0})),appendBannerHtml:function(e){var t=this.get("banner")||[];-1===t.indexOf(e)&&t.pushObject(e),this.set("banner",t)},logoUrl:Ember.computed((function(){return t.default.getAppURL("/assets/images/docker-manager-aff8eaea0445c0488c19f8cfd14faa8c2b278924438f19048eacc175d7d134e4.png")})),returnToSiteUrl:Ember.computed((function(){return t.default.getAppURL("/")})),backupsUrl:Ember.computed((function(){return t.default.getAppURL("/admin/backups")})),actions:{dismiss:function(){this.set("bannerDismissed",!0)}}})
return e&&e.length>0})),appendBannerHtml:function(e){var t=this.get("banner")||[];-1===t.indexOf(e)&&t.pushObject(e),this.set("banner",t)},logoUrl:Ember.computed((function(){return t.default.logoUrl})),returnToSiteUrl:Ember.computed((function(){return t.default.getAppURL("/")})),backupsUrl:Ember.computed((function(){return t.default.getAppURL("/admin/backups")})),actions:{dismiss:function(){this.set("bannerDismissed",!0)}}})
e.default=n})),define("manager-client/controllers/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
var t=Ember.Controller.extend({managerRepo:null,upgrading:null,upgradeAllButtonDisabled:Ember.computed("managerRepo.upToDate","allUpToDate",(function(){return!this.get("managerRepo.upToDate")||this.get("allUpToDate")})),allUpToDate:Ember.computed("model.@each.upToDate",(function(){return this.get("model").every((function(e){return e.get("upToDate")}))})),actions:{upgradeAllButton:function(){this.replaceRoute("upgrade","all")}}})
e.default=t})),define("manager-client/controllers/processes",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
@ -163,4 +163,4 @@ var t=Ember.HTMLBars.template({id:"VQmN43M/",block:'{"symbols":[],"statements":[
e.default=t})),define("manager-client/templates/upgrade",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
var t=Ember.HTMLBars.template({id:"IO8vYqzv",block:'{"symbols":[],"statements":[[10,"h3"],[12],[2,"Upgrade "],[1,[34,4]],[13],[2,"\\n\\n"],[1,[30,[36,8],null,[["percent"],[[35,7]]]]],[2,"\\n\\n"],[6,[37,3],[[35,9]],null,[["default"],[{"statements":[[2," "],[10,"p"],[12],[2,"Upgrade completed successfully!"],[13],[2,"\\n"]],"parameters":[]}]]],[2,"\\n"],[6,[37,3],[[35,10]],null,[["default"],[{"statements":[[2," "],[10,"p"],[12],[2,"Sorry, there was an error upgrading Discourse. Please check the logs below."],[13],[2,"\\n"]],"parameters":[]}]]],[2,"\\n"],[6,[37,3],[[35,11]],null,[["default","else"],[{"statements":[[6,[37,6],[[35,5]],null,[["default","else"],[{"statements":[[2," "],[10,"p"],[12],[1,[34,4]],[2," is at the newest version."],[13],[2,"\\n"]],"parameters":[]},{"statements":[[2," "],[10,"p"],[12],[2,"Everything is up-to-date."],[13],[2,"\\n"]],"parameters":[]}]]]],"parameters":[]},{"statements":[[2," "],[10,"div"],[14,5,"clear: both"],[12],[2,"\\n "],[11,"button"],[16,"disabled",[34,1]],[24,0,"btn"],[4,[38,0],[[32,0],"start"],null],[12],[1,[34,2]],[13],[2,"\\n"],[6,[37,3],[[35,1]],null,[["default"],[{"statements":[[2," "],[11,"button"],[24,0,"btn unlock"],[4,[38,0],[[32,0],"resetUpgrade"],null],[12],[2,"Reset Upgrade"],[13],[2,"\\n"]],"parameters":[]}]]],[2," "],[13],[2,"\\n"]],"parameters":[]}]]],[2,"\\n"],[1,[30,[36,13],null,[["output","followOutput"],[[35,12],true]]]],[2,"\\n"]],"hasEval":false,"upvars":["action","upgrading","upgradeButtonText","if","title","multiUpgrade","unless","percent","progress-bar","complete","failed","isUpToDate","output","x-console"]}',meta:{moduleName:"manager-client/templates/upgrade.hbs"}})
e.default=t})),define("manager-client/transforms/boolean",["exports","@ember-data/serializer/-private"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.BooleanTransform}})})),define("manager-client/transforms/date",["exports","@ember-data/serializer/-private"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.DateTransform}})})),define("manager-client/transforms/number",["exports","@ember-data/serializer/-private"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.NumberTransform}})})),define("manager-client/transforms/string",["exports","@ember-data/serializer/-private"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.StringTransform}})})),define("manager-client/config/environment",[],(function(){try{var e="manager-client/config/environment",t=document.querySelector('meta[name="'+e+'"]').getAttribute("content"),n={default:JSON.parse(decodeURIComponent(t))}
return Object.defineProperty(n,"__esModule",{value:!0}),n}catch(r){throw new Error('Could not read config from meta tag with name "'+e+'".')}})),runningTests||require("manager-client/app").default.create({name:"manager-client",version:"0.0.0+815ed175"})
return Object.defineProperty(n,"__esModule",{value:!0}),n}catch(r){throw new Error('Could not read config from meta tag with name "'+e+'".')}})),runningTests||require("manager-client/app").default.create({name:"manager-client",version:"0.0.0+afc7d94b"})

4
manager-client/app/controllers/application.js
View File

@ -21,9 +21,7 @@ export default Controller.extend({
},
logoUrl: computed(function() {
return Discourse.getAppURL(
"/assets/images/docker-manager-aff8eaea0445c0488c19f8cfd14faa8c2b278924438f19048eacc175d7d134e4.png"
);
return Discourse.logoUrl;
}),
returnToSiteUrl: computed(function() {