@topconsultnpm/sdkui-react-beta 6.10.62 → 6.10.63

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/lib/components/choosers/TMUserChooser.js +25 -13
  2. package/lib/services/platform_services.d.ts +0 -1
  3. package/lib/services/platform_services.js +2 -9
  4. package/package.json +1 -1
package/lib/components/choosers/TMUserChooser.js CHANGED
@@ -77,7 +77,8 @@ export const TMUserIdViewer = ({ userId, showIcon = false, noneSelectionText = `
77
77
  export const TMUserIcon = ({ ud }) => {
78
78
  if (!ud)
79
79
  return null;
80
- let icon = getUserIcon(ud.level, ud.ownershipLevel);
80
+ let isExpired = User_IsExpired(ud);
81
+ let icon = getUserIcon(ud.level, ud.ownershipLevel, isExpired);
81
82
  return (_jsx(TMUserTooltip, { ud: ud, children: icon }));
82
83
  };
83
84
  export const TMUserTooltip = ({ ud, children }) => {
@@ -94,19 +95,30 @@ const getCompleteUserName = (domain, name) => {
94
95
  return name;
95
96
  return domain + "\\" + name;
96
97
  };
97
- const getUserIcon = (userLevel, level) => {
98
+ function User_IsExpired(d) {
99
+ if (d == undefined)
100
+ return false;
101
+ let ud = d;
102
+ const today = new Date();
103
+ return (ud.validFrom && today < ud.validFrom) || (ud.validTo && today > ud.validTo);
104
+ }
105
+ const getUserIcon = (userLevel, level, isExpired) => {
98
106
  let ownershipColor = "";
99
- if (level) {
100
- switch (level) {
101
- case OwnershipLevels.DirectOwner:
102
- ownershipColor = "green";
103
- break;
104
- case OwnershipLevels.IndirectOwner:
105
- ownershipColor = "gold";
106
- break;
107
- case OwnershipLevels.NotOwner:
108
- ownershipColor = "red";
109
- break;
107
+ if (isExpired)
108
+ ownershipColor = "grey";
109
+ else {
110
+ if (level) {
111
+ switch (level) {
112
+ case OwnershipLevels.DirectOwner:
113
+ ownershipColor = "green";
114
+ break;
115
+ case OwnershipLevels.IndirectOwner:
116
+ ownershipColor = "gold";
117
+ break;
118
+ case OwnershipLevels.NotOwner:
119
+ ownershipColor = "red";
120
+ break;
121
+ }
110
122
  }
111
123
  }
112
124
  switch (userLevel) {
package/lib/services/platform_services.d.ts CHANGED
@@ -12,7 +12,6 @@ export declare class PlatformObjectService {
12
12
  static readonly deleteAsync: (objClass: ObjectClasses, id: number) => Promise<number | undefined>;
13
13
  private static readonly getJobName;
14
14
  static readonly getName: (objClass: ObjectClasses, jobType?: JobTypes, isPlural?: boolean) => string;
15
- static User_IsExpired(d: any): boolean | undefined;
16
15
  static readonly getIcon: (objClass: ObjectClasses, d: any) => import("react/jsx-runtime").JSX.Element;
17
16
  static readonly getTooltip: (objClass: ObjectClasses, d: any) => import("react/jsx-runtime").JSX.Element | null;
18
17
  }
package/lib/services/platform_services.js CHANGED
@@ -2,17 +2,10 @@ var _a;
2
2
  import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
3
3
  import { SDK_Globals, SDK_Localizator, JobTypes, ObjectClasses, OwnershipLevels, ProcessStates, DcmtTypeListCacheService } from "@topconsultnpm/sdk-ts-beta";
4
4
  import { TMTooltip, TMUserIcon } from "../components";
5
- import { Icon123, IconAccessPoint, IconAddressBook, IconBasket, IconCloud, IconDataList, IconDisk, IconProcess, IconServerService, IconSettings, IconSignCert, IconSuitcase, IconTree, IconUserExpired, IconUserGroup, SDKUI_Localizator } from "../helper";
5
+ import { Icon123, IconAccessPoint, IconAddressBook, IconBasket, IconCloud, IconDataList, IconDisk, IconProcess, IconServerService, IconSettings, IconSignCert, IconSuitcase, IconTree, IconUserGroup, SDKUI_Localizator } from "../helper";
6
6
  import { TMColors } from "../utils/theme";
7
7
  import { LocalizeOwnershipLevels } from "../helper/Enum_Localizator";
8
8
  export class PlatformObjectService {
9
- static User_IsExpired(d) {
10
- if (d == undefined)
11
- return false;
12
- let ud = d;
13
- const today = new Date();
14
- return (ud.validFrom && today < ud.validFrom) || (ud.validTo && today > ud.validTo);
15
- }
16
9
  }
17
10
  _a = PlatformObjectService;
18
11
  PlatformObjectService.retrieveAllJobsAsync = async (jobType) => {
@@ -401,7 +394,7 @@ PlatformObjectService.getIcon = (objClass, d) => {
401
394
  ownershipColor = "red";
402
395
  break;
403
396
  }
404
- return (_jsx("div", { style: { flexDirection: "row", display: "flex", alignItems: "center", justifyContent: "center", overflow: 'visible' }, children: _jsxs(TMTooltip, { content: _a.getTooltip(objClass, d), children: [objClass == ObjectClasses.Area && _jsx(IconCloud, { color: ownershipColor }), objClass == ObjectClasses.BasketType && _jsx(IconBasket, { color: ownershipColor }), objClass == ObjectClasses.Disk && _jsx(IconDisk, { fontSize: 20, color: ownershipColor }), objClass == ObjectClasses.DataList && d.id && d.id > 26 && _jsx(IconDataList, { color: ownershipColor }), objClass == ObjectClasses.DataList && d.id && d.id <= 26 && _jsx(IconSettings, { color: ownershipColor }), objClass == ObjectClasses.Group && _jsx(IconUserGroup, { fontSize: 20, color: ownershipColor }), objClass == ObjectClasses.Numerator && _jsx(Icon123, { color: ownershipColor }), objClass == ObjectClasses.SignCert && _jsx(IconSignCert, { fontSize: 20, color: ownershipColor }), objClass == ObjectClasses.SignServer && _jsx(IconServerService, { fontSize: 20, color: ownershipColor }), objClass == ObjectClasses.LDAP && _jsx(IconAddressBook, { fontSize: 20, color: ownershipColor }), objClass == ObjectClasses.Tree && _jsx(IconTree, { color: ownershipColor }), objClass == ObjectClasses.TSA && _jsx(IconAccessPoint, { color: ownershipColor }), objClass == ObjectClasses.User && _a.User_IsExpired(d) && _jsx(IconUserExpired, { fontSize: 20, color: 'grey' }), objClass == ObjectClasses.User && !_a.User_IsExpired(d) && _jsx(TMUserIcon, { ud: d }), objClass == ObjectClasses.Job && _jsx(IconSuitcase, { color: ownershipColor }), objClass == ObjectClasses.Process && _jsx(IconProcess, { color: d.state === ProcessStates.Running ? TMColors.primary : d.state === ProcessStates.Ready || d.state === ProcessStates.Started ? TMColors.secondary : d.state === ProcessStates.Freezed ? 'rgb(180,180,180)' : d.state === ProcessStates.Completed ? TMColors.success : TMColors.error })] }) }));
397
+ return (_jsx("div", { style: { flexDirection: "row", display: "flex", alignItems: "center", justifyContent: "center", overflow: 'visible' }, children: _jsxs(TMTooltip, { content: _a.getTooltip(objClass, d), children: [objClass == ObjectClasses.Area && _jsx(IconCloud, { color: ownershipColor }), objClass == ObjectClasses.BasketType && _jsx(IconBasket, { color: ownershipColor }), objClass == ObjectClasses.Disk && _jsx(IconDisk, { fontSize: 20, color: ownershipColor }), objClass == ObjectClasses.DataList && d.id && d.id > 26 && _jsx(IconDataList, { color: ownershipColor }), objClass == ObjectClasses.DataList && d.id && d.id <= 26 && _jsx(IconSettings, { color: ownershipColor }), objClass == ObjectClasses.Group && _jsx(IconUserGroup, { fontSize: 20, color: ownershipColor }), objClass == ObjectClasses.Numerator && _jsx(Icon123, { color: ownershipColor }), objClass == ObjectClasses.SignCert && _jsx(IconSignCert, { fontSize: 20, color: ownershipColor }), objClass == ObjectClasses.SignServer && _jsx(IconServerService, { fontSize: 20, color: ownershipColor }), objClass == ObjectClasses.LDAP && _jsx(IconAddressBook, { fontSize: 20, color: ownershipColor }), objClass == ObjectClasses.Tree && _jsx(IconTree, { color: ownershipColor }), objClass == ObjectClasses.TSA && _jsx(IconAccessPoint, { color: ownershipColor }), objClass == ObjectClasses.User && _jsx(TMUserIcon, { ud: d }), objClass == ObjectClasses.Job && _jsx(IconSuitcase, { color: ownershipColor }), objClass == ObjectClasses.Process && _jsx(IconProcess, { color: d.state === ProcessStates.Running ? TMColors.primary : d.state === ProcessStates.Ready || d.state === ProcessStates.Started ? TMColors.secondary : d.state === ProcessStates.Freezed ? 'rgb(180,180,180)' : d.state === ProcessStates.Completed ? TMColors.success : TMColors.error })] }) }));
405
398
  };
406
399
  PlatformObjectService.getTooltip = (objClass, d) => {
407
400
  let ownLevel = LocalizeOwnershipLevels(d.ownershipLevel);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@topconsultnpm/sdkui-react-beta",
3
- "version": "6.10.62",
3
+ "version": "6.10.63",
4
4
  "description": "",
5
5
  "scripts": {
6
6
  "test": "echo \"Error: no test specified\" && exit 1",