diff --git a/dashboard/src/views/app.html b/dashboard/src/views/app.html index 41421a0e4..0788846ec 100644 --- a/dashboard/src/views/app.html +++ b/dashboard/src/views/app.html @@ -1326,15 +1326,6 @@ -
-
- {{ 'app.updates.info.repository' | tr }} -
-
- {{ app.repository || '-' }} -
-
-
{{ 'app.updates.info.packageVersion' | tr }} diff --git a/src/apps.js b/src/apps.js index 7fd7cc07d..4225837f4 100644 --- a/src/apps.js +++ b/src/apps.js @@ -141,10 +141,6 @@ exports = module.exports = { LOCATION_TYPE_MAIL: 'mail', LOCATION_TYPE_DIRECTORY_SERVER: 'directoryserver', - // respositories, match with appstore - REPOSITORY_CORE: 'core', - REPOSITORY_COMMUNITY: 'community', - // exported for testing _validatePortBindings: validatePortBindings, _validateAccessRestriction: validateAccessRestriction, @@ -595,7 +591,7 @@ function removeInternalFields(app) { 'accessRestriction', 'manifest', 'portBindings', 'iconUrl', 'memoryLimit', 'cpuShares', 'operators', 'sso', 'debugMode', 'reverseProxyConfig', 'enableBackup', 'creationTime', 'updateTime', 'ts', 'tags', 'label', 'secondaryDomains', 'redirectDomains', 'aliasDomains', 'env', 'enableAutomaticUpdate', - 'storageVolumeId', 'storageVolumePrefix', 'mounts', 'repository', + 'storageVolumeId', 'storageVolumePrefix', 'mounts', 'enableMailbox', 'mailboxDisplayName', 'mailboxName', 'mailboxDomain', 'enableInbox', 'inboxName', 'inboxDomain'); removeCertificateKeys(result); @@ -605,7 +601,7 @@ function removeInternalFields(app) { // non-admins can only see these function removeRestrictedFields(app) { const result = _.pick(app, - 'id', 'appStoreId', 'installationState', 'error', 'runState', 'health', 'taskId', 'accessRestriction', 'repository', + 'id', 'appStoreId', 'installationState', 'error', 'runState', 'health', 'taskId', 'accessRestriction', 'secondaryDomains', 'redirectDomains', 'aliasDomains', 'sso', 'subdomain', 'domain', 'fqdn', 'certificate', 'manifest', 'portBindings', 'iconUrl', 'creationTime', 'ts', 'tags', 'label', 'enableBackup', 'upstreamUri'); @@ -755,11 +751,6 @@ function postProcess(result) { delete result.errorJson; result.taskId = result.taskId ? String(result.taskId) : null; - - // package repository is currently determined by dockerImage - if (!result.manifest.dockerImage) result.repository = ''; - else if (result.manifest.dockerImage.startsWith('cloudron/')) result.repository = exports.REPOSITORY_CORE; - else result.repository = exports.REPOSITORY_COMMUNITY; } function attachProperties(app, domainObjectMap) {