Merge pull request #13 from fleetbase/dev-v0.0.12

v0.2.11
fleetbase · May 30, 2024 · 632fe83 · 632fe83
2 parents 6b11bf9 + 9acee7a
commit 632fe83
Show file tree

Hide file tree

Showing 12 changed files with 572 additions and 350 deletions.
diff --git a/addon/components/modals/group-form.hbs b/addon/components/modals/group-form.hbs
@@ -16,10 +16,24 @@
 
             <div class="input-group">
                 <div class="mb-4">
-                    <InputLabel class="mb-2" @labelText={{t "iam.components.modals.group-form.select-users-add-group"}} @helpText={{t "iam.components.modals.group-form.search-select-users-add-group"}} />
+                    <InputLabel
+                        class="mb-2"
+                        @labelText={{t "iam.components.modals.group-form.select-users-add-group"}}
+                        @helpText={{t "iam.components.modals.group-form.search-select-users-add-group"}}
+                    />
 
                     <div class="flex items-start justify-between">
-                        <ModelSelect @modelName="user" @selectedModel={{@options.lastSelectedUser}} @placeholder={{t "iam.components.modals.group-form.select-user-add-group"}} class="w-64" @triggerClass="form-select form-input" @infiniteScroll={{false}} @renderInPlace={{true}} @onChange={{@options.addUser}} as |model|>
+                        <ModelSelect
+                            @modelName="user"
+                            @selectedModel={{@options.lastSelectedUser}}
+                            @placeholder={{t "iam.components.modals.group-form.select-user-add-group"}}
+                            class="w-64"
+                            @triggerClass="form-select form-input"
+                            @infiniteScroll={{false}}
+                            @renderInPlace={{true}}
+                            @onChange={{@options.addUser}}
+                            as |model|
+                        >
                             {{model.name}}
                         </ModelSelect>
                     </div>
@@ -32,8 +46,7 @@
                                     {{user.name}}
                                 </span>
                                 <span>
-                                    <a href="javascript:;" class="text-blue-300 no-underline hover:text-blue-500" {{on "click" (fn
-                                        @options.removeUser user)}}>
+                                    <a href="javascript:;" class="text-blue-300 no-underline hover:text-blue-500" {{on "click" (fn @options.removeUser user)}}>
                                         <FaIcon @icon="times" @prefix="fas" />
                                     </a>
                                 </span>

diff --git a/addon/components/modals/policy-form.hbs b/addon/components/modals/policy-form.hbs
@@ -14,7 +14,7 @@
         </div>
         <div class="input-group">
             <label>
-               {{t "iam.components.modals.policy-form.select-permissions"}}
+                {{t "iam.components.modals.policy-form.select-permissions"}}
             </label>
             <PermissionPicker @selected={{@options.policy.permissions}} @onChange={{fn (mut @options.policy.permissions)}} />
         </div>

diff --git a/addon/components/modals/user-form.hbs b/addon/components/modals/user-form.hbs
@@ -32,7 +32,12 @@
                         <label>
                             {{t "iam.common.country"}}
                         </label>
-                        <CountrySelect class="w-full form-input form-select form-datalist" @value={{@options.user.country}} @onChange={{fn (mut @options.user.country)}} placeholder={{t "iam.common.country"}} />
+                        <CountrySelect
+                            class="w-full form-input form-select form-datalist"
+                            @value={{@options.user.country}}
+                            @onChange={{fn (mut @options.user.country)}}
+                            placeholder={{t "iam.common.country"}}
+                        />
                     </div>
                 </div>
             </div>

diff --git a/addon/components/permission-picker.hbs b/addon/components/permission-picker.hbs
@@ -2,7 +2,12 @@
     <div class="mb-2 flex items-center justify-between">
         <div class="flex items-center">
             <div class="permission-picker-search">
