Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[FIX] App updates were not being shown correctly #11893

Merged
merged 6 commits into from
Aug 31, 2018
Merged

[FIX] App updates were not being shown correctly #11893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c0dca19
[FIX] App updates were not been shown correctly
rodrigok Aug 28, 2018
16c6741
Filter app versions by compatible ones
rodrigok Aug 28, 2018
f6d5747
Show errors of app installation
rodrigok Aug 28, 2018
3d4aabd
Pass app version to the download api
rodrigok Aug 28, 2018
e0bd5a7
Show errors when enabling apps
rodrigok Aug 28, 2018
0eb6a09
Open urls of app author and support in a new window/tab
rodrigok Aug 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions packages/rocketchat-apps/client/admin/appManage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,12 @@
{{/header}}
<div class="content">
{{#requiresPermission 'manage-apps'}}
{{#if isReady}}
{{#if hasError}}
<div class="apps-error error-color">
<i class="icon-attention"></i>
<p>{{theError}}</p>
</div>
{{else if isReady}}
<div class="rc-apps-details">
<div class="rc-apps-container rc-apps-container__header">
{{#if iconFileData}}
Expand Down Expand Up @@ -63,13 +68,13 @@ <h2> {{_ "Contact"}} </h2>
<div class="rc-apps-details__col">
{{#if author.homepage}}
<h3>{{_ "Author_Site"}}</h3>
<a href="{{author.homepage}}">{{author.homepage}}</a>
<a href="{{author.homepage}}" target="_blank">{{author.homepage}}</a>
{{/if}}
</div>
<div class="rc-apps-details__col">
{{#if author.support}}
<h3>{{_ "Support"}}</h3>
<a href="{{author.support}}">{{author.support}}</a>
<a href="{{author.support}}" target="_blank">{{author.support}}</a>
{{/if}}
</div>
</div>
Expand Down Expand Up @@ -431,11 +436,6 @@ <h2> {{_ "Settings"}} </h2>
{{/if}}
</div>
</div>
{{else if hasError}}
<div class="apps-error error-color">
<i class="icon-attention"></i>
<p>Sadly, an error has occured while loading this page.</p>
</div>
{{else}}
{{> loading}}
{{/if}}
Expand Down
43 changes: 33 additions & 10 deletions packages/rocketchat-apps/client/admin/appManage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,37 @@
import _ from 'underscore';
import s from 'underscore.string';
import toastr from 'toastr';

import { AppEvents } from '../communication';
import { Utilities } from '../../lib/misc/Utilities';

import semver from 'semver';

const HOST = 'https://marketplace.rocket.chat'; // TODO move this to inside RocketChat.API

function getApps(instance) {
const id = instance.id.get();

return Promise.all([
fetch(`${ HOST }/v1/apps/${ id }`).then((data) => data.json()),
fetch(`${ HOST }/v1/apps/${ id }?version=${ RocketChat.Info.marketplaceApiVersion }`).then((data) => data.json()),
RocketChat.API.get('apps/').then((result) => result.apps.filter((app) => app.id === id)),
]).then(([[remoteApp], [localApp]]) => {
]).then(([remoteApps, [localApp]]) => {
remoteApps = remoteApps.filter((app) => semver.satisfies(RocketChat.Info.marketplaceApiVersion, app.requiredApiVersion)).sort((a, b) => {
if (semver.gt(a.version, b.version)) {
return -1;
}
if (semver.lt(a.version, b.version)) {
return 1;
}
return 0;
});

const remoteApp = remoteApps[0];
if (localApp) {
localApp.installed = true;
if (remoteApp) {
localApp.categories = remoteApp.categories;
if (localApp.version !== remoteApp.version) {
if (semver.gt(remoteApp.version, localApp.version)) {
localApp.newVersion = remoteApp.version;
}
}
Expand Down Expand Up @@ -53,9 +67,9 @@ Template.appManage.onCreated(function() {

const id = this.id.get();

this.__ = (key) => {
this.__ = (key, options, lang_tag) => {
const appKey = Utilities.getI18nKeyForApp(key, id);
return TAPi18next.exists(`project:${ appKey }`) ? TAPi18n.__(appKey) : TAPi18n.__(key);
return TAPi18next.exists(`project:${ appKey }`) ? TAPi18n.__(appKey, options, lang_tag) : TAPi18n.__(key, options, lang_tag);
};

function _morphSettings(settings) {
Expand Down Expand Up @@ -100,8 +114,13 @@ Template.apps.onDestroyed(function() {
});

Template.appManage.helpers({
_(key) {
return Template.instance().__(key);
_(key, ...args) {
const options = (args.pop()).hash;
if (!_.isEmpty(args)) {
options.sprintf = args;
}

return Template.instance().__(key, options);
},
languages() {
const languages = TAPi18n.getLanguages();
Expand Down Expand Up @@ -217,8 +236,7 @@ async function setActivate(actiavate, e, t) {
info.status = result.status;
t.app.set(info);
} catch (e) {
// el.prop('checked', !el.prop('checked'));
// TODO alert
toastr.error((e.xhr.responseJSON && e.xhr.responseJSON.error) || e.message);
}
t.processingEnabled.set(false);
el.prop('disabled', false);
Expand Down Expand Up @@ -267,7 +285,7 @@ Template.appManage.events({

const app = t.app.get();

const url = `${ HOST }/v1/apps/${ t.id.get() }/download`;
const url = `${ HOST }/v1/apps/${ t.id.get() }/download/${ app.version }`;

const api = app.newVersion ? `apps/${ t.id.get() }` : 'apps/';

Expand All @@ -276,6 +294,11 @@ Template.appManage.events({
el.prop('disabled', false);
el.removeClass('loading');
});
}).catch((e) => {
el.prop('disabled', false);
el.removeClass('loading');
t.hasError.set(true);
t.theError.set((e.xhr.responseJSON && e.xhr.responseJSON.error) || e.message);
});

// play animation
Expand Down
10 changes: 7 additions & 3 deletions packages/rocketchat-apps/client/admin/apps.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import toastr from 'toastr';

import { AppEvents } from '../communication';
const ENABLED_STATUS = ['auto_enabled', 'manually_enabled'];
const HOST = 'https://marketplace.rocket.chat';
Expand Down Expand Up @@ -67,7 +69,7 @@ Template.apps.onCreated(function() {
getApps(instance);
getInstalledApps(instance);

fetch('https://marketplace.rocket.chat/v1/categories')
fetch(`${ HOST }/v1/categories`)
.then((response) => response.json())
.then((data) => {
instance.categories.set(data);
Expand All @@ -76,7 +78,7 @@ Template.apps.onCreated(function() {
instance.onAppAdded = function _appOnAppAdded() {
// ToDo: fix this formatting data to add an app to installedApps array without to fetch all

// fetch(`https://marketplace.rocket.chat/v1/apps/${ appId }`).then((result) => {
// fetch(`${ HOST }/v1/apps/${ appId }`).then((result) => {
// const installedApps = instance.installedApps.get();

// installedApps.push({
Expand Down Expand Up @@ -245,10 +247,12 @@ Template.apps.events({
'click .js-install'(e, template) {
e.stopPropagation();

const url = `${ HOST }/v1/apps/${ this.latest.id }/download`;
const url = `${ HOST }/v1/apps/${ this.latest.id }/download/${ this.latest.version }`;

RocketChat.API.post('apps/', { url }).then(() => {
getInstalledApps(template);
}).catch((e) => {
toastr.error((e.xhr.responseJSON && e.xhr.responseJSON.error) || e.message);
});

// play animation
Expand Down
4 changes: 3 additions & 1 deletion packages/rocketchat-lib/client/lib/RestApiClient.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,9 @@ RocketChat.API = {
resolve(result);
},
error: function _rlGetFailure(xhr, status, errorThrown) {
reject(new Error(errorThrown));
const error = new Error(errorThrown);
error.xhr = xhr;
reject(error);
},
});
});
Expand Down