1.portal.js新增资源共享权限设置接口; 新增updateResourcesShareSetting(资源共享设置)、iPortalShareParam(共享设置参数类)、iPortalShareEntity(共享设置参数实体类)

xujiaming · xujiaming · commit 2835aa479d35 · 2019-12-04T16:45:30.000+08:00
2.添加UT测试 review huangqh
diff --git a/src/common/iPortal/iPortal.js b/src/common/iPortal/iPortal.js
@@ -17,6 +17,7 @@ import { IPortalMapdashboardsQueryParam } from "./iPortalMapdashboardsQueryParam
 import { IPortalQueryParam } from "./iPortalQueryParam";
 import { IPortalQueryResult } from "./iPortalQueryResult";
 import { IPortalResource } from "./iPortalResource";
+import { IPortalShareParam } from "./iPortalShareParam";
 
 /**
  * @class SuperMap.iPortal
@@ -50,7 +51,11 @@ export class IPortal extends IPortalServiceBase {
      */
     queryResources(queryParams) {
         if (!(queryParams instanceof IPortalQueryParam)) {
-            return null;
+            return new Promise( function(resolve){
+                resolve(
+                    "queryParams is not instanceof iPortalQueryParam !"
+                );
+            });
         }
         var me = this;
         var resourceUrl = this.iportalUrl + "/gateway/catalog/resource/search.json";
@@ -71,6 +76,33 @@ export class IPortal extends IPortalServiceBase {
     }
 
 
+    /**
+     * @function SuperMap.iPortal.prototype.updateResourcesShareSetting
+     * @description 查询资源。
+     * @param {SuperMap.updateResourcesShareSetting} shareParams - 查询参数。
+     * @returns {Promise} 返回包含所有资源结果的 Promise 对象。
+     */
+    updateResourcesShareSetting(shareParams) {
+        if (!(shareParams instanceof IPortalShareParam)) {
+            return new Promise( function(resolve){
+                resolve(
+                    "shareParams is not instanceof iPortalShareParam !"
+                );
+            });
+        }
+        var resourceUrlName = shareParams.resourceType.replace("_","").toLowerCase()+"s";
+        if(resourceUrlName === "datas"){
+            resourceUrlName = "mycontent/"+resourceUrlName;
+        }
+        var cloneShareParams = {
+            ids: shareParams.ids,
+            entities: shareParams.entities
+        }
+        var shareUrl = this.iportalUrl + "/web/"+resourceUrlName+"/sharesetting.json";
+        return this.request("PUT", shareUrl, JSON.stringify(cloneShareParams)).then(function(result) {
+            return result;
+        });
+    }
     /**
      * @function SuperMap.iPortal.prototype.queryServices
      * @description 查询服务。
diff --git a/src/common/iPortal/iPortalShareEntity.js b/src/common/iPortal/iPortalShareEntity.js
@@ -0,0 +1,27 @@
+/* Copyright© 2000 - 2019 SuperMap Software Co.Ltd. All rights reserved.
+ * This program are made available under the terms of the Apache License, Version 2.0
+ * which accompanies this distribution and is available at http://www.apache.org/licenses/LICENSE-2.0.html.*/
+import {SuperMap} from '../SuperMap';
+import {Util} from '../commontypes/Util';
+ 
+/**
+ * @class SuperMap.iPortalShareEntity
+ * @classdesc iPortal 资源查询参数。
+ * @category iPortal/Online
+ * @param {Object} params - iPortal 资源查询具体参数。
+ *
+ */
+export class IPortalShareEntity {
+
+    constructor(params) {
+        params = params || {};
+        this.permissionType = ""; // SEARCH READ READWRITE DOWNLOAD
+        this.entityType = ""; // USER DEPARTMENT IPORTALGROUP
+        this.entityName = "GUEST"; // GUEST or 具体用户 name
+        this.entityId = null;
+        Util.extend(this, params);
+    }
+}
+SuperMap.iPortalShareEntity = IPortalShareEntity;
+ 
+ 
diff --git a/src/common/iPortal/iPortalShareParam.js b/src/common/iPortal/iPortalShareParam.js
@@ -0,0 +1,26 @@
+/* Copyright© 2000 - 2019 SuperMap Software Co.Ltd. All rights reserved.
+ * This program are made available under the terms of the Apache License, Version 2.0
+ * which accompanies this distribution and is available at http://www.apache.org/licenses/LICENSE-2.0.html.*/
+import {SuperMap} from '../SuperMap';
+import {Util} from '../commontypes/Util';
+ 
+/**
+ * @class SuperMap.iPortalShareParam
+ * @classdesc iPortal 资源查询参数。
+ * @category iPortal/Online
+ * @param {Object} params - iPortal 资源查询具体参数。
+ *
+ */
+export class IPortalShareParam {
+
+    constructor(params) {
+        params = params || {};
+        this.ids = [];
+        this.entities = [];
+        this.resourceType = ""; // MAP SERVICE SCENE DATA INSIGHTS_WORKSPACE MAP_DASHBOARD
+        Util.extend(this, params);
+    }
+}
+SuperMap.iPortalShareParam = IPortalShareParam;
+ 
+ 
diff --git a/src/common/iPortal/index.js b/src/common/iPortal/index.js
@@ -5,6 +5,8 @@ import {IPortal} from './iPortal';
 import {IPortalQueryParam} from './iPortalQueryParam';
 import {IPortalResource} from './iPortalResource';
 import {IPortalQueryResult} from './iPortalQueryResult';
+import {IPortalShareParam} from './iPortalShareParam';
+import {IPortalShareEntity} from './iPortalShareEntity';
 import {IPortalMap} from './iPortalMap'
 import {IPortalMapsQueryParam} from './iPortalMapsQueryParam';
 import {IPortalService} from './iPortalService';
@@ -21,6 +23,8 @@ export {IPortal} ;
 export {IPortalQueryParam};
 export {IPortalResource};
 export {IPortalQueryResult};
+export {IPortalShareParam};
+export {IPortalShareEntity};
 export {IPortalMap};
 export {IPortalMapsQueryParam} ;
 export {IPortalService} ;
diff --git a/src/common/index.js b/src/common/index.js
@@ -100,6 +100,8 @@ import {
     IPortalQueryParam,
     IPortalResource,
     IPortalQueryResult,
+    IPortalShareParam,
+    IPortalShareEntity,
     IPortalMap,
     IPortalMapsQueryParam,
     IPortalInsight,
@@ -560,6 +562,8 @@ export {
     IPortalQueryParam,
     IPortalResource,
     IPortalQueryResult,
+    IPortalShareParam,
+    IPortalShareEntity,
     IPortalMap,
     IPortalMapsQueryParam,
     IPortalInsight,
diff --git a/src/leaflet/index.js b/src/leaflet/index.js
@@ -71,6 +71,8 @@ import {
     IPortalQueryParam,
     IPortalResource,
     IPortalQueryResult,
+    IPortalShareParam,
+    IPortalShareEntity,
     IPortalMap,
     IPortalMapsQueryParam,
     IPortalInsight,
@@ -533,6 +535,8 @@ export {
     IPortalQueryParam,
     IPortalResource,
     IPortalQueryResult,
+    IPortalShareParam,
+    IPortalShareEntity,
     IPortalMap,
     IPortalMapsQueryParam,
     IPortalInsight,
diff --git a/src/mapboxgl/index.js b/src/mapboxgl/index.js
@@ -71,6 +71,8 @@ export {
     IPortalQueryParam,
     IPortalResource,
     IPortalQueryResult,
+    IPortalShareParam,
+    IPortalShareEntity,
     IPortalMap,
     IPortalMapsQueryParam,
     IPortalInsight,
diff --git a/src/openlayers/index.js b/src/openlayers/index.js
@@ -71,6 +71,8 @@ export {
     IPortalQueryParam,
     IPortalResource,
     IPortalQueryResult,
+    IPortalShareParam,
+    IPortalShareEntity,
     IPortalMap,
     IPortalMapsQueryParam,
     IPortalService,
diff --git a/test/common/iPortal/iPortalQueryParamSpec.js b/test/common/iPortal/iPortalQueryParamSpec.js
@@ -1,4 +1,4 @@
-import {IPortalQueryParam} from '../../../src/common/iPortal/IPortalQueryParam';
+import {IPortalQueryParam} from '../../../src/common/iPortal/iPortalQueryParam';
 
 describe('IPortalQueryParam', () => {
     it('resourceType', () => {
diff --git a/test/common/iPortal/iPortalShareEntitySpec.js b/test/common/iPortal/iPortalShareEntitySpec.js
@@ -0,0 +1,27 @@
+import {IPortalShareEntity} from '../../../src/common/iPortal/iPortalShareEntity';
+
+describe('IPortalShareEntity', () => {
+    it('permissionType', () => {
+        var param = new IPortalShareEntity({permissionType: 'SEARCH'});
+        expect(param).not.toBeNull();
+        expect(param.permissionType).toEqual('SEARCH');
+    });
+
+    it('entityType', () => {
+        var param = new IPortalShareEntity({ entityType: "DEPARTMENT" });
+        expect(param).not.toBeNull();
+        expect(param.entityType).toEqual("DEPARTMENT");
+    });
+
+    it('entityName', () => {
+        var param = new IPortalShareEntity({ entityName: "GUEST" });
+        expect(param).not.toBeNull();
+        expect(param.entityName).toEqual("GUEST");
+    });
+
+    it('entityId', () => {
+        var param = new IPortalShareEntity({ entityId: 123 });
+        expect(param).not.toBeNull();
+        expect(param.entityId).toEqual(123);
+    });
+});
diff --git a/test/common/iPortal/iPortalShareParamSpec.js b/test/common/iPortal/iPortalShareParamSpec.js
@@ -0,0 +1,21 @@
+import {IPortalShareParam} from '../../../src/common/iPortal/iPortalShareParam';
+
+describe('IPortalShareParam', () => {
+    it('ids', () => {
+        var param = new IPortalShareParam({ids: [1,2]});
+        expect(param).not.toBeNull();
+        expect(param.ids[1]).toEqual(2);
+    });
+
+    it('entities', () => {
+        var param = new IPortalShareParam({ entities: ["demo"] });
+        expect(param).not.toBeNull();
+        expect(param.entities[0]).toEqual("demo");
+    });
+
+    it('resourceType', () => {
+        var param = new IPortalShareParam({ resourceType: "MAP" });
+        expect(param).not.toBeNull();
+        expect(param.resourceType).toEqual("MAP");
+    });
+});

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import {IPortalQueryParam} from '../../../src/common/iPortal/IPortalQueryParam';`
	`1`	`+import {IPortalQueryParam} from '../../../src/common/iPortal/iPortalQueryParam';`
`2`	`2`
`3`	`3`	`describe('IPortalQueryParam', () => {`
`4`	`4`	`it('resourceType', () => {`