-                <Input @type="text" {{on "input" (perform this.search)}} placeholder={{t "iam.components.permission-picker.search-permissions-keyword"}} class="w-64 form-input form-input-sm" />
+                <Input
+                    @type="text"
+                    {{on "input" (perform this.search)}}
+                    placeholder={{t "iam.components.permission-picker.search-permissions-keyword"}}
+                    class="w-64 form-input form-input-sm"
+                />
             </div>
             <div>
                 {{#if this.isLoading}}
@@ -13,7 +18,8 @@
             </div>
         </div>
         <div class="text-sm dark:text-gray-100">
-            {{t "iam.components.permission-picker.selected"}} {{this.selected.length}}
+            {{t "iam.components.permission-picker.selected"}}
+            {{this.selected.length}}
         </div>
     </div>
     <div class="bg-white border border-gray-200 rounded shadow-sm dark:bg-gray-700 dark:border-gray-900 text-xs">

diff --git a/addon/components/table/cell/group-members.hbs b/addon/components/table/cell/group-members.hbs
@@ -1,7 +1,11 @@
 <div class="flex flex-row items-center space-x-2">
     {{#each @row.users as |user|}}
         <div class="rounded-lg shadow-sm border border-blue-800 bg-blue-600 hover:bg-blue-500 text-white">
-            <a href="javascript:;" class="truncate inline-flex items-center px-2 py-0.5 rounded-lg text-xs font-medium text-white leading-4 whitespace-no-wrap" {{on "click" (fn @column.onClick user @row)}}>
+            <a
+                href="javascript:;"
+                class="truncate inline-flex items-center px-2 py-0.5 rounded-lg text-xs font-medium text-white leading-4 whitespace-no-wrap"
+                {{on "click" (fn @column.onClick user @row)}}
+            >
                 {{user.name}}
             </a>
         </div>

diff --git a/addon/components/table/cell/user-name.hbs b/addon/components/table/cell/user-name.hbs
@@ -1,5 +1,5 @@
 <div class="relative flex items-center">
-    <img src={{@row.avatar_url}} alt={{@row.name}} class="w-6 h-6 rounded-md {{if @column.hasOnline "mx-2" "mr-2"}}" />
+    <img src={{@row.avatar_url}} alt={{@row.name}} class="w-6 h-6 rounded-md {{if @column.hasOnline 'mx-2' 'mr-2'}}" />
     <span class="relative block">
         <a href="javascript:;" class="relative block" {{on "click" this.onClick}}>
             {{#if (has-block)}}
@@ -12,6 +12,6 @@
         </a>
     </span>
     {{#if @column.showOnlineIndicator}}
-        <FaIcon @icon="circle" class="absolute left-0 top-0 {{if @row.online "text-green-500" "text-yellow-200"}}" />
+        <FaIcon @icon="circle" class="absolute left-0 top-0 {{if @row.online 'text-green-500' 'text-yellow-200'}}" />
     {{/if}}
 </div>
diff --git a/addon/templates/groups/index.hbs b/addon/templates/groups/index.hbs
@@ -1,5 +1,5 @@
 <Layout::Section::Header @title={{t "iam.common.group"}} @searchQuery={{this.query}} @onSearch={{perform this.search}}>
-   {{#if (safe-has this.table "selectedRows")}}
+    {{#if (safe-has this.table "selectedRows")}}
         <DropdownButton @icon="layer-group" @text={{t "iam.common.bulk-action"}} @type="magic" @size="sm" @buttonWrapperClass="mr-2" @contentClass="dropdown-menu" as |dd|>
             <div class="next-dd-menu mt-2 mx-0">
                 <div class="px-1">
@@ -15,7 +15,17 @@
 </Layout::Section::Header>
 
 <Layout::Section::Body>
-    <Table @rows={{@model}} @columns={{this.columns}} @selectable={{true}} @canSelectAll={{true}} @onSetup={{fn (mut this.table)}} @pagination={{true}} @paginationMeta={{@model.meta}} @page={{this.page}} @onPageChange={{fn (mut this.page)}} @tfootVerticalOffset="53" @tfootVerticalOffsetElements=".next-view-section-subheader" />
+    <Table
+        @rows={{@model}}
+        @columns={{this.columns}}
+        @selectable={{true}}
+        @canSelectAll={{true}}
+        @onSetup={{fn (mut this.table)}}
+        @pagination={{true}}
+        @paginationMeta={{@model.meta}}
+        @page={{this.page}}
+        @onPageChange={{fn (mut this.page)}}
+    />
 </Layout::Section::Body>
 
 {{outlet}}
diff --git a/addon/templates/policies/index.hbs b/addon/templates/policies/index.hbs
@@ -1,5 +1,5 @@
 <Layout::Section::Header @title={{t "iam.policies.index.title"}} @searchQuery={{this.query}} @onSearch={{perform this.search}}>
-   {{#if (safe-has this.table "selectedRows")}}
+    {{#if (safe-has this.table "selectedRows")}}
         <DropdownButton @icon="layer-group" @text={{t "iam.common.bulk-action"}} @type="magic" @size="sm" @buttonWrapperClass="mr-2" @contentClass="dropdown-menu" as |dd|>
             <div class="next-dd-menu mt-2 mx-0">
                 <div class="px-1">
@@ -14,7 +14,17 @@
 </Layout::Section::Header>
 
 <Layout::Section::Body>
-    <Table @rows={{@model}} @columns={{this.columns}} @selectable={{true}} @canSelectAll={{true}} @onSetup={{fn (mut this.table)}} @pagination={{true}} @paginationMeta={{@model.meta}} @page={{this.page}} @onPageChange={{fn (mut this.page)}} @tfootVerticalOffset="53" @tfootVerticalOffsetElements=".next-view-section-subheader" />
+    <Table
+        @rows={{@model}}
+        @columns={{this.columns}}
+        @selectable={{true}}
+        @canSelectAll={{true}}
+        @onSetup={{fn (mut this.table)}}
+        @pagination={{true}}
+        @paginationMeta={{@model.meta}}
+        @page={{this.page}}
+        @onPageChange={{fn (mut this.page)}}
+    />
 </Layout::Section::Body>
 
 {{outlet}}
diff --git a/addon/templates/roles/index.hbs b/addon/templates/roles/index.hbs
@@ -1,5 +1,5 @@
 <Layout::Section::Header @title={{t "iam.common.role"}} @searchQuery={{this.query}} @onSearch={{perform this.search}}>
-   {{#if (safe-has this.table "selectedRows")}}
+    {{#if (safe-has this.table "selectedRows")}}
         <DropdownButton @icon="layer-group" @text={{t "iam.common.bulk-action"}} @type="magic" @size="sm" @buttonWrapperClass="mr-2" @contentClass="dropdown-menu" as |dd|>
             <div class="next-dd-menu mt-2 mx-0">
                 <div class="px-1">
@@ -14,7 +14,17 @@
 </Layout::Section::Header>
 
 <Layout::Section::Body>
-    <Table @rows={{@model}} @columns={{this.columns}} @selectable={{true}} @canSelectAll={{true}} @onSetup={{fn (mut this.table)}} @pagination={{true}} @paginationMeta={{@model.meta}} @page={{this.page}} @onPageChange={{fn (mut this.page)}} @tfootVerticalOffset="53" @tfootVerticalOffsetElements=".next-view-section-subheader" />
+    <Table
+        @rows={{@model}}
+        @columns={{this.columns}}
+        @selectable={{true}}
+        @canSelectAll={{true}}
+        @onSetup={{fn (mut this.table)}}
+        @pagination={{true}}
+        @paginationMeta={{@model.meta}}
+        @page={{this.page}}
+        @onPageChange={{fn (mut this.page)}}
+    />
 </Layout::Section::Body>
 
 {{outlet}}
diff --git a/addon/templates/users/index.hbs b/addon/templates/users/index.hbs
@@ -25,8 +25,6 @@
         @paginationMeta={{@model.meta}}
         @page={{this.page}}
         @onPageChange={{fn (mut this.page)}}
-        @tfootVerticalOffset="53"
-        @tfootVerticalOffsetElements=".next-view-section-subheader"
     />
 </Layout::Section::Body>
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/iam-engine",
-    "version": "0.0.11",
+    "version": "0.0.12",
     "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.10",
-        "@fleetbase/ember-ui": "^0.2.15",
+        "@fleetbase/ember-core": "^0.2.11",
+        "@fleetbase/ember-ui": "^0.2.16",
         "@babel/core": "^7.23.2",
         "ember-cli-babel": "^8.2.0",
         "ember-cli-htmlbars": "^6.3.0",