consolidate feature-service-admin and feature-service packages

.gitignore

@@ -79,9 +79,6 @@ packages/*/debug/
 # no idea
 /packages/*/.rpt2_cache
 
-# packages in development
-packages/arcgis-rest-portal/
-
 #
 test.html
 test.js

README.md

@@ -72,13 +72,9 @@ Some useful commands include:
 * [`@esri/arcgis-rest-request`](./packages/arcgis-rest-request/) - Underpins other packages and supports making low-level requests.
 * [`@esri/arcgis-rest-auth`](./packages/arcgis-rest-auth) - Provides methods for authenticating named users and applications.
 * [`@esri/arcgis-rest-common`](./packages/arcgis-rest-common-types) - - Stores shared methods and types used throughout the ArcGIS API.
-* [`@esri/arcgis-rest-items`](./packages/arcgis-rest-items) - Methods for working with ArcGIS Online/Enterprise content.
-* [`@esri/arcgis-rest-groups`](./packages/arcgis-rest-groups) - Methods for working with ArcGIS Online/Enterprise groups.
-* [`@esri/arcgis-rest-users`](./packages/arcgis-rest-users) - Methods for working with ArcGIS Online/Enterprise users.
-* [`@esri/arcgis-rest-sharing`](./packages/arcgis-rest-sharing) - Methods for updating permissions for ArcGIS Online/Enterprise content.
-* [`@esri/arcgis-rest-feature-service`](./packages/arcgis-rest-feature-service) - Functions for querying and editing the features inside feature services.
+* [`@esri/arcgis-rest-portal`](./packages/arcgis-rest-portal) - Methods for working with ArcGIS Online/Enterprise content and users.
+* [`@esri/arcgis-rest-feature-service`](./packages/arcgis-rest-feature-service) - Functions for creating and updating feature services and querying and editing the features they contain.
 * [`@esri/arcgis-rest-geocoder`](./packages/arcgis-rest-geocoder) - Geocoding wrapper for `@esri/arcgis-rest-js`
-* [`@esri/arcgis-rest-feature-service-admin`](./packages/arcgis-rest-feature-service-admin) - Functions for creating and updating feature services.
 * [`@esri/arcgis-rest-routing`](./packages/arcgis-rest-routing) - Routing and directions wrapper for `@esri/arcgis-rest-js`.
 
 ### Frequently Asked Questions

demos/ago-node-cli/lib/item-export-command.js

@@ -1,4 +1,4 @@
-const { getItem, getItemData } = require("@esri/arcgis-rest-items");
+const { getItem, getItemData } = require("@esri/arcgis-rest-portal");
 const jsonfile = require('jsonfile');
 
 module.exports = {

demos/ago-node-cli/lib/item-search-command.js

@@ -2,15 +2,15 @@
 /**
  * Bring in searchItems fn
  */
-const { searchItems } = require("@esri/arcgis-rest-items");
+const { searchItems } = require("@esri/arcgis-rest-portal");
 
 module.exports = {
   /**
    * Execute the command
    */
   execute: function (query) {
     // construct the search call..
-    return searchItems({ 
+    return searchItems({
       searchForm: {
         q: query,
         start: 1,

demos/ago-node-cli/package.json

@@ -19,7 +19,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@esri/arcgis-rest-auth": "^1.19.2",
-    "@esri/arcgis-rest-items": "^1.19.2",
+    "@esri/arcgis-rest-portal": "^1.19.2",
     "@esri/arcgis-rest-request": "^1.19.2",
     "chalk": "^2.3.0",
     "commander": "^2.12.2",

demos/jsapi-integration/index.html

@@ -20,7 +20,7 @@
 
   <script src="node_modules/@esri/arcgis-rest-request/dist/umd/request.umd.js"></script>
   <script src="node_modules/@esri/arcgis-rest-auth/dist/umd/auth.umd.js"></script>
-  <script src="node_modules/@esri/arcgis-rest-items/dist/umd/items.umd.js"></script>
+  <script src="node_modules/@esri/arcgis-rest-portal/dist/umd/portal.umd.js"></script>
 
   <!--
     NOTE: rather than include the ArcGIS API for JavaScript via a <script> tag

demos/jsapi-integration/package.json

@@ -7,7 +7,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@esri/arcgis-rest-auth": "^1.19.2",
-    "@esri/arcgis-rest-items": "^1.19.2",
+    "@esri/arcgis-rest-portal": "^1.19.2",
     "@esri/arcgis-rest-request": "^1.19.2"
   },
   "devDependencies": {

demos/node-cli-item-management/index.js

@@ -3,7 +3,7 @@ require("isomorphic-form-data");
 const prompts = require("prompts");
 const chalk = require("chalk");
 const { UserSession } = require("@esri/arcgis-rest-auth");
-const { searchItems, removeItem } = require("@esri/arcgis-rest-items");
+const { searchItems, removeItem } = require("@esri/arcgis-rest-portal");
 
 // 1. Promt the user for sign in. Create a `UserSession`
 authenticate()

demos/node-cli-item-management/package.json

@@ -17,7 +17,7 @@
   ],
   "dependencies": {
     "@esri/arcgis-rest-auth": "^1.19.2",
-    "@esri/arcgis-rest-items": "^1.19.2",
+    "@esri/arcgis-rest-portal": "^1.19.2",
     "@esri/arcgis-rest-request": "^1.19.2",
     "chalk": "^2.3.0",
     "isomorphic-fetch": "^2.2.1",

demos/tree-shaking-rollup/package.json

@@ -19,7 +19,7 @@
     "rollup-plugin-node-resolve": "^4.0.1"
   },
   "dependencies": {
-    "@esri/arcgis-rest-items": "^1.19.2",
+    "@esri/arcgis-rest-portal": "^1.19.2",
     "@esri/arcgis-rest-request": "^1.19.2"
   }
 }

demos/tree-shaking-rollup/src/index.js

@@ -1,4 +1,4 @@
-import { searchItems } from "@esri/arcgis-rest-items";
+import { searchItems } from "@esri/arcgis-rest-portal";
 
 let element = document.createElement("div");
 document.body.appendChild(element);

demos/tree-shaking-webpack/package.json

@@ -18,7 +18,7 @@
     "webpack-cli": "^3.3.0"
   },
   "dependencies": {
-    "@esri/arcgis-rest-items": "^1.19.2",
+    "@esri/arcgis-rest-portal": "^1.19.2",
     "@esri/arcgis-rest-request": "^1.19.2"
   }
 }

demos/tree-shaking-webpack/src/index.js

@@ -1,4 +1,4 @@
-import { searchItems } from "@esri/arcgis-rest-items";
+import { searchItems } from "@esri/arcgis-rest-portal";
 
 let element = document.createElement('div');
 document.body.appendChild(element);

demos/webmap-checker-sapper/package.json

@@ -14,9 +14,8 @@
   },
   "dependencies": {
     "@esri/arcgis-rest-auth": "^1.19.2",
-    "@esri/arcgis-rest-items": "^1.19.2",
+    "@esri/arcgis-rest-portal": "^1.19.2",
     "@esri/arcgis-rest-request": "^1.19.2",
-    "@esri/arcgis-rest-users": "^1.19.2",
     "compression": "^1.7.1",
     "cookies": "^0.7.3",
     "dotenv": "^6.2.0",

demos/webmap-checker-sapper/src/routes/webmaps/[webmapId].html

@@ -21,7 +21,7 @@ <h2>{item.title}</h2>
 
 <script>
   import { UserSession } from "@esri/arcgis-rest-auth";
-  import { getItem, getItemData } from "@esri/arcgis-rest-items";
+  import { getItem, getItemData } from "@esri/arcgis-rest-portal";
   import { retryWithNewSession } from "../../utils.js";
   import LayerStatus from "../../components/LayerStatus.html";
   import WebMap from "../../components/WebMap.html";

demos/webmap-checker-sapper/src/routes/webmaps/index.html

@@ -10,7 +10,7 @@ <h1>Webmaps</h1>
 
 <script>
   import { UserSession } from "@esri/arcgis-rest-auth";
-  import { searchItems } from "@esri/arcgis-rest-items";
+  import { searchItems } from "@esri/arcgis-rest-portal";
   import { retryWithNewSession } from "../../utils.js";
 
   export default {

demos/webmap-checker-sapper/src/userInfoMiddleware.js

@@ -1,6 +1,6 @@
 import { getSelf } from "@esri/arcgis-rest-request";
 // we could use UserSession.getUser() instead
-import { getUser } from "@esri/arcgis-rest-users";
+import { getUser } from "@esri/arcgis-rest-portal";
 
 // this middleware checks for a session and if we find a session add
 // additional info to that session from the getUser and getSelf calls

packages/arcgis-rest-feature-service/package.json

@@ -16,12 +16,17 @@
     "tslib": "^1.9.3"
   },
   "devDependencies": {
+    "@esri/arcgis-rest-request": "^1.19.2",
     "@esri/arcgis-rest-common": "^1.19.2",
-    "@esri/arcgis-rest-request": "^1.19.2"
+    "@esri/arcgis-rest-auth": "^1.19.2",
+    "@esri/arcgis-rest-portal": "^1.19.2"
+
   },
   "peerDependencies": {
+    "@esri/arcgis-rest-request": "^1.19.2",
     "@esri/arcgis-rest-common": "^1.19.2",
-    "@esri/arcgis-rest-request": "^1.19.2"
+    "@esri/arcgis-rest-auth": "^1.19.2",
+    "@esri/arcgis-rest-portal": "^1.19.2"
   },
   "scripts": {
     "prepare": "npm run build",