Version 1.22.0, spring 2020 release of ArcGIS Online and Enterprise 1…

…0.8.1

README.md

@@ -9,7 +9,7 @@ The Story Map Journal is ideal when you want to combine narrative text with maps
 [Map Journal page on Esri Story Maps website](http://storymaps.arcgis.com/en/app-list/map-journal/) |
 [Download](http://links.esri.com/storymaps/map_journal_template_zip)
 
-**Latest release is version 1.20.0**; if you want to be informed of new releases, we recommend you to watch this repository ([see GitHub help](https://help.github.com/articles/watching-repositories)). See the [release page](https://github.com/Esri/map-journal-storytelling-template-js/releases) for release notes.
+**Latest release is version 1.22.0**; if you want to be informed of new releases, we recommend you to watch this repository ([see GitHub help](https://help.github.com/articles/watching-repositories)). See the [release page](https://github.com/Esri/map-journal-storytelling-template-js/releases) for release notes.
 
 For more infomation about using and customizing Esri's Storytelling Apps follow the [Story Maps Developers' Corner](https://developerscorner.storymaps.arcgis.com).
 
@@ -434,7 +434,7 @@ Find a bug or want to request a new feature?  Please let us know by submitting a
 Esri welcomes contributions from anyone and everyone. Please see our [guidelines for contributing](https://github.com/esri/contributing).
 
 ## Licensing
-Copyright 2014-2018 Esri
+Copyright 2014-2020 Esri
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "Storymaps-MapJournal",
-  "version": "1.20.0",
+  "version": "1.22.0",
   "devDependencies": {
     "grunt": "~0.4.1",
     "grunt-contrib-clean": "~0.4.0",

src/app/main-config.js

@@ -50,6 +50,8 @@ function defineDojoConfig()
 		isDebug: false,
 		useDeferredInstrumentation: true,
 		async: !app.isProduction,
+	  has: { "esri-webgl-max-contexts": -1 },
+
 		//cacheBust: ! app.isProduction,
 		packages: [
       {

src/app/storymaps/common/Core.js

@@ -345,7 +345,11 @@ define(["lib-build/css!lib-app/bootstrap/css/bootstrap.min",
 							if (identityResponse && identityResponse.code && identityResponse.code === "IdentityManagerBase.1") {
 								initError("notAuthorizedBuilder");
 								return;
-							}else {
+							} else if(identityResponse.viewOnly){
+								// Storyteller user type
+								initError("viewOnlyLicense");
+								return;
+							} else {
 								initializeUI();
 								_mainView.startFromScratch();
 								appInitComplete();
@@ -403,12 +407,17 @@ define(["lib-build/css!lib-app/bootstrap/css/bootstrap.min",
 						portalUrl: 'https:' + app.indexCfg.sharingurl.split('/sharing')[0],
 						popup: true
 					});
+
 					IdentityManager.registerOAuthInfos([oAuthInfo]);
-					if(response.item.access !== "public") {
+					if(response.item.access !== "public" || app.isInBuilder) {
 						IdentityManager.checkAppAccess('https:' + app.indexCfg.sharingurl, 'storymaps').then(function(identityResponse){
 							if (identityResponse && identityResponse.code && identityResponse.code === "IdentityManagerBase.1") {
 								initError("notAuthorizedLicense");
 								return;
+							} else if(app.isInBuilder && identityResponse.viewOnly){
+								// Storyteller user type
+								initError("viewOnlyLicense");
+								return;
 							} else {
 								loadWebMappingAppStep3(response);
 								return;
@@ -419,6 +428,7 @@ define(["lib-build/css!lib-app/bootstrap/css/bootstrap.min",
 						});
 					} else {
 						loadWebMappingAppStep3(response);
+						return;
 					}
 				},
 				function(error)
@@ -720,6 +730,9 @@ define(["lib-build/css!lib-app/bootstrap/css/bootstrap.min",
 			if ( error == "notAuthorizedLicense" ) {
 				errorMsg = i18n.commonCore.licenseChange2018.noAccess;
 				errorMsg = errorMsg.replace(/%USER_NAME%/g, CommonHelper.getPortalUser() ? CommonHelper.getPortalUser() : '');
+			} else if (error == "viewOnlyLicense") {
+				errorMsg = i18n.commonCore.storyTellerUserType.notCreatorError;
+				errorMsg = errorMsg.replace(/%USER_NAME%/g, CommonHelper.getPortalUser() ? CommonHelper.getPortalUser() : '');
 			} else {
 				errorMsg = errorMsg.replace(/%TPL_NAME%/g, app.cfg.TPL_NAME);
 			}

src/app/storymaps/common/_resources/nls/core.js

@@ -164,6 +164,9 @@ define({
 			},
 			licenseChange2018: {
 				noAccess: "Your account (%USER_NAME%) is not licensed to open a Story Map that is not public.  Please ask your organization administrator to assign you a user type that includes Story Maps or an add-on Essential Apps license."
+			},
+			storyTellerUserType: {
+				notCreatorError: 'Your account (%USER_NAME%) is not licensed to use classic story map builders. Please ask your organization administrator to assign you a Creator user type.'
 			}
 		}
 	}),
@@ -179,7 +182,6 @@ define({
 	"fi": 1,
 	"fr": 1,
 	"he": 1,
-	"hi": 1,
 	"hr": 1,
 	"hu": 1,
 	"id": 1,