@capillarytech/cap-ui-utils 1.3.2 → 1.3.4

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 (2) hide show
  1. package/package.json +1 -1
  2. package/utils/multipleOrgSwitch.js +6 -3
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@capillarytech/cap-ui-utils",
3
- "version": "1.3.2",
3
+ "version": "1.3.4",
4
4
  "description": "Utility functions shared accross all the modules",
5
5
  "main": "index.js",
6
6
  "scripts": {
package/utils/multipleOrgSwitch.js CHANGED
@@ -11,7 +11,7 @@ const logNewTab = () => {
11
11
  saveItem(`tab_${hash}`, true);
12
12
  };
13
13
 
14
- const removeTabsFromStorage = (tabs) => {
14
+ const removeTabsFromStorage = (tabs = {}) => {
15
15
  for (const key in tabs) {
16
16
  if (tabs.hasOwnProperty(key)) {
17
17
  clearItem(key);
@@ -32,9 +32,12 @@ const filterObjectByKeyName = (substring, object) => {
32
32
  return filteredObject;
33
33
  };
34
34
 
35
- const getOrgNameFromId = (orgId, proxyOrgList) => {
35
+ const utilsGetOrgNameFromId = (orgId, proxyOrgList = [], defaultOrgID, defaultOrgName) => {
36
36
  const orgObj = proxyOrgList.find(proxyOrg => proxyOrg['orgID'] == orgId);
37
37
  const orgName = (orgObj && orgObj.orgName) || orgId;
38
+ if (orgName === defaultOrgID){
39
+ return defaultOrgName;
40
+ }
38
41
  return orgName;
39
42
  };
40
43
 
@@ -63,7 +66,7 @@ export default {
63
66
  logNewTab,
64
67
  removeTabsFromStorage,
65
68
  filterObjectByKeyName,
66
- getOrgNameFromId,
69
+ utilsGetOrgNameFromId,
67
70
  tabBeforeUnloadEventHandler,
68
71
  utilsHandleStorageChange,
69
72
  isMultipleTabsOpen