@enso-ui/users 3.0.3 → 3.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@enso-ui/users",
-  "version": "3.0.3",
+  "version": "3.0.5",
   "description": "Basic users package",
   "main": "bulma/index.js",
   "scripts": {

package/src/bulma/pages/users/Edit.vue

@@ -5,7 +5,7 @@
                 ref="form"
                 @ready="
                     ready = true;
-                    pivotParams.userGroups.id = $refs.form.field('group_id').value;
+                    pivotParams.userGroups.id = $event.form.field('group_id').value;
                 ">
                 <template #group_id="props">
                     <form-field v-bind="props"
@@ -33,20 +33,6 @@
                         v-if="!props.field.meta.hidden"/>
                 </template>
                 <template #actions-left>
-                    <div class="level-item"
-                        v-if="canAccess('administration.users.destroy')">
-                        <a class="button is-danger"
-                            @click="deletableUser = Number.parseInt($route.params.user, 10)"
-                            v-if="ready">
-                            <span class="is-hidden-mobile">
-                                {{ i18n('Delete') }}
-                            </span>
-                            <span class="icon">
-                                <fa icon="trash-alt"/>
-                            </span>
-                            <span class="is-hidden-mobile"/>
-                        </a>
-                    </div>
                     <div class="level-item">
                         <a class="button is-warning"
                             @click="$router.push({
@@ -105,10 +91,6 @@
                     </tab>
                 </template>
             </accessories>
-            <delete-modal :user-id="deletableUser"
-                @close="deletableUser = null"
-                @destroyed="navigateToIndex"
-                v-if="!!deletableUser"/>
         </div>
     </div>
 </template>
@@ -124,7 +106,6 @@ import Accessories from '@enso-ui/accessories/bulma';
 import { Tab } from '@enso-ui/tabs/bulma';
 import { mapState } from 'vuex';
 import { PasswordStrength } from '@enso-ui/auth';
-import DeleteModal from './components/DeleteModal.vue';
 import Tokens from './components/Tokens.vue';
 import Sessions from './components/Sessions.vue';
 
@@ -135,7 +116,6 @@ export default {
 
     components: {
         Accessories,
-        DeleteModal,
         EnsoForm,
         Fa,
         FormField,
@@ -153,7 +133,6 @@ export default {
     emits: ['update'],
 
     data: () => ({
-        deletableUser: null,
         ready: false,
         pivotParams: { userGroups: { id: null } },
         password: null,
@@ -174,8 +153,6 @@ export default {
 
     methods: {
         navigateToIndex() {
-            this.deletableUser = null;
-
             this.$nextTick(() => this.$router
                 .push({ name: 'administration.users.index' })
                 .catch(this.routerErrorHandler));

package/src/bulma/pages/users/Index.vue

@@ -1,46 +1,21 @@
 <template>
     <div>
-        <enso-table class="box is-paddingless raises-on-hover"
+        <EnsoTable class="box is-paddingless raises-on-hover"
             id="users"
             ref="table">
             <template #avatarId="{ row }">
                 <avatar class="is-24x24"
                     :user="row"/>
             </template>
-            <template #destroy-button="{ icon, cssClass, row }">
-                <a class="button is-small is-table-button ml-1"
-                    :class="cssClass"
-                    @click="deletableUser = row.id">
-                    <span class="icon is-small">
-                        <fa :icon="icon"/>
-                    </span>
-                </a>
-            </template>
-        </enso-table>
-        <delete-modal :user-id="deletableUser"
-            @close="deletableUser = null"
-            @destroyed="deletableUser = null; $refs.table.fetch()"
-            v-if="!!deletableUser"/>
+        </EnsoTable>
     </div>
 </template>
 
-<script>
-import { FontAwesomeIcon as Fa } from '@fortawesome/vue-fontawesome';
+<script setup>
+import { inject } from 'vue';
 import { EnsoTable } from '@enso-ui/tables/bulma';
 import Avatar from './components/Avatar.vue';
-import DeleteModal from './components/DeleteModal.vue';
-
-export default {
-    name: 'Index',
-
-    components: {
-        Avatar, DeleteModal, EnsoTable, Fa,
-    },
-
-    inject: ['canAccess', 'i18n'],
 
-    data: () => ({
-        deletableUser: null,
-    }),
-};
+const canAccess = inject('canAccess');
+const i18n = inject('i18n');
 </script>

package/src/bulma/pages/users/components/DeleteModal.vue

@@ -1,64 +0,0 @@
-<template>
-    <modal>
-        <div class="box">
-            <h5 class="subtitle is-5">
-                {{ i18n("The selected user is about to be deleted. Are you sure?") }}
-            </h5>
-            <hr>
-            <div class="level">
-                <div class="level-left"/>
-                <div class="level-right">
-                    <div class="level-item">
-                        <button class="button is-outlined"
-                            @click="$emit('close')">
-                            {{ i18n("Cancel") }}
-                        </button>
-                        <button class="button is-danger ml-1"
-                            v-focus
-                            @click="destroy()">
-                            {{ i18n("Delete User") }}
-                        </button>
-                        <button class="button is-danger ml-1"
-                            v-focus
-                            @click="destroy(true)">
-                            {{ i18n("Delete User and Person") }}
-                        </button>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </modal>
-</template>
-
-<script>
-import { focus } from '@enso-ui/directives';
-import { Modal } from '@enso-ui/modal/bulma';
-
-export default {
-    name: 'DeleteModal',
-
-    components: { Modal },
-
-    directives: { focus },
-
-    inject: ['http', 'i18n', 'errorHandler', 'route'],
-
-    props: {
-        userId: {
-            type: Number,
-            required: true,
-        },
-    },
-
-    emits: ['close', 'destroyed'],
-
-    methods: {
-        destroy(person = false) {
-            this.http.delete(this.route('administration.users.destroy', this.userId),
-                { params: { person: !!person } })
-                .then(({ data }) => this.$emit('destroyed', data))
-                .catch(this.errorHandler);
-        },
-    },
-};
-</script>