From 91b88ec28c62a70458fe97eb3f93856cb6713150 Mon Sep 17 00:00:00 2001 From: Futa Ikeda Date: Tue, 19 Dec 2023 10:53:51 -0500 Subject: [PATCH] CR feedback --- app/guid-node/addons/route.ts | 4 ---- .../addon/components/addon-card/component.ts | 14 ++++++-------- .../addon/components/addon-card/template.hbs | 2 +- public/assets/images/addons/logos/box.png | Bin 1665 -> 0 bytes 4 files changed, 7 insertions(+), 13 deletions(-) delete mode 100644 public/assets/images/addons/logos/box.png diff --git a/app/guid-node/addons/route.ts b/app/guid-node/addons/route.ts index 8f1e8f5cf79..a8eec208348 100644 --- a/app/guid-node/addons/route.ts +++ b/app/guid-node/addons/route.ts @@ -1,10 +1,6 @@ import Route from '@ember/routing/route'; -import { inject as service } from '@ember/service'; -import Store from '@ember-data/store'; export default class GuidNodeAddons extends Route { - @service store: Store; - async model() { return await this.modelFor('guid-node').taskInstance; } diff --git a/lib/osf-components/addon/components/addon-card/component.ts b/lib/osf-components/addon/components/addon-card/component.ts index 38262278bbe..946792cbd7f 100644 --- a/lib/osf-components/addon/components/addon-card/component.ts +++ b/lib/osf-components/addon/components/addon-card/component.ts @@ -11,11 +11,10 @@ interface Args { manager: AddonsServiceManagerComponent; } -const addonLogoMap: Record = { +const legacyAddonLogoMap: Record = { aws: '/assets/images/addons/logos/aws.png', bitbucket: '/assets/images/addons/logos/bitbucket.png', boa: '/assets/images/addons/logos/boa_color.png', - box: '/assets/images/addons/logos/box.png', dataverse: '/assets/images/addons/logos/dataverse.png', dropbox: '/assets/images/addons/logos/dropbox.png', figshare: '/assets/images/addons/logos/figshare.png', @@ -31,11 +30,6 @@ const addonLogoMap: Record = { export default class AddonsCardComponent extends Component { @tracked deleteModalOpen = false; - @action - toggleDeleteModal() { - this.deleteModalOpen = !this.deleteModalOpen; - } - @action closeDeleteModal() { this.deleteModalOpen = false; @@ -48,7 +42,11 @@ export default class AddonsCardComponent extends Component { } get assetLogo() { - return addonLogoMap[this.args.addon.provider.id]; + if (this.args.addon instanceof LegacyProvider) { + return legacyAddonLogoMap[this.args.addon.provider.id]; + } else { + return this.args.addon.provider.iconUri; + } } get addonIsConfigured() { diff --git a/lib/osf-components/addon/components/addon-card/template.hbs b/lib/osf-components/addon/components/addon-card/template.hbs index 524900343e6..1c402ad97b5 100644 --- a/lib/osf-components/addon/components/addon-card/template.hbs +++ b/lib/osf-components/addon/components/addon-card/template.hbs @@ -31,7 +31,7 @@ data-test-addon-card-disable data-analytics-name='Disable' local-class='disable' - {{on 'click' this.toggleDeleteModal}} + {{on 'click' (action (mut this.deleteModalOpen) true)}} > {{t 'osf-components.addon-card.disable'}} diff --git a/public/assets/images/addons/logos/box.png b/public/assets/images/addons/logos/box.png deleted file mode 100644 index b0ded9a1ee819870d6a9d2c0942cabe94cd6c14b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1665 zcmV-{27dX8P)|`+T3{_xnEY z3b5kx0PZ4u?k2Gq5_}ghB-q;-5=<;l3qWgL0-D}Wz?`xE|9`LkLwE(}WrQO@E<~t8 zh_@Dmd5cyCuV6okwOAqbu2ny@hrOL4!QPJO-|7qY7vjDM2|^S?^z;s(uC*8C^+xpe zdw%Fr$$T(cEoE6?U;wCVHQ`d7k+o;fqEsak!X-F-sT03fb-8VON}L>Wu>dEo8hHEU zkzkovfK};%Sd|`t#AvBQeS23w4qfO#?vE|FP}|MhhK~SPn5sn9j3A`N$srJM>$`de z@cqROY(Lt9k{kaBo1dh_zO`z0ojo@cvvX_k(`CKWe&#L-$MZ9T*!9olddz&c#^D~` z^YB3aD9d%Hu^%m+eHan!>taZ(d|K3o=L#EP=;^nVC4`Gnkf}zJ#&NLt*ju7Q)?O_( z&I(4(yim&>xAlFPkW-187L&tMYaa;2N6R8Czx(-tULJj0jHIk+M$S zw%yLKJw+7;9KP6zhBgy(W9cL1m^WSlUm>>>KV0m@nmt;a&xvJw)t1ZkMtpmr12>v_ zAQlObG(w6el9f!5EhM<`Hyw67%@vbh+=f-V8`w3)laiNXECWn5wDq!;aI3xd&IMCo zS^7ymiYp8bb(#=g6l6xSfMH8*iwV&-tAqCGhC(fN6}PcqWeW}7_QhdXF*SfwzM-%Y zVT8v#{>yRin4!RS ze6t1rDlfqA?-&q^{u^#-+B$lHfb>F9&6hqth~YK5JYJpcK+Jx zw0)2A@YVyjT#Ciu?5)giaF{tWyHB>c6-&IZuaSu~6B#H%Vw4o~^KPP1XDz3#U@w-0 zx)KXd1XHvvJgsxvQG!PN)OE)tkHLNC2{dr_?;~MaT`v=D8^mlmQ`Lp_1&was;8t*D zvx#-WQ_AX%ym$U_lRrQ6QC7#jm&^`9`8oSwv%?du`aU)oe8$BdUct5oMQj&+-C>_H z%*dRS^P!S+qcs^D3?5sTPEt8MLHCauF7c>sUcr^kJ(laZFfoQHJ$In?k=o2;C*^$1 zxYy6FKPKkP@>dSW7`3A?a&cd*QG4VUcm*H7VzqD7*v45w9(8nXq5|<@V&1wzc5AV^f_AgWJ)9=*Dv7}O!m;0&9g)B*aQXNtrkXxi?M6v zaHsWTP+ot0n9DZ8lp-9+ih|IlS6`oNXD)5qliW{DXREugdH*d=S+Yik51tBl`3@n* zXXV%z*0=RyT$Gf#7=mVIVTy`jB75)oY3Ti ztE|EGTy-~+U#)a#+hrcU-qeGnSE_iuFCQna>X~UbizRej{dnk|8kRrx#(uYL(1(EZ zZPiSa{TEX*FZNuNo**8#P<0AVVdnF6IFP4v>!`Vp$ZY3&8lV-iYoLdDA8FC z?#>AD7h+jj0OpMG$GB)Ig8hW7lVn>@-7sMPnRaGB%|3vZ`Of7Lm>Ms~i9ZckwzD2a z7v^H|L?w1)M8H=hz?QF?@ZquBcP`jl82W1I?Fr400000 LNkvXXu0mjf4NyLA