Merge pull request #119 from Esri/revert-118-1.9

Revert "Merge 1.9 to master branch"
Esri · Jul 19, 2022 · 8a574b0 · 8a574b0
2 parents 756dc86 + ba2ea7b
commit 8a574b0
Show file tree

Hide file tree

Showing 34 changed files with 68 additions and 66 deletions.
diff --git a/themes/demo-theme/manifest.json b/themes/demo-theme/manifest.json
@@ -3,8 +3,8 @@
   "label": "Demo Theme",
   "type": "theme",
   "thumbnails ": [],
-  "version": "1.9.0",
-  "exbVersion": "1.9.0",
+  "version": "1.8.0",
+  "exbVersion": "1.8.0",
   "author": "Esri R&D Center Beijing",
   "description": "This is a demo theme containing all customizable theme variables.",
   "copyright": "",

diff --git a/widgets/add-layers/README.md b/widgets/add-layers/README.md
@@ -27,7 +27,8 @@ In this sample, the ArcGIS API for JavaScript modules are loaded asynchronously
 // that we need - only once the "Add Layer" button is pressed.
 loadArcGISJSAPIModules([
   "esri/layers/FeatureLayer",
+  "esri/tasks/support/Query",
   "esri/geometry/SpatialReference",
 ]).then((modules) => {
-  [this.FeatureLayer, this.SpatialReference] = modules;
+  [this.FeatureLayer, this.Query, this.SpatialReference] = modules;
 ```
diff --git a/widgets/add-layers/manifest.json b/widgets/add-layers/manifest.json
@@ -2,8 +2,8 @@
   "name": "add-layers",
   "label": "Add Layers",
   "type": "widget",
-  "version": "1.9.0",
-  "exbVersion": "1.9.0",
+  "version": "1.8.0",
+  "exbVersion": "1.8.0",
   "author": "Esri R&D Center Beijing",
   "description": "This widget demonstrates how to add a layer to a map programmatically.",
   "copyright": "",

diff --git a/widgets/add-layers/src/runtime/widget.tsx b/widgets/add-layers/src/runtime/widget.tsx
@@ -76,9 +76,10 @@ export default class Widget extends React.PureComponent<
     // that we need - only once the "Add Layer" button is pressed.
     loadArcGISJSAPIModules([
       "esri/layers/FeatureLayer",
+      "esri/tasks/support/Query",
       "esri/geometry/SpatialReference",
     ]).then((modules) => {
-      [this.FeatureLayer, this.SpatialReference] = modules;
+      [this.FeatureLayer, this.Query, this.SpatialReference] = modules;
 
       // First create the Feature Layer from the URL that is in the box.
       const layer = new this.FeatureLayer({
@@ -94,7 +95,7 @@ export default class Widget extends React.PureComponent<
           this.props.config.hasOwnProperty("zoomToLayer") &&
           this.props.config.zoomToLayer === true
         ) {
-          const query = layer.createQuery();
+          const query = new this.Query();
           query.where = "1=1";
           query.outSpatialReference = new this.SpatialReference({
             wkid: 102100,

diff --git a/widgets/client-side-output/manifest.json b/widgets/client-side-output/manifest.json
@@ -2,8 +2,8 @@
   "name": "client-side-output",
   "label": "Client-side Output",
   "type": "widget",
-  "version": "1.9.0",
-  "exbVersion": "1.9.0",
+  "version": "1.8.0",
+  "exbVersion": "1.8.0",
   "author": "Esri R&D Center Beijing",
   "description": "This is the widget used in developer guide",
   "copyright": "",

diff --git a/widgets/clustering/manifest.json b/widgets/clustering/manifest.json
@@ -2,8 +2,8 @@
   "name": "clustering",
   "label": "Clustering",
   "type": "widget",
-  "version": "1.9.0",
-  "exbVersion": "1.9.0",
+  "version": "1.8.0",
+  "exbVersion": "1.8.0",
   "author": "Esri R&D Center Beijing",
   "description": "This is the widget used in developer documentation",
   "copyright": "",

diff --git a/widgets/control-the-widget-state/manifest.json b/widgets/control-the-widget-state/manifest.json
@@ -2,8 +2,8 @@
   "name": "control-the-widget-state",
   "label": "Control the Widget State",
   "type": "widget",
-  "version": "1.9.0",
-  "exbVersion": "1.9.0",
+  "version": "1.8.0",
+  "exbVersion": "1.8.0",
   "author": "Esri R&D Center Beijing",
   "description": "This widgets demonstrates the ability to control the widget state of another widget.",
   "copyright": "",

diff --git a/widgets/d3/manifest.json b/widgets/d3/manifest.json
@@ -2,8 +2,8 @@
   "name": "d3",
   "label": "d3",
   "type": "widget",
-  "version": "1.9.0",
-  "exbVersion": "1.9.0",
+  "version": "1.8.0",
+  "exbVersion": "1.8.0",
   "author": "Esri R&D Center Beijing",
   "description": "This widget demonstrates how to use D3.js.",
   "copyright": "",

diff --git a/widgets/demo-function/manifest.json b/widgets/demo-function/manifest.json
@@ -2,8 +2,8 @@
   "name": "demo-function",
   "label": "Demo (Function)",
   "type": "widget",
-  "version": "1.9.0",
-  "exbVersion": "1.9.0",
+  "version": "1.8.0",
+  "exbVersion": "1.8.0",
   "author": "Esri R&D Center Beijing",
   "description": "This is the widget used in developer documentation",
   "copyright": "",

diff --git a/widgets/demo/manifest.json b/widgets/demo/manifest.json
@@ -2,8 +2,8 @@
   "name": "demo",
   "label": "Demo (Class)",
   "type": "widget",
-  "version": "1.9.0",
-  "exbVersion": "1.9.0",
+  "version": "1.8.0",
+  "exbVersion": "1.8.0",
   "author": "Esri R&D Center Beijing",
   "description": "This is the widget used in developer documentation",
   "copyright": "",

diff --git a/widgets/editor/manifest.json b/widgets/editor/manifest.json
@@ -2,8 +2,8 @@
   "name": "editor",
   "label": "Editor",
   "type": "widget",
-  "version": "1.9.0",
-  "exbVersion": "1.9.0",
+  "version": "1.8.0",
+  "exbVersion": "1.8.0",
   "author": "Esri R&D Center Beijing",
   "description": "This is the widget used in developer guide",
   "copyright": "",

diff --git a/widgets/feature-layer-class/manifest.json b/widgets/feature-layer-class/manifest.json
@@ -2,8 +2,8 @@
   "name": "feature-layer-class",
   "label": "Feature Layer (Class)",
   "type": "widget",
-  "version": "1.9.0",
-  "exbVersion": "1.9.0",
+  "version": "1.8.0",
+  "exbVersion": "1.8.0",
   "author": "Esri R&D Center Beijing",
   "description": "This is the widget used in developer documentation",
   "copyright": "",

diff --git a/widgets/feature-layer-function/manifest.json b/widgets/feature-layer-function/manifest.json
@@ -2,8 +2,8 @@
   "name": "feature-layer-function",
   "label": "Feature Layer (Function)",
   "type": "widget",
-  "version": "1.9.0",
-  "exbVersion": "1.9.0",
+  "version": "1.8.0",
+  "exbVersion": "1.8.0",
   "author": "Esri R&D Center Beijing",
   "description": "This is the widget used in developer documentation",
   "copyright": "",

diff --git a/widgets/filter-feature-layer/manifest.json b/widgets/filter-feature-layer/manifest.json
@@ -2,8 +2,8 @@
   "name": "filter-feature-layer",
   "label": "Filter Feature Layer",
   "type": "widget",
-  "version": "1.9.0",
-  "exbVersion": "1.9.0",
+  "version": "1.8.0",
+  "exbVersion": "1.8.0",
   "author": "Esri R&D Center Beijing",
   "description": "This widget demonstrates how to filter a feature layer data source programmatically.",
   "copyright": "",

diff --git a/widgets/get-map-coordinates-class/manifest.json b/widgets/get-map-coordinates-class/manifest.json
@@ -2,8 +2,8 @@
   "name": "get-map-coordinates-class",
   "label": "Get Map Coordinates (Class)",
   "type": "widget",
-  "version": "1.9.0",
-  "exbVersion": "1.9.0",
+  "version": "1.8.0",
+  "exbVersion": "1.8.0",
   "author": "Esri R&D Center Beijing",
   "description": "This widget demonstrates how to display the latitude/longitude, scale, and zoom level of the map.",
   "copyright": "",

diff --git a/widgets/get-map-coordinates-function/manifest.json b/widgets/get-map-coordinates-function/manifest.json
@@ -2,8 +2,8 @@
   "name": "get-map-coordinates-function",
   "label": "Get Map Coordinates (Function)",
   "type": "widget",
-  "version": "1.9.0",
-  "exbVersion": "1.9.0",
+  "version": "1.8.0",
+  "exbVersion": "1.8.0",
   "author": "Esri R&D Center Beijing",
   "description": "This widget demonstrates how to display the latitude/longitude, scale, and zoom level of the map.",
   "copyright": "",

diff --git a/widgets/jquery/manifest.json b/widgets/jquery/manifest.json
@@ -2,8 +2,8 @@
   "name": "jquery",
   "label": "jQuery",
   "type": "widget",
-  "version": "1.9.0",
-  "exbVersion": "1.9.0",
+  "version": "1.8.0",
+  "exbVersion": "1.8.0",
   "author": "Esri R&D Center Beijing",
   "description": "This widget demonstrates how to load dependencies from CDN, the dependencies are loaded in sequence.",
   "copyright": "",

diff --git a/widgets/js-api-widget/manifest.json b/widgets/js-api-widget/manifest.json
@@ -2,8 +2,8 @@
   "name": "js-api-widget",
   "label": "JS API Widget",
   "type": "widget",
-  "version": "1.9.0",
-  "exbVersion": "1.9.0",
+  "version": "1.8.0",
+  "exbVersion": "1.8.0",
   "author": "Esri R&D Center Beijing",
   "description": "This is the widget used in developer documentation",
   "copyright": "",

diff --git a/widgets/map-view/manifest.json b/widgets/map-view/manifest.json
@@ -3,8 +3,8 @@
   "label": "MapView",
   "type": "widget",
   "dependency": "jimu-arcgis",
-  "version": "1.9.0",
-  "exbVersion": "1.9.0",
+  "version": "1.8.0",
+  "exbVersion": "1.8.0",
   "author": "Esri R&D Center Beijing",
   "description": "This is the widget used in developer documentation",
   "copyright": "",

diff --git a/widgets/message-subscriber/manifest.json b/widgets/message-subscriber/manifest.json
@@ -3,8 +3,8 @@
   "label": "Message Subscriber",
   "dependency": "jimu-arcgis",
   "type": "widget",
-  "version": "1.9.0",
-  "exbVersion": "1.9.0",
+  "version": "1.8.0",
+  "exbVersion": "1.8.0",
   "author": "Esri R&D Center Beijing",
   "description": "This is the widget used in developer guide",
   "copyright": "",

diff --git a/widgets/message-subscriber/src/runtime/widget.tsx b/widgets/message-subscriber/src/runtime/widget.tsx
@@ -1,5 +1,5 @@
 import { React, utils, DataSource, DataSourceComponent, AllWidgetProps, DataSourceStatus, IMDataSourceInfo } from 'jimu-core';
-import Query from 'esri/rest/support/Query';
+import Query from 'esri/tasks/support/Query';
 
 export default class Widget extends React.PureComponent<AllWidgetProps<unknown>, { query: any }>{
   state = { query: null }

diff --git a/widgets/react-data-grid/manifest.json b/widgets/react-data-grid/manifest.json
@@ -2,8 +2,8 @@
   "name": "react-data-grid",
   "label": "React Data Grid",
   "type": "widget",
-  "version": "1.9.0",
-  "exbVersion": "1.9.0",
+  "version": "1.8.0",
+  "exbVersion": "1.8.0",
   "author": "Esri R&D Center Beijing",
   "description": "This widget demonstrates how to use react-data-grid.",
   "copyright": "",

diff --git a/widgets/redux/manifest.json b/widgets/redux/manifest.json
@@ -2,8 +2,8 @@
   "name": "redux",
   "label": "Redux",
   "type": "widget",
-  "version": "1.9.0",
-  "exbVersion": "1.9.0",
+  "version": "1.8.0",
+  "exbVersion": "1.8.0",
   "author": "Esri R&D Center Beijing",
   "description": "This is the widget used in developer guide",
   "copyright": "",

diff --git a/widgets/server-side-output/manifest.json b/widgets/server-side-output/manifest.json
@@ -2,8 +2,8 @@
   "name": "server-side-output",
   "label": "Server-side Output",
   "type": "widget",
-  "version": "1.9.0",
-  "exbVersion": "1.9.0",
+  "version": "1.8.0",
+  "exbVersion": "1.8.0",
   "author": "Esri R&D Center Beijing",
   "description": "This is the widget used in developer guide",
   "copyright": "",

diff --git a/widgets/show-record-id/manifest.json b/widgets/show-record-id/manifest.json
@@ -2,8 +2,8 @@
   "name": "show-record-id",
   "label": "Show Record ID",
   "type": "widget",
-  "version": "1.9.0",
-  "exbVersion": "1.9.0",
+  "version": "1.8.0",
+  "exbVersion": "1.8.0",
   "author": "Esri R&D Center Beijing",
   "description": "This is the widget used in developer guide",
   "copyright": "",

diff --git a/widgets/show-unit-tests/manifest.json b/widgets/show-unit-tests/manifest.json
@@ -2,8 +2,8 @@
   "name": "show-unit-tests",
   "label": "Show Unit Tests",
   "type": "widget",
-  "version": "1.9.0",
-  "exbVersion": "1.9.0",
+  "version": "1.8.0",
+  "exbVersion": "1.8.0",
   "author": "Esri R&D Center Beijing",
   "description": "This widget shows how to unit test a widget.",
   "copyright": "",

diff --git a/widgets/showextent/manifest.json b/widgets/showextent/manifest.json
@@ -2,8 +2,8 @@
   "name": "showextent",
   "label": "Show Extent",
   "type": "widget",
-  "version": "1.9.0",
-  "exbVersion": "1.9.0",
+  "version": "1.8.0",
+  "exbVersion": "1.8.0",
   "author": "Esri R&D Center Beijing",
   "description": "This is the widget used in developer documentation",
   "copyright": "",

diff --git a/widgets/statistic-client-side-output/manifest.json b/widgets/statistic-client-side-output/manifest.json
@@ -2,8 +2,8 @@
   "name": "statistic-client-side-output",
   "label": "Statistic Client-side Output",
   "type": "widget",
-  "version": "1.9.0",
-  "exbVersion": "1.9.0",
+  "version": "1.8.0",
+  "exbVersion": "1.8.0",
   "author": "Esri R&D Center Beijing",
   "description": "This is the widget used in developer guide",
   "copyright": "",

diff --git a/widgets/translation/manifest.json b/widgets/translation/manifest.json
@@ -2,8 +2,8 @@
   "name": "translation",
   "label": "Translation",
   "type": "widget",
-  "version": "1.9.0",
-  "exbVersion": "1.9.0",
+  "version": "1.8.0",
+  "exbVersion": "1.8.0",
   "author": "Esri R&D Center Beijing",
   "description": "This widget demos a way to support content translation by using APP_CONFIG_PROCESSOR extension point.",
   "copyright": "",

diff --git a/widgets/translation/sample-app-config.json b/widgets/translation/sample-app-config.json
@@ -47,7 +47,7 @@
   "widgets": {
     "widget_1": {
       "uri": "widgets/common/text/",
-      "version": "1.9.0",
+      "version": "1.8.0",
       "label": "Text 1",
       "config": {
         "text": "<p>This is key1: ${key1}</p><p>This is key2: ${key2}</p>",
@@ -61,7 +61,7 @@
     },
     "widget_2": {
       "uri": "widgets/samples/translation/",
-      "version": "1.9.0",
+      "version": "1.8.0",
       "label": "Translation",
       "config": {
       },

diff --git a/widgets/use-assets/manifest.json b/widgets/use-assets/manifest.json
@@ -2,8 +2,8 @@
   "name": "use-assets",
   "label": "Use Assets",
   "type": "widget",
-  "version": "1.9.0",
-  "exbVersion": "1.9.0",
+  "version": "1.8.0",
+  "exbVersion": "1.8.0",
   "author": "Esri R&D Center Beijing",
   "description": "This widget demonstrates how to use assets in a widget.",
   "copyright": "",

diff --git a/widgets/use-calcite-components/manifest.json b/widgets/use-calcite-components/manifest.json
@@ -1,8 +1,8 @@
 {
   "name": "use-calcite-components",
   "type": "widget",
-  "version": "1.9.0",
-  "exbVersion": "1.9.0",
+  "version": "1.8.0",
+  "exbVersion": "1.8.0",
   "author": "Esri R&D Center Beijing",
   "description": "A sample component is used to show how to use Calcite components in a custom widget",
 

diff --git a/widgets/view-layers-toggle/manifest.json b/widgets/view-layers-toggle/manifest.json
@@ -2,8 +2,8 @@
   "name": "view-layers-toggle",
   "label": "View Layers Toggle",
   "type": "widget",
-  "version": "1.9.0",
-  "exbVersion": "1.9.0",
+  "version": "1.8.0",
+  "exbVersion": "1.8.0",
   "author": "Esri R&D Center Beijing",
   "description": "This widget demonstrates how to create a dropdown toggle to allow viewing different layers on the map.",
   "copyright": "",

diff --git a/widgets/web-component/manifest.json b/widgets/web-component/manifest.json
@@ -2,8 +2,8 @@
   "name": "web-component",
   "label": "Web Component",
   "type": "widget",
-  "version": "1.9.0",
-  "exbVersion": "1.9.0",
+  "version": "1.8.0",
+  "exbVersion": "1.8.0",
   "author": "Esri R&D Center Beijing",
   "description": "This is the widget used in developer documentation",
   "copyright": "",