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

FEATURE: Add indicator if plugin is official but forked (#96)

This commit is contained in:
Bianca Nenciu 2021-03-22 18:17:52 +02:00 committed by GitHub
parent 8827fdc71f
commit a8579f3c80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/docker_manager/admin_controller.rb
View File

@ -34,6 +34,8 @@ module DockerManager
official: Plugin::Metadata::OFFICIAL_PLUGINS.include?(r.name)
}
result[:fork] = true if result[:official] && !r.url.starts_with?("https://github.com/discourse/")
if r.valid?
result[:id] = r.name.downcase.gsub(/[^a-z]/, '_').gsub(/_+/, '_').sub(/_$/, '')
result[:version] = r.latest_local_commit

2
assets/docker-manager-app.css
View File

File diff suppressed because one or more lines are too long

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

@ -20,7 +20,7 @@ var t=Ember.Component.extend({classNameBindings:[":progress",":progress-striped"
return e>0?(e>100&&(e=100),("width: "+this.get("percent")+"%").htmlSafe()):"".htmlSafe()}))})
e.default=t})),define("manager-client/components/repo-status",["exports","manager-client/discourse"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
var n=Ember.Component.extend({router:Ember.inject.service(),tagName:"tr",upgradeDisabled:Ember.computed("upgradingRepo","repo","managerRepo","managerRepo.upToDate",(function(){if(!this.get("upgradingRepo")){var e=this.get("managerRepo")
return!!e&&(!e.get("upToDate")&&e!==this.get("repo"))}return!0})),officialRepoImageSrc:Ember.computed("repo.official",(function(){if(this.get("repo.official"))return t.default.getAppURL("/plugins/docker_manager/images/font-awesome-check-circle.png")})),actions:{upgrade:function(){this.get("router").transitionTo("upgrade",this.get("repo"))}}})
return!!e&&(!e.get("upToDate")&&e!==this.get("repo"))}return!0})),officialRepoImageSrc:Ember.computed("repo.official",(function(){return this.get("repo.fork")?t.default.getAppURL("/plugins/docker_manager/images/font-awesome-exclamation-circle.png"):this.get("repo.official")?t.default.getAppURL("/plugins/docker_manager/images/font-awesome-check-circle.png"):void 0})),officialRepoImageTitle:Ember.computed("repo.official",(function(){return this.get("repo.fork")?"Forked Official Plugin":this.get("repo.official")?"Official Plugin":void 0})),actions:{upgrade:function(){this.get("router").transitionTo("upgrade",this.get("repo"))}}})
e.default=n})),define("manager-client/components/x-console",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
var t=Ember.Component.extend({classNameBindings:[":logs"],_outputChanged:Ember.observer("output",(function(){Ember.run.scheduleOnce("afterRender",this,"_scrollBottom")})),_scrollBottom:function(){this.get("followOutput")&&(this.element.scrollTop=this.element.scrollHeight)},didInsertElement:function(){this._super.apply(this,arguments),this._scrollBottom()}})
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
@ -149,7 +149,7 @@ e.default=t})),define("manager-client/templates/components/progress-bar",["expor
var t=Ember.HTMLBars.template({id:"a165sycW",block:'{"symbols":[],"statements":[[10,"div"],[15,0,[31,["progress-bar progress-bar-striped ",[30,[36,1],[[35,0],"progress-bar-animated"],null]]]],[15,5,[34,2]],[12],[13],[2,"\\n"]],"hasEval":false,"upvars":["active","if","barStyle"]}',meta:{moduleName:"manager-client/templates/components/progress-bar.hbs"}})
e.default=t}))
define("manager-client/templates/components/repo-status",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
var t=Ember.HTMLBars.template({id:"U2xNSpvW",block:'{"symbols":[],"statements":[[10,"td"],[12],[2,"\\n"],[6,[37,4],[[35,2,["official"]]],null,[["default"],[{"statements":[[2," "],[10,"img"],[14,0,"check-circle"],[15,"src",[34,6]],[14,"alt","Official Plugin"],[14,"title","Official Plugin"],[12],[13],[2,"\\n"]],"parameters":[]}]]],[13],[2,"\\n"],[10,"td"],[12],[2,"\\n "],[10,"a"],[15,6,[31,[[34,2,["url"]]]]],[12],[1,[35,2,["name"]]],[13],[2,"\\n "],[10,"span"],[14,0,"current commit-hash"],[12],[1,[35,2,["prettyVersion"]]],[13],[2,"\\n"],[13],[2,"\\n"],[10,"td"],[12],[2,"\\n"],[6,[37,4],[[35,2,["checkingStatus"]]],null,[["default","else"],[{"statements":[[2," Checking for new version...\\n"]],"parameters":[]},{"statements":[[6,[37,4],[[35,2,["upToDate"]]],null,[["default","else"],[{"statements":[[2," Up to date\\n"]],"parameters":[]},{"statements":[[2," "],[10,"div"],[14,0,"new-version"],[12],[2,"\\n "],[10,"h4"],[12],[2,"New Version Available!"],[13],[2,"\\n "],[10,"ul"],[12],[2,"\\n "],[10,"li"],[12],[2,"Remote Version: "],[10,"span"],[14,0,"new commit-hash"],[12],[1,[35,2,["prettyLatestVersion"]]],[13],[13],[2,"\\n "],[10,"li"],[12],[2,"Last Updated:\\n"],[6,[37,4],[[35,2,["latest","date"]]],null,[["default","else"],[{"statements":[[2," "],[1,[30,[36,3],[[35,2,["latest","date"]]],[["interval"],[1000]]]],[2,"\\n"]],"parameters":[]},{"statements":[[2," —\\n"]],"parameters":[]}]]],[2," "],[13],[2,"\\n "],[10,"li"],[14,0,"new-commits"],[12],[1,[30,[36,5],[[35,2,["latest","commits_behind"]],[35,2,["version"]],[35,2,["latest","version"]],[35,2,["url"]]],null]],[13],[2,"\\n "],[13],[2,"\\n"],[6,[37,4],[[35,2,["upgrading"]]],null,[["default","else"],[{"statements":[[2," "],[11,"button"],[24,0,"btn"],[4,[38,1],[[32,0],"upgrade"],null],[12],[2,"Currently Upgrading..."],[13],[2,"\\n"]],"parameters":[]},{"statements":[[2," "],[11,"button"],[24,0,"upgrade-button btn"],[16,"disabled",[34,0]],[4,[38,1],[[32,0],"upgrade"],null],[12],[2,"Upgrade"],[13],[2,"\\n"]],"parameters":[]}]]],[2," "],[13],[2,"\\n "]],"parameters":[]}]]]],"parameters":[]}]]],[13],[2,"\\n"]],"hasEval":false,"upvars":["upgradeDisabled","action","repo","moment-from-now","if","new-commits","officialRepoImageSrc"]}',meta:{moduleName:"manager-client/templates/components/repo-status.hbs"}})
var t=Ember.HTMLBars.template({id:"i42wYwsY",block:'{"symbols":[],"statements":[[10,"td"],[12],[2,"\\n"],[6,[37,4],[[35,6]],null,[["default"],[{"statements":[[2," "],[10,"img"],[14,0,"check-circle"],[15,"src",[34,6]],[15,"alt",[34,7]],[15,"title",[34,7]],[12],[13],[2,"\\n"]],"parameters":[]}]]],[13],[2,"\\n"],[10,"td"],[12],[2,"\\n "],[10,"a"],[15,6,[31,[[34,2,["url"]]]]],[12],[1,[35,2,["name"]]],[13],[2,"\\n "],[10,"span"],[14,0,"current commit-hash"],[12],[1,[35,2,["prettyVersion"]]],[13],[2,"\\n"],[13],[2,"\\n"],[10,"td"],[12],[2,"\\n"],[6,[37,4],[[35,2,["checkingStatus"]]],null,[["default","else"],[{"statements":[[2," Checking for new version...\\n"]],"parameters":[]},{"statements":[[6,[37,4],[[35,2,["upToDate"]]],null,[["default","else"],[{"statements":[[2," Up to date\\n"]],"parameters":[]},{"statements":[[2," "],[10,"div"],[14,0,"new-version"],[12],[2,"\\n "],[10,"h4"],[12],[2,"New Version Available!"],[13],[2,"\\n "],[10,"ul"],[12],[2,"\\n "],[10,"li"],[12],[2,"Remote Version: "],[10,"span"],[14,0,"new commit-hash"],[12],[1,[35,2,["prettyLatestVersion"]]],[13],[13],[2,"\\n "],[10,"li"],[12],[2,"Last Updated:\\n"],[6,[37,4],[[35,2,["latest","date"]]],null,[["default","else"],[{"statements":[[2," "],[1,[30,[36,3],[[35,2,["latest","date"]]],[["interval"],[1000]]]],[2,"\\n"]],"parameters":[]},{"statements":[[2," —\\n"]],"parameters":[]}]]],[2," "],[13],[2,"\\n "],[10,"li"],[14,0,"new-commits"],[12],[1,[30,[36,5],[[35,2,["latest","commits_behind"]],[35,2,["version"]],[35,2,["latest","version"]],[35,2,["url"]]],null]],[13],[2,"\\n "],[13],[2,"\\n"],[6,[37,4],[[35,2,["upgrading"]]],null,[["default","else"],[{"statements":[[2," "],[11,"button"],[24,0,"btn"],[4,[38,1],[[32,0],"upgrade"],null],[12],[2,"Currently Upgrading..."],[13],[2,"\\n"]],"parameters":[]},{"statements":[[2," "],[11,"button"],[24,0,"upgrade-button btn"],[16,"disabled",[34,0]],[4,[38,1],[[32,0],"upgrade"],null],[12],[2,"Upgrade"],[13],[2,"\\n"]],"parameters":[]}]]],[2," "],[13],[2,"\\n "]],"parameters":[]}]]]],"parameters":[]}]]],[13],[2,"\\n"]],"hasEval":false,"upvars":["upgradeDisabled","action","repo","moment-from-now","if","new-commits","officialRepoImageSrc","officialRepoImageTitle"]}',meta:{moduleName:"manager-client/templates/components/repo-status.hbs"}})
e.default=t})),define("manager-client/templates/components/x-console",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
var t=Ember.HTMLBars.template({id:"ZW89qKKO",block:'{"symbols":[],"statements":[[1,[34,0]],[2,"\\n"]],"hasEval":false,"upvars":["output"]}',meta:{moduleName:"manager-client/templates/components/x-console.hbs"}})
e.default=t})),define("manager-client/templates/index",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
@ -161,4 +161,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+02da7713"})
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+f6307675"})

29
manager-client/app/components/repo-status.js
View File

@ -12,7 +12,7 @@ export default Component.extend({
"repo",
"managerRepo",
"managerRepo.upToDate",
function() {
function () {
const upgradingRepo = this.get("upgradingRepo");
if (!upgradingRepo) {
@ -26,18 +26,29 @@ export default Component.extend({
}
),
officialRepoImageSrc: computed("repo.official", function() {
if (!this.get("repo.official")) {
return;
officialRepoImageSrc: computed("repo.official", function () {
if (this.get("repo.fork")) {
return Discourse.getAppURL(
"/plugins/docker_manager/images/font-awesome-exclamation-circle.png"
);
} else if (this.get("repo.official")) {
return Discourse.getAppURL(
"/plugins/docker_manager/images/font-awesome-check-circle.png"
);
}
}),
officialRepoImageTitle: computed("repo.official", function () {
if (this.get("repo.fork")) {
return "Forked Official Plugin";
} else if (this.get("repo.official")) {
return "Official Plugin";
}
return Discourse.getAppURL(
"/plugins/docker_manager/images/font-awesome-check-circle.png"
);
}),
actions: {
upgrade() {
this.get("router").transitionTo("upgrade", this.get("repo"));
}
}
},
},
});

4
manager-client/app/templates/components/repo-status.hbs
View File

@ -1,6 +1,6 @@
<td>
{{#if repo.official}}
<img class="check-circle" src={{officialRepoImageSrc}} alt="Official Plugin" title="Official Plugin">
{{#if officialRepoImageSrc}}
<img class="check-circle" src={{officialRepoImageSrc}} alt={{officialRepoImageTitle}} title={{officialRepoImageTitle}}>
{{/if}}
</td>
<td>

BIN
public/images/font-awesome-exclamation-circle.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.4 KiB