From 84d68e8f68bfd6f8789c9944293b1d7920735848 Mon Sep 17 00:00:00 2001 From: Mo Bitar Date: Sun, 4 Feb 2018 11:24:48 -0600 Subject: [PATCH] Component view error handling, extensions-manager submodule --- .../app/directives/views/componentView.js | 12 +++++++++--- .../templates/directives/component-view.html.haml | 4 ++++ public/extensions/extensions-manager | 2 +- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/app/directives/views/componentView.js b/app/assets/javascripts/app/directives/views/componentView.js index 045fad945..dd67eadee 100644 --- a/app/assets/javascripts/app/directives/views/componentView.js +++ b/app/assets/javascripts/app/directives/views/componentView.js @@ -82,14 +82,20 @@ class ComponentView { var expired, offlineRestricted, urlError; offlineRestricted = component.offlineOnly && !isDesktopApplication(); - urlError = !isDesktopApplication() && (!component.url && !component.hosted_url); + + urlError = + (!isDesktopApplication() && (!component.url && !component.hosted_url)) + || + (isDesktopApplication() && (!component.local_url && !component.url && !component.hosted_url)) + expired = component.valid_until && component.valid_until <= new Date(); $scope.componentValid = !offlineRestricted && !urlError && !expired; if(offlineRestricted) $scope.error = 'offline-restricted'; - if(urlError) $scope.error = 'url-missing'; - if(expired) $scope.error = 'expired'; + else if(urlError) $scope.error = 'url-missing'; + else if(expired) $scope.error = 'expired'; + else $scope.error = null; if($scope.componentValid !== previouslyValid) { if($scope.componentValid) { diff --git a/app/assets/templates/directives/component-view.html.haml b/app/assets/templates/directives/component-view.html.haml index b7aa03eb5..e507ea060 100644 --- a/app/assets/templates/directives/component-view.html.haml +++ b/app/assets/templates/directives/component-view.html.haml @@ -57,6 +57,10 @@ %h2.title This extension is not installed correctly. %p Please uninstall {{component.name}}, then re-install it. + %p + This issue can occur if you access Standard Notes using an older version of the app. + Ensure you are running at least version 2.1 on all platforms. + %iframe{"ng-if" => "component && componentValid", "ng-attr-id" => "component-{{component.uuid}}", diff --git a/public/extensions/extensions-manager b/public/extensions/extensions-manager index aed8ee9e8..76886d2fe 160000 --- a/public/extensions/extensions-manager +++ b/public/extensions/extensions-manager @@ -1 +1 @@ -Subproject commit aed8ee9e89b62ac1bca9af0f429d6731f3c8f8d9 +Subproject commit 76886d2fec409cacbee0baaba954b676d041c39d