jamespot-user-api 1.0.103 → 1.0.105

package/lib/src/apis/{Licenses → admin}/licenses.mock.d.ts

@@ -1,8 +1,7 @@
-import { ApiWrapper } from '../../types';
-import { JLicense, JLicenseAvailable } from './licenses';
+import { AdminLicensesNotAssigned, ApiWrapper, License } from '../../types';
 export declare const licenseManagerAssignLicenseDefault: ApiWrapper<boolean>;
 export declare const licenseManagerAssignLicenseIsAssign: ApiWrapper<boolean>;
-export declare const licenseManagerCountLicensesNotAssignedCount: ApiWrapper<JLicenseAvailable>;
-export declare const licenseManagerGetLicensesAssignedDefault: ApiWrapper<Array<JLicense>>;
+export declare const licenseManagerCountLicensesNotAssignedCount: ApiWrapper<AdminLicensesNotAssigned>;
+export declare const licenseManagerGetLicensesAssignedDefault: ApiWrapper<Array<License>>;
 export declare const licenseManagerUnassignLicenseDefault: ApiWrapper<boolean>;
 export declare const licenseManagerUnassignLicenseIsUnassign: ApiWrapper<boolean>;

package/lib/src/apis/{adminStore.d.ts → admin/store.d.ts}

