update developer to support subwidget

Author: gavinr

README.md

@@ -26,7 +26,7 @@ If you're not using the builder interface, this version extracts Web AppBuilder,
 1. Install Node.js.
 1. `npm install -g grunt-cli` (see https://gruntjs.com/getting-started)
 1. Clone or download this repo.
-1. Download the Web AppBuilder Developer Edition zip file from [here](https://developers.arcgis.com/web-appbuilder/), and save the zip file named `arcgis-web-appbuilder-2.9.zip` into the `developer/` folder, right at the same level as the `Gruntfile.js`.
+1. Download the Web AppBuilder Developer Edition zip file from [here](https://developers.arcgis.com/web-appbuilder/), and save the zip file named `arcgis-web-appbuilder-2.11.zip` into the `developer/` folder, right at the same level as the `Gruntfile.js`.
 1. In the terminal, browse to the `developer` folder
 1. `npm install`
 1. `grunt init`

developer/Gruntfile.js

@@ -77,7 +77,7 @@ module.exports = function(grunt) {
       }
     },
     unzip: {
-      'temp/': 'arcgis-web-appbuilder-2.9.zip'
+      'temp/': 'arcgis-web-appbuilder-2.12.zip'
     },
     connect: {
       server: {

developer/app/env.js

@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// Copyright © 2014 - 2018 Esri. All Rights Reserved.
+// Copyright © Esri. All Rights Reserved.
 //
 // Licensed under the Apache License Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -77,7 +77,7 @@ var
 
   //This version number will be appended to URL to avoid cache.
   //The reason we do not use wabVersion is to avoid force user to change wabVersion when they are customizing app.
-  deployVersion = '2.9';
+  deployVersion = '2.12';
 
 // console.time('before map');
 
@@ -90,18 +90,24 @@ var
 (function(global){
   //init API URL
   var queryObject = getQueryObject();
-  var apiVersion = '4.8';
+  var apiVersion = '4.11';
   ////////uncomment the following line when downloading the app
 
-  apiUrl = 'https://js.arcgis.com/4.8';
+  apiUrl = 'https://js.arcgis.com/4.11';
 
   //////////////////////////////////////////////////////////////
   allCookies = getAllCookies();
   window.appInfo = {isRunInPortal: !isXT};
+
+  if (queryObject.apiurl3d) {
+    if(!checkApiUrl(queryObject.apiurl3d)){
+      console.error('?apiurl must point to an ULR that is in the app or in esri.com/arcgis.com domain.');
+      return;
+    }
+    apiUrl = queryObject.apiurl3d;
+  }
   if (!apiUrl) {
-    if (queryObject.apiurl3d) {
-      apiUrl = queryObject.apiurl3d;
-    } else if (isXT) {
+    if (isXT) {
       apiUrl = 'https://js.arcgis.com/' + apiVersion;
     } else {
       var portalUrl = getPortalUrlFromLocation();
@@ -141,6 +147,14 @@ var
     return cookies;
   }
 
+  function checkApiUrl(url){
+    if(/^\/\//.test(url) || /^https?:\/\//.test(url)){
+      return /(?:[\w\-\_]+\.)+(?:esri|arcgis)\.com/.test(url); //api url must be in esri.com or arcgis.com
+    }else{
+      return true;
+    }
+  }
+
   function getPortalUrlFromLocation(){
     var portalUrl = getPortalServerFromLocation() +  getDeployContextFromLocation();
     return portalUrl;
@@ -152,9 +166,9 @@ var
   }
 
   function getDeployContextFromLocation (){
-    var keyIndex = window.location.href.indexOf("/home");
+    var keyIndex = window.location.href.indexOf("/home/");
     if(keyIndex < 0){
-      keyIndex = window.location.href.indexOf("/apps");
+      keyIndex = window.location.href.indexOf("/apps/");
     }
     var context = window.location.href.substring(window.location.href.indexOf(
       window.location.host) + window.location.host.length + 1, keyIndex);

developer/app/widgets/Demo/Widget.ts

@@ -12,12 +12,12 @@ import FeatureSet from 'esri/tasks/support/FeatureSet';
 import Query from 'esri/tasks/support/Query';
 import SceneView from 'esri/views/SceneView';
 
-// Dojo imports:
-// import * as on from 'dojo/on';
+// dojo imports:
+// import on from 'dojo/on';
+
+import IConfig from './config';
+import Subwidget from './widgets/Subwidget';
 
-interface IConfig {
-  demoSetting: string;
-}
 interface IWidget {
   baseClass: string;
   config?: IConfig;
@@ -30,12 +30,20 @@ class Widget implements IWidget {
 
   private sceneView: SceneView;
   private widgetWrapper: HTMLElement;
+  private subwidget: Subwidget;
 
-  private postCreate(args: any) {
+  private postCreate(args: any): void {
     const self: any = this;
     self.inherited(arguments);
+
     this.widgetWrapper.innerHTML = this.config.demoSetting;
     this.createLayer();
+
+    // create a new instance of "Subwidget" wich is just a plain old dojo Widget.
+    this.subwidget = new Subwidget({
+      text: 'This is a subwidget.'
+    });
+    this.subwidget.placeAt(this.widgetWrapper, 'last');
   }
 
   /**

developer/app/widgets/Demo/config.ts

@@ -0,0 +1,3 @@
+export default interface IConfig {
+  demoSetting: string;
+}

developer/app/widgets/Demo/widgets/Subwidget.html

@@ -0,0 +1,3 @@
+<div>
+  Subwidget!
+</div>

developer/app/widgets/Demo/widgets/Subwidget.ts

@@ -0,0 +1,25 @@
+/// <amd-dependency path="dojo/text!./Subwidget.html" name="template" />
+declare var template: any;
+
+import declare from '../support/declareDecorator';
+import WidgetBase from 'dijit/_WidgetBase';
+import _TemplatedMixin from 'dijit/_TemplatedMixin';
+import _WidgetsInTemplateMixin from 'dijit/_WidgetsInTemplateMixin';
+
+// This line tells Typescript that our Subwidget extends from WidgetBase,
+// so when we call built-in properties or functions (like .placeAt()), 
+// Typescript will not error:
+interface Subwidget extends WidgetBase {};
+
+@declare(WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin)
+class Subwidget {
+  private templateString: string = template;
+
+  baseClass: string = 'subwidget';
+
+  constructor(params?: any, srcNodeRef?: dojo.NodeOrString) {
+    // lang.mixin(this, params);
+  }
+}
+
+export default Subwidget;