From 4696c49b857912d2460cf278d910c529ea10e418 Mon Sep 17 00:00:00 2001 From: Doljinsuren Enkhbayar Date: Thu, 16 May 2024 11:50:16 +0800 Subject: [PATCH 1/4] added selection --- addon/controllers/users/index.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addon/controllers/users/index.js b/addon/controllers/users/index.js index 8e2a978..36c4a97 100644 --- a/addon/controllers/users/index.js +++ b/addon/controllers/users/index.js @@ -266,7 +266,8 @@ export default class UsersIndexController extends Controller { * @void */ @action exportUsers() { - this.crud.export('user'); + const selections = this.table.selectedRows.map((_) => _.id); + this.crud.export('user', { params: { selections } }); } /** From 9c046cd3bccfb60eda315a6f485166faabb8e46b Mon Sep 17 00:00:00 2001 From: Doljinsuren Enkhbayar Date: Fri, 17 May 2024 10:59:05 +0800 Subject: [PATCH 2/4] fix url --- addon/controllers/users/index.js | 2 +- addon/templates/users/index.hbs | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/addon/controllers/users/index.js b/addon/controllers/users/index.js index 36c4a97..6220e20 100644 --- a/addon/controllers/users/index.js +++ b/addon/controllers/users/index.js @@ -267,7 +267,7 @@ export default class UsersIndexController extends Controller { */ @action exportUsers() { const selections = this.table.selectedRows.map((_) => _.id); - this.crud.export('user', { params: { selections } }); + this.crud.export('users', { params: { selections } }); } /** diff --git a/addon/templates/users/index.hbs b/addon/templates/users/index.hbs index c005f59..a714cce 100644 --- a/addon/templates/users/index.hbs +++ b/addon/templates/users/index.hbs @@ -1,5 +1,5 @@ - {{#if (safe-has this.table "selectedRows")}} + {{#if (safe-has this.table "selectedRows")}}
@@ -15,7 +15,19 @@ - +
{{outlet}} \ No newline at end of file From 4d868d907969c8e0ec136647c475fd6ca7061325 Mon Sep 17 00:00:00 2001 From: "Ronald A. Richardson" Date: Fri, 17 May 2024 11:34:50 +0800 Subject: [PATCH 3/4] preparing next release --- package.json | 6 +++--- pnpm-lock.yaml | 22 +++++++++++----------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/package.json b/package.json index 5edbcae..f5135a1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@fleetbase/iam-engine", - "version": "0.0.10", + "version": "0.0.11", "description": "Fleetbase IAM extension provides identity and access management module for managing users, permissions and policies.", "fleetbase": { "route": "iam", @@ -42,8 +42,8 @@ "publish:github": "npm config set '@fleetbase:registry' https://npm.pkg.github.com/ && npm publish" }, "dependencies": { - "@fleetbase/ember-core": "^0.2.8", - "@fleetbase/ember-ui": "^0.2.12", + "@fleetbase/ember-core": "^0.2.9", + "@fleetbase/ember-ui": "^0.2.14", "@babel/core": "^7.23.2", "ember-cli-babel": "^8.2.0", "ember-cli-htmlbars": "^6.3.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ae17c60..15119b9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5,11 +5,11 @@ dependencies: specifier: ^7.23.2 version: 7.23.2 '@fleetbase/ember-core': - specifier: ^0.2.8 - version: 0.2.8(@ember/test-helpers@3.2.0)(ember-source@5.4.0)(webpack@5.89.0) + specifier: ^0.2.9 + version: 0.2.9(@ember/test-helpers@3.2.0)(ember-source@5.4.0)(webpack@5.89.0) '@fleetbase/ember-ui': - specifier: ^0.2.12 - version: 0.2.12(@ember/test-helpers@3.2.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(ember-source@5.4.0)(postcss@8.4.35)(rollup@4.12.0)(tracked-built-ins@3.3.0)(webpack@5.89.0) + specifier: ^0.2.14 + version: 0.2.14(@ember/test-helpers@3.2.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(ember-source@5.4.0)(postcss@8.4.35)(rollup@4.12.0)(tracked-built-ins@3.3.0)(webpack@5.89.0) '@fortawesome/ember-fontawesome': specifier: ^0.4.1 version: 0.4.1(rollup@4.12.0) @@ -2343,8 +2343,8 @@ packages: - supports-color dev: false - /@fleetbase/ember-core@0.2.8(@ember/test-helpers@3.2.0)(ember-source@5.4.0)(webpack@5.89.0): - resolution: {integrity: sha512-9GGwjkp038UuMX4IHjw4NUqSinCOQWMisFG6XhQT8iyGlcOfSXJX8CxMyNutKpdwQ21VPbRoylVw0q4CmwjaNw==} + /@fleetbase/ember-core@0.2.9(@ember/test-helpers@3.2.0)(ember-source@5.4.0)(webpack@5.89.0): + resolution: {integrity: sha512-Z4XU5QydqP4dqzyncYW1vKxsUn9VjPiJ/R7l/L+jHuJTMr2AbbkZV5LtoQ0nP+Ib2euhlLMgLuxwlVRWUv/C+g==} engines: {node: '>= 18'} dependencies: '@babel/core': 7.23.2 @@ -2376,8 +2376,8 @@ packages: - webpack dev: false - /@fleetbase/ember-ui@0.2.12(@ember/test-helpers@3.2.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(ember-source@5.4.0)(postcss@8.4.35)(rollup@4.12.0)(tracked-built-ins@3.3.0)(webpack@5.89.0): - resolution: {integrity: sha512-F1jqOAH8ACEW5QWyFgQrVvZB/jTMtK8pJG8MghSpLqo0zh+NKFs70PNGg18fKAljfL50Ld2wuP5c4rxhGxgX8A==} + /@fleetbase/ember-ui@0.2.14(@ember/test-helpers@3.2.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(ember-source@5.4.0)(postcss@8.4.35)(rollup@4.12.0)(tracked-built-ins@3.3.0)(webpack@5.89.0): + resolution: {integrity: sha512-31FAddlqt9M4Gcnzsgot/2I+/yWg+iWOuRef0zKTOh58BBKE5mrPP9UaK+er6SShgPRyLDAirIwttha1AMXuNg==} engines: {node: '>= 18'} dependencies: '@babel/core': 7.23.2 @@ -2432,7 +2432,7 @@ packages: ember-window-mock: 0.9.0(ember-source@5.4.0) ember-wormhole: 0.6.0 imask: 6.6.3 - intl-tel-input: 18.5.3 + intl-tel-input: 22.0.2 postcss-at-rules-variables: 0.3.0(postcss@8.4.35) postcss-conditionals-renewed: 1.0.0(postcss@8.4.35) postcss-each: 1.1.0(postcss@8.4.35) @@ -10297,8 +10297,8 @@ packages: tslib: 2.6.2 dev: false - /intl-tel-input@18.5.3: - resolution: {integrity: sha512-ncFqSpkdGf2YC/FvAiwBH44KAeRG8L7aqDODEpOvMAT3ZpBtvc/WtwaQ/6X4+HKDTlGkobdBjr6P3nAMwO8jtA==} + /intl-tel-input@22.0.2: + resolution: {integrity: sha512-FYDLp56aCVE+G7TJGmKCeU8LlfSztINiv54TALquMhMJumlUP1d48I6fEssbcq325vcXOrqdOO7Bbi1U/WRCcw==} dev: false /invariant@2.2.4: From 467c7b48b3c6751e6b021d803f6508f22e1ea3c8 Mon Sep 17 00:00:00 2001 From: "Ronald A. Richardson" Date: Fri, 17 May 2024 15:46:27 +0800 Subject: [PATCH 4/4] upgraded core dependencies --- addon/controllers/users/index.js | 4 ++-- package.json | 4 ++-- pnpm-lock.yaml | 16 ++++++++-------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/addon/controllers/users/index.js b/addon/controllers/users/index.js index 6220e20..c997a77 100644 --- a/addon/controllers/users/index.js +++ b/addon/controllers/users/index.js @@ -107,7 +107,7 @@ export default class UsersIndexController extends Controller { { label: this.intl.t('iam.common.name'), valuePath: 'name', - width: '170px', + width: '160px', cellComponent: 'table/cell/user-name', mediaPath: 'avatar_url', action: this.editUser, @@ -156,7 +156,7 @@ export default class UsersIndexController extends Controller { label: this.intl.t('iam.users.index.created-at'), valuePath: 'createdAt', sortParam: 'created_at', - width: '130px', + width: '140px', resizable: true, sortable: false, filterable: false, diff --git a/package.json b/package.json index f5135a1..06cff9b 100644 --- a/package.json +++ b/package.json @@ -42,8 +42,8 @@ "publish:github": "npm config set '@fleetbase:registry' https://npm.pkg.github.com/ && npm publish" }, "dependencies": { - "@fleetbase/ember-core": "^0.2.9", - "@fleetbase/ember-ui": "^0.2.14", + "@fleetbase/ember-core": "^0.2.10", + "@fleetbase/ember-ui": "^0.2.15", "@babel/core": "^7.23.2", "ember-cli-babel": "^8.2.0", "ember-cli-htmlbars": "^6.3.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 15119b9..7a18a5d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5,11 +5,11 @@ dependencies: specifier: ^7.23.2 version: 7.23.2 '@fleetbase/ember-core': - specifier: ^0.2.9 - version: 0.2.9(@ember/test-helpers@3.2.0)(ember-source@5.4.0)(webpack@5.89.0) + specifier: ^0.2.10 + version: 0.2.10(@ember/test-helpers@3.2.0)(ember-source@5.4.0)(webpack@5.89.0) '@fleetbase/ember-ui': - specifier: ^0.2.14 - version: 0.2.14(@ember/test-helpers@3.2.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(ember-source@5.4.0)(postcss@8.4.35)(rollup@4.12.0)(tracked-built-ins@3.3.0)(webpack@5.89.0) + specifier: ^0.2.15 + version: 0.2.15(@ember/test-helpers@3.2.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(ember-source@5.4.0)(postcss@8.4.35)(rollup@4.12.0)(tracked-built-ins@3.3.0)(webpack@5.89.0) '@fortawesome/ember-fontawesome': specifier: ^0.4.1 version: 0.4.1(rollup@4.12.0) @@ -2343,8 +2343,8 @@ packages: - supports-color dev: false - /@fleetbase/ember-core@0.2.9(@ember/test-helpers@3.2.0)(ember-source@5.4.0)(webpack@5.89.0): - resolution: {integrity: sha512-Z4XU5QydqP4dqzyncYW1vKxsUn9VjPiJ/R7l/L+jHuJTMr2AbbkZV5LtoQ0nP+Ib2euhlLMgLuxwlVRWUv/C+g==} + /@fleetbase/ember-core@0.2.10(@ember/test-helpers@3.2.0)(ember-source@5.4.0)(webpack@5.89.0): + resolution: {integrity: sha512-K1k7+vNdYoJmJdViUj5tMJFpIfGA/a2SBmUk2QuFhk8PlHARhM8S8U7RxtgAIBA8C9VsQyO0Ekgr5WN3WU6aVQ==} engines: {node: '>= 18'} dependencies: '@babel/core': 7.23.2 @@ -2376,8 +2376,8 @@ packages: - webpack dev: false - /@fleetbase/ember-ui@0.2.14(@ember/test-helpers@3.2.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(ember-source@5.4.0)(postcss@8.4.35)(rollup@4.12.0)(tracked-built-ins@3.3.0)(webpack@5.89.0): - resolution: {integrity: sha512-31FAddlqt9M4Gcnzsgot/2I+/yWg+iWOuRef0zKTOh58BBKE5mrPP9UaK+er6SShgPRyLDAirIwttha1AMXuNg==} + /@fleetbase/ember-ui@0.2.15(@ember/test-helpers@3.2.0)(@glimmer/component@1.1.2)(@glimmer/tracking@1.1.2)(ember-source@5.4.0)(postcss@8.4.35)(rollup@4.12.0)(tracked-built-ins@3.3.0)(webpack@5.89.0): + resolution: {integrity: sha512-nYuyN3ird4lCRUwozFQY3AK8NAnS1pdZB/SGD2vg8SOIr7CjfG7MjixmDbK+d9Vdt2t2QyhbUgzYHleLUAD4qw==} engines: {node: '>= 18'} dependencies: '@babel/core': 7.23.2