@@ -1,6 +1,5 @@
-import { ApiWrapper } from '../types';
-import { JBaseApi } from './base';
-import { StoreItem, StoreFinalize } from '../types/adminStore';
+import { ApiWrapper, StoreItem, StoreFinalize } from '../../types';
+import { JBaseApi } from '../base';
 export declare class AdminStoreApi extends JBaseApi {
     getItem(uri: string): Promise<ApiWrapper<StoreItem>>;
     checkoutBilling(uri: string): Promise<ApiWrapper<boolean>>;

package/lib/src/apis/admin/utils.d.ts

@@ -0,0 +1,8 @@
+import { AdminApps } from '../../types';
+import { JBaseApi } from '../base';
+export declare class AdminUtilsApi extends JBaseApi {
+    /**
+     * Request the admin applications and sub applications for the admin panel
+     */
+    getApps(): Promise<import("../../types").ApiWrapper<AdminApps, import("../../types").BaseMessages>>;
+}

package/lib/src/apis/drive/drive.d.ts

@@ -0,0 +1,20 @@
+import { JBaseApi } from '../base';
+import { ApiWrapper, DriveDocumentParams, DriveItemType, MSGraphGroup, MSGraphSite, MSGraphTenant } from '../../types';
+export declare class JDriveApi extends JBaseApi {
+    /**
+     * Microsoft graph only
+     * @returns
+     */
+    tenants(): Promise<ApiWrapper<MSGraphTenant[]>>;
+    /**
+     * Microsoft graph only
+     * @returns
+     */
+    groups(): Promise<ApiWrapper<MSGraphGroup[]>>;
+    /**
+     * Microsoft graph only
+     * @returns
+     */
+    sites(): Promise<ApiWrapper<MSGraphSite[]>>;
+    documents(service: string, documentParams: DriveDocumentParams): Promise<ApiWrapper<DriveItemType[]>>;
+}

package/lib/src/apis/drive/drive.mock.d.ts

@@ -0,0 +1,4 @@
+import { ApiWrapper, BaseMessages, DriveItemType, MSGraphGroup, MSGraphTenant } from '../../types';
+export declare const driveGetTenants: ApiWrapper<MSGraphTenant[], BaseMessages>;
+export declare const driveGetGroups: ApiWrapper<MSGraphGroup[], BaseMessages>;
+export declare const driveGetDocuments: ApiWrapper<DriveItemType[], BaseMessages>;

package/lib/src/apis/index.d.ts

@@ -1,4 +1,4 @@
-export * from './adminStore';
+export * from './admin';
 export * from './application';
 export * from './article/article';
 export * from './assetReservation';
@@ -12,7 +12,6 @@ export * from './filebank';
 export * from './group';
 export * from './jamespotUserApi';
 export * from './jland/jland';
-export * from './Licenses/licenses';
 export * from './messenger';
 export * from './search/search';
 export * from './share';

package/lib/src/apis/jamespotUserApi.d.ts

@@ -1,10 +1,11 @@
-import { AdminStoreApi } from './adminStore';
+import { AdminLicenseApi, AdminUtilsApi, AdminStoreApi } from './admin';
 import { JApplicationApi } from './application';
 import { JArticleApi } from './article/article';
 import { JAseiApi } from './asei';
 import { JAssetReservation } from './assetReservation';
 import { JAudienceApi } from './audience/audience';
 import { JCommunityApi } from './community';
+import { JDriveApi } from './drive/drive';
 import { JFileApi } from './file';
 import { JFilebankApi } from './filebank';
 import { JGroupApi } from './group';
@@ -19,7 +20,6 @@ import { JDiapazoneApi } from './diapazone';
 import { JWedocApi } from './wedoc';
 import { Network } from '../util/network';
 import { JShareApi } from './share';
-import { JLicenseApi } from './Licenses/licenses';
 /**
  * In browser usage, 'window' should be the window object.
  * In server side usage, 'window' object given must implement the fetch method, used by the Apis.
@@ -31,7 +31,9 @@ export declare class JamespotUserApi {
     version: string;
     network: Network;
     admin: {
+        license: AdminLicenseApi;
         store: AdminStoreApi;
+        utils: AdminUtilsApi;
     };
     application: JApplicationApi;
     article: JArticleApi;
@@ -41,11 +43,11 @@ export declare class JamespotUserApi {
     bookmark: JBookmarkApi;
     community: JCommunityApi;
     diapazone: JDiapazoneApi;
+    drive: JDriveApi;
     file: JFileApi;
     filebank: JFilebankApi;
     group: JGroupApi;
     jland: JLandApi;
-    license: JLicenseApi;
     mediaLibrary: JMediaLibraryApi;
     messenger: JMessengerApi;
     search: JSearchApi;

package/lib/src/apis/jland/jland.d.ts

@@ -1,7 +1,6 @@
 import { JBaseApi } from '../base';
-import { ApiWrapper, jArticleList, MaybeWithToken, PagingResults } from '../../types';
+import { ApiWrapper, jArticleList, License, MaybeWithToken, PagingResults } from '../../types';
 import { ArticleCreation } from '../article/article';
-import { JLicense } from '../Licenses/licenses';
 export declare type JLandLog = {
     idLog: number;
     slug: string;
@@ -23,7 +22,7 @@ export declare type JLandMap = jArticleList & {
     waMapUrl?: string;
     limit?: number;
     _extend: {
-        licenses: Array<JLicense>;
+        licenses: Array<License>;
     };
 };
 export declare type JLandMapCreation = ArticleCreation & {

package/lib/src/apis/user/user.d.ts

@@ -17,7 +17,6 @@ export interface ObjectListProps {
     facets?: {}[];
     filters?: Filters;
     query?: string;
-    queryFields?: Array<string>;
     limit?: number;
     page?: number;
     orders?: Orders;

package/lib/src/types/adminLicence.d.ts

@@ -0,0 +1,43 @@
+import { ObjectListProps } from '../apis';
+import { jUserList } from './user';
+export declare type AdminLicenseUserStats = {
+    countActiveUsersWithoutLicense: number;
+    countLicensesAssigned: number;
+    countLicensesNotAssigned: number;
+};
+export declare type ObjectWithoutLicenseFilter = {
+    name: string;
+    operator: string;
+    value: number;
+};
+export declare type AdminLicensesNotAssigned = {
+    [key: string]: number;
+};
+export declare type AdminLicensesAssigned = {
+    id: number;
+    kind: string;
+    dateCreation: string;
+    idFeature: number;
+    uri: string;
+    contentId: number;
+    contentType: string;
+    status: number;
+};
+export declare type License = {
+    id: number;
+    kind: string;
+    dateCreation: string;
+    idFeature: number;
+    uri: string;
+    contentId: number;
+    contentType: string;
+    status: number;
+};
+export declare type JAdminLicenseUserList = jUserList & {
+    _extend: {
+        licenses: Array<License>;
+    };
+};
+export interface AdminLicenseUser extends ObjectListProps {
+    data: JAdminLicenseUserList[];
+}

package/lib/src/types/adminUtils.d.ts

@@ -0,0 +1,18 @@
+export declare type AdminAppTab = {
+    sref?: string;
+    href?: string;
+    idDiv: string;
+    label: string;
+    icon: string;
+};
+export declare type AdminApp = {
+    name: string;
+    label: string;
+    icon: string;
+    color: [string, string, string];
+    state?: string;
+    access: boolean;
+    url?: string;
+    tabs?: AdminAppTab[];
+};
+export declare type AdminApps = AdminApp[];

package/lib/src/types/drive.d.ts

@@ -0,0 +1,27 @@
+export declare type MSGraphTenant = {
+    title: string;
+    type: string;
+};
+export declare type MSGraphGroup = {
+    title: string;
+    id: string;
+    type: string;
+};
+export declare type MSGraphSite = {
+    title: string;
+    id: string;
+    type: string;
+};
+export declare type DriveItemType = {
+    title: string;
+    id: string;
+    type: string;
+    webUrl: string;
+};
+export declare type DriveDocumentParams = {
+    msTenant: 'groups' | 'sites' | undefined;
+    msId: string | undefined;
+    idFolder: string | undefined;
+    page: number;
+    limit: number;
+};

package/lib/src/types/index.d.ts

@@ -1,8 +1,11 @@
+export * from './adminLicence';
 export * from './adminStore';
+export * from './adminUtils';
 export * from './asei';
 export * from './assetReservation';
 export * from './autocomplete';
 export * from './bookmark';
+export * from './drive';
 export * from './file';
 export * from './group';
 export * from './mediaLibrary';

package/lib/src/types/model.d.ts

@@ -27,6 +27,7 @@ export declare type WidgetDatePicker = {
     type: 'datePicker';
 };
 export declare type WidgetDatePickerValue = string | null;
+export declare type WidgetActiveValue = number;
 export declare type WidgetMultiattribute = {
     type: 'multiattribute';
 };
@@ -71,6 +72,7 @@ export declare type WidgetTaxonomy = {
     type: 'taxonomy';
     params: {
         idTaxonomy: string;
+        type?: string;
     };
 };
 export declare type WidgetOrientedlinks = {
@@ -90,7 +92,7 @@ export declare type WidgetUri = {
     };
 };
 export declare type Widget = WidgetText | WidgetTextarea | WidgetNumber | WidgetDate | WidgetDatetime | WidgetDatePicker | WidgetSelect | WidgetEmail | WidgetUrl | WidgetRefUser | WidgetRadio | WidgetCheckbox | WidgetOrientedlinks | WidgetTaxonomy | WidgetUri | WidgetTransient | WidgetMultiattribute | WidgetFile;
-export declare type WidgetsValue = WidgetDatePickerValue | WidgetDatetimeValue | WidgetDateValue | WidgetEmailValue | WidgetNumberValue | WidgetTextareaValue | WidgetTextValue | WidgetUrlValue;
+export declare type WidgetsValue = WidgetActiveValue | WidgetDatePickerValue | WidgetDatetimeValue | WidgetDateValue | WidgetEmailValue | WidgetNumberValue | WidgetTextareaValue | WidgetTextValue | WidgetUrlValue;
 export declare type FieldConfiguration<T extends string = string> = {
     label: string;
     description?: string;

package/lib/src/types/user.d.ts

@@ -1,8 +1,12 @@
 import { WidgetsValue } from './model';
 import { jObjectLittle } from './utils';
+/**
+ * @deprecated Use jUserList instead
+ */
 export declare type UserModel = jObjectLittle & {
     firstname: string;
     lastname: string;
+    active: number;
     mail?: string;
 };
 export declare type UserMapModel = {
@@ -22,6 +26,7 @@ export declare type jUserLittle = jObjectLittle & {
     dateModified: string;
 };
 export declare type jUserList = jUserLittle & {
+    active: number;
     [key: string]: WidgetsValue;
 };
 export declare type jUserView = jUserList & {};

package/lib/src/types/utils.d.ts

@@ -110,7 +110,7 @@ export declare type Order = {
     sort: 'ASC' | 'DESC';
 };
 export declare type Orders = Array<Order>;
-export declare type FilterValue = boolean | string | string[] | {
+export declare type FilterValue = boolean | string | number | string[] | {
     srcId: number | string;
     srcType: string;
 } | {

package/lib/src/util/Test.d.ts

@@ -1,5 +1,5 @@
 import { JamespotUserApi } from '../apis';
-import { ApiDefaultWrapper, PagingResults, jArticleLittle, jObjectAutocomplete } from '../types';
+import { ApiDefaultWrapper, PagingResults, jArticleLittle, jObjectAutocomplete, jObjectList, jUserList } from '../types';
 import { Network } from './network';
 export declare const network: Network;
 export declare const jApi: JamespotUserApi;
@@ -25,4 +25,6 @@ export declare const validateObjectIsFormatLittle: <T extends {
     title: string;
     _url: string;
 }>(object: T) => boolean;
+export declare const validateObjectIsFormatList: <T extends jObjectList = jObjectList>(object: T) => boolean;
+export declare const validateUserIsFormatList: <T extends jUserList = jUserList>(object: T) => boolean;
 export declare const validateObjectIsFormatAutocomplete: <T extends jObjectAutocomplete = jObjectAutocomplete>(object: T) => boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "jamespot-user-api",
-    "version": "1.0.103",
+    "version": "1.0.105",
     "scripts": {
         "build": "npx webpack --env NODE_ENV=production",
         "build-dev-vm": "npx webpack --env NODE_ENV=development --env NODE_BUILD=VM",

package/phpunitMock/articleCount-mpArticle.json

@@ -1 +1 @@
-{ "o": "article", "f": "count", "error": 0, "messages": [], "result": 13 }
+{ "o": "article", "f": "count", "error": 0, "messages": [], "result": 4 }

package/phpunitMock/articleCreate-mpArticle-little.json

@@ -2,17 +2,20 @@
     "o": "article",
     "f": "create",
     "error": 0,
-    "messages": [{ "code": 200, "msg": "Enregistrement r\u00e9ussi" }],
+    "messages": [
+        { "code": 200, "msg": "Enregistrement r\u00e9ussi" },
+        { "code": 400, "msg": "Message non envoy\u00e9 (configuration Mail)." }
+    ],
     "result": [
         {
-            "id": 35,
+            "id": 167,
             "mainType": "article",
             "type": "mpArticle",
-            "uri": "mpArticle/35",
+            "uri": "mpArticle/167",
+            "dateCreation": "2023-05-29 17:37:14",
+            "dateModified": "2023-05-29 17:37:14",
             "title": "Article for testArticleCreate",
-            "_url": "/article/35",
-            "dateCreation": "2023-04-11 14:53:51",
-            "dateModified": "2023-04-11 14:53:51"
+            "_url": "/article/167"
         }
     ]
 }

package/phpunitMock/articleGet-mpArticle-list.json

@@ -8,10 +8,10 @@
         "mainType": "article",
         "type": "mpArticle",
         "uri": "mpArticle/2",
-        "title": "Article groupe public",
-        "_url": "/article/2",
         "dateCreation": "2019-07-19 09:36:25",
         "dateModified": "2019-07-19 09:36:25",
+        "title": "Article groupe public",
+        "_url": "/article/2",
         "_right": {
             "create": true,
             "read": true,
@@ -28,10 +28,10 @@
             "mainType": "user",
             "type": "user",
             "uri": "user/1",
+            "dateCreation": "2019-03-26 16:29:33",
+            "dateModified": "2023-05-29 17:35:50",
             "title": "AdminJenkins",
             "_url": "/user/1",
-            "dateCreation": "2019-03-26 16:29:33",
-            "dateModified": "2019-07-19 09:39:23",
             "level": 9
         },
         "_nbAttachedFiles": 0

package/phpunitMock/articleUpdate-mpArticleView.json

@@ -4,14 +4,14 @@
     "error": 0,
     "messages": [{ "code": 200, "msg": "Enregistrement r\u00e9ussi" }],
     "result": {
-        "id": 64,
+        "id": 174,
         "mainType": "article",
         "type": "mpArticle",
-        "uri": "mpArticle/64",
+        "uri": "mpArticle/174",
+        "dateCreation": "2023-05-29 17:37:17",
+        "dateModified": "2023-05-29 17:37:17",
         "title": "New Title for testArticleUpdate",
-        "_url": "/article/64",
-        "dateCreation": "2023-04-11 15:34:46",
-        "dateModified": "2023-04-11 15:34:46",
+        "_url": "/article/174",
         "_right": {
             "create": true,
             "read": true,
@@ -28,10 +28,10 @@
             "mainType": "user",
             "type": "user",
             "uri": "user/4",
-            "title": "Admin1",
-            "_url": "/user/4",
             "dateCreation": "2019-07-09 15:48:26",
             "dateModified": "2019-07-09 15:51:24",
+            "title": "Admin1",
+            "_url": "/user/4",
             "level": 9
         },
         "processContext": null

package/phpunitMock/autocompleteAudience-u.json

@@ -59,6 +59,48 @@
             "cssClass": "group",
             "cssColor": "#e34d55",
             "class": "user-selector-spot"
+        },
+        {
+            "id": "spot/22",
+            "idspot": "22",
+            "uri": "spot/22",
+            "shortUri": "s22",
+            "title": "Groupe test A",
+            "name": "Groupe test A",
+            "mainType": "spot",
+            "type": "spot",
+            "label": "Groupe",
+            "cssClass": "group",
+            "cssColor": "#e34d55",
+            "class": "user-selector-spot"
+        },
+        {
+            "id": "spot/5",
+            "idspot": "5",
+            "uri": "spot/5",
+            "shortUri": "s5",
+            "title": "Spot 1 [updated]",
+            "name": "Spot 1 [updated]",
+            "mainType": "spot",
+            "type": "spot",
+            "label": "Groupe",
+            "cssClass": "group",
+            "cssColor": "#e34d55",
+            "class": "user-selector-spot"
+        },
+        {
+            "id": "spot/6",
+            "idspot": "6",
+            "uri": "spot/6",
+            "shortUri": "s6",
+            "title": "Spot 2 [updated]",
+            "name": "Spot 2 [updated]",
+            "mainType": "spot",
+            "type": "spot",
+            "label": "Groupe",
+            "cssClass": "group",
+            "cssColor": "#e34d55",
+            "class": "user-selector-spot"
         }
     ]
 }

package/phpunitMock/autocompleteTaxonomy-default.json

@@ -5,8 +5,8 @@
     "messages": [],
     "result": [
         {
-            "id": "tagConcept/101",
-            "uri": "tagConcept/101",
+            "id": "tagConcept/9",
+            "uri": "tagConcept/9",
             "shortUri": "",
             "title": "autocomplete",
             "name": "autocomplete",

package/phpunitMock/licenseManagerAssignLicense-default.json

@@ -1,7 +1 @@
-{
-    "o": "licenseManager",
-    "f": "assignLicense",
-    "error": 0,
-    "messages": [],
-    "result": false
-}
+{ "o": "licenseManager", "f": "assignLicense", "error": 0, "messages": [], "result": false }

package/phpunitMock/licenseManagerCountLicensesNotAssigned-count.json

@@ -1,15 +1,7 @@
-{
-    "o": "licenseManager",
-    "f": "countLicensesNotAssigned",
-    "error": 0,
-    "messages": [],
-    "result": {
-        "JLO1": 0,
-        "JLO2": 0,
-        "JLO3": 0,
-        "JLO5": 0,
-        "JLMO2": 0,
-        "JLV3": 1,
-        "JLC3": 0
-    }
-}
+{
+    "o": "licenseManager",
+    "f": "countLicensesNotAssigned",
+    "error": 0,
+    "messages": [],
+    "result": { "JLO1": 0, "JLO2": 0, "JLO3": 0, "JLO5": 0, "JLMO2": 0, "JLV3": 1, "JLC3": 0 }
+}

package/phpunitMock/licenseManagerGetLicensesAssigned-default.json

@@ -1,48 +1,48 @@
-{
-    "o": "licenseManager",
-    "f": "getLicensesAssigned",
-    "error": 0,
-    "messages": [],
-    "result": [
-        {
-            "id": 4,
-            "kind": "capacity-JLO1",
-            "dateCreation": "2023-04-13 16:02:53",
-            "idFeature": 7,
-            "uri": "jlandmap/16",
-            "contentId": 16,
-            "contentType": "jlandmap",
-            "status": 0
-        },
-        {
-            "id": 6,
-            "kind": "capacity-JLO3",
-            "dateCreation": "2023-04-13 16:02:54",
-            "idFeature": 9,
-            "uri": "jlandmap/18",
-            "contentId": 18,
-            "contentType": "jlandmap",
-            "status": 0
-        },
-        {
-            "id": 7,
-            "kind": "capacity-JLO5",
-            "dateCreation": "2023-04-13 16:02:54",
-            "idFeature": 10,
-            "uri": "jlandmap/19",
-            "contentId": 19,
-            "contentType": "jlandmap",
-            "status": 0
-        },
-        {
-            "id": 8,
-            "kind": "capacity-JLO5",
-            "dateCreation": "2023-04-13 16:02:54",
-            "idFeature": 10,
-            "uri": "jlandmap/20",
-            "contentId": 20,
-            "contentType": "jlandmap",
-            "status": 0
-        }
-    ]
-}
+{
+    "o": "licenseManager",
+    "f": "getLicensesAssigned",
+    "error": 0,
+    "messages": [],
+    "result": [
+        {
+            "id": 2,
+            "kind": "capacity-JLO1",
+            "dateCreation": "2023-05-29 17:37:33",
+            "idFeature": 5,
+            "uri": "jlandmap/190",
+            "contentId": 190,
+            "contentType": "jlandmap",
+            "status": 0
+        },
+        {
+            "id": 6,
+            "kind": "capacity-JLO3",
+            "dateCreation": "2023-05-29 17:37:34",
+            "idFeature": 8,
+            "uri": "jlandmap/192",
+            "contentId": 192,
+            "contentType": "jlandmap",
+            "status": 0
+        },
+        {
+            "id": 7,
+            "kind": "capacity-JLO5",
+            "dateCreation": "2023-05-29 17:37:34",
+            "idFeature": 9,
+            "uri": "jlandmap/193",
+            "contentId": 193,
+            "contentType": "jlandmap",
+            "status": 0
+        },
+        {
+            "id": 8,
+            "kind": "capacity-JLO5",
+            "dateCreation": "2023-05-29 17:37:34",
+            "idFeature": 9,
+            "uri": "jlandmap/194",
+            "contentId": 194,
+            "contentType": "jlandmap",
+            "status": 0
+        }
+    ]
+}

package/phpunitMock/licenseManagerUnassignLicense-default.json

@@ -1,7 +1 @@
-{
-    "o": "licenseManager",
-    "f": "unassignLicense",
-    "error": 0,
-    "messages": [],
-    "result": false
-}
+{ "o": "licenseManager", "f": "unassignLicense", "error": 0, "messages": [], "result": false }