feat: minor dashboard changes

Relewise · Oct 28, 2022 · ae8473c · ae8473c
1 parent 16879ed
commit ae8473c
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 12 deletions.
diff --git a/samples/UmbracoV10/App_Plugins/Relewise.Dashboard/dashboard.controller.js b/samples/UmbracoV10/App_Plugins/Relewise.Dashboard/dashboard.controller.js
@@ -1,7 +1,8 @@
 function relewiseDashboardController(relewiseDashboardResources) {
     var vm = this;
     vm.exportLoading = false;
-    vm.configurationError = false;
+    vm.relewiseNotAddedToUmbracoBuilder = false;
+    vm.unhandledError = false;
     vm.configuration = null;
     vm.exportContent = function () {
         vm.exportLoading = true;
@@ -41,13 +42,19 @@
     function init() {
         relewiseDashboardResources.getConfiguration().then((response) => {
             if (response.status === 200) {
-                vm.configurationError = false;
+                vm.unhandledError = false;
                 vm.configuration = response.data;
+            } else if (response.status === 403) {
+                vm.relewiseNotAddedToUmbracoBuilder = true;
             } else {
-                vm.configurationError = true;
+                vm.unhandledError = true;
+            }
+        }, (response) => {
+            if (response && response.status === 403) {
+                vm.relewiseNotAddedToUmbracoBuilder = true;
+            } else {
+                vm.unhandledError = true;
             }
-        }, () => {
-            vm.configurationError = true;
         });
     }
 

diff --git a/samples/UmbracoV10/App_Plugins/Relewise.Dashboard/dashboard.html b/samples/UmbracoV10/App_Plugins/Relewise.Dashboard/dashboard.html
@@ -24,7 +24,21 @@ <h3 class="bold">Welcome to the Relewise dashboard!</h3>
     <umb-box>
         <umb-box-content>
             <h3>Settings</h3>
-            <div ng-if="vm.configurationError">
+            <div ng-if="vm.relewiseNotAddedToUmbracoBuilder">
+                <span class="error">Relewise has not been added to the Umbraco builder. In 'Startup.cs' locate the 'services.AddUmbraco(...)'-method:</span><br />
+                <pre>
+services.AddUmbraco(_env, _config)
+	.AddBackOffice()
+	.AddWebsite()
+	.AddComposers()
+	.AddRelewise()
+	.Build();
+...
+</pre>
+                Note the '.AddRelewise()' method-call above - insert that and re-run the site.
+            </div>
+
+            <div ng-if="vm.unhandledError">
                 <span class="error">Unexpected error occurred. Please check the response on the XHR request or check logs.</span><br />
             </div>
 

diff --git a/src/Integrations.Umbraco/App_Plugins/Relewise.Dashboard/dashboard.controller.js b/src/Integrations.Umbraco/App_Plugins/Relewise.Dashboard/dashboard.controller.js
@@ -1,7 +1,8 @@
 function relewiseDashboardController(relewiseDashboardResources) {
     var vm = this;
     vm.exportLoading = false;
-    vm.configurationError = false;
+    vm.relewiseNotAddedToUmbracoBuilder = false;
+    vm.unhandledError = false;
     vm.configuration = null;
     vm.exportContent = function () {
         vm.exportLoading = true;
@@ -41,13 +42,19 @@
     function init() {
         relewiseDashboardResources.getConfiguration().then((response) => {
             if (response.status === 200) {
-                vm.configurationError = false;
+                vm.unhandledError = false;
                 vm.configuration = response.data;
+            } else if (response.status === 403) {
+                vm.relewiseNotAddedToUmbracoBuilder = true;
             } else {
-                vm.configurationError = true;
+                vm.unhandledError = true;
+            }
+        }, (response) => {
+            if (response && response.status === 403) {
+                vm.relewiseNotAddedToUmbracoBuilder = true;
+            } else {
+                vm.unhandledError = true;
             }
-        }, () => {
-            vm.configurationError = true;
         });
     }
 

diff --git a/src/Integrations.Umbraco/App_Plugins/Relewise.Dashboard/dashboard.html b/src/Integrations.Umbraco/App_Plugins/Relewise.Dashboard/dashboard.html
@@ -24,7 +24,21 @@ <h3 class="bold">Welcome to the Relewise dashboard!</h3>
     <umb-box>
         <umb-box-content>
             <h3>Settings</h3>
-            <div ng-if="vm.configurationError">
+            <div ng-if="vm.relewiseNotAddedToUmbracoBuilder">
+                <span class="error">Relewise has not been added to the Umbraco builder. In 'Startup.cs' locate the 'services.AddUmbraco(...)'-method:</span><br />
+                <pre>
+services.AddUmbraco(_env, _config)
+	.AddBackOffice()
+	.AddWebsite()
+	.AddComposers()
+	.AddRelewise()
+	.Build();
+...
+</pre>
+                Note the '.AddRelewise()' method-call above - insert that and re-run the site.
+            </div>
+
+            <div ng-if="vm.unhandledError">
                 <span class="error">Unexpected error occurred. Please check the response on the XHR request or check logs.</span><br />
             </div>