namirasoft-account-react 1.4.220 → 1.4.221

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.
@@ -57,8 +57,9 @@ export class NSAWorkspaceListDialog extends Component {
57
57
  else {
58
58
  let workspaces = SearchOperation.filter(this.state.workspaces, p => p.name, this.state.search);
59
59
  let def = workspaces.find(p => p.id === this.state.default_id);
60
- let cur = workspaces.find(p => p.id === this.state.current_id);
61
- workspaces = [...[cur, def].filter(x => x), ...workspaces.filter(p => (p.id !== this.state.default_id) && p.id !== this.state.current_id)];
60
+ let cur = workspaces.find(p => p.id !== this.state.default_id && p.id === this.state.current_id);
61
+ let rest = workspaces.filter(p => p.id !== this.state.default_id && p.id !== this.state.current_id);
62
+ workspaces = [...[cur, def].filter(x => x), ...rest];
62
63
  let content_workspaces = (_jsx("div", { className: Styles.nsa_workspace_list, children: workspaces.map((workspace) => (_jsxs("div", { className: Styles.nsa_workspace_border, onClick: () => this.workspaceClickHandler(workspace.id), style: { backgroundColor: getColor(workspace) }, children: [_jsx("img", { src: "https://static.namirasoft.com/image/namirasoft/workspace/logo/base.png", alt: 'No Profile', width: 48, height: 48, style: { cursor: "pointer" } }), _jsxs("div", { className: 'd-flex flex-column align-items-start', children: [_jsxs("h2", { className: Styles.nsa_workspace_h2, style: { display: "flex", alignItems: "center" }, children: [workspace.name, "\u00A0", _jsx("p", { style: {
63
64
  margin: "0px",
64
65
  fontSize: "10px"
@@ -1 +1 @@
1
- {"version":3,"file":"NSAWorkspaceListDialog.js","sourceRoot":"","sources":["../../src/components/NSAWorkspaceListDialog.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"NSAWorkspaceListDialog.js","sourceRoot":"","sources":["../../src/components/NSAWorkspaceListDialog.tsx"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -8,7 +8,7 @@
8
8
  "framework": "npm",
9
9
  "application": "package",
10
10
  "private": false,
11
- "version": "1.4.220",
11
+ "version": "1.4.221",
12
12
  "author": "Amir Abolhasani",
13
13
  "license": "MIT",
14
14
  "main": "./dist/main.js",
@@ -30,7 +30,7 @@
30
30
  "namirasoft-account": "^1.4.69",
31
31
  "namirasoft-account-client": "^1.4.5",
32
32
  "namirasoft-api-product": "^1.4.20",
33
- "namirasoft-core": "^1.4.58",
33
+ "namirasoft-core": "^1.4.59",
34
34
  "namirasoft-field": "^1.4.21",
35
35
  "namirasoft-history": "^1.4.15",
36
36
  "namirasoft-message": "^1.4.17",
@@ -38,8 +38,8 @@
38
38
  "namirasoft-secret": "^1.4.30",
39
39
  "namirasoft-site": "^1.4.24",
40
40
  "namirasoft-site-map": "^1.4.18",
41
- "namirasoft-site-react": "^1.4.314",
42
- "namirasoft-workspace": "^1.4.20",
41
+ "namirasoft-site-react": "^1.4.315",
42
+ "namirasoft-workspace": "^1.4.22",
43
43
  "os-browserify": "^0.3.0",
44
44
  "path-browserify": "^1.0.1",
45
45
  "process": "^0.11.10",
@@ -82,8 +82,9 @@ export class NSAWorkspaceListDialog extends Component<NSAWorkspaceListDialogProp
82
82
  {
83
83
  let workspaces = SearchOperation.filter(this.state.workspaces, p => p.name, this.state.search);
84
84
  let def = workspaces.find(p => p.id === this.state.default_id);
85
- let cur = workspaces.find(p => p.id === this.state.current_id);
86
- workspaces = [...[cur, def].filter(x => x) as WorkspaceRow[], ...workspaces.filter(p => (p.id !== this.state.default_id) && p.id !== this.state.current_id)];
85
+ let cur = workspaces.find(p => p.id !== this.state.default_id && p.id === this.state.current_id);
86
+ let rest = workspaces.filter(p => p.id !== this.state.default_id && p.id !== this.state.current_id);
87
+ workspaces = [...[cur, def].filter(x => x) as WorkspaceRow[], ...rest];
87
88
  let content_workspaces = (
88
89
  <div className={Styles.nsa_workspace_list}>
89
90
